Update FSharp.Core package to 4.6.1, Fix product version (* AssemblyV…

…ersion of compiler binaries *) and remove trailing '.' from githash.

FSharpBuild.Directory.Build.props

@@ -18,6 +18,10 @@
 
   <!-- nuget -->
   <PropertyGroup>
+    <!-- Point to artifacts folder as an additional nuget package source  -->
+    <RestoreAdditionalProjectSources Condition = "'$(RestoreAdditionalProjectSources)' != ''">$(RestoreAdditionalProjectSources);$(MSBuildThisFileDirectory)\artifacts</RestoreAdditionalProjectSources>
+    <RestoreAdditionalProjectSources Condition = "'$(RestoreAdditionalProjectSources)' == ''">$(MSBuildThisFileDirectory)\artifacts</RestoreAdditionalProjectSources>
+
     <!-- default NuGet package restore location -->
     <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot>
     <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == '' AND '$(OS)' == 'Windows_NT'">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>

build-nuget-packages.proj

@@ -6,7 +6,11 @@
     <PackageProjects Include="src\fsharp\FSharp.Core\FSharp.Core.fsproj" Condition="'$(BUILD_NUGET)'=='1'" />
   </ItemGroup>
 
-  <Target Name="Pack">
+  <Target Name="Build">
+    <MSBuild Projects="@(PackageProjects)" Targets="Pack" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
+  </Target>
+
+  <Target Name="Rebuild">
     <MSBuild Projects="@(PackageProjects)" Targets="Pack" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
   </Target>
 

build.cmd

@@ -108,10 +108,12 @@ if /i "%_autoselect%" == "1" (
 
 if /i "%_autoselect_tests%" == "1" (
     if /i "%BUILD_NET40_FSHARP_CORE%" == "1" (
+        set BUILD_NUGET=1
         set TEST_NET40_COREUNIT_SUITE=1
     )
 
     if /i "%BUILD_NET40%" == "1" (
+        set BUILD_NUGET=1
         set TEST_NET40_COMPILERUNIT_SUITE=1
         set TEST_NET40_COREUNIT_SUITE=1
         set TEST_NET40_FSHARP_SUITE=1
@@ -265,6 +267,7 @@ if /i "%ARG%" == "ci_part2" (
     set BUILD_PROTO=1
     set BUILD_NET40=1
     set BUILD_NET40_FSHARP_CORE=1
+    set BUILD_NUGET=1
     set TEST_NET40_COMPILERUNIT_SUITE=1
     set TEST_NET40_COREUNIT_SUITE=1
     set TEST_NET40_FSHARPQA_SUITE=1
@@ -394,13 +397,15 @@ if /i "%ARG%" == "test-net40-ideunit" (
 if /i "%ARG%" == "test-net40-coreunit" (
     set _autoselect=0
     set BUILD_NET40_FSHARP_CORE=1
+    set BUILD_NUGET=1
     set TEST_NET40_COREUNIT_SUITE=1
 )
 
 if /i "%ARG%" == "test-coreclr-coreunit" (
     set _autoselect=0
     set BUILD_PROTO_WITH_CORECLR_LKG=1
     set BUILD_CORECLR=1
+    set BUILD_NUGET=1
     set TEST_CORECLR_COREUNIT_SUITE=1
 )
 
@@ -694,12 +699,6 @@ if not "%SIGN_TYPE%" == "" (
     if ERRORLEVEL 1 echo Error running sign tool && goto :failure
 )
 
-echo ---------------- Done with assembly signing, start package creation ---------------
-
-echo %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG% /t:Pack /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-nuget-packages.build.%BUILD_CONFIG%.binlog
-     %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG% /t:Pack /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-nuget-packages.build.%BUILD_CONFIG%.binlog
-if ERRORLEVEL 1 echo Error building NuGet packages && goto :failure
-
 if not "%SIGN_TYPE%" == "" (
     echo %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:ConfigFile=%~dp0build\config\PackageSignToolData.json
          %_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:ConfigFile=%~dp0build\config\PackageSignToolData.json

build/targets/AssemblyVersions.props

@@ -21,13 +21,14 @@
     <_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>
     <Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
 
-    <FSCoreMajorVersion>4.6</FSCoreMajorVersion>
-    <FSCorePackageVersion>$(FSCoreMajorVersion).0</FSCorePackageVersion>
+    <FSLanguageVersion>4.6</FSLanguageVersion>
+    <FSCoreMajorVersion>$(FSLanguageVersion)</FSCoreMajorVersion>
+    <FSCorePackageVersion>$(FSCoreMajorVersion).1</FSCorePackageVersion>
     <FSCoreVersion>$(FSCoreMajorVersion).0.0</FSCoreVersion>
 
     <FSPackageMajorVersion>10.4</FSPackageMajorVersion>
-    <FSPackageVersion>$(FSPackageMajorVersion).0</FSPackageVersion>
-    <FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
+    <FSPackageVersion>$(FSPackageMajorVersion).1</FSPackageVersion>
+    <FSProductVersion>$(FSPackageMajorVersion).0.0</FSProductVersion>
 
     <VSMajorVersion>16</VSMajorVersion>
     <VSMinorVersion>0</VSMinorVersion>

fsharp.proj

@@ -11,6 +11,7 @@
     <BuildVS Condition="'$(BuildVS)' == ''">false</BuildVS>
     <BuildFCS Condition="'$(BuildFCS)' == ''">false</BuildFCS>
     <BuildSetup Condition="'$(BuildSetup)' == ''">false</BuildSetup>
+    <BuildNuget Condition="'$(BuildNuget)' == ''">false</BuildNuget>
 
     <TestCompiler Condition="'$(TestCompiler)' == ''">false</TestCompiler>
     <TestFSharpSuite Condition="'$(TestFSharpSuite)' == ''">false</TestFSharpSuite>
@@ -26,6 +27,7 @@
     <BuildVS Condition="'$(BUILD_VS)' == '1'">true</BuildVS>
     <BuildFCS Condition="'$(BUILD_FCS)' == '1'">true</BuildFCS>
     <BuildSetup Condition="'$(BUILD_SETUP)' == '1'">true</BuildSetup>
+    <BuildNuget Condition="'$(BUILD_NUGET)' == '1'">true</BuildNuget>
 
     <TestCompiler Condition="'$(TEST_NET40_COMPILERUNIT_SUITE)' == '1'">true</TestCompiler>
     <TestCompiler Condition="'$(TEST_CORECLR_COREUNIT_SUITE)' == '1'">true</TestCompiler>
@@ -62,6 +64,10 @@
       <Projects Include="vsintegration\fsharp-vsintegration-vsix-build.proj" />
     </ItemGroup>
 
+    <ItemGroup Condition="'$(BuildCompiler)' == 'true' OR '$(BuildNuget)' == 'true' OR '$(BuildVS)' == 'true' OR'$(_RunningRestore)' == 'true'">
+      <NugetProjects Include="src\fsharp\FSharp.Core\FSharp.Core.fsproj" />
+    </ItemGroup>
+
     <ItemGroup Condition="'$(BuildFCS)' == 'true' OR '$(_RunningRestore)' == 'true'">
       <Projects Include="$(MSBuildThisFileDirectory)fcs\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
       <Projects Include="$(MSBuildThisFileDirectory)fcs\FSharp.Compiler.Service.MSBuild.v12\FSharp.Compiler.Service.MSBuild.v12.fsproj" />
@@ -120,8 +126,8 @@
       <Projects Include="@(NugetProjects)" />
     </ItemGroup>
 
-    <MSBuild Projects="@(Projects)" Targets="Build" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
     <MSBuild Projects="@(NugetProjects)" Targets="Pack" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
+    <MSBuild Projects="@(Projects)" Targets="Build" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
   </Target>
 
   <Target Name="Rebuild" DependsOnTargets="CollectProjects">

src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props

@@ -74,7 +74,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 
   <PropertyGroup>
     <DefaultValueTuplePackageVersion>4.4.0</DefaultValueTuplePackageVersion>
-    <DefaultFSharpCorePackageVersion>4.5.2</DefaultFSharpCorePackageVersion>
+    <DefaultFSharpCorePackageVersion>4.6.1</DefaultFSharpCorePackageVersion>
     <ValueTupleImplicitPackageVersion>$(DefaultValueTuplePackageVersion)</ValueTupleImplicitPackageVersion>
     <FSharpCoreImplicitPackageVersion>$(DefaultFSharpCorePackageVersion)</FSharpCoreImplicitPackageVersion>
   </PropertyGroup>

src/fsharp/FSharp.Core/FSharp.Core.nuspec

@@ -11,7 +11,7 @@
                     netstandard1.6      (netstandard1.6)
                     netstandard2.0      (netstandard2.0)
 
-                Commit hash: $githeadsha$.
+                Commit hash: $githeadsha$
         </description>
         <owners>$owners$</owners>
         <version>$version$</version>

tests/fsharp/single-test.fs

@@ -130,6 +130,8 @@ let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework =
     <DefineConstants>FX_RESHAPED_REFLECTION</DefineConstants>
     <DefineConstants Condition=""'$(OutputType)' == 'Script' and '$(FSharpTestCompilerVersion)' == 'coreclr'"">NETCOREAPP</DefineConstants>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <RestoreAdditionalProjectSources Condition = "" '$(RestoreAdditionalProjectSources)' == ''"">$(RestoreFromArtifactsPath)</RestoreAdditionalProjectSources>
+    <RestoreAdditionalProjectSources Condition = "" '$(RestoreAdditionalProjectSources)' != ''"">$(RestoreAdditionalProjectSources);$(RestoreFromArtifactsPath)</RestoreAdditionalProjectSources>
   </PropertyGroup>
 
   <!-- Utility sources -->
@@ -170,6 +172,8 @@ let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework =
         |> replaceTokens "$(OPTIMIZE)" optimize
         |> replaceTokens "$(DEBUG)" debug
         |> replaceTokens "$(TARGETFRAMEWORK)" targetFramework
+        |> replaceTokens "$(RestoreFromArtifactsPath)" (Path.GetFullPath(__SOURCE_DIRECTORY__) + "/../../artifacts")
+
     generateProjBody
 
 let singleTestBuildAndRunCore cfg copyFiles p =

vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate

@@ -27,7 +27,7 @@
   <WizardData>
     <packages repository="extension" repositoryId="VisualFSharpTemplates">
       <package id="System.ValueTuple" version="4.4.0" />
-      <package id="FSharp.Core" version="4.5.2" />
+      <package id="FSharp.Core" version="4.6.1" />
      </packages>
   </WizardData>
 </VSTemplate>

vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate

@@ -27,7 +27,7 @@
   <WizardData>
     <packages repository="extension" repositoryId="VisualFSharpTemplates">
       <package id="System.ValueTuple" version="4.4.0" />
-      <package id="FSharp.Core" version="4.5.2" />
+      <package id="FSharp.Core" version="4.6.1" />
     </packages>
   </WizardData>
 </VSTemplate>

vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate

@@ -25,7 +25,7 @@
   <WizardData>
     <packages repository="extension" repositoryId="VisualFSharpTemplates">
       <package id="System.ValueTuple" version="4.4.0" />
-      <package id="FSharp.Core" version="4.5.2" />
+      <package id="FSharp.Core" version="4.6.1" />
      </packages>
   </WizardData>
 </VSTemplate>

vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj

@@ -10,9 +10,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="$(NuGetPackageRoot)\FSharp.Core\4.5.2\FSharp.Core.4.5.2.nupkg">
+    <Content Include="$(MSBuildThisFileDirectory)\..\..\..\artifacts\FSharp.Core.$(FSCorePackageVersion).nupkg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>packages\FSharp.Core.4.5.2.nupkg</Link>
+      <Link>packages\FSharp.Core.$(FSCorePackageVersion).nupkg</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="$(NuGetPackageRoot)\System.ValueTuple\4.4.0\System.ValueTuple.4.4.0.nupkg">

vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs

@@ -1263,18 +1263,6 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
                     // This is the first time, so set up interface for language service to talk to us
                     projectSite.Open(x.CreateRunningProjectSite())
 
-            // =====================================================================================================
-            // Todo: x.Compile(compile:System.Converter<int,int>, flags:string[], sources:string[]) for VS2017.7
-            // Earlier buildtasks usesd System.Converter<int,int> for cross platform we are moving to Func<int>
-            // This is so that during the interim, earlier VS's will still load the OSS project
-            // =====================================================================================================
-            member x.Compile(compile:System.Converter<int,int>, flags:string[], sources:string[]) =
-                x.CoreCompile(flags, sources)
-                if actuallyBuild then
-                    compile.Invoke(0)
-                else
-                    0
-
             member x.Compile(compile:Func<int>, flags:string[], sources:string[]) =
                 x.CoreCompile(flags, sources)
                 if actuallyBuild then