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

Commit2bf3a16

Browse files
brettfoKevinRansom
authored andcommitted
Merge dev16.0-future to dev16.0 (dotnet#5861)
* Update for dev 16.0* Finish targeting `net472` for future dev16 work. (dotnet#5719)* don't set `$(TargetFramework)` on non-SDK projects* HostedCompilerServer and PEVerify should explicitly be `net472`* don't copy System.ValueTuple.dll for tests because it's not deployed any more* add net472 support where System.ValueTuple can come from mscorlib* force target framework 4.6 on Linux/Mono
1 parent41d31c1 commit2bf3a16

File tree

30 files changed

+83
-76
lines changed

30 files changed

+83
-76
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharp"
3232
file source="$(BinariesFolder)\net40\bin\Microsoft.Portable.FSharp.Targets"
3333
file source="$(BinariesFolder)\net40\bin\System.Collections.Immutable.dll"
3434
file source="$(BinariesFolder)\net40\bin\System.Reflection.Metadata.dll"
35-
file source="$(BinariesFolder)\net40\bin\System.ValueTuple.dll"
3635
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.props"
3736
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.NetSdk.targets"
3837
file source="$(BinariesFolder)\net40\bin\Microsoft.FSharp.Overrides.NetSdk.targets"

‎src/FSharpSource.targets‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@
5656
<ImportProject="FSharpSource.Profiles.targets" />
5757

5858
<PropertyGroupCondition="'$(TargetDotnetProfile)'=='net40'">
59-
<TargetFrameworkVersionCondition="'$(TargetFrameworkVersion)' == ''">v4.6</TargetFrameworkVersion>
59+
<!-- target .NET 4.7.2, except on Mono which doesn't have 4.7.2 reference assemblies yet-->
60+
<TargetFrameworkVersionCondition="'$(TargetFrameworkVersion)' == '' AND '$(MonoPackaging)' != 'true'">v4.7.2</TargetFrameworkVersion>
61+
<TargetFrameworkVersionCondition="'$(TargetFrameworkVersion)' == '' AND '$(MonoPackaging)' == 'true'">v4.6</TargetFrameworkVersion>
6062
<TargetFrameworkProfile></TargetFrameworkProfile>
6163
<!-- MSbuild works out the assembly references-->
6264
</PropertyGroup>

‎src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<BuiltProjectOutputGroupKeyOutputInclude="$(FSharpSourcesRoot)\..\$(Configuration)\net40\bin\Microsoft.Build.Tasks.Core.dll" />
3030
<BuiltProjectOutputGroupKeyOutputInclude="$(FSharpSourcesRoot)\..\$(Configuration)\net40\bin\System.Reflection.Metadata.dll" />
3131
<BuiltProjectOutputGroupKeyOutputInclude="$(FSharpSourcesRoot)\..\$(Configuration)\net40\bin\System.Collections.Immutable.dll" />
32-
<BuiltProjectOutputGroupKeyOutputInclude="$(FSharpSourcesRoot)\..\$(Configuration)\net40\bin\System.ValueTuple.dll" />
32+
<BuiltProjectOutputGroupKeyOutputInclude="$(FSharpSourcesRoot)\..\$(Configuration)\net40\bin\System.ValueTuple.dll"Condition="'$(MonoPackaging)' == 'true'"/>
3333
</ItemGroup>
3434
</Target>
3535
<ImportProject="$(FSharpSourcesRoot)\.nuget\NuGet.targets"Condition="Exists('$(FSharpSourcesRoot)\.nuget\NuGet.targets')" />
@@ -673,17 +673,19 @@
673673
<ReferenceInclude="System.Numerics" />
674674
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
675675
<ReferenceInclude="System.Reflection.Metadata">
676-
<HintPath>..\..\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataPackageVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
676+
<HintPathCondition="'$(MonoPackaging)' != 'true'">..\..\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataPackageVersion)\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
677+
<HintPathCondition="'$(MonoPackaging)' == 'true'">..\..\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataPackageVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
677678
</Reference>
678679
<ReferenceInclude="System.Collections.Immutable">
679-
<HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutablePackageVersion)\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath>
680-
</Reference>
681-
<ReferenceInclude="System.ValueTuple">
682-
<HintPath>..\..\..\packages\System.ValueTuple.$(SystemValueTuplePackageVersion)\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
680+
<HintPathCondition="'$(MonoPackaging)' != 'true'">..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutablePackageVersion)\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
681+
<HintPathCondition="'$(MonoPackaging)' == 'true'">..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutablePackageVersion)\lib\netstandard1.0\System.Collections.Immutable.dll</HintPath>
683682
</Reference>
684683
<ReferenceInclude="System.IO.Compression">
685684
<HintPath>..\..\..\packages\System.IO.Compression.$(SystemIoCompressionPackageVersion)\lib\net46\System.IO.Compression.dll</HintPath>
686685
</Reference>
686+
<ReferenceInclude="System.ValueTuple"Condition="'$(MonoPackaging)' == 'true'">
687+
<HintPath>..\..\..\packages\System.ValueTuple.$(SystemValueTuplePackageVersion)\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
688+
</Reference>
687689
</ItemGroup>
688690
<ItemGroupCondition=" '$(TargetDotnetProfile)' != 'coreclr' AND '$(MonoPackaging)' != 'true'">
689691
<ReferenceInclude="Microsoft.Build.Framework">

