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

Commit0c50721

Browse files
authored
[WIP] --- rework msbuild dependencies (#5425)
Rework msbuild dependencies
1 parente7f2bfc commit0c50721

File tree

62 files changed

+253
-764
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+253
-764
lines changed

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.300-rtm-008707
1+
2.1.400-preview-009197

‎build.cmd‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ echo.
556556

557557
echo ---------------- Done with arguments, starting preparation -----------------
558558

559-
setBuildToolsPackage=Microsoft.VSSDK.BuildTools.15.1.192
559+
setBuildToolsPackage=Microsoft.VSSDK.BuildTools.15.6.170
560560
if"%VSSDKInstall%"=="" (
561561
setVSSDKInstall=%~dp0packages\%BuildToolsPackage%\tools\vssdk
562562
)
@@ -717,15 +717,17 @@ if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (
717717
)
718718

719719
echo ---------------- Done with package restore, starting proto ------------------------
720+
setlogdir=%~dp0%BUILD_CONFIG%\logs
721+
ifnotexist"!logdir!"mkdir"!logdir!"
720722

721723
rem Build Proto
722724
if"%BUILD_PROTO%"=="1" (
723725
rmdir /s /q Proto
724726

725727
if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="1" (
726728

727-
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:artifacts\protobuild-net40.build.binlog
728-
%_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:artifacts\protobuild-net40.build.binlog
729+
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%\logs\protobuild-coreclr.build.binlog
730+
%_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%\logs\protobuild-coreclr.build.binlog
729731
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :failure
730732
)
731733

@@ -734,8 +736,8 @@ if "%BUILD_PROTO%" == "1" (
734736
echo%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo
735737
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo
736738

737-
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:artifacts\protobuild-coreclr.build.binlog
738-
%_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:artifacts\protobuild-coreclr.build.binlog
739+
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%\logs\protobuild-net40.build.binlog
740+
%_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%\logs\protobuild-net40.build.binlog
739741
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :failure
740742
)
741743

@@ -758,8 +760,8 @@ if "%BUILD_PHASE%" == "1" (
758760
echo%_msbuildexe%%msbuildflags% build-everything.proj /t:Restore%BUILD_DIAG%
759761
%_msbuildexe%%msbuildflags% build-everything.proj /t:Restore%BUILD_DIAG%
760762

761-
echo%_msbuildexe%%msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG%%BUILD_DIAG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% /bl:artifacts\msbuild.build-everything.build.%BUILD_CONFIG%.binlog
762-
%_msbuildexe%%msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG%%BUILD_DIAG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% /bl:artifacts\msbuild.build-everything.build.%BUILD_CONFIG%.binlog
763+
echo%_msbuildexe%%msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG%%BUILD_DIAG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-everything.build.%BUILD_CONFIG%.binlog
764+
%_msbuildexe%%msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG%%BUILD_DIAG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-everything.build.%BUILD_CONFIG%.binlog
763765

764766
@if ERRORLEVEL1echo Error build failed&&goto :failure
765767
)
@@ -783,8 +785,8 @@ if not "%SIGN_TYPE%" == "" (
783785

784786
echo ---------------- Done with assembly signing, start package creation ---------------
785787

786-
echo%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG% /bl:artifacts\msbuild.build-nuget-packages.build.%BUILD_CONFIG%.binlog
787-
%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG% /bl:artifacts\msbuild.build-nuget-packages.build.%BUILD_CONFIG%.binlog
788+
echo%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-nuget-packages.build.%BUILD_CONFIG%.binlog
789+
%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-nuget-packages.build.%BUILD_CONFIG%.binlog
788790
ifERRORLEVEL1echo Error building NuGet packages&&goto :failure
789791

790792
ifnot"%SIGN_TYPE%"=="" (
@@ -794,8 +796,8 @@ if not "%SIGN_TYPE%" == "" (
794796
)
795797

796798
if"%BUILD_SETUP%"=="1" (
797-
echo%_msbuildexe%%msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG% /bl:artifacts\msbuild.build-insertion.build.%BUILD_CONFIG%.binlog
798-
%_msbuildexe%%msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG% /bl:artifacts\msbuild.build-insertion.build.%BUILD_CONFIG%.binlog
799+
echo%_msbuildexe%%msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-insertion.build.%BUILD_CONFIG%.binlog
800+
%_msbuildexe%%msbuildflags% setup\build-insertion.proj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-insertion.build.%BUILD_CONFIG%.binlog
799801
ifERRORLEVEL1echo Error building insertion packages&&goto :failure
800802
)
801803

@@ -808,8 +810,8 @@ if not "%SIGN_TYPE%" == "" (
808810
echo ---------------- Done with signing, building insertion files ---------------
809811

810812
if"%BUILD_SETUP%"=="1" (
811-
echo%_msbuildexe%%msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG% /bl:artifacts\msbuild.setup-swix.build.%BUILD_CONFIG%.binlog
812-
%_msbuildexe%%msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG% /bl:artifacts\msbuild.setup-swix.build.%BUILD_CONFIG%.binlog
813+
echo%_msbuildexe%%msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.setup-swix.build.%BUILD_CONFIG%.binlog
814+
%_msbuildexe%%msbuildflags% setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=%BUILD_CONFIG% /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.setup-swix.build.%BUILD_CONFIG%.binlog
813815
ifERRORLEVEL1echo Error building .vsmanproj&&goto :failure
814816
)
815817

@@ -1183,6 +1185,8 @@ if "%TEST_VS_IDEUNIT_SUITE%" == "1" (
11831185
type"!ERRORFILE!"
11841186
echo -------end vs-ide-unit errors ------------------------
11851187
echo Error: Running tests vs-ideunit failed, see logs above, search for"Errors and Failures" -- FAILED
1188+
echo Command Line for running tests
1189+
echo"!NUNIT3_CONSOLE!" --verbose --x86 --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!" --workers=1 --agents=1 --full"!FSCBINPATH!\VisualFSharp.UnitTests.dll"!WHERE_ARG_NUNIT!
11861190
echo ----------------------------------------------------------------------------------------------------
11871191
goto :failure
11881192
)

‎build/config/AssemblySignToolData.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,13 @@
5858
],
5959
"exclude": [
6060
"FSharp.Data.TypeProviders.dll",
61-
"Microsoft.Build.Conversion.Core.dll",
6261
"Microsoft.Build.dll",
63-
"Microsoft.Build.Engine.dll",
6462
"Microsoft.Build.Framework.dll",
6563
"Microsoft.Build.Tasks.Core.dll",
6664
"Microsoft.Build.Utilities.Core.dll",
6765
"Newtonsoft.Json.dll",
6866
"System.Collections.Immutable.dll",
6967
"System.Reflection.Metadata.dll",
70-
"System.ValueTuple.4.3.1.nupkg",
7168
"System.ValueTuple.4.4.0.nupkg",
7269
"System.ValueTuple.dll"
7370
]

‎build/config/InsertionSignToolData.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
"fsiAnyCpu.exe",
2828
"FSharp.Data.TypeProviders.dll",
2929
"Microsoft.Build.dll",
30-
"Microsoft.Build.Conversion.Core.dll",
31-
"Microsoft.Build.Engine.dll",
3230
"Microsoft.Build.Framework.dll",
3331
"Microsoft.Build.Tasks.Core.dll",
3432
"Microsoft.Build.Utilities.Core.dll",

‎build/targets/AssemblyVersions.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@
2424
<FSCoreVersion>4.4.3.0</FSCoreVersion>
2525
<FSProductVersion>10.1.1.0</FSProductVersion>
2626
<FSPackageVersion>10.1.4</FSPackageVersion>
27+
2728
<VSMajorVersion>15</VSMajorVersion>
2829
<VSMinorVersion>7</VSMinorVersion>
2930
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3031
<VSAssemblyVersion>$(VSMajorVersion).$(VSMinorVersion).0.0</VSAssemblyVersion>
32+
3133
<MicroBuildAssemblyVersionCondition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>
3234

3335
<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion-->

‎build/targets/PackageVersions.props‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
<RoslynPackageVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\..\RoslynPackageVersion.txt').Trim())</RoslynPackageVersion>
77

88
<!-- System.* packages-->
9-
<SystemCollectionsImmutablePackageVersion>1.3.1</SystemCollectionsImmutablePackageVersion>
9+
<SystemCollectionsImmutablePackageVersion>1.4.0</SystemCollectionsImmutablePackageVersion>
10+
<SystemIoCompressionPackageVersion>4.3.0</SystemIoCompressionPackageVersion>
1011
<SystemRuntimeCachingPackageVersion>1.5.0</SystemRuntimeCachingPackageVersion>
12+
<SystemReflectionMetadataPackageVersion>1.5.0</SystemReflectionMetadataPackageVersion>
13+
<SystemValueTuplePackageVersion>4.3.0</SystemValueTuplePackageVersion>
1114

1215
<!-- Roslyn packages-->
1316
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
@@ -27,7 +30,7 @@
2730
<!-- Visual Studio packages-->
2831
<EnvDTE80PackageVersion>8.0.1</EnvDTE80PackageVersion>
2932
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalPackageVersion>14.0.25420</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalPackageVersion>
30-
<MicrosoftVisualStudioCoreUtility>15.6.27740</MicrosoftVisualStudioCoreUtility>
33+
<MicrosoftVisualStudioCoreUtilityPackageVersion>15.6.27740</MicrosoftVisualStudioCoreUtilityPackageVersion>
3134
<MicrosoftVisualStudioComponentModelHostPackageVersion>15.0.26201-alpha</MicrosoftVisualStudioComponentModelHostPackageVersion>
3235
<MicrosoftVisualStudioDesignerInterfacesPackageVersion>1.1.4322</MicrosoftVisualStudioDesignerInterfacesPackageVersion>
3336
<MicrosoftVisualStudioEditorPackageVersion>15.0.26201</MicrosoftVisualStudioEditorPackageVersion>
@@ -60,10 +63,11 @@
6063
<MicrosoftVisualStudioTextManagerInterop120PackageVersion>12.0.30112</MicrosoftVisualStudioTextManagerInterop120PackageVersion>
6164
<MicrosoftVisualStudioTextUIPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIPackageVersion>
6265
<MicrosoftVisualStudioTextUIWpfPackageVersion>15.6.27740</MicrosoftVisualStudioTextUIWpfPackageVersion>
66+
<MicrosoftVisualStudioThreadingPackageVersion>15.3.23</MicrosoftVisualStudioThreadingPackageVersion>
6367
<MicrosoftVisualStudioUtilitiesPackageVersion>15.0.26201</MicrosoftVisualStudioUtilitiesPackageVersion>
6468
<MicrosoftVisualStudioValidationPackageVersion>15.3.15</MicrosoftVisualStudioValidationPackageVersion>
6569
<MicrosoftVisualStudioWCFReferenceInteropPackageVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropPackageVersion>
66-
<MicrosoftVSSDKBuildToolsPackageVersion>15.1.192</MicrosoftVSSDKBuildToolsPackageVersion>
70+
<MicrosoftVSSDKBuildToolsPackageVersion>15.6.170</MicrosoftVSSDKBuildToolsPackageVersion>
6771
<VSSDKDebuggerVisualizersPackageVersion>12.0.4</VSSDKDebuggerVisualizersPackageVersion>
6872
<VSSDKVSLangProjPackageVersion>7.0.4</VSSDKVSLangProjPackageVersion>
6973
<VSSDKVSLangProj8PackageVersion>8.0.4</VSSDKVSLangProj8PackageVersion>

‎packages.config‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,21 @@
1515
<packageid="Microsoft.DotNet.Build.Tasks.Feed"version="2.1.0-prerelease-02419-02" />
1616

1717
<!-- Actual dependencies of FSharp.Compiler.dll and FSharp.Core.dll-->
18-
<packageid="System.Collections.Immutable"version="1.3.1" />
19-
<packageid="System.Reflection.Metadata"version="1.4.2" />
20-
<packageid="System.ValueTuple"version="4.3.1" />
18+
<packageid="System.Collections.Immutable"version="1.4.0" />
19+
<packageid="System.Reflection.Metadata"version="1.5.0" />
20+
<packageid="System.ValueTuple"version="4.3.0" />
2121
<packageid="System.ValueTuple"version="4.4.0" />
22-
<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />
2322
<packageid="Microsoft.Build"version="14.3.0" />
2423
<packageid="Microsoft.Build.Framework"version="14.3.0" />
2524
<packageid="Microsoft.Build.Utilities.Core"version="14.3.0" />
2625
<packageid="Microsoft.Build.Tasks.Core"version="14.3.0" />
2726

27+
<packageid="Microsoft.Build"version="15.6.85" />
28+
<packageid="Microsoft.Build.Framework"version="15.6.85" />
29+
<packageid="Microsoft.Build.Utilities.Core"version="15.6.85" />
30+
<packageid="Microsoft.Build.Tasks.Core"version="15.6.85" />
31+
<packageid="System.IO.Compression"version="4.3.0" />
32+
2833
<!-- Testing-->
2934
<packageid="FsCheck"version="3.0.0-alpha3" />
3035
<packageid="NUnit"version="3.5.0"targetFramework="net45" />
@@ -36,7 +41,7 @@
3641
<packageid="Newtonsoft.Json"version="9.0.1"/>
3742
<packageid="Microsoft.VisualFSharp.Type.Providers.Redist"version="1.0.0" />
3843
<packageid="Microsoft.FSharp.TupleSample"version="1.0.0-alpha-161121"/>
39-
<packageid="Microsoft.VSSDK.BuildTools"version="15.1.192" />
44+
<packageid="Microsoft.VSSDK.BuildTools"version="15.6.170" />
4045

4146
<!-- Testing Span-->
4247
<packageid="System.Memory"version="4.5.0-rc1" />

‎setup/Swix/Microsoft.FSharp.Compiler/Files.swr‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp"
1818
file source="$(BinariesFolder)\net40\bin\fsi.exe.config"
1919
file source="$(BinariesFolder)\net40\bin\fsiAnyCpu.exe" vs.file.ngen=yes
2020
file source="$(BinariesFolder)\net40\bin\fsiAnyCpu.exe.config"
21-
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Conversion.Core.dll"
2221
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.dll"
23-
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Engine.dll"
2422
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Framework.dll"
2523
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Tasks.Core.dll"
2624
file source="$(BinariesFolder)\net40\bin\Microsoft.Build.Utilities.Core.dll"

‎setup/packages.config‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="System.Collections.Immutable"version="1.3.1" />
4-
<packageid="System.Reflection.Metadata"version="1.4.2" />
3+
<packageid="System.Collections.Immutable"version="1.4.0" />
4+
<packageid="System.Reflection.Metadata"version="1.5.0" />
55
<packageid="FsSrGen"version="2.0.0"targetFramework="net46" />
66
<packageid="MicroBuild.Core"version="0.2.0" />
77
<packageid="MicroBuild.Core.Sentinel"version="1.0.0" />
88
<packageid="MicroBuild.Plugins.SwixBuild"version="1.0.147" />
99
<packageid="Microsoft.VisualFSharp.Core.Redist"version="1.0.0" />
1010
<packageid="Microsoft.VisualStudio.Shell.14.0"version="14.3.25407"targetFramework="net46" />
11-
<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />
1211
<packageid="System.ValueTuple"version="4.4.0" />
1312
<packageid="Microsoft.VisualFSharp.Type.Providers.Redist"version="1.0.0" />
1413
</packages>

‎src/FSharp.Profiles.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
<DefineConstants>$(DefineConstants);FX_JITTRACKING_ISSUE</DefineConstants>
5151
<DefineConstants>$(DefineConstants);FX_NO_INDENTED_TEXT_WRITER</DefineConstants>
5252
<DefineConstantsCondition=" '$(FX_NO_LOADER)' != 'true'">$(DefineConstants);FX_RESHAPED_REFLECTION_CORECLR</DefineConstants>
53-
<DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
5453
<DefineConstants>$(DefineConstants);FSI_TODO_NETCORE</DefineConstants>
5554
<OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
5655
</PropertyGroup>

0 commit comments

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