Update .NET SDK to 6.0.101 and fix `Microsoft.PowerShell.GlobalTool.S…

…him.csproj` (#16821)
PowerShell · Feb 1, 2022 · 46e5af7 · 46e5af7
1 parent 8af0834
commit 46e5af7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
@@ -3137,8 +3137,8 @@
           <Component Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0">
             <File Id="fil2146848B6ACB45FCA8E9C8FEE3BECDD8" KeyPath="yes" Source="$(var.ProductSourcePath)\_manifest\spdx_2.2\manifest.spdx.json" />
           </Component>
-          <Component Id="cmp58D994EAF5F64D618ABC0E63DCD48C05">
-            <File Id="filFB88509DC8C044A28FF3B7CF61B1CE4F" KeyPath="yes" Source="$(var.ProductSourcePath)\_manifest\spdx_2.2\manifest.spdx.json.sha256" />
+          <Component Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9">
+            <File Id="fil5B154D0E36C747769E1387D3A3E9AC7E" KeyPath="yes" Source="$(var.ProductSourcePath)\_manifest\spdx_2.2\manifest.spdx.json.sha256" />
           </Component>
         </Directory>
       </Directory>
@@ -3154,8 +3154,8 @@
       <Component Id="cmp22840874A8C84AA796496634FBEBF09C">
         <File Id="fil2067B616D1FA4B30932A0240ABE06089" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
       </Component>
-      <Component Id="cmpFB17CABA17334B2BBA1ED6CBF757B310">
-        <File Id="fil1621E0132D2C49B89068166196075157" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.52210.dll" />
+      <Component Id="cmpC100F34A32A0436A973FE7F9A02F5A78">
+        <File Id="filC8B8F95747F64A97B511342C7F154B54" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.121.56705.dll" />
       </Component>
     </DirectoryRef>
   </Fragment>
@@ -4164,7 +4164,6 @@
       <ComponentRef Id="cmp5492F78ACB1A4391BBED371FDFC06B9E" />
       <ComponentRef Id="cmp22840874A8C84AA796496634FBEBF09C" />
       <ComponentRef Id="cmp0173AE0CBFA44C269D93361F6C98F99B" />
-      <ComponentRef Id="cmpFB17CABA17334B2BBA1ED6CBF757B310" />
       <ComponentRef Id="cmpD55F08F6CF51498E9E8551067BA57040" />
       <ComponentRef Id="cmp777DF202EF2542F2ACFCCF0481E8D6EE" />
       <ComponentRef Id="cmpF24D3B9F29F84B4D9C47577B7926FC2E" />
@@ -4173,7 +4172,8 @@
       <ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
       <ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
       <ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
-      <ComponentRef Id="cmp58D994EAF5F64D618ABC0E63DCD48C05" />
+      <ComponentRef Id="cmpC100F34A32A0436A973FE7F9A02F5A78" />
+      <ComponentRef Id="cmpB7C69B48760E47CD89D0641D4A9FEFE9" />
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.100"
+    "version": "6.0.101"
   }
 }
diff --git a/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs b/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
@@ -26,7 +26,7 @@ public static class EntryPoint
         public static int Main(string[] args)
         {
             var currentPath = new FileInfo(System.Reflection.Assembly.GetEntryAssembly().Location).Directory.FullName;
-            var isWindows = Platform.IsWindows;
+            var isWindows = OperatingSystem.IsWindows();
 
             string platformFolder = isWindows ? WinFolderName : UnixFolderName;
 

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
@@ -221,6 +221,12 @@ function Start-PSPackage {
                 $createdSpdxPath = New-Item -Path $manifestSpdxPath -Force
                 Write-Verbose -Verbose "Created manifest.spdx.json file: $createdSpdxPath"
             }
+
+            $manifestSpdxPathSha = (Join-Path -Path $Source "_manifest\spdx_2.2\manifest.spdx.json.sha256")
+            if (-not (Test-Path -Path $manifestSpdxPathSha)) {
+                $createdSpdxPathSha = New-Item -Path $manifestSpdxPathSha -Force
+                Write-Verbose -Verbose "Created manifest.spdx.json.sha256 file: $createdSpdxPathSha"
+            }
         }
 
         # If building a symbols package, we add a zip of the parent to publish