‎src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<ProjectGuid>{d5870cf0-ed51-4cbc-b3d7-6f56da84ac06}</ProjectGuid>
1414
<OutputType>Library</OutputType>
1515
<AssemblyName>FSharp.Compiler.Server.Shared</AssemblyName>
16-
<TargetFrameworkVersionCondition="'$(TargetDotnetProfile)' != 'coreclr'">v4.6</TargetFrameworkVersion>
1716
</PropertyGroup>
1817
<ItemGroup>
1918
<InternalsVisibleToInclude="fsi" />

‎src/fsharp/Fsc-proto/Fsc-proto.fsproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,10 +461,12 @@
461461
<ReferenceInclude="System.Windows.Forms" />
462462
<ReferenceInclude="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
463463
<ReferenceInclude="System.Reflection.Metadata">
464-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataPackageVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
464+
<HintPathCondition="'$(MonoPackaging)' != 'true'">$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataPackageVersion)\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
465+
<HintPathCondition="'$(MonoPackaging)' == 'true'">$(FSharpSourcesRoot)\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataPackageVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
465466
</Reference>
466467
<ReferenceInclude="System.Collections.Immutable">
467-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutablePackageVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
468+
<HintPathCondition="'$(MonoPackaging)' != 'true'">$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutablePackageVersion)\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
469+
<HintPathCondition="'$(MonoPackaging)' == 'true'">$(FSharpSourcesRoot)\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutablePackageVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
468470
</Reference>
469471
<ReferenceInclude="System.ValueTuple">
470472
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.$(SystemValueTuplePackageVersion)\lib\netstandard1.0\System.ValueTuple.dll</HintPath>

‎src/fsharp/MSBuildReferenceResolver.fs‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,23 @@ module internal Microsoft.FSharp.Compiler.MSBuildReferenceResolver
7474
//let private Net452 = "v4.5.2" // not available in Dev15 MSBuild version
7575

7676
#if MSBUILD_AT_LEAST_14
77-
[<Literal>]
77+
[<Literal>]
7878
letprivateNet46="v4.6"
7979

80-
[<Literal>]
80+
[<Literal>]
8181
letprivateNet461="v4.6.1"
82+
83+
[<Literal>]
84+
letprivateNet462="v4.6.2"
85+
86+
[<Literal>]
87+
letprivateNet47="v4.7"
88+
89+
[<Literal>]
90+
letprivateNet471="v4.7.1"
91+
92+
[<Literal>]
93+
letprivateNet472="v4.7.2"
8294
#endif
8395

8496
/// Get the path to the .NET Framework implementation assemblies by using ToolLocationHelper.GetPathToDotNetFramework.
@@ -97,6 +109,10 @@ module internal Microsoft.FSharp.Compiler.MSBuildReferenceResolver
97109
//| Net452 -> Some TargetDotNetFrameworkVersion.Version452 // not available in Dev15 MSBuild version
98110
| Net46-> Some TargetDotNetFrameworkVersion.Version46
99111
| Net461-> Some TargetDotNetFrameworkVersion.Version461
112+
| Net462-> Some TargetDotNetFrameworkVersion.Version462
113+
| Net47-> Some TargetDotNetFrameworkVersion.Version47
114+
| Net471-> Some TargetDotNetFrameworkVersion.Version471
115+
| Net472-> Some TargetDotNetFrameworkVersion.Version472
100116
#endif
101117
|_->assertfalse; None
102118
match vwith
@@ -122,7 +138,11 @@ module internal Microsoft.FSharp.Compiler.MSBuildReferenceResolver
122138
letHighestInstalledNetFrameworkVersion()=
123139
try
124140
#if MSBUILD_AT_LEAST_14
125-
if box(ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version461))<>nullthen Net461
141+
if box(ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version472))<>nullthen Net472
142+
elif box(ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version471))<>nullthen Net471
143+
elif box(ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version47))<>nullthen Net47
144+
elif box(ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version462))<>nullthen Net462
145+
elif box(ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version461))<>nullthen Net461
126146
elif box(ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version46))<>nullthen Net46
127147
// 4.5.2 enumeration is not available in Dev15 MSBuild version
128148
//elif box (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version452)) <> null then Net452

‎src/fsharp/fsi/Fsi.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<AllowCrossTargeting>true</AllowCrossTargeting>
2727
<OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags>
2828
<Win32Resource>fsi.res</Win32Resource>
29-
<TargetFrameworkVersionCondition="'$(TargetDotnetProfile)' != 'coreclr'">v4.6</TargetFrameworkVersion>
3029
</PropertyGroup>
3130
<ItemGroup>
3231
<CompileInclude="console.fs">

