admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump .NET 9 to 9.0.100-rc.1.24452.12 (#24273) (#24320)

Browse Source
This commit is contained in:
Aditya Patwardhan
2024-09-20 12:43:27 -07:00
committed by GitHub
parent 7742238959
commit f484c607d2
16 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9.0.100-preview.6.24328.19"
"version": "9.0.100-rc.1.24452.12"
}
}
src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
+1 -1
View File
@@ -8,7 +8,7 @@
<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.1.24431.7" />
</ItemGroup>
<PropertyGroup>
src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+1 -1
View File
@@ -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.6.24327.7" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-rc.1.24431.7" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs
+2
View File
@@ -425,7 +425,9 @@ namespace Microsoft.PowerShell.Cim
var cimIntrinsicValue = (byte[])LanguagePrimitives.ConvertTo(cimObject, typeof(byte[]), CultureInfo.InvariantCulture);
return exceptionSafeReturn(delegate
{
#pragma warning disable SYSLIB0057
return new X509Certificate2(cimIntrinsicValue);
#pragma warning restore SYSLIB0057
});
}
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+2 -2
View File
@@ -33,8 +33,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
<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="System.Threading.AccessControl" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0-rc.1.24451.1" />
<PackageReference Include="JsonSchema.Net" Version="7.0.4" />
</ItemGroup>
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+1 -1
View File
@@ -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.6.24327.7" />
<PackageReference Include="System.Diagnostics.EventLog" Version="9.0.0-rc.1.24431.7" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+4 -4
View File
@@ -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.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" />
<PackageReference Include="System.IO.Packaging" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0-rc.1.24431.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.
@@ -36,7 +36,7 @@
<PackageReference Include="System.ServiceModel.Security" Version="4.10.3" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-preview.3.24175.3" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-rc.1.24452.1" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.Security/security/CertificateCommands.cs
+3
View File
@@ -208,8 +208,11 @@ namespace Microsoft.PowerShell.Commands
private static X509Certificate2 GetCertFromPfxFile(string path, SecureString password)
{
// No overload found in X509CertificateLoader that takes SecureString
#pragma warning disable SYSLIB0057
var cert = new X509Certificate2(path, password, X509KeyStorageFlags.DefaultKeySet);
return cert;
#pragma warning restore SYSLIB0057
}
}
}
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+1 -1
View File
@@ -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.6.24327.7" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-rc.1.24431.7" />
</ItemGroup>
<PropertyGroup>
src/System.Management.Automation/System.Management.Automation.csproj
+8 -8
View File
@@ -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.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="Microsoft.Win32.Registry.AccessControl" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.DirectoryServices" Version="9.0.0-rc.1.24431.7" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="System.Management" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
<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" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Security.Permissions" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-rc.1.24431.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" />
src/System.Management.Automation/engine/serialization.cs
+2
View File
@@ -7292,7 +7292,9 @@ namespace Microsoft.PowerShell
private static System.Security.Cryptography.X509Certificates.X509Certificate2 RehydrateX509Certificate2(PSObject pso)
{
byte[] rawData = GetPropertyValue<byte[]>(pso, "RawData");
#pragma warning disable SYSLIB0057
return new System.Security.Cryptography.X509Certificates.X509Certificate2(rawData);
#pragma warning restore SYSLIB0057
}
private static System.Security.Cryptography.X509Certificates.X500DistinguishedName RehydrateX500DistinguishedName(PSObject pso)
src/System.Management.Automation/security/SecuritySupport.cs
+7 -2
View File
@@ -1104,7 +1104,10 @@ namespace System.Management.Automation
var certificatesToProcess = new X509Certificate2Collection();
try
{
#pragma warning disable SYSLIB0057
X509Certificate2 newCertificate = new X509Certificate2(messageBytes);
#pragma warning restore SYSLIB0057
certificatesToProcess.Add(newCertificate);
}
catch (Exception)
@@ -1182,7 +1185,9 @@ namespace System.Management.Automation
try
{
#pragma warning disable SYSLIB0057
certificate = new X509Certificate2(path);
#pragma warning restore SYSLIB0057
}
catch (Exception)
{
@@ -1337,7 +1342,7 @@ namespace System.Management.Automation
static AmsiUtils()
{
#if !UNIX
try
try
{
s_amsiInitFailed = !CheckAmsiInit();
}
@@ -1347,7 +1352,7 @@ namespace System.Management.Automation
s_amsiInitFailed = true;
return;
}
PSEtwLog.LogAmsiUtilStateEvent($"init-{s_amsiInitFailed}", $"{s_amsiContext}-{s_amsiSession}");
#endif
}
test/powershell/Host/Startup.Tests.ps1
+1
View File
@@ -71,6 +71,7 @@ Describe "Validate start of console host" -Tag CI {
}
else {
$allowedAssemblies += @(
'System.Diagnostics.DiagnosticSource.dll'
'System.Net.Sockets.dll'
)
}
test/tools/TestService/TestService.csproj
+2 -2
View File
@@ -15,8 +15,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-preview.6.24327.6" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-rc.1.24452.1" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
</ItemGroup>
test/tools/WebListener/Program.cs
+12
View File
@@ -44,7 +44,10 @@ namespace mvc
int.Parse(args[3]),
listenOptions =>
{
#pragma warning disable SYSLIB0057
var certificate = new X509Certificate2(args[0], args[1]);
#pragma warning restore SYSLIB0057
HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
httpsOption.SslProtocols = SslProtocols.Tls12;
httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
@@ -60,7 +63,10 @@ namespace mvc
int.Parse(args[4]),
listenOptions =>
{
#pragma warning disable SYSLIB0057
var certificate = new X509Certificate2(args[0], args[1]);
#pragma warning restore SYSLIB0057
HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
// TLS 1.1 is obsolete. Using this value now defaults to TLS 1.2.
@@ -79,7 +85,10 @@ namespace mvc
int.Parse(args[5]),
listenOptions =>
{
#pragma warning disable SYSLIB0057
var certificate = new X509Certificate2(args[0], args[1]);
#pragma warning restore SYSLIB0057
HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
// TLS is obsolete. Using this value now defaults to TLS 1.2.
@@ -98,7 +107,10 @@ namespace mvc
int.Parse(args[6]),
listenOptions =>
{
#pragma warning disable SYSLIB0057
var certificate = new X509Certificate2(args[0], args[1]);
#pragma warning restore SYSLIB0057
HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
httpsOption.SslProtocols = SslProtocols.Tls13;
httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
test/tools/WebListener/WebListener.csproj
+2 -2
View File
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0-preview.6.24328.4" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0-rc.1.24452.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-rc.1.24431.7" />
</ItemGroup>
</Project>