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

Commitae135de

Browse files
authored
Merge pull requestdotnet#5437 from Microsoft/merges/dev15.8-to-dev15.9
Merge dev15.8 to dev15.9
2 parents6e34558 +a6e3d84 commitae135de

File tree

10 files changed

+27
-14
lines changed

10 files changed

+27
-14
lines changed

‎build.cmd‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -744,8 +744,8 @@ if "%BUILD_PROTO%" == "1" (
744744

745745
if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="1" (
746746

747-
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true
748-
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true
747+
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true /bl:%~dp0%BUILD_CONFIG%\net40\binprotobuild-net40.build.binlog
748+
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true /bl:%~dp0%BUILD_CONFIG%\net40\binprotobuild-net40.build.binlog
749749
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :failure
750750
)
751751

@@ -754,8 +754,8 @@ if "%BUILD_PROTO%" == "1" (
754754
echo%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo
755755
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo
756756

757-
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true
758-
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true
757+
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true /bl:%~dp0%BUILD_CONFIG%\net40\binprotobuild-coreclr.build.binlog
758+
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true /bl:%~dp0%BUILD_CONFIG%\net40\binprotobuild-coreclr.build.binlog
759759
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :failure
760760
)
761761

@@ -775,11 +775,11 @@ echo ---------------- Done with SDK restore, starting build --------------------
775775

776776
if"%BUILD_PHASE%"=="1" (
777777

778-
echo%_msbuildexe%%msbuildflags% build-everything.proj /t:Restore%BUILD_DIAG%
779-
%_msbuildexe%%msbuildflags% build-everything.proj /t:Restore%BUILD_DIAG%
778+
echo%_msbuildexe%%msbuildflags% build-everything.proj /t:Restore%BUILD_DIAG% /bl:%~dp0%BUILD_CONFIG%\net40\binmsbuild.build-everything.restore.%BUILD_CONFIG%.binlog
779+
%_msbuildexe%%msbuildflags% build-everything.proj /t:Restore%BUILD_DIAG% /bl:%~dp0%BUILD_CONFIG%\net40\binmsbuild.build-everything.restore.%BUILD_CONFIG%.binlog
780780

781-
echo%_msbuildexe%%msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG%%BUILD_DIAG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN%
782-
%_msbuildexe%%msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG%%BUILD_DIAG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN%
781+
echo%_msbuildexe%%msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG%%BUILD_DIAG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% /bl:%~dp0%BUILD_CONFIG%\net40\binmsbuild.build-everything.build.%BUILD_CONFIG%.binlog
782+
%_msbuildexe%%msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG%%BUILD_DIAG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% /bl:%~dp0%BUILD_CONFIG%\net40\binmsbuild.build-everything.build.%BUILD_CONFIG%.binlog
783783

784784
@if ERRORLEVEL1echo Error build failed&&goto :failure
785785
)
@@ -803,8 +803,8 @@ if not "%SIGN_TYPE%" == "" (
803803

804804
echo ---------------- Done with assembly signing, start package creation ---------------
805805

806-
echo%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG%
807-
%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG%
806+
echo%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG% /bl:=~dp0artifacts\msbuild.build-nuget-packages.build.%BUILD_CONFIG%.binlog
807+
%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\net40\binmsbuild.build-nuget-packages.build.%BUILD_CONFIG%.binlog
808808
ifERRORLEVEL1echo Error building NuGet packages&&goto :failure
809809

810810
ifnot"%SIGN_TYPE%"=="" (
@@ -814,8 +814,8 @@ if not "%SIGN_TYPE%" == "" (
814814
)
815815

816816
if"%BUILD_SETUP%"=="1" (
817-
echo%_msbuildexe%%msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG%
818-
%_msbuildexe%%msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG%
817+
echo%_msbuildexe%%msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\net40\binmsbuild.build-insertion.build.%BUILD_CONFIG%.binlog
818+
%_msbuildexe%%msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\net40\binmsbuild.build-insertion.build.%BUILD_CONFIG%.binlog
819819
ifERRORLEVEL1echo Error building insertion packages&&goto :failure
820820
)
821821

@@ -828,8 +828,8 @@ if not "%SIGN_TYPE%" == "" (
828828
echo ---------------- Done with signing, building insertion files ---------------
829829

830830
if"%BUILD_SETUP%"=="1" (
831-
echo%_msbuildexe%%msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG%
832-
%_msbuildexe%%msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG%
831+
echo%_msbuildexe%%msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\net40\binmsbuild.setup-swix.build.%BUILD_CONFIG%.binlog
832+
%_msbuildexe%%msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\net40\binmsbuild.setup-swix.build.%BUILD_CONFIG%.binlog
833833
ifERRORLEVEL1echo Error building .vsmanproj&&goto :failure
834834
)
835835

‎build/targets/PackageVersions.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<!-- System.* packages-->
99
<SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
10+
<SystemValueTuplePackageVersion>4.3.0</SystemValueTuplePackageVersion>
1011

1112
<!-- Roslyn packages-->
1213
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>

‎vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<OutputType>Exe</OutputType>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
88
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
9+
<DefaultValueTuplePackageVersion>$(SystemValueTuplePackageVersion)</DefaultValueTuplePackageVersion>
910
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
1011
</PropertyGroup>
1112

‎vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<NoWarn>$(NoWarn);75</NoWarn>
1111
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1212
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
13+
<DefaultValueTuplePackageVersion>$(SystemValueTuplePackageVersion)</DefaultValueTuplePackageVersion>
1314
<OtherFlags>$(OtherFlags) --warnon:1182 --subsystemversion:6.00</OtherFlags>
1415
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
1516
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
@@ -163,6 +164,7 @@
163164
<PackageReferenceInclude="Microsoft.VSSDK.BuildTools"Version="$(MicrosoftVSSDKBuildToolsPackageVersion)"ExcludeAssets="all" />
164165
<PackageReferenceInclude="Newtonsoft.Json"Version="$(NewtonsoftJsonPackageVersion)" />
165166
<PackageReferenceInclude="System.Collections.Immutable"Version="$(SystemCollectionsImmutablePackageVersion)" />
167+
<PackageReferenceInclude="System.ValueTuple"Version="$(SystemValueTuplePackageVersion)" />
166168
<PackageReferenceInclude="VSSDK.VSLangProj"Version="$(VSSDKVSLangProjPackageVersion)" />
167169
</ItemGroup>
168170

‎vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.11.0"Version="$(MicrosoftVisualStudioShellImmutable110PackageVersion)" />
6363
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0"Version="$(MicrosoftVisualStudioShellInterop100PackageVersion)" />
6464
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0"Version="$(MicrosoftVisualStudioShellInterop110PackageVersion)" />
65+
<PackageReferenceInclude="System.ValueTuple"Version="$(SystemValueTuplePackageVersion)" />
6566
<PackageReferenceInclude="VSSDK.VSHelp"Version="$(VSSDKVSHelpPackageVersion)" />
6667
<PackageReferenceInclude="VSSDK.VSLangProj.8"Version="$(VSSDKVSLangProj8PackageVersion)" />
6768
</ItemGroup>

‎vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<NoWarn>$(NoWarn);75</NoWarn>
1111
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1212
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
13+
<DefaultValueTuplePackageVersion>$(SystemValueTuplePackageVersion)</DefaultValueTuplePackageVersion>
1314
<OtherFlags>$(OtherFlags) --warnon:1182 --subsystemversion:6.00</OtherFlags>
1415
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
1516
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
@@ -89,6 +90,7 @@
8990
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Immutable.11.0"Version="$(MicrosoftVisualStudioShellImmutable110PackageVersion)" />
9091
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Interop.10.0"Version="$(MicrosoftVisualStudioShellInterop100PackageVersion)" />
9192
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Interop.11.0"Version="$(MicrosoftVisualStudioShellInterop110PackageVersion)" />
93+
<PackageReferenceInclude="System.ValueTuple"Version="$(SystemValueTuplePackageVersion)" />
9294
<PackageReferenceInclude="VSSDK.VSHelp"Version="$(VSSDKVSHelpPackageVersion)" />
9395
<PackageReferenceInclude="VSSDK.VSLangProj.8"Version="$(VSSDKVSLangProj8PackageVersion)" />
9496
</ItemGroup>

‎vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<NoWarn>$(NoWarn);52;62;75</NoWarn>
1212
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1313
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
14+
<DefaultValueTuplePackageVersion>$(SystemValueTuplePackageVersion)</DefaultValueTuplePackageVersion>
1415
<OtherFlags>$(OtherFlags) --warnon:1182 --subsystemversion:6.00</OtherFlags>
1516
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
1617
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>

‎vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<NoWarn>$(NoWarn);47;75</NoWarn>
1111
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1212
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
13+
<DefaultValueTuplePackageVersion>$(SystemValueTuplePackageVersion)</DefaultValueTuplePackageVersion>
1314
<OtherFlags>$(OtherFlags) --subsystemversion:6.00</OtherFlags>
1415
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
1516
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
@@ -84,6 +85,7 @@
8485
<PackageReferenceInclude="Microsoft.VisualStudio.Shell.Design"Version="$(MicrosoftVisualStudioShellDesignPackageVersion)" />
8586
<PackageReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.10.0"Version="$(MicrosoftVisualStudioTextManagerInterop100PackageVersion)" />
8687
<PackageReferenceInclude="System.Collections.Immutable"Version="$(SystemCollectionsImmutablePackageVersion)" />
88+
<PackageReferenceInclude="System.ValueTuple"Version="$(SystemValueTuplePackageVersion)" />
8789
<PackageReferenceInclude="VSSDK.DebuggerVisualizers"Version="$(VSSDKDebuggerVisualizersPackageVersion)" />
8890
<PackageReferenceInclude="VSSDK.VSHelp"Version="$(VSSDKVSHelpPackageVersion)" />
8991
<PackageReferenceInclude="VSSDK.VSLangProj.8"Version="$(VSSDKVSLangProj8PackageVersion)" />

‎vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<NoWarn>$(NoWarn);45;47;52;58;75</NoWarn>
99
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1010
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
11+
<DefaultValueTuplePackageVersion>$(SystemValueTuplePackageVersion)</DefaultValueTuplePackageVersion>
1112
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
1213
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1314
</PropertyGroup>

‎vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<DefineConstants>NO_PROJECTCRACKER;$(DefineConstants)</DefineConstants>
1010
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1111
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
12+
<DefaultValueTuplePackageVersion>$(SystemValueTuplePackageVersion)</DefaultValueTuplePackageVersion>
1213
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
1314
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
1415
</PropertyGroup>
@@ -204,6 +205,7 @@
204205
<PackageReferenceInclude="Microsoft.VisualStudio.TextManager.Interop"Version="$(MicrosoftVisualStudioTextManagerInteropPackageVersion)" />
205206
<PackageReferenceInclude="Microsoft.VisualStudio.TextManager.Interop.8.0"Version="$(MicrosoftVisualStudioTextManagerInterop80PackageVersion)" />
206207
<PackageReferenceInclude="NUnit"Version="$(NUnitPackageVersion)" />
208+
<PackageReferenceInclude="System.ValueTuple"Version="$(SystemValueTuplePackageVersion)" />
207209
<PackageReferenceInclude="VSSDK.VSHelp"Version="$(VSSDKVSHelpPackageVersion)" />
208210
<PackageReferenceInclude="VSSDK.VSLangProj.8"Version="$(VSSDKVSLangProj8PackageVersion)" />
209211
</ItemGroup>

0 commit comments

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