Skip to content

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.3xx' #1756

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
github-actions wants to merge 2 commits into
base: release/10.0.3xx
Choose a base branch
from
+32 −20
Open

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.3xx' #1756

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
0c274fb
Remove ViktorHofer from CODEOWNERS (#1750)
ViktorHofer Aug 7, 2026
5004ba7
Reset files to release/10.0.3xx
github-actions[bot] Aug 7, 2026
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 CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# These owners will be the default owners for everything unless a later match takes precedence
* @tmat @ViktorHofer
* @tmat
8 changes: 4 additions & 4 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-e0c9b3f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-e0c9b3f9/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<!-- Feeds for command-line-api -->
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<!-- Feeds for source-build command-line-api intermediate -->
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<!-- End: Package sources from dotnet-dotnet -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
<auditSources>
<clear />
Expand Down
10 changes: 7 additions & 3 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,19 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26376.103</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>2.0.12</SystemCommandLinePackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.12</SystemSecurityCryptographyXmlPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26378.113</MicrosoftDotNetArcadeSdkPackageVersion>
<SystemCommandLinePackageVersion>2.0.10</SystemCommandLinePackageVersion>
<SystemIOHashingPackageVersion>10.0.10</SystemIOHashingPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.10</SystemSecurityCryptographyXmlPackageVersion>
<SystemTextJsonPackageVersion>10.0.10</SystemTextJsonPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<SystemCommandLineVersion>$(SystemCommandLinePackageVersion)</SystemCommandLineVersion>
<SystemIOHashingVersion>$(SystemIOHashingPackageVersion)</SystemIOHashingVersion>
<SystemSecurityCryptographyXmlVersion>$(SystemSecurityCryptographyXmlPackageVersion)</SystemSecurityCryptographyXmlVersion>
<SystemTextJsonVersion>$(SystemTextJsonPackageVersion)</SystemTextJsonVersion>
</PropertyGroup>
</Project>
26 changes: 17 additions & 9 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d" BarId="324500" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="44eb40611be3c94e8b5f2584367a4a129ceb8dfa" BarId="324781" />
<ProductDependencies>
<Dependency Name="System.CommandLine" Version="2.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
<Dependency Name="System.CommandLine" Version="2.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>f7d90799ce4ef09a0bb257852a57248d2a8fb8dd</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.12">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
<Dependency Name="System.IO.Hashing" Version="10.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>f7d90799ce4ef09a0bb257852a57248d2a8fb8dd</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>f7d90799ce4ef09a0bb257852a57248d2a8fb8dd</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
<Sha>f7d90799ce4ef09a0bb257852a57248d2a8fb8dd</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26376.103">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26378.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e0c9b3f934e7b97b360f4ce3692ab45b9634ae1d</Sha>
<Sha>44eb40611be3c94e8b5f2584367a4a129ceb8dfa</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.110",
"version": "10.0.302",
"allowPrerelease": true,
"rollForward": "latestFeature",
"paths": [
Expand All @@ -10,10 +10,10 @@
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
},
"tools": {
"dotnet": "10.0.110"
"dotnet": "10.0.302"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26376.103",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26378.113",
"Microsoft.Build.NoTargets": "3.7.0"
}
}