diff --git a/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json
index a2bec0cdc0..50884cd0a3 100644
--- a/DotnetRuntimeMetadata.json
+++ b/DotnetRuntimeMetadata.json
@@ -1,11 +1,11 @@
{
"sdk": {
- "channel": "8.0.1xx",
+ "channel": "9.0.1xx-preview6",
"quality": "daily",
"qualityFallback": "preview",
- "packageVersionPattern": "8.0.0",
- "sdkImageVersion": "8.0.101",
- "nextChannel": "8.0.1xx",
+ "packageVersionPattern": "9.0.0-preview.6",
+ "sdkImageVersion": "9.0.0-preview.6.24327.7",
+ "nextChannel": "9.0.0-preview.7",
"azureFeed": "",
"sdkImageOverride": ""
},
diff --git a/global.json b/global.json
index a28e9c5823..de9b44d3e3 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "9.0.100-preview.3.24204.13"
+ "version": "9.0.100-preview.6.24328.19"
}
}
diff --git a/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj b/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
index 7a1b3a817f..acc4eae2c6 100644
--- a/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
+++ b/src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
@@ -5,10 +5,11 @@
$(NoWarn);CS1570
Microsoft.Management.UI.Internal
Microsoft.PowerShell.GraphicalHost
- True
+ false
Windows
8.0
- false
+ true
+ True
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
index 2054b9c1dd..a438fa73e0 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index cd7ee4594d..cfa5ea247d 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@@ -47,7 +47,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 2e59deee7a..a950973b6d 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -33,8 +33,8 @@
-
-
+
+
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 4b9ec289f5..4271ef3784 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index b97d6859b4..074b0e6c13 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -21,9 +21,9 @@
-
-
-
+
+
+
-
+
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 459bf2be92..3319c928fa 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -2,7 +2,7 @@
PowerShell's System.Management.Automation project
- $(NoWarn);CS1570;CS1734;CA1416
+ $(NoWarn);CS1570;CS1734;CA1416;CA2022
System.Management.Automation
@@ -34,16 +34,16 @@
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
diff --git a/test/powershell/Host/Base-Directory.Tests.ps1 b/test/powershell/Host/Base-Directory.Tests.ps1
index a55af971f0..203d214e93 100644
--- a/test/powershell/Host/Base-Directory.Tests.ps1
+++ b/test/powershell/Host/Base-Directory.Tests.ps1
@@ -44,7 +44,7 @@ Describe "Configuration file locations" -tags "CI","Slow" {
}
It @ItArgs "PSModulePath should contain the correct path" {
- $env:PSModulePath = ""
+ $env:PSModulePath = $null
$actual = & $powershell -noprofile -c `$env:PSModulePath
$actual | Should -Match ([regex]::Escape($expectedModule))
}
@@ -94,7 +94,7 @@ Describe "Configuration file locations" -tags "CI","Slow" {
}
It @ItArgs "PSModulePath should respect XDG_DATA_HOME" {
- $env:PSModulePath = ""
+ $env:PSModulePath = $null
$env:XDG_DATA_HOME = $TestDrive
$expected = [IO.Path]::Combine($TestDrive, "powershell", "Modules")
$actual = & $powershell -noprofile -c `$env:PSModulePath
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
index d4423b034b..5412020169 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
@@ -683,7 +683,7 @@ Describe "Additional tests for Import-Module with WinCompat" -Tag "Feature" {
@"
{"Microsoft.PowerShell:ExecutionPolicy": "RemoteSigned", "WindowsPowerShellCompatibilityNoClobberModuleList": ["$desktopModuleToUse"]}
"@ | Out-File -Force $ConfigPath
- $env:PSModulePath = ''
+ $env:PSModulePath = $null
## The desktop-edition module is listed in the no-clobber list, so we will first try loading a core-edition
## compatible version of the module before loading the remote one. The 'system32' module path will be skipped
@@ -1479,7 +1479,7 @@ Describe "WinCompat importing should check availablity of built-in modules" -Tag
$_.Exception.Message
}}
'@
- $env:PSModulePath = ''
+ $env:PSModulePath = $null
$script = $template -f $Command
$scriptBlock = [scriptblock]::Create($script)
@@ -1507,7 +1507,7 @@ Describe "WinCompat importing should check availablity of built-in modules" -Tag
`$_.Exception.Message
}
"@
- $env:PSModulePath = ''
+ $env:PSModulePath = $null
$scriptBlock = [scriptblock]::Create($script)
$result = & "$pwshDir\pwsh.exe" -NoProfile -NonInteractive -c $scriptBlock
$result | Should -HaveCount 2
@@ -1516,7 +1516,7 @@ Describe "WinCompat importing should check availablity of built-in modules" -Tag
}
It "When built-in modules are available but not in `$PSHOME module path, things should work" {
- $env:PSModulePath = ''
+ $env:PSModulePath = $null
$result = & "$pwshDir\pwsh.exe" -NoProfile -NonInteractive -c @"
`$env:PSModulePath += ';$moduleDir'
Import-Module Microsoft.PowerShell.Utility -UseWindowsPowerShell -WarningAction Ignore
diff --git a/test/powershell/engine/Module/ModulePath.Tests.ps1 b/test/powershell/engine/Module/ModulePath.Tests.ps1
index 5861455e72..1450eb31f2 100644
--- a/test/powershell/engine/Module/ModulePath.Tests.ps1
+++ b/test/powershell/engine/Module/ModulePath.Tests.ps1
@@ -68,7 +68,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
It "validate sxs module path" -Skip:$skipNoPwsh {
- $env:PSModulePath = ""
+ $env:PSModulePath = $null
$defaultModulePath = & $powershell -nopro -c '$env:PSModulePath'
$pathSeparator = [System.IO.Path]::PathSeparator
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index cca4de650b..5612cc769a 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -14,6 +14,8 @@
+
+
diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json
index 0b8b512316..b087efab47 100644
--- a/tools/packaging/boms/windows.json
+++ b/tools/packaging/boms/windows.json
@@ -1087,6 +1087,10 @@
"Pattern": "PresentationFramework.dll",
"FileType": "NonProduct"
},
+ {
+ "Pattern": "PresentationFramework.Fluent.dll",
+ "FileType": "NonProduct"
+ },
{
"Pattern": "PresentationFramework.Luna.dll",
"FileType": "NonProduct"
@@ -1867,6 +1871,10 @@
"Pattern": "ref/WindowsBase.dll",
"FileType": "NonProduct"
},
+ {
+ "Pattern": "ref\\System.IO.Pipelines.dll",
+ "FileType": "NonProduct"
+ },
{
"Pattern": "ru/Microsoft.CodeAnalysis.CSharp.resources.dll",
"FileType": "NonProduct"
@@ -2367,6 +2375,10 @@
"Pattern": "System.Formats.Asn1.dll",
"FileType": "NonProduct"
},
+ {
+ "Pattern": "System.Formats.Nrbf.dll",
+ "FileType": "NonProduct"
+ },
{
"Pattern": "System.Formats.Tar.dll",
"FileType": "NonProduct"
@@ -2439,6 +2451,10 @@
"Pattern": "System.IO.Packaging.dll",
"FileType": "NonProduct"
},
+ {
+ "Pattern": "System.IO.Pipelines.dll",
+ "FileType": "NonProduct"
+ },
{
"Pattern": "System.IO.Pipes.AccessControl.dll",
"FileType": "NonProduct"