mirror of
https://github.com/aphrody-labs/PowerShell.git
synced 2026-10-14 05:39:11 +00:00
Move to 9.0.0-preview.6.24327.7 (#24133)
--------- Co-authored-by: James Truher [MSFT] <jimtru@microsoft.com>
This commit is contained in:
1 parent
61fa143ede
commit
c11e4cf0d1
15 files changed
+51
-32
No files matched your search
@@ -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": ""
|
||||
},
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"sdk": {
|
||||
"version": "9.0.100-preview.3.24204.13"
|
||||
"version": "9.0.100-preview.6.24328.19"
|
||||
}
|
||||
}
|
||||
@@ -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>
|
||||
|
||||
+1
-1
@@ -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>
|
||||
|
||||
+1
-1
@@ -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>
|
||||
+2
-2
@@ -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>
|
||||
|
||||
|
||||
+1
-1
@@ -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>
|
||||
@@ -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.
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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" />
|
||||
|
||||
@@ -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
|
||||
|
||||
+4
-4
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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>
|
||||
@@ -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"
|
||||
|
||||
Reference in new issue
Block a user