Skip to content

Commit 0b33beb

Browse files
author
dotnet-automerge-bot
authored
Merge pull request #6456 from Microsoft/merges/master-to-dev16.1
Merge master to dev16.1
2 parents 627a596 + 45e9d7b commit 0b33beb

18 files changed

Lines changed: 103 additions & 64 deletions

‎eng/Versions.props‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,29 @@
1414
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
1515
<FSCoreMajorVersion>4.6</FSCoreMajorVersion>
1616
<FSCorePackageVersion>$(FSCoreMajorVersion).2</FSCorePackageVersion>
17-
<FSCoreVersion>$(FSCoreMajorVersion).0</FSCoreVersion>
18-
<FSCoreVersion Condition="'$(OfficialBuildId)' == ''">$(FSCoreVersion).0</FSCoreVersion>
19-
<!-- PR builds should specify a 4-part version number -->
17+
<FSCoreVersionPrefix>$(FSCoreMajorVersion).0</FSCoreVersionPrefix>
18+
<FSCoreVersion>$(FSCoreVersionPrefix).0</FSCoreVersion>
19+
</PropertyGroup>
20+
<PropertyGroup>
2021
<FSPackageMajorVersion>10.4</FSPackageMajorVersion>
2122
<FSPackageVersion>$(FSPackageMajorVersion).2</FSPackageVersion>
22-
<FSProductVersion>$(FSPackageVersion)</FSProductVersion>
23-
<FSProductVersion Condition="'$(OfficialBuildId)' == ''">$(FSProductVersion).0</FSProductVersion>
24-
<!-- PR builds should specify a 4-part version number -->
23+
<FSProductVersionPrefix>$(FSPackageVersion)</FSProductVersionPrefix>
24+
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
25+
</PropertyGroup>
26+
<PropertyGroup>
2527
<VSMajorVersion>16</VSMajorVersion>
2628
<VSMinorVersion>1</VSMinorVersion>
2729
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
28-
<VSAssemblyVersion>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersion>
29-
<VSAssemblyVersion Condition="'$(OfficialBuildId)' == ''">$(VSAssemblyVersion).0</VSAssemblyVersion>
30-
<!-- PR builds should specify a 4-part version number -->
30+
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
31+
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
3132
</PropertyGroup>
3233
<!-- version number assignment -->
3334
<PropertyGroup>
34-
<VersionPrefix>$(FSCoreVersion)</VersionPrefix>
35+
<VersionPrefix>$(FSCoreVersionPrefix)</VersionPrefix>
3536
<VersionPrefix Condition="'$(UseFSharpPackageVersion)' == 'true'">$(FSCorePackageVersion)</VersionPrefix>
36-
<VersionPrefix Condition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersion)</VersionPrefix>
37-
<VersionPrefix Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">$(VSAssemblyVersion)</VersionPrefix>
38-
<AssemblyVersion Condition="'$(OfficialBuildId)' == ''">$(VersionPrefix)</AssemblyVersion>
37+
<VersionPrefix Condition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersionPrefix)</VersionPrefix>
38+
<VersionPrefix Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">$(VSAssemblyVersionPrefix)</VersionPrefix>
39+
<AssemblyVersion Condition="'$(OfficialBuildId)' == ''">$(VersionPrefix).0</AssemblyVersion>
3940
<!-- PR builds should explicitly specify a version number -->
4041
</PropertyGroup>
4142
<PropertyGroup>

‎fcs/Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<RestoreSources>
55
$(RestoreSources);
66
https://api.nuget.org/v3/index.json;
7+
https://dotnet.myget.org/F/fsharp/api/v3/index.json;
78
</RestoreSources>
89
</PropertyGroup>
910

‎fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,8 @@
3232
<PackageReference Include="FSharp.Core" Version="4.5.2" />
3333
<PackageReference Include="FSharp.Core" Version="4.1.19" />
3434
<PackageReference Include="FSharp.Core" Version="4.1.18" />
35+
<PackageReference Include="FSharp.Compiler.Service.MSBuild.v12.0" Version="1.0.0" />
3536
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
36-
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
37-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
38-
<Private>false</Private>
39-
</Reference>
40-
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
41-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Engine.dll</HintPath>
42-
<Private>false</Private>
43-
</Reference>
44-
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
45-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.dll</HintPath>
46-
<Private>false</Private>
47-
</Reference>
48-
<Reference Include="Microsoft.Build.Utilities.v12.0">
49-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Utilities.v12.0.dll</HintPath>
50-
<Private>false</Private>
51-
</Reference>
52-
<Reference Include="Microsoft.Build.Tasks.v12.0">
53-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Tasks.v12.0.dll</HintPath>
54-
<Private>false</Private>
55-
</Reference>
5637
</ItemGroup>
5738
<ItemGroup>
5839
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />

‎fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,6 @@
2424
<Reference Include="System.Runtime" />
2525
<Reference Include="System.IO" />
2626
<PackageReference Include="FSharp.Core" Version="4.6.2" />
27-
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
28-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
29-
<Private>false</Private>
30-
</Reference>
31-
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
32-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Engine.dll</HintPath>
33-
<Private>false</Private>
34-
</Reference>
35-
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
36-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.dll</HintPath>
37-
<Private>false</Private>
38-
</Reference>
39-
<Reference Include="Microsoft.Build.Utilities.v12.0">
40-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Utilities.v12.0.dll</HintPath>
41-
<Private>false</Private>
42-
</Reference>
43-
<Reference Include="Microsoft.Build.Tasks.v12.0">
44-
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Tasks.v12.0.dll</HintPath>
45-
<Private>false</Private>
46-
</Reference>
27+
<PackageReference Include="FSharp.Compiler.Service.MSBuild.v12.0" Version="1.0.0" />
4728
</ItemGroup>
4829
</Project>

‎fcs/dependencies/MSBuild.v12.0/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.dll

‎fcs/dependencies/MSBuild.v12.0/MSBuild.v12.0.csproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net45</TargetFramework>
5+
<NuspecFile>MSBuild.v12.0.nuspec</NuspecFile>
6+
</PropertyGroup>
7+
8+
<Target Name="Build" />
9+
10+
</Project>

‎fcs/dependencies/MSBuild.v12.0/MSBuild.v12.0.nuspec‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
3+
<metadata>
4+
<id>FSharp.Compiler.Service.MSBuild.v12.0</id>
5+
<version>1.0</version>
6+
<authors>Microsoft and F# Software Foundation</authors>
7+
<description>MSBuild.v12.0 dependencies for fcs.</description>
8+
<dependencies>
9+
<group targetFramework="net45">
10+
</group>
11+
</dependencies>
12+
</metadata>
13+
<files>
14+
<file src="Microsoft.Build.dll" target="lib\net45" />
15+
<file src="Microsoft.Build.Engine.dll" target="lib\net45" />
16+
<file src="Microsoft.Build.Framework.dll" target="lib\net45" />
17+
<file src="Microsoft.Build.Tasks.v12.0.dll" target="lib\net45" />
18+
<file src="Microsoft.Build.Utilities.v12.0.dll" target="lib\net45" />
19+
</files>
20+
</package>

‎fcs/dependencies/MSBuild.v12.0/Microsoft.Build.Engine.dll‎

-656 KB
Binary file not shown.

‎fcs/dependencies/MSBuild.v12.0/Microsoft.Build.Framework.dll‎

-81.7 KB
Binary file not shown.

‎fcs/dependencies/MSBuild.v12.0/Microsoft.Build.Tasks.v12.0.dll‎

-1.12 MB
Binary file not shown.

0 commit comments

Comments
 (0)