Skip to content

[master] Update branch for release #26027

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
daxian-dbw merged 5 commits into from
Sep 10, 2025
Merged

[master] Update branch for release #26027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8225499
Update .NET SDK to latest version
pwshBot Sep 9, 2025
8a132e4
Update package references
pwshBot Sep 9, 2025
cc16481
Update cgmanifest
pwshBot Sep 9, 2025
b67ea01
Replace the deprecated 'WebHost' with 'IHost'
daxian-dbw Sep 10, 2025
fd1c8ab
Update test/tools/WebListener/WebListener.csproj
daxian-dbw Sep 10, 2025
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 DotnetRuntimeMetadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"quality": "daily",
"qualityFallback": "preview",
"packageVersionPattern": "9.0.0-preview.6",
"sdkImageVersion": "10.0.100-preview.7.25380.108",
"sdkImageVersion": "10.0.100-rc.1.25451.107",
"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": "10.0.100-preview.7.25380.108"
"version": "10.0.100-rc.1.25451.107"
}
}
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="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.0-rc.1.25451.107" />
</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="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.0-rc.1.25451.107" />
</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.14.0" />
<PackageReference Include="System.Threading.AccessControl" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.Drawing.Common" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.Threading.AccessControl" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="System.Drawing.Common" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="JsonSchema.Net" Version="7.4.0" />
</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="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 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 @@ -16,13 +16,13 @@

<ItemGroup>
<!-- This section is to force the version of non-direct dependencies -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="10.0.0-rc.1.25451.107" />
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.IO.Packaging" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="10.0.0-rc.1.25451.107" />
<!-- Removing due to NU1510 -->
<!-- PackageReference Include="System.Text.Encodings.Web" Version="9.0.2" /-->
<!--
Expand All @@ -37,7 +37,7 @@
<PackageReference Include="System.ServiceModel.Security" Version="4.10.3" NoWarn="NU1605" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.3" NoWarn="NU1605" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>

</Project>
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="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>

<PropertyGroup>
Expand Down
12 changes: 6 additions & 6 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 @@ -32,17 +32,17 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.23.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25451.107" />
<!-- Removing due to NU1510 -->
<!-- PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" /-->
<PackageReference Include="System.DirectoryServices" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.DirectoryServices" Version="10.0.0-rc.1.25451.107" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.Management" Version="10.0.0-rc.1.25451.107" />
<!-- Removing System.Security.AccessControl as per NU1510 -->
<!-- PackageReference Include="System.Security.AccessControl" Version="6.0.1" /-->
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.Security.Permissions" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="System.Security.Permissions" Version="10.0.0-rc.1.25451.107" />
<!-- Removing due to NU1510 -->
<!-- PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.2" /-->
<!-- the following package(s) are from the powershell org -->
Expand Down
2 changes: 1 addition & 1 deletion test/tools/TestAlc/nested/Test.Isolated.Nested.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" PrivateAssets="All" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta7.25380.108" />
<PackageReference Include="System.CommandLine" Version="2.0.0-rc.1.25451.107" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion test/tools/TestService/TestService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-preview.7.25380.108" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-rc.1.25451.107" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
</ItemGroup>

Expand Down
198 changes: 101 additions & 97 deletions test/tools/WebListener/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
using System.Security.Authentication;
using System.Security.Cryptography.X509Certificates;

using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Server.Kestrel.Https;
using Microsoft.Extensions.Hosting;

namespace mvc
{
Expand All @@ -18,108 +18,112 @@ public static void Main(string[] args)
{
if (args.Length != 7)
{
System.Console.WriteLine("Required: <CertificatePath> <CertificatePassword> <HTTPPortNumber> <HTTPSPortNumberTls12> <HTTPSPortNumberTls11> <HTTPSPortNumberTls> <HTTPSPortNumberTls12>");
Console.WriteLine("Required: <CertificatePath> <CertificatePassword> <HTTPPortNumber> <HTTPSPortNumberTls12> <HTTPSPortNumberTls11> <HTTPSPortNumberTls> <HTTPSPortNumberTls12>");
Environment.Exit(1);
}

BuildWebHost(args).Run();
BuildHost(args).Run();
}

public static IWebHost BuildWebHost(string[] args) =>
WebHost.CreateDefaultBuilder()
.UseStartup<Startup>().UseKestrel(options =>
public static IHost BuildHost(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
{
options.AllowSynchronousIO = true;

options.Listen(
IPAddress.Loopback,
int.Parse(args[2]),
listenOptions =>
{
listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
});

options.Listen(
IPAddress.Loopback,
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;
httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
httpsOption.CheckCertificateRevocation = false;
httpsOption.ServerCertificate = certificate;
listenOptions.UseHttps(httpsOption);
listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
});

options.Listen(
IPAddress.Loopback,
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.
httpsOption.SslProtocols = SslProtocols.Tls12;

httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
httpsOption.CheckCertificateRevocation = false;
httpsOption.ServerCertificate = certificate;
listenOptions.UseHttps(httpsOption);
listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
});

options.Listen(
IPAddress.Loopback,
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.
httpsOption.SslProtocols = SslProtocols.Tls12;

httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
httpsOption.CheckCertificateRevocation = false;
httpsOption.ServerCertificate = certificate;
listenOptions.UseHttps(httpsOption);
listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
});

options.Listen(
IPAddress.Loopback,
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;
httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
httpsOption.CheckCertificateRevocation = false;
httpsOption.ServerCertificate = certificate;
listenOptions.UseHttps(httpsOption);
listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
});
webBuilder.UseStartup<Startup>();
webBuilder.UseKestrel(options =>
{
options.AllowSynchronousIO = true;

options.Listen(
IPAddress.Loopback,
int.Parse(args[2]),
listenOptions =>
{
listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
});

options.Listen(
IPAddress.Loopback,
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;
httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
httpsOption.CheckCertificateRevocation = false;
httpsOption.ServerCertificate = certificate;
listenOptions.UseHttps(httpsOption);
listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
});

options.Listen(
IPAddress.Loopback,
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.
httpsOption.SslProtocols = SslProtocols.Tls12;

httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
httpsOption.CheckCertificateRevocation = false;
httpsOption.ServerCertificate = certificate;
listenOptions.UseHttps(httpsOption);
listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
});

options.Listen(
IPAddress.Loopback,
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.
httpsOption.SslProtocols = SslProtocols.Tls12;

httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
httpsOption.CheckCertificateRevocation = false;
httpsOption.ServerCertificate = certificate;
listenOptions.UseHttps(httpsOption);
listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
});

options.Listen(
IPAddress.Loopback,
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;
httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
httpsOption.CheckCertificateRevocation = false;
httpsOption.ServerCertificate = certificate;
listenOptions.UseHttps(httpsOption);
listenOptions.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
});
});
})
.Build();
}
Expand Down
2 changes: 1 addition & 1 deletion test/tools/WebListener/WebListener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>
</Project>
Loading
Loading