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

Commit6107ba5

Browse files
authored
Merge pull requestdotnet#4692 from Microsoft/merges/master-to-dev15.8
Merge master to dev15.8
2 parentsa3e5bb5 +0d569e4 commit6107ba5

File tree

35 files changed

+15722
-102
lines changed

35 files changed

+15722
-102
lines changed

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.3-servicing-007056
1+
2.1.300-preview3-008433

‎FSharp.Directory.Build.props‎

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,6 @@
11
<Project>
22

3-
<ImportProject="build\targets\PackageVersions.props" />
4-
<ImportProject="build\targets\CommonPackages.targets" />
5-
6-
<!-- directory locations-->
7-
<PropertyGroup>
8-
<ConfigurationCondition="'$(Configuration)' == ''">Debug</Configuration>
9-
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
10-
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
11-
<ToolsRoot>$(RepoRoot)Tools</ToolsRoot>
12-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
13-
<ProtoOutputPath>$(RepoRoot)Proto\net40\bin</ProtoOutputPath>
14-
</PropertyGroup>
15-
16-
<!-- nuget-->
17-
<PropertyGroup>
18-
<!-- default NuGet package restore location-->
19-
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot>
20-
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(MSBuildThisFileDirectory)packages</NuGetPackageRoot>
21-
<!-- ensure there is a trailing slash-->
22-
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot>
23-
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot>
24-
</PropertyGroup>
25-
26-
<!-- signing-->
27-
<PropertyGroup>
28-
<SkipSigning>false</SkipSigning>
29-
<SignAssembly>true</SignAssembly>
30-
<AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
31-
<StrongNames>true</StrongNames>
32-
<DelaySign>true</DelaySign>
33-
</PropertyGroup>
34-
35-
<!-- mono-->
36-
<PropertyGroup>
37-
<MonoPackagingCondition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</MonoPackaging>
38-
</PropertyGroup>
39-
40-
<!-- localization-->
41-
<PropertyGroup>
42-
<EnableXlfLocalizationCondition="'$(Configuration)' == 'Proto' or '$(MonoPackaging)' == 'true'">false</EnableXlfLocalization>
43-
<UpdateXlfOnBuildCondition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
44-
</PropertyGroup>
45-
46-
<!-- other-->
47-
<PropertyGroup>
48-
<DebugType>portable</DebugType>
49-
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
50-
<UseStandardResourceNames>false</UseStandardResourceNames>
51-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
52-
</PropertyGroup>
53-
54-
<!-- SDK targets override-->
55-
<PropertyGroupCondition="'$(Configuration)' != 'Proto'">
56-
<ProtoFSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</ProtoFSharpTargetsShim>
57-
<FSharpTargetsShimCondition="Exists('$(ProtoFSharpTargetsShim)')">$(ProtoFSharpTargetsShim)</FSharpTargetsShim>
58-
</PropertyGroup>
3+
<ImportProject="FSharpBuild.Directory.Build.props" Condition =" '$(FSharpTestCompilerVersion)' == ''"/>
4+
<ImportProject="FSharpTests.Directory.Build.props" Condition =" '$(FSharpTestCompilerVersion)' != ''"/>
595

606
</Project>

‎FSharp.Directory.Build.targets‎

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,6 @@
11
<Project>
22