‎src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<AllowCrossTargeting>true</AllowCrossTargeting>
2222
<OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags>
2323
<Win32Resource>..\fsi\fsi.res</Win32Resource>
24-
<TargetFrameworkVersionCondition="'$(TargetDotnetProfile)' != 'coreclr'">v4.6</TargetFrameworkVersion>
2524
</PropertyGroup>
2625
<ItemGroup>
2726
<CompileInclude="..\fsi\console.fs">

‎src/utils/reshapedmsbuild.fs‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ module internal MsBuildAdapters =
7272
openMicrosoft.FSharp.Core.ReflectionAdapters
7373

7474
/// <summary>
75-
/// Used to specify the targeted version of the .NET Framework for some methods of ToolLocationHelper.
75+
/// Used to specify the targeted version of the .NET Framework for some methods of ToolLocationHelper. This is meant to mimic
76+
/// the official version here: https://source.dot.net/#q=TargetDotNetFrameworkVersion.
7677
/// </summary>
7778
typepublicTargetDotNetFrameworkVersion=
7879
| Version11=0
@@ -85,7 +86,11 @@ module internal MsBuildAdapters =
8586
| Version46=7
8687
| Version461=8
8788
| Version452=9
88-
| VersionLatest=8//TargetDotNetFrameworkVersion.Version461
89+
| Version462=10
90+
| Version47=11
91+
| Version471=12
92+
| Version472=13
93+
| VersionLatest=10//TargetDotNetFrameworkVersion.Version462
8994

9095
/// <summary>
9196
/// Used to specify the targeted bitness of the .NET Framework for some methods of ToolLocationHelper
@@ -114,7 +119,11 @@ module internal ToolLocationHelper =
114119
letdotNetFrameworkVersion451= Version(4,5,1)
115120
letdotNetFrameworkVersion452= Version(4,5,2)
116121
letdotNetFrameworkVersion46= Version(4,6)
117-
letdotNetFrameworkVersion461= Version(4,6,1)
122+
letdotNetFrameworkVersion461= Version(4,6,1)
123+
letdotNetFrameworkVersion462= Version(4,6,2)
124+
letdotNetFrameworkVersion47= Version(4,7)
125+
letdotNetFrameworkVersion471= Version(4,7,1)
126+
letdotNetFrameworkVersion472= Version(4,7,2)
118127

119128
// visual studio versions.
120129
letvisualStudioVersion100=new Version(10,0);
@@ -206,6 +215,10 @@ module internal ToolLocationHelper =
206215
| TargetDotNetFrameworkVersion.Version452-> dotNetFrameworkVersion452
207216
| TargetDotNetFrameworkVersion.Version46-> dotNetFrameworkVersion46
208217
| TargetDotNetFrameworkVersion.Version461-> dotNetFrameworkVersion461
218+
| TargetDotNetFrameworkVersion.Version462-> dotNetFrameworkVersion462
219+
| TargetDotNetFrameworkVersion.Version47-> dotNetFrameworkVersion47
220+
| TargetDotNetFrameworkVersion.Version471-> dotNetFrameworkVersion471
221+
| TargetDotNetFrameworkVersion.Version472-> dotNetFrameworkVersion472
209222
|_-> raise(getArgumentException version)
210223

211224
letcomplusInstallRoot= Environment.GetEnvironmentVariable("COMPLUS_INSTALLROOT")
@@ -745,6 +758,10 @@ module internal ToolLocationHelper =
745758
CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion452 visualStudioVersion150// v4.5.2
746759
CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion46 visualStudioVersion140// v4.6
747760
CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion461 visualStudioVersion150// v4.6.1
761+
CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion462 visualStudioVersion150// v4.6.2
762+
CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion47 visualStudioVersion150// v4.7
763+
CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion471 visualStudioVersion150// v4.7.1
764+
CreateDotNetFrameworkSpecForV4 dotNetFrameworkVersion472 visualStudioVersion150// v4.7.2
748765
|]
749766
array.ToDictionary<DotNetFrameworkSpec, Version>(fun spec-> spec.Version)
750767

‎tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@
4343
<ReferenceInclude="System" />
4444
<ReferenceInclude="System.Numerics"Condition="'$(TargetDotnetProfile)' == 'net40'" />
4545
<ReferenceInclude="System.Core" />
46-
<ReferenceInclude="System.ValueTuple">
47-
<HintPath>..\..\..\packages\System.ValueTuple.$(SystemValueTuplePackageVersion)\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
48-
<HintPath>..\..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
49-
</Reference>
5046
</ItemGroup>
5147
<ItemGroup>
5248
<CompileInclude="NunitHelpers.fs" />

0 commit comments

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