Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to 9.0.0-preview.6.24327.7 #24133

Merged
merged 10 commits into from
Aug 13, 2024
Merged

Move to 9.0.0-preview.6.24327.7 #24133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2507fbd
Move to 9.0.0-preview.6.24327.7
TravisEz13 Aug 9, 2024
3913728
fix ref to drawing
TravisEz13 Aug 9, 2024
22d8df2
Disable new warning
TravisEz13 Aug 9, 2024
c45fcf9
update deps
TravisEz13 Aug 9, 2024
bcdc141
Apply suggestions from code review
TravisEz13 Aug 9, 2024
2a72d09
Change env:PSModulePath removing by assigning to $null rather than em…
JamesWTruher Aug 12, 2024
d35b0ef
Include more instances of clearing env:PSModulePath.
JamesWTruher Aug 12, 2024
ac45819
Add UseWinForms
TravisEz13 Aug 12, 2024
7e5f02c
update windows bom
TravisEz13 Aug 12, 2024
9042c89
add file back
TravisEz13 Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions DotnetRuntimeMetadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": ""
},
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9.0.100-preview.3.24204.13"
"version": "9.0.100-preview.6.24328.19"
}
}
5 changes: 3 additions & 2 deletions src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
<NoWarn>$(NoWarn);CS1570</NoWarn>
<RootNamespace>Microsoft.Management.UI.Internal</RootNamespace>
<AssemblyName>Microsoft.PowerShell.GraphicalHost</AssemblyName>
<UseWPF>True</UseWPF>
<RunAnalyzers>false</RunAnalyzers>
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
<TargetPlatformVersion>8.0</TargetPlatformVersion>
<RunAnalyzers>false</RunAnalyzers>
<UseWindowsForms>true</UseWindowsForms>
<UseWPF>True</UseWPF>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...icrosoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0-preview.6.24327.7" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-preview.6.24327.7" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
<PackageReference Include="System.Threading.AccessControl" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Threading.AccessControl" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0-preview.6.24327.6" />
<PackageReference Include="JsonSchema.Net" Version="7.0.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Diagnostics.EventLog" Version="9.0.0-preview.6.24327.7" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.IO.Packaging" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0-preview.6.24327.7" />
<!--
the following package(s) are from https://github.com/dotnet/wcf
they are pinned to the version 4.10.x due to a breaking change in newer versions.
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-preview.6.24327.7" />
</ItemGroup>

<PropertyGroup>
Expand Down
18 changes: 9 additions & 9 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="..\..\PowerShell.Common.props" />
<PropertyGroup>
<Description>PowerShell's System.Management.Automation project</Description>
<NoWarn>$(NoWarn);CS1570;CS1734;CA1416</NoWarn>
<NoWarn>$(NoWarn);CS1570;CS1734;CA1416;CA2022</NoWarn>
<AssemblyName>System.Management.Automation</AssemblyName>
</PropertyGroup>

Expand Down Expand Up @@ -34,16 +34,16 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.DirectoryServices" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="System.DirectoryServices" Version="9.0.0-preview.6.24327.7" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Management" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Security.Permissions" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="System.Security.Permissions" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-preview.6.24327.7" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.4.0" />
Expand Down
4 changes: 2 additions & 2 deletions test/powershell/Host/Base-Directory.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/powershell/engine/Module/ModulePath.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions test/tools/TestService/TestService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
</ItemGroup>

</Project>
16 changes: 16 additions & 0 deletions tools/packaging/boms/windows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,6 +1087,10 @@
"Pattern": "PresentationFramework.dll",
"FileType": "NonProduct"
},
{
"Pattern": "PresentationFramework.Fluent.dll",
"FileType": "NonProduct"
},
{
"Pattern": "PresentationFramework.Luna.dll",
"FileType": "NonProduct"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Loading