3-
<PropertyGroup>
4-
<XlfLanguages>en;$(XlfLanguages)</XlfLanguages>
5-
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp'))">coreclr</TargetDotnetProfile>
6-
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('net4'))">net40</TargetDotnetProfile>
7-
<ActualOutputPathCondition="'$(Language)' != 'VB'">$(MSBuildProjectDirectory)\$(OutputPath)</ActualOutputPath>
8-
<ActualOutputPathCondition="'$(Language)' == 'VB'">$(OutputPath)</ActualOutputPath>
9-
<FinalOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</FinalOutputPath>
10-
<FinalIntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj</FinalIntermediateOutputPath>
11-
</PropertyGroup>
12-
13-
<TargetName="HACK_CopyOutputsToTheProperLocation"
14-
AfterTargets="AfterBuild"
15-
Condition="'$(DisableOutputPathCopying)' != 'true'">
16-
<!--
17-
Ideally we'd set <OutputPath> to `$(Configuration)\[net40|coreclr]\bin`, but the calculation of `[net40|coreclr]`
18-
depends on the `$(TargetFramework)` variable which is set by the individual project files, but by the time we have
19-
that value (e.g., in this file) it's too late; some targets, particularly from the VsSDK have already used the
20-
values of $(OutputPath)/$(OutDir).
21-
22-
The fix is to not set `$(Outputpath)` and simply copy stuff there after the fact.
23-
-->
24-
25-
<ItemGroup>
26-
<OutputFilesToCopyInclude="$(ActualOutputPath)**" />
27-
<IntermediateFilesToCopyInclude="$(IntermediateOutputPath)\**" />
28-
</ItemGroup>
29-
30-
<MessageText="Copying build artifacts to $(FinalOutputPath)" />
31-
<MakeDirDirectories="$(FinalOutputPath);$(FinalIntermediateOutputPath)" />
32-
<CopySourceFiles="@(OutputFilesToCopy)"DestinationFolder="$(FinalOutputPath)" />
33-
<CopySourceFiles="@(IntermediateFilesToCopy)"DestinationFolder="$(FinalIntermediateOutputPath)" />
34-
</Target>
35-
36-
<ImportProject="build\targets\AssemblyVersions.props" />
37-
<ImportProject="build\targets\ConvertPortablePdbs.targets" />
38-
<ImportProject="build\targets\GenerateAssemblyAttributes.targets" />
39-
<ImportProject="build\targets\GenerateInternalsVisibleTo.targets" />
3+
<ImportProject="FSharpBuild.Directory.Build.targets" Condition =" '$(FSharpTestCompilerVersion)' == ''"/>
4+
<ImportProject="FSharpTests.Directory.Build.targets" Condition =" '$(FSharpTestCompilerVersion)' != ''"/>
405

416
</Project>

