From 7c07673876fa2c5767621a36c3818b19ba064124 Mon Sep 17 00:00:00 2001
From: "Brett V. Forsgren" <brettfo@microsoft.com>
Date: Fri, 26 Jan 2018 17:16:52 -0800
Subject: [PATCH] build nuget packages after signing (#4269)

---
 build-everything.proj                         |  8 ++-----
 build-nuget-packages.proj                     | 21 +++++++++++++++++
 build.cmd                                     |  6 +++++
 .../FSharp.Compiler.Template.nuget.props      | 20 ++++++++++++++++
 ...=> FSharp.Compiler.Template.nuget.targets} | 23 -------------------
 .../Microsoft.FSharp.Compiler.nuget.proj      | 11 +++++++++
 .../Testing.FSharp.Compiler.nuget.proj        | 11 +++++++++
 7 files changed, 71 insertions(+), 29 deletions(-)
 create mode 100644 build-nuget-packages.proj
 create mode 100644 src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.Template.nuget.props
 rename src/fsharp/FSharp.Compiler.nuget/{FSharp.Compiler.nuget.proj => FSharp.Compiler.Template.nuget.targets} (57%)
 create mode 100644 src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuget.proj
 create mode 100644 src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuget.proj

diff --git a/build-everything.proj b/build-everything.proj
index f236cde62..5c52b99ae 100644
--- a/build-everything.proj
+++ b/build-everything.proj
@@ -24,8 +24,8 @@
     <ProjectsWithCoreClr Include="src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj" />
     <ProjectsWithCoreClr Include="src/fsharp/Fsc/Fsc.fsproj" />
     <ProjectsWithCoreClr Include="src/fsharp/fsi/Fsi.fsproj" />
-    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj" />
- </ItemGroup>
+    <ProjectsWithCoreClr Include="src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuget.proj" />
+  </ItemGroup>
 
   <ItemGroup Condition="'$(BUILD_VS)'=='1'">
     <ProjectsWithNet40 Include="vsintegration/fsharp-vsintegration-src-build.proj" />
@@ -47,10 +47,6 @@
     <SetupProjects Include="setup/fsharp-setup-build.proj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(BUILD_NUGET)'=='1'">
-    <NugetProjects Include="src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj" />
-  </ItemGroup>
-
   <!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++ -->
 
   <ItemGroup Condition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >
diff --git a/build-nuget-packages.proj b/build-nuget-packages.proj
new file mode 100644
index 000000000..2aab5455e
--- /dev/null
+++ b/build-nuget-packages.proj
@@ -0,0 +1,21 @@
+<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+
+  <ItemGroup>
+    <PackageProjects Include="src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.nuget.proj" Condition="'$(BUILD_CORECLR)'=='1'" />
+    <PackageProjects Include="src\fsharp\FSharp.Core.nuget\FSharp.Core.nuget.proj" Condition="'$(BUILD_NUGET)'=='1'" />
+  </ItemGroup>
+
+  <Target Name="Build">
+    <MSBuild Projects="@(PackageProjects)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
+  </Target>
+
+  <Target Name="Rebuild">
+    <MSBuild Projects="@(PackageProjects)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
+  </Target>
+
+  <Target Name="Clean">
+    <MSBuild Projects="@(PackageProjects)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
+  </Target>
+
+</Project>
diff --git a/build.cmd b/build.cmd
index 0201854c8..6f7e9d506 100644
--- a/build.cmd
+++ b/build.cmd
@@ -686,6 +686,12 @@ 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%
+     %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG%
+if ERRORLEVEL 1 echo Error building NuGet packages && goto :failure
+
 if "%BUILD_SETUP%" == "1" (
     echo %_msbuildexe% %msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
          %_msbuildexe% %msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
diff --git a/src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.Template.nuget.props b/src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.Template.nuget.props
new file mode 100644
index 000000000..bb30ab3a7
--- /dev/null
+++ b/src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.Template.nuget.props
@@ -0,0 +1,20 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
+    <PreReleaseLabel>rc</PreReleaseLabel>
+    <BuildVersionFilePath Condition="'$(BuildVersionFilePath)'==''" >obj\BuildVersionFile.props</BuildVersionFilePath>
+  </PropertyGroup>
+
+  <Import Project="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
+
+  <PropertyGroup>
+    <PackageLicenceUrl Condition="'$(PackageLicenceUrl)' == ''">https://github.com/Microsoft/visualfsharp/blob/master/License.txt</PackageLicenceUrl>
+    <PackageProjectUrl Condition="'$(PackageProjectUrl)' == ''">https://github.com/Microsoft/visualfsharp</PackageProjectUrl>
+    <PackageAuthors    Condition="'$(PackageAuthors)' == ''"   >Microsoft and F# Software Foundation</PackageAuthors> 
+    <PackageTags       Condition="'$(PackageTags)' == ''"      >Visual F# Compiler FSharp functional programming</PackageTags> 
+    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\coreclr\bin</OutputPath>
+    <PreReleaseSuffix  Condition="'$(PreRelease)' != 'false'">-rtm-$(BuildRevision.Trim())-0</PreReleaseSuffix>
+    <PackageVersion>$(FSPackageVersion)$(PreReleaseSuffix)</PackageVersion>
+    <PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
+  </PropertyGroup>
+</Project>
diff --git a/src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj b/src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.Template.nuget.targets
similarity index 57%
rename from src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj
rename to src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.Template.nuget.targets
index 763ce2f6e..d8a8818e9 100644
--- a/src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj
+++ b/src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.Template.nuget.targets
@@ -1,27 +1,4 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
-    <PreReleaseLabel>rc</PreReleaseLabel>
-    <BuildVersionFilePath Condition="'$(BuildVersionFilePath)'==''" >obj\BuildVersionFile.props</BuildVersionFilePath>
-  </PropertyGroup>
-
-  <Import Project="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
-
-  <PropertyGroup>
-    <PackageLicenceUrl Condition="'$(PackageLicenceUrl)' == ''">https://github.com/Microsoft/visualfsharp/blob/master/License.txt</PackageLicenceUrl>
-    <PackageProjectUrl Condition="'$(PackageProjectUrl)' == ''">https://github.com/Microsoft/visualfsharp</PackageProjectUrl>
-    <PackageAuthors    Condition="'$(PackageAuthors)' == ''"   >Microsoft and F# Software Foundation</PackageAuthors> 
-    <PackageTags       Condition="'$(PackageTags)' == ''"      >Visual F# Compiler FSharp functional programming</PackageTags> 
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\coreclr\bin</OutputPath>
-    <PreReleaseSuffix  Condition="'$(PreRelease)' != 'false'">-rtm-$(BuildRevision.Trim())-0</PreReleaseSuffix>
-    <PackageVersion>$(FSPackageVersion)$(PreReleaseSuffix)</PackageVersion>
-    <PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(TargetDotnetProfile)' == 'coreclr'">
-    <PackageNuspec Include="Testing.FSharp.Compiler.nuspec" />
-    <PackageNuspec Include="Microsoft.FSharp.Compiler.nuspec" />
-  </ItemGroup>
 
   <ItemGroup>
     <RefMarker Include="_._"></RefMarker>
diff --git a/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuget.proj b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuget.proj
new file mode 100644
index 000000000..53ed79e8a
--- /dev/null
+++ b/src/fsharp/FSharp.Compiler.nuget/Microsoft.FSharp.Compiler.nuget.proj
@@ -0,0 +1,11 @@
+<Project>
+
+  <Import Project="FSharp.Compiler.Template.nuget.props" />
+
+  <ItemGroup>
+    <PackageNuspec Include="Microsoft.FSharp.Compiler.nuspec" />
+  </ItemGroup>
+
+  <Import Project="FSharp.Compiler.Template.nuget.targets" />
+
+</Project>
diff --git a/src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuget.proj b/src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuget.proj
new file mode 100644
index 000000000..dc9f19add
--- /dev/null
+++ b/src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuget.proj
@@ -0,0 +1,11 @@
+<Project>
+
+  <Import Project="FSharp.Compiler.Template.nuget.props" />
+
+  <ItemGroup>
+    <PackageNuspec Include="Testing.FSharp.Compiler.nuspec" />
+  </ItemGroup>
+
+  <Import Project="FSharp.Compiler.Template.nuget.targets" />
+
+</Project>