From 286bf8c2f94b42da881b99835c30b2effcedc287 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 15 Oct 2020 16:41:29 -0700
Subject: [PATCH 1/2] Update nuspec for NuGet.org compliance

---
 build.psm1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 6e1f5dd..371a667 100644
--- a/build.psm1
+++ b/build.psm1
@@ -579,14 +579,14 @@ function Start-BuildPowerShellNativePackage
         <version>{0}</version>
         <authors>Microsoft</authors>
         <owners>Microsoft,PowerShell</owners>
-        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Native binaries for PowerShell Core</description>
-            <projectUrl>https://github.com/PowerShell/PowerShell</projectUrl>
+            <projectUrl>https://github.com/PowerShell/PowerShell-Native</projectUrl>
             <iconUrl>https://github.com/PowerShell/PowerShell/blob/master/assets/Powershell_black_64.png?raw=true</iconUrl>
             <license type="expression">MIT</license>
             <tags>PowerShell</tags>
             <language>en-US</language>
-            <copyright>© Microsoft Corporation.</copyright>
+            <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
             <contentFiles>
                 <files include="**/*" buildAction="None" copyToOutput="true" flatten="false" />
             </contentFiles>

From 6abb7c456b320183973d9413e9fa93d939ce42ea Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 15 Oct 2020 16:47:50 -0700
Subject: [PATCH 2/2] Update nuget packaging to be compliant with NuGet.org

---
 assets/Powershell_black_64.png | Bin 0 -> 3287 bytes
 build.psm1                     |  25 ++++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 assets/Powershell_black_64.png

diff --git a/assets/Powershell_black_64.png b/assets/Powershell_black_64.png
new file mode 100644
index 0000000000000000000000000000000000000000..53bbbee10b75a1932cf557acbe256a921ccc0b63
GIT binary patch
literal 3287
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
Vtkc`h@Hzkh002ovPDHLkV1h0#5k&w1

literal 0
HcmV?d00001

diff --git a/build.psm1 b/build.psm1
index 371a667..cc98393 100644
--- a/build.psm1
+++ b/build.psm1
@@ -581,20 +581,23 @@ function Start-BuildPowerShellNativePackage
         <owners>Microsoft,PowerShell</owners>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Native binaries for PowerShell Core</description>
-            <projectUrl>https://github.com/PowerShell/PowerShell-Native</projectUrl>
-            <iconUrl>https://github.com/PowerShell/PowerShell/blob/master/assets/Powershell_black_64.png?raw=true</iconUrl>
-            <license type="expression">MIT</license>
-            <tags>PowerShell</tags>
-            <language>en-US</language>
-            <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
-            <contentFiles>
-                <files include="**/*" buildAction="None" copyToOutput="true" flatten="false" />
-            </contentFiles>
-        </metadata>
+        <projectUrl>https://github.com/PowerShell/PowerShell-Native</projectUrl>
+        <icon>{1}</icon>
+        <license type="expression">MIT</license>
+        <tags>PowerShell</tags>
+        <language>en-US</language>
+        <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
+        <contentFiles>
+            <files include="**/*" buildAction="None" copyToOutput="true" flatten="false" />
+        </contentFiles>
+    </metadata>
 </package>
 '@
 
-    $Nuspec -f $Version | Out-File -FilePath (Join-Path $PackageRoot -ChildPath 'Microsoft.PowerShell.Native.nuspec') -Force
+    $iconFileName = "Powershell_black_64.png"
+    $iconPath = Join-Path $pwd -ChildPath "assets\$iconFileName" -Resolve
+
+    $Nuspec -f $Version, $iconPath | Out-File -FilePath (Join-Path $PackageRoot -ChildPath 'Microsoft.PowerShell.Native.nuspec') -Force
 
     if(-not (Test-Path $NuGetOutputPath))
     {