‎FSharpBuild.Directory.Build.props‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<Project>
2+
3+
<ImportProject="build\targets\PackageVersions.props" />
4+
<ImportProject="build\targets\CommonPackages.targets" />
5+
6+
<!-- directory locations-->
7+
<PropertyGroup>
8+
<ConfigurationCondition="'$(Configuration)' == ''">Debug</Configuration>
9+
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
10+
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
11+
<ToolsRoot>$(RepoRoot)Tools</ToolsRoot>
12+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
13+
<ProtoOutputPath>$(RepoRoot)Proto\net40\bin</ProtoOutputPath>
14+
</PropertyGroup>
15+
16+
<!-- nuget-->
17+
<PropertyGroup>
18+
<!-- default NuGet package restore location-->
19+
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot>
20+
<NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(MSBuildThisFileDirectory)packages</NuGetPackageRoot>
21+
<!-- ensure there is a trailing slash-->
22+
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot>
23+
<NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot>
24+
</PropertyGroup>
25+
26+
<!-- signing-->
27+
<PropertyGroup>
28+
<SkipSigning>false</SkipSigning>
29+
<SignAssembly>true</SignAssembly>
30+
<AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
31+
<StrongNames>true</StrongNames>
32+
<DelaySign>true</DelaySign>
33+
</PropertyGroup>
34+
35+
<!-- mono-->
36+
<PropertyGroup>
37+
<MonoPackagingCondition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</MonoPackaging>
38+
</PropertyGroup>
39+
40+
<!-- localization-->
41+
<PropertyGroup>
42+
<EnableXlfLocalizationCondition="'$(Configuration)' == 'Proto' or '$(MonoPackaging)' == 'true'">false</EnableXlfLocalization>
43+
<UpdateXlfOnBuildCondition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
44+
</PropertyGroup>
45+
46+
<!-- other-->
47+
<PropertyGroup>
48+
<DebugType>portable</DebugType>
49+
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
50+
<UseStandardResourceNames>false</UseStandardResourceNames>
51+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
52+
</PropertyGroup>
53+
54+
<!-- SDK targets override-->
55+
<PropertyGroupCondition="'$(Configuration)' != 'Proto'">
56+
<ProtoFSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</ProtoFSharpTargetsShim>
57+
<FSharpTargetsShimCondition="Exists('$(ProtoFSharpTargetsShim)')">$(ProtoFSharpTargetsShim)</FSharpTargetsShim>
58+
</PropertyGroup>
59+
60+
</Project>
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<XlfLanguages>en;$(XlfLanguages)</XlfLanguages>
5+
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp'))">coreclr</TargetDotnetProfile>
6+
<TargetDotnetProfileCondition="$(TargetFramework.StartsWith('net4'))">net40</TargetDotnetProfile>
7+
<ActualOutputPathCondition="'$(Language)' != 'VB'">$(MSBuildProjectDirectory)\$(OutputPath)</ActualOutputPath>
8+
<ActualOutputPathCondition="'$(Language)' == 'VB'">$(OutputPath)</ActualOutputPath>
9+
<FinalOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\bin</FinalOutputPath>
10+
<FinalIntermediateOutputPath>$(RepoRoot)$(Configuration)\$(TargetDotnetProfile)\obj</FinalIntermediateOutputPath>
11+
</PropertyGroup>
12+
13+
<TargetName="HACK_CopyOutputsToTheProperLocation"
14+
AfterTargets="AfterBuild"
15+
Condition="'$(DisableOutputPathCopying)' != 'true'">
16+
<!--
17+
Ideally we'd set <OutputPath> to `$(Configuration)\[net40|coreclr]\bin`, but the calculation of `[net40|coreclr]`
18+
depends on the `$(TargetFramework)` variable which is set by the individual project files, but by the time we have
19+
that value (e.g., in this file) it's too late; some targets, particularly from the VsSDK have already used the
20+
values of $(OutputPath)/$(OutDir).
21+
22+
The fix is to not set `$(Outputpath)` and simply copy stuff there after the fact.
23+
-->
24+
25+
<ItemGroup>
26+
<OutputFilesToCopyInclude="$(ActualOutputPath)**" />
27+
<IntermediateFilesToCopyInclude="$(IntermediateOutputPath)\**" />
28+
</ItemGroup>
29+
30+
<MessageText="Copying build artifacts to $(FinalOutputPath)" />
31+
<MakeDirDirectories="$(FinalOutputPath);$(FinalIntermediateOutputPath)" />
32+
<CopySourceFiles="@(OutputFilesToCopy)"DestinationFolder="$(FinalOutputPath)" />
33+
<CopySourceFiles="@(IntermediateFilesToCopy)"DestinationFolder="$(FinalIntermediateOutputPath)" />
34+
</Target>
35+
36+
<ImportProject="build\targets\AssemblyVersions.props" />
37+
<ImportProject="build\targets\ConvertPortablePdbs.targets" />
38+
<ImportProject="build\targets\GenerateAssemblyAttributes.targets" />
39+
<ImportProject="build\targets\GenerateInternalsVisibleTo.targets" />
40+
41+
</Project>

‎FSharpTests.Directory.Build.props‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project>
2+
3+
<!-- SDK targets override-->
4+
<PropertyGroupCondition=" '$(FSharpTestCompilerVersion)' == 'net40'">
5+
<_FSharpCompilerPath>$(MSBuildThisFileDirectory)$(Configuration)/net40/bin</_FSharpCompilerPath>
6+
7+
<FscToolPath>$(_FSharpCompilerPath)</FscToolPath>
8+
<FscToolExe>fsc.exe</FscToolExe>
9+
<DotnetFscCompilerPath></DotnetFscCompilerPath>
10+
</PropertyGroup>
11+
12+
<!-- SDK targets override-->
13+
<PropertyGroupCondition=" '$(FSharpTestCompilerVersion)' == 'coreclr'">
14+
<_FSharpCompilerPath>$(MSBuildThisFileDirectory)$(Configuration)/coreclr/bin</_FSharpCompilerPath>
15+
16+
<FscToolPath>$(MSBuildThisFileDirectory)Tools/dotnet20</FscToolPath>
17+
<FscToolExeCondition="'$(OS)' != 'Unix'">dotnet.exe</FscToolExe>
18+
<FscToolExeCondition="'$(OS)' == 'Unix'">dotnet</FscToolExe>
19+
<DotnetFscCompilerPath>$(_FSharpCompilerPath)/fsc.exe</DotnetFscCompilerPath>
20+
</PropertyGroup>
21+
22+
<!-- SDK targets override-->
23+
<PropertyGroup>
24+
<FSharpPropsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
25+
<FSharpTargetsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
26+
<FSharpOverridesTargetsShim>$(_FSharpCompilerPath)/Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
27+
</PropertyGroup>
28+
29+
30+
<!-- We are running under netcore so even though we will use the fsc compiler we can't use the desktop version of the fsharp.build tasks-->
31+
<PropertyGroup>
32+
<FSharpBuildAssemblyFile Condition =" '$(DOTNET_HOST_PATH)' != ''">$(MSBuildThisFileDirectory)$(Configuration)\coreclr\bin\FSharp.Build.dll</FSharpBuildAssemblyFile>
33+
<FSharpBuildAssemblyFile Condition =" '$(DOTNET_HOST_PATH)' == ''">$(MSBuildThisFileDirectory)$(Configuration)\net40\bin\FSharp.Build.dll</FSharpBuildAssemblyFile>
34+
</PropertyGroup>
35+
36+
</Project>
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Project>
2+
3+
<TargetName="HACK_CopyFscDependenciesToReleaseDirectory"
4+
BeforeTargets="CoreCompile"
5+
Condition=" '$(FSharpTestCompilerVersion)' == 'coreclr'">
6+
<!--
7+
When the build is done using correct netsdk projects this won't be necessary
8+
-->
9+
10+
<PropertyGroup>
11+
<DotnetSdkVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)DotnetCLIToolsVersion.txt').Trim())</DotnetSdkVersion>
12+
</PropertyGroup>
13+
<ItemGroup>
14+
<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" />
17+
</ItemGroup>
18+
19+
<MessageText="Copying compiler files to $(_FSharpCompilerPath)" />
20+
<CopySourceFiles="@(CompilerFilesToCopy)"DestinationFolder="$(_FSharpCompilerPath)" SkipUnchangedFiles ="true" />
21+
</Target>
22+
23+
</Project>

‎build.cmd‎

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ echo Usage:
1919
echo.
2020
echo build.cmd^<all^|net40^|coreclr^|vs^>
2121
echo^<proto^|protofx^>
22-
echo^<ci^|ci_part1^|ci_part2^|ci_part3^|microbuild^|nuget^>
22+
echo^<ci^|ci_part1^|ci_part2^|ci_part3^|ci_part4^|microbuild^|nuget^>
2323
echo^<debug^|release^>
2424
echo^<diag^|publicsign^>
25-
echo^<test^|no-test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-net40-ideunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^>
25+
echo^<nobuild^|test^|no-test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-net40-ideunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^|end-2-end^>
2626
echo^<include tag^>
2727
echo^<init^>
2828
echo.
@@ -75,6 +75,7 @@ set TEST_CORECLR_COREUNIT_SUITE=0
7575
setTEST_CORECLR_FSHARP_SUITE=0
7676
setTEST_VS_IDEUNIT_SUITE=0
7777
setTEST_FCS=0
78+
setTEST_END_2_END=0
7879
setINCLUDE_TEST_SPEC_NUNIT=
7980
setINCLUDE_TEST_TAGS=
8081

@@ -295,6 +296,14 @@ if /i "%ARG%" == "ci_part4" (
295296
setCI=1
296297
)
297298

299+
if /i"%ARG%"=="end-2-end" (
300+
setBUILD_PROTO=1
301+
setBUILD_CORECLR=1
302+
setBUILD_NET40_FSHARP_CORE=1
303+
setBUILD_NET40=1
304+
setTEST_END_2_END=1
305+
)
306+
298307
if /i"%ARG%"=="proto" (
299308
set_autoselect=0
300309
setBUILD_PROTO=1
@@ -354,6 +363,7 @@ if /i "%ARG%" == "test-all" (
354363
setTEST_CORECLR_COREUNIT_SUITE=1
355364
setTEST_VS_IDEUNIT_SUITE=1
356365
setTEST_FCS=1
366+
setTEST_END_2_END=1
357367
)
358368

359369
if /i"%ARG%"=="test-net40-fsharpqa" (
@@ -444,6 +454,12 @@ if /i "%PB_SKIPTESTS%" == "true" (
444454
setTEST_VS_IDEUNIT_SUITE=0
445455
)
446456

457+
if /i"%TEST_NET40_FSHARP_SUITE"=="1" (
458+
if /i"%TEST_CORECLR_FSHARP_SUITE%"=="1" (
459+
TEST_END_2_END=1
460+
)
461+
)
462+
447463
if /i"%BUILD_PROTO_WITH_CORECLR_LKG%"=="1" (
448464
setNEEDS_DOTNET_CLI_TOOLS=1
449465
)
@@ -465,6 +481,14 @@ if NOT EXIST Proto\net40\bin\fsc.exe (
465481
setBUILD_PROTO=1
466482
)
467483

484+
rem
485+
rem This stops the dotnet cli from hunting around and
486+
rem finding the highest possible dotnet sdk version to use.
487+
rem
488+
rem description of dotnet lookup here:
489+
rem https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet?tabs=netcore2x
490+
setDOTNET_MULTILEVEL_LOOKUP=false
491+
468492
echo Build/Tests configuration:
469493
echo.
470494
echo BUILD_PROTO=%BUILD_PROTO%
@@ -944,6 +968,22 @@ if "%TEST_FCS%" == "1" (
944968
goto :failure
945969
)
946970
)
971+
972+
REM ---------------- end2end -----------------------
973+
if"%TEST_END_2_END%"=="1" (
974+
975+
pushd%~dp0tests\EndToEndBuildTests
976+
977+
echo Execute end to end compiler tests
978+
echo call EndToEndBuildTests.cmd
979+
call EndToEndBuildTests.cmd
980+
iferrorlevel1 (
981+
popd
982+
Echo end to end tests failed.
983+
goto :failure
984+
)
985+
)
986+
947987
REM ---------------- net40-fsharpqa -----------------------
948988

949989
setOSARCH=%PROCESSOR_ARCHITECTURE%

‎src/FSharpSource.targets‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,11 @@
101101
<WhenCondition="'$(BuildWith)' == 'LKG' AND '$(BUILD_PROTO_WITH_CORECLR_LKG)' == '1'">
102102
<PropertyGroup >
103103
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(ProtoFlavour)\bin</OutputPath>
104+
105+
<DotnetSdkVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\DotnetCLIToolsVersion.txt').Trim())</DotnetSdkVersion>
106+
<FSharpNetCoreLkgPath>$(MSBuildThisFileDirectory)..\Tools\dotnet20\sdk\$(DotnetSdkVersion)\FSharp</FSharpNetCoreLkgPath>
107+
104108
<!-- When using coreclr to bootstrap to proto. We acquire the FSharp.Core LKG, targets LKG, the FSharp.Build LKG from the .NET Framework compiler tools LKG package.-->
105-
<FSharpNetCoreLkgPath>$(FSharpSourcesRoot)\..\Tools\dotnet20\sdk\2.0.3-servicing-007056\FSharp</FSharpNetCoreLkgPath>
106109
<FSharpTargetsPath>..\packages\FSharp.Compiler.Tools.4.1.27\tools\Microsoft.FSharp.Targets</FSharpTargetsPath>
107110

108111
<!-- When using coreclr to bootstrap, the compiler binary comes from the coreclr LKG, invoked using corehost.exe-->

0 commit comments

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