Skip to content

Bump .NET 9 to 9.0.100-rc.1.24452.12 #24273

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

Merged
Aditya Patwardhan (adityapatwardhan) merged 6 commits into from
Sep 12, 2024
Merged

Bump .NET 9 to 9.0.100-rc.1.24452.12 #24273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c19fb46
Bump .NET 9 to `9.0.100-rc.1.24452.12`
adityapatwardhan Sep 11, 2024
8bcab0b
Fix and igonore SYSLIB0057
adityapatwardhan Sep 11, 2024
cc577f6
Add pragma warnining disable to tests
adityapatwardhan Sep 11, 2024
174ef07
Add pragma warning disable for SYSLIB0057
adityapatwardhan Sep 11, 2024
88774d5
Add new assembly
adityapatwardhan Sep 12, 2024
b785c22
Add new linux only assembly
adityapatwardhan Sep 12, 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
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.6.24328.19"
"version": "9.0.100-rc.1.24452.12"
}
}
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.6.24327.7" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0-rc.1.24431.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.6.24327.7" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-rc.1.24431.7" />
</ItemGroup>

</Project>
2 changes: 2 additions & 0 deletions src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,9 @@ internal static object ConvertFromCimToDotNet(object cimObject, Type expectedDot
var cimIntrinsicValue = (byte[])LanguagePrimitives.ConvertTo(cimObject, typeof(byte[]), CultureInfo.InvariantCulture);
return exceptionSafeReturn(delegate
{
#pragma warning disable SYSLIB0057
Comment thread
adityapatwardhan marked this conversation as resolved.
return new X509Certificate2(cimIntrinsicValue);
#pragma warning restore SYSLIB0057
});
}

Expand Down
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.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>

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.6.24327.7" />
<PackageReference Include="System.Diagnostics.EventLog" Version="9.0.0-rc.1.24431.7" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 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.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.
Expand All @@ -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>
3 changes: 3 additions & 0 deletions src/Microsoft.PowerShell.Security/security/CertificateCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,11 @@ protected override void ProcessRecord()

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
}
}
}
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.6.24327.7" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-rc.1.24431.7" />
</ItemGroup>

<PropertyGroup>
Expand Down
16 changes: 8 additions & 8 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 @@ -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" />
Expand Down
2 changes: 2 additions & 0 deletions src/System.Management.Automation/engine/serialization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7292,7 +7292,9 @@ internal static PSSenderInfo RehydratePSSenderInfo(PSObject pso)
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)
Expand Down
9 changes: 7 additions & 2 deletions src/System.Management.Automation/security/SecuritySupport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,10 @@ private void ResolveFromBase64Encoding(ResolutionPurpose purpose, out ErrorRecor
var certificatesToProcess = new X509Certificate2Collection();
try
{
#pragma warning disable SYSLIB0057
X509Certificate2 newCertificate = new X509Certificate2(messageBytes);
#pragma warning restore SYSLIB0057

certificatesToProcess.Add(newCertificate);
}
catch (Exception)
Expand Down Expand Up @@ -1182,7 +1185,9 @@ private void ResolveFromPath(SessionState sessionState, ResolutionPurpose purpos

try
{
#pragma warning disable SYSLIB0057
certificate = new X509Certificate2(path);
#pragma warning restore SYSLIB0057
}
catch (Exception)
{
Expand Down Expand Up @@ -1337,7 +1342,7 @@ internal static class AmsiUtils
static AmsiUtils()
{
#if !UNIX
try
try
{
s_amsiInitFailed = !CheckAmsiInit();
}
Expand All @@ -1347,7 +1352,7 @@ static AmsiUtils()
s_amsiInitFailed = true;
return;
}

PSEtwLog.LogAmsiUtilStateEvent($"init-{s_amsiInitFailed}", $"{s_amsiContext}-{s_amsiSession}");
#endif
}
Expand Down
1 change: 1 addition & 0 deletions test/powershell/Host/Startup.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ Describe "Validate start of console host" -Tag CI {
}
else {
$allowedAssemblies += @(
'System.Diagnostics.DiagnosticSource.dll'
'System.Net.Sockets.dll'
)
}
Expand Down
4 changes: 2 additions & 2 deletions test/tools/TestService/TestService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
12 changes: 12 additions & 0 deletions test/tools/WebListener/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ public static IWebHost BuildWebHost(string[] args) =>
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;
Expand All @@ -60,7 +63,10 @@ public static IWebHost BuildWebHost(string[] args) =>
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.
Expand All @@ -79,7 +85,10 @@ public static IWebHost BuildWebHost(string[] args) =>
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.
Expand All @@ -98,7 +107,10 @@ public static IWebHost BuildWebHost(string[] args) =>
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;
Expand Down
4 changes: 2 additions & 2 deletions test/tools/WebListener/WebListener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>