diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 78b21b8d64..14b2204c15 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3137,8 +3137,8 @@
-
-
+
+
@@ -3154,8 +3154,8 @@
-
-
+
+
@@ -4164,7 +4164,6 @@
-
@@ -4173,7 +4172,8 @@
-
+
+
diff --git a/global.json b/global.json
index 047020849f..e52d340bc6 100644
--- 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
index 33675e30b4..c8e9562868 100644
--- a/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
+++ b/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
@@ -26,7 +26,7 @@ namespace Microsoft.PowerShell.GlobalTool.Shim
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
index e84857354a..929d7868a4 100644
--- 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