Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2544d91

Browse files
dotnet-botKevinRansom
authored andcommitted
Merge master to dev15.8 (dotnet#4749)
* remove DiaSymReader package dependencies since they're not used*Fixdotnet#4534 - build with spaces in path (dotnet#4724)* build fixes for spaces in path
1 parent5c2e85e commit2544d91

File tree

7 files changed

+166
-141
lines changed

7 files changed

+166
-141
lines changed

‎FSharpTests.Directory.Build.targets‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<CompilerFilesToCopyInclude="$(MSBuildThisFileDirectory)Tools/dotnet20/sdk/$(DotnetSdkVersion)/FSharp/*.json" />
15-
<CompilerFilesToCopyInclude="$(MSBuildThisFileDirectory)Tools/dotnet20/sdk/$(DotnetSdkVersion)/FSharp/Microsoft.DiaSymReader.dll" />
16-
<CompilerFilesToCopyInclude="$(MSBuildThisFileDirectory)Tools/dotnet20/sdk/$(DotnetSdkVersion)/FSharp/Microsoft.DiaSymReader.PortablePdb.dll" />
1715
</ItemGroup>
1816

1917
<MessageText="Copying compiler files to $(_FSharpCompilerPath)" />

‎build.cmd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ if "%RestorePackages%" == "true" (
643643
)
644644

645645
ifnot"%SIGN_TYPE%"=="" (
646-
setsigntoolnugetoptions=-PackagesDirectory%USERPROFILE%\.nuget\packages -ConfigFile%_nugetconfig%
646+
setsigntoolnugetoptions=-PackagesDirectory"%USERPROFILE%\.nuget\packages" -ConfigFile%_nugetconfig%
647647
ifnot"%PB_RESTORESOURCE%"==""setsigntoolnugetoptions=!signtoolnugetoptions! -FallbackSource%PB_RESTORESOURCE%
648648
%_nugetexe% restore build\config\packages.config!signtoolnugetoptions!
649649
@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure
@@ -661,7 +661,7 @@ if "%RestorePackages%" == "true" (
661661

662662
if"%NEEDS_DOTNET_CLI_TOOLS%"=="1" (
663663
:: Restore the Tools directory
664-
call%~dp0init-tools.cmd
664+
call"%~dp0init-tools.cmd"
665665
)
666666
set_dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
667667
set_dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
@@ -785,8 +785,8 @@ echo ---------------- Done with build, starting assembly version checks --------
785785
setasmvercheckpath=%~dp0tests\fsharpqa\testenv\src\AssemblyVersionCheck
786786

787787
if"%BUILD_NET40%"=="1" (
788-
echo"%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe"%asmvercheckpath%\AssemblyVersionCheck.fsx --"%~dp0build\config\AssemblySignToolData.json""%~dp0%BUILD_CONFIG%"
789-
"%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe"%asmvercheckpath%\AssemblyVersionCheck.fsx --"%~dp0build\config\AssemblySignToolData.json""%~dp0%BUILD_CONFIG%"
788+
echo"%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe""%asmvercheckpath%\AssemblyVersionCheck.fsx" --"%~dp0build\config\AssemblySignToolData.json""%~dp0%BUILD_CONFIG%"
789+
"%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe""%asmvercheckpath%\AssemblyVersionCheck.fsx" --"%~dp0build\config\AssemblySignToolData.json""%~dp0%BUILD_CONFIG%"
790790
ifERRORLEVEL1echo Error verifying assembly versions and commit hashes.&&goto :failure
791791
)
792792

‎src/FSharpSource.Settings.targets‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@
9494
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>
9595
<MicrosoftVisualStudioValidationVersion>15.3.15</MicrosoftVisualStudioValidationVersion>
9696

97+
<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists-->
98+
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
99+
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
100+
97101
<!-- Frozen FSharp.Core package being built with this build-->
98102
<FSharpCore41TargetPackageVersion>4.1.19</FSharpCore41TargetPackageVersion>
99103
<FSharpCore41TargetMajorVersion>4.1</FSharpCore41TargetMajorVersion>

‎src/buildfromsource.cmd‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
set__scriptpath=%~dp0
44

55
rem build tools
6-
dotnet restore%__scriptpath%buildtools\fslex\fslex.fsproj
6+
dotnet restore"%__scriptpath%buildtools\fslex\fslex.fsproj"
77
ifERRORLEVEL1echo Error: failed&&goto :failure
8-
dotnet publish%__scriptpath%buildtools\fslex\fslex.fsproj -o%__scriptpath%..\Tools\fslex
8+
dotnet publish"%__scriptpath%buildtools\fslex\fslex.fsproj" -o"%__scriptpath%..\Tools\fslex"
99
ifERRORLEVEL1echo Error: failed&&goto :failure
10-
dotnet restore%__scriptpath%buildtools\fsyacc\fsyacc.fsproj
10+
dotnet restore"%__scriptpath%buildtools\fsyacc\fsyacc.fsproj"
1111
ifERRORLEVEL1echo Error: failed&&goto :failure
12-
dotnet publish%__scriptpath%buildtools\fsyacc\fsyacc.fsproj -o%__scriptpath%..\Tools\fsyacc
12+
dotnet publish"%__scriptpath%buildtools\fsyacc\fsyacc.fsproj" -o"%__scriptpath%..\Tools\fsyacc"
1313
ifERRORLEVEL1echo Error: failed&&goto :failure
1414

1515
rem build and pack tools
16-
dotnet restore%__scriptpath%buildfromsource\FSharp.Compiler.nuget\FSharp.Compiler.nuget.fsproj
16+
dotnet restore"%__scriptpath%buildfromsource\FSharp.Compiler.nuget\FSharp.Compiler.nuget.fsproj"
1717
ifERRORLEVEL1echo Error: failed&&goto :failure
18-
dotnet pack%__scriptpath%buildfromsource\FSharp.Compiler.nuget\FSharp.Compiler.nuget.fsproj -c Release
18+
dotnet pack"%__scriptpath%buildfromsource\FSharp.Compiler.nuget\FSharp.Compiler.nuget.fsproj" -c Release
1919
ifERRORLEVEL1echo Error: failed&&goto :failure
2020

2121
goto :success

‎src/buildfromsource/BuildFromSource.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- Signing flags currently done using OtherFlags. Can migrate to properties once build target updated-->
1616
<KeyFile>$(MSBuildThisFileDirectory)../buildtools/keys/MSFT.snk</KeyFile>
1717
<PublicSign>true</PublicSign>
18-
<OtherFlags>$(OtherFlags) --publicsign --keyfile:$(KeyFile)</OtherFlags>
18+
<OtherFlags>$(OtherFlags) --publicsign --keyfile:"$(KeyFile)"</OtherFlags>
1919
<OtherFlags>$(OtherFlags) --nocopyfsharpcore</OtherFlags>
2020

2121
<DotNetExeCondition=" '$(OS)' == 'Unix'">dotnet</DotNetExe>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp