Skip to content

[automated] Merge branch 'release/8.0' => 'release/8.0-staging' #114668

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
merged 5 commits into from
Apr 22, 2025
Merged

[automated] Merge branch 'release/8.0' => 'release/8.0-staging' #114668

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
6cd8ef8
[release/8.0] Update dependencies from dotnet/emsdk (#114330)
dotnet-maestro[bot] Apr 11, 2025
0239fb0
Update dependencies from https://github.com/dotnet/emsdk build 202504…
dotnet-maestro[bot] Apr 14, 2025
aacb60f
Turn off packages that are not being released in the May Release.
carlossanlop Apr 14, 2025
d0ccb54
Merge pull request #114661 from carlossanlop/release/8.0-staging
carlossanlop Apr 15, 2025
4f67954
[release/8.0] Update dependencies from dotnet/arcade (#114667)
dotnet-maestro[bot] Apr 15, 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 NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-29119a8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-29119a81/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-adc0d6e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-sdk -->
<!-- End: Package sources from dotnet-sdk -->
Expand Down
78 changes: 39 additions & 39 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.16">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>29119a816b59b6d35447ce71606287d1c2c9a39a</Sha>
<Sha>adc0d6e7d3abb9c4ecee2420c51ae99c57dc9755</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.16-servicing.25203.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.16-servicing.25211.4">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>29119a816b59b6d35447ce71606287d1c2c9a39a</Sha>
<Sha>adc0d6e7d3abb9c4ecee2420c51ae99c57dc9755</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">
Expand All @@ -111,79 +111,79 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25164.5">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25211.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -334,9 +334,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>6dbf15dc48cde2bde6f62811ba73241b067b3683</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25164.5">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25214.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,21 +87,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25164.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25164.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25164.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25164.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25164.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25164.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25164.5</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25164.5</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25214.7</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25214.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25214.7</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25214.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25214.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25214.7</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25214.7</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25214.7</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -269,7 +269,7 @@
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
<!-- installer version, for testing workloads must be greater than or equal to global.json sdk version -->
<MicrosoftDotnetSdkInternalVersion>8.0.114</MicrosoftDotnetSdkInternalVersion>
<MicrosoftDotnetSdkInternalVersion>8.0.115</MicrosoftDotnetSdkInternalVersion>
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
</PropertyGroup>
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdl/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
<package id="Microsoft.Guardian.Cli" version="0.199.0"/>
</packages>
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "8.0.114",
"version": "8.0.115",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "8.0.114"
"dotnet": "8.0.115"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25164.5",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25214.7",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25214.7",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25214.7",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Diagnostics.EventLog/src/System.Diagnostics.EventLog.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);$(NetCoreAppPrevious)-windows;$(NetCoreAppPrevious);$(NetCoreAppMinimum)-windows;$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<ServicingVersion>2</ServicingVersion>
<PackageDescription>Provides the System.Diagnostics.EventLog class, which allows the applications to use the Windows event log service.

Expand Down
2 changes: 1 addition & 1 deletion ...ibraries/System.DirectoryServices.Protocols/src/System.DirectoryServices.Protocols.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeDllSafeSearchPathAttribute>true</IncludeDllSafeSearchPathAttribute>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<ServicingVersion>1</ServicingVersion>
<AddNETFrameworkPlaceholderFileToPackage>true</AddNETFrameworkPlaceholderFileToPackage>
<AddNETFrameworkAssemblyReferenceToPackage>true</AddNETFrameworkAssemblyReferenceToPackage>
Expand Down
3 changes: 0 additions & 3 deletions src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
<RootNamespace>System.Xml</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<EnableAOTAnalyzer>false</EnableAOTAnalyzer>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ServicingVersion>1</ServicingVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading