Skip to content

[automated] Merge branch 'vs16.11' => 'vs17.8' #12798

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

Open
wants to merge 2 commits into
base: vs17.8
Choose a base branch
from
+32 −23
Open

[automated] Merge branch 'vs16.11' => 'vs17.8' #12798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
211a842
[vs16.11] Update dependencies from dotnet/arcade (#12550)
dotnet-maestro[bot] Oct 20, 2025
77b597c
Bump System.Configuration.ConfigurationManager to 6.0.0 # (#12795)
YuliiaKovalova Nov 21, 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
7 changes: 4 additions & 3 deletions eng/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@
<PackageReference Update="SourceLink.Create.CommandLine" Version="2.1.2" />
<PackageReference Update="System.CodeDom" Version="4.4.0" />
<PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Update="System.Configuration.ConfigurationManager" Version="4.7.0" />
<PackageReference Update="System.Configuration.ConfigurationManager" Version="6.0.0" />

<PackageReference Update="System.Memory" Version="4.5.4" />
<PackageReference Update="System.Reflection.Metadata" Version="1.6.0" />
<PackageReference Update="System.Resources.Extensions" Version="4.6.0" />
<PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="5.0.0"/>
<PackageReference Update="System.Security.Cryptography.Pkcs" Version="4.7.0" />
<PackageReference Update="System.Security.Cryptography.Xml" Version="4.7.0" />
<PackageReference Update="System.Security.Permissions" Version="4.7.0" />
<PackageReference Update="System.Security.Principal.Windows" Version="4.7.0" />
<PackageReference Update="System.Security.Permissions" Version="6.0.0" />
<PackageReference Update="System.Security.Principal.Windows" Version="5.0.0" />
<PackageReference Update="System.Text.Encoding.CodePages" Version="4.0.1" />
<PackageReference Update="System.Text.Json" Version="4.7.0" />
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.9.0" />
Expand Down
27 changes: 13 additions & 14 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
<Usage Id="CommandLineParser" Version="2.4.3" />
<Usage Id="Iced" Version="1.4.0" />
<Usage Id="jnm2.ReferenceAssemblies.net35" Version="1.0.1" IsDirectDependency="true" />
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="5.0.0" />
<Usage Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.17" />
<Usage Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="5.0.17" />
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="5.0.0" />
<Usage Id="Microsoft.NETCore.App.Ref" Version="5.0.0" />
<Usage Id="Microsoft.Build" Version="14.3.0" IsDirectDependency="true" />
<Usage Id="Microsoft.Build.CentralPackageVersions" Version="2.0.1" />
<Usage Id="Microsoft.Build.Framework" Version="14.3.0" IsDirectDependency="true" />
Expand All @@ -25,20 +24,20 @@
<Usage Id="Microsoft.Diagnostics.NETCore.Client" Version="0.2.61701" />
<Usage Id="Microsoft.Diagnostics.Runtime" Version="1.1.57604" />
<Usage Id="Microsoft.Diagnostics.Tracing.TraceEvent" Version="2.0.49" />
<Usage Id="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.25405.2" />
<Usage Id="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.25468.4" />
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
<Usage Id="Microsoft.DotNet.SourceBuild.Tasks" Version="6.0.0-beta.25405.2" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.DotNet.SourceBuild.Tasks" Version="6.0.0-beta.25468.4" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21431.1" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="5.0.0" IsDirectDependency="true" />
<Usage Id="Microsoft.Net.Compilers.Toolset" Version="3.9.0-2.20574.26" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETCore.App.Host.win-x64" Version="5.0.17" />
<Usage Id="Microsoft.NETCore.App.Host.win-x86" Version="5.0.17" />
<Usage Id="Microsoft.NETCore.App.Ref" Version="5.0.0" />
<Usage Id="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.17" />
<Usage Id="Microsoft.NETCore.App.Runtime.win-x86" Version="5.0.17" />
<Usage Id="Microsoft.NETCore.Platforms" Version="1.0.1" />
<Usage Id="Microsoft.NETCore.Platforms" Version="1.1.0" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.Platforms" Version="3.1.0" />
<Usage Id="Microsoft.NETCore.Targets" Version="1.0.1" />
<Usage Id="Microsoft.NETCore.Targets" Version="1.1.0" />
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" IsDirectDependency="true" />
Expand All @@ -55,7 +54,7 @@
<Usage Id="Microsoft.Win32.Registry" Version="4.0.0" />
<Usage Id="Microsoft.Win32.Registry" Version="4.3.0" />
<Usage Id="Microsoft.Win32.Registry" Version="4.5.0" />
<Usage Id="Microsoft.Win32.SystemEvents" Version="4.7.0" />
<Usage Id="Microsoft.Win32.SystemEvents" Version="6.0.0" />
<Usage Id="NETStandard.Library" Version="1.6.1" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="NETStandard.Library" Version="2.0.3" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Newtonsoft.Json" Version="9.0.1" />
Expand Down Expand Up @@ -131,7 +130,7 @@
<Usage Id="System.Collections.Immutable" Version="5.0.0" />
<Usage Id="System.Collections.NonGeneric" Version="4.0.1" />
<Usage Id="System.Collections.Specialized" Version="4.0.1" />
<Usage Id="System.Configuration.ConfigurationManager" Version="4.7.0" />
<Usage Id="System.Configuration.ConfigurationManager" Version="6.0.0" />
<Usage Id="System.Console" Version="4.0.0" />
<Usage Id="System.Console" Version="4.3.0" />
<Usage Id="System.Diagnostics.Debug" Version="4.0.11" />
Expand All @@ -145,7 +144,7 @@
<Usage Id="System.Diagnostics.TraceSource" Version="4.0.0" />
<Usage Id="System.Diagnostics.Tracing" Version="4.1.0" />
<Usage Id="System.Diagnostics.Tracing" Version="4.3.0" />
<Usage Id="System.Drawing.Common" Version="4.7.0" />
<Usage Id="System.Drawing.Common" Version="6.0.0" />
<Usage Id="System.Dynamic.Runtime" Version="4.0.11" />
<Usage Id="System.Dynamic.Runtime" Version="4.3.0" />
<Usage Id="System.Formats.Asn1" Version="5.0.0" />
Expand Down Expand Up @@ -213,7 +212,7 @@
<Usage Id="System.Runtime.Serialization.Primitives" Version="4.1.1" />
<Usage Id="System.Runtime.Serialization.Xml" Version="4.1.1" />
<Usage Id="System.Security.AccessControl" Version="4.5.0" />
<Usage Id="System.Security.AccessControl" Version="4.7.0" />
<Usage Id="System.Security.AccessControl" Version="6.0.0" />
<Usage Id="System.Security.Cryptography.Algorithms" Version="4.3.0" />
<Usage Id="System.Security.Cryptography.Cng" Version="4.3.0" />
<Usage Id="System.Security.Cryptography.Cng" Version="4.7.0" />
Expand All @@ -225,12 +224,12 @@
<Usage Id="System.Security.Cryptography.Pkcs" Version="5.0.0" />
<Usage Id="System.Security.Cryptography.Primitives" Version="4.3.0" />
<Usage Id="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
<Usage Id="System.Security.Cryptography.ProtectedData" Version="4.7.0" />
<Usage Id="System.Security.Cryptography.ProtectedData" Version="6.0.0" />
<Usage Id="System.Security.Cryptography.X509Certificates" Version="4.3.0" />
<Usage Id="System.Security.Cryptography.Xml" Version="4.7.0" />
<Usage Id="System.Security.Permissions" Version="4.7.0" />
<Usage Id="System.Security.Permissions" Version="6.0.0" />
<Usage Id="System.Security.Principal.Windows" Version="4.5.0" />
<Usage Id="System.Security.Principal.Windows" Version="4.7.0" />
<Usage Id="System.Security.Principal.Windows" Version="5.0.0" />
<Usage Id="System.Text.Encoding" Version="4.0.11" />
<Usage Id="System.Text.Encoding" Version="4.3.0" />
<Usage Id="System.Text.Encoding.CodePages" Version="4.0.1" />
Expand All @@ -256,7 +255,7 @@
<Usage Id="System.Threading.Timer" Version="4.0.1" />
<Usage Id="System.Threading.Timer" Version="4.3.0" />
<Usage Id="System.ValueTuple" Version="4.5.0" />
<Usage Id="System.Windows.Extensions" Version="4.7.0" />
<Usage Id="System.Windows.Extensions" Version="6.0.0" />
<Usage Id="System.Xml.ReaderWriter" Version="4.0.11" />
<Usage Id="System.Xml.ReaderWriter" Version="4.3.0" />
<Usage Id="System.Xml.XDocument" Version="4.0.11" />
Expand All @@ -271,4 +270,4 @@
<Usage Id="xunit.extensibility.core" Version="2.4.2-pre.9" />
<Usage Id="xunit.extensibility.execution" Version="2.4.2-pre.9" />
</Usages>
</UsageData>
</UsageData>
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.25405.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.25468.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>05a5ee2a0c496e69d6d22cd03423231e928d1545</Sha>
<Sha>4fd02da57297248915f054a69990409bf79021ae</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="5.9.1-rc.8">
<Uri>https://github.com/nuget/nuget.client</Uri>
Expand Down
3 changes: 1 addition & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<PropertyGroup>
<VersionPrefix>16.11.13</VersionPrefix>
<VersionPrefix>16.11.15</VersionPrefix>
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>

<!-- differentiate experimental insertions to avoid package id conflicts,
it has to be alphabetically after "preview" to avoid downgrade errors in VS -->
<PreReleaseVersionLabel Condition="'$(IsExperimental)' == 'true'">test</PreReleaseVersionLabel>
Expand Down
5 changes: 5 additions & 0 deletions eng/common/templates-official/job/job.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion eng/common/templates/job/job.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.25405.2"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.25468.4"
}
}