From f10279ef1f9706bd180724655a536699a7ffff20 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 25 Jan 2019 11:10:47 -0800
Subject: [PATCH] Update packaging script to build reference assembly targeting
 `netcoreapp2.1` and use actual `.csproj` files (#8729)

# Conflicts:
#	tools/packaging/packaging.psm1
#	tools/packaging/packaging.strings.psd1
---
 tools/packaging/packaging.psm1                |  2 +-
 tools/packaging/packaging.strings.psd1        | 17 +----------------
 .../nuget}/package.csproj                     |  0
 .../nuget}/powershell.nuspec                  |  2 +-
 ...crosoft.PowerShell.Commands.Utility.csproj | 19 +++++++++++++++++++
 .../System.Management.Automation.csproj       | 15 +++++++++++++++
 6 files changed, 37 insertions(+), 18 deletions(-)
 rename tools/packaging/{project => projects/nuget}/package.csproj (100%)
 rename tools/packaging/{project => projects/nuget}/powershell.nuspec (90%)
 create mode 100644 tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility.csproj
 create mode 100644 tools/packaging/projects/reference/System.Management.Automation.csproj

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index ac6df46d4b..462b1286b1 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1911,7 +1911,7 @@ function New-ReferenceAssembly
         {
             Push-Location $projectFolder
 
-            $sourceProjectRoot = Join-Path $PSScriptRoot "projects/reference/$assemblyName"
+            $sourceProjectRoot = Join-Path $PSScriptRoot 'projects/reference'
             $sourceProjectFile = Join-Path $sourceProjectRoot "$assemblyName.csproj"
             Copy-Item -Path $sourceProjectFile -Destination "$projectFolder/$assemblyName.csproj" -Force
 
diff --git a/tools/packaging/packaging.strings.psd1 b/tools/packaging/packaging.strings.psd1
index 1e862b5885..1e634aa9aa 100644
--- a/tools/packaging/packaging.strings.psd1
+++ b/tools/packaging/packaging.strings.psd1
@@ -132,22 +132,7 @@ NuspecTemplate = @'
     </metadata>
 </package>
 '@
-RefAssemblyCsProj = @'
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>{0}</Version>
-    <DelaySign>true</DelaySign>
-    <AssemblyOriginatorKeyFile>{1}</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0-alpha08" />
-    <PackageReference Include="System.Security.AccessControl" Version="4.4.1" />
-    <PackageReference Include="System.Security.Principal.Windows" Version="4.4.1" />
-  </ItemGroup>
-</Project>
-'@
+
 NuGetConfigFile = @'
 <configuration>
   <packageSources>
diff --git a/tools/packaging/project/package.csproj b/tools/packaging/projects/nuget/package.csproj
similarity index 100%
rename from tools/packaging/project/package.csproj
rename to tools/packaging/projects/nuget/package.csproj
diff --git a/tools/packaging/project/powershell.nuspec b/tools/packaging/projects/nuget/powershell.nuspec
similarity index 90%
rename from tools/packaging/project/powershell.nuspec
rename to tools/packaging/projects/nuget/powershell.nuspec
index 4207a096f7..da67106f43 100644
--- a/tools/packaging/project/powershell.nuspec
+++ b/tools/packaging/projects/nuget/powershell.nuspec
@@ -7,7 +7,7 @@
     <authors>PowerShell</authors>
     <owners>PowerShell</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <licenseUrl>https://github.com/PowerShell/PowerShell/blob/master/LICENSE.txt</licenseUrl>
+    <license type="expression">MIT</license>
     <projectUrl>https://github.com/powershell/powershell</projectUrl>
     <iconUrl>https://github.com/PowerShell/PowerShell/blob/master/assets/Powershell_64.png</iconUrl>
     <description>This package contains the PowerShell Core for $runtime$.</description>
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility.csproj
new file mode 100644
index 0000000000..ea180ca686
--- /dev/null
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <Version>$(RefAsmVersion)</Version>
+    <DelaySign>true</DelaySign>
+    <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <LangVersion>Latest</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Management.Automation">
+    <HintPath>$(SmaRefFile)</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.5.0" />
+  </ItemGroup>
+</Project>
diff --git a/tools/packaging/projects/reference/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation.csproj
new file mode 100644
index 0000000000..77b99b0dba
--- /dev/null
+++ b/tools/packaging/projects/reference/System.Management.Automation.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <Version>$(RefAsmVersion)</Version>
+    <DelaySign>true</DelaySign>
+    <AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <LangVersion>Latest</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0" />
+    <PackageReference Include="System.Security.AccessControl" Version="4.5.0" />
+    <PackageReference Include="System.Security.Principal.Windows" Version="4.5.1" />
+  </ItemGroup>
+</Project>