Skip to content

[automated] Merge branch 'release/7.0' => 'release/7.0-staging' #89815

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
carlossanlop merged 5 commits into from
Aug 3, 2023
Merged

[automated] Merge branch 'release/7.0' => 'release/7.0-staging' #89815

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50f5fd0
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 13, 2023
4bc0fe9
Update dependencies from https://github.com/dotnet/emsdk build 202307…
dotnet-maestro[bot] Jul 13, 2023
254f912
Update branding to 7.0.11 (#89801)
vseanreesermsft Aug 1, 2023
4b8bbf5
Update dependencies from https://github.com/dotnet/emsdk build 202308…
dotnet-maestro[bot] Aug 2, 2023
fd26be1
Merge branch 'release/7.0-staging' into merge/release/7.0-to-release/…
carlossanlop Aug 2, 2023
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-9b227c1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9b227c16/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-96ba1fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-96ba1fed/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!--
Expand Down
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,87 +48,87 @@
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.9">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.10">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>9b227c1606a01920839873f840f6b76f7b492a66</Sha>
<Sha>96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.9">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.10">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>9b227c1606a01920839873f840f6b76f7b492a66</Sha>
<Sha>96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23313.4">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23179.6">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -258,9 +258,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>0627fd5c5d3d1979e3a2234280e47c149c73333a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23313.4">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23361.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
<Sha>cae11bc40b691f546d788f7ab37f7eaf0e24ded8</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
40 changes: 20 additions & 20 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>
<PropertyGroup>
<!-- The .NET product branding version -->
<ProductVersion>7.0.10</ProductVersion>
<ProductVersion>7.0.11</ProductVersion>
<!-- File version numbers -->
<MajorVersion>7</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>10</PatchVersion>
<PatchVersion>11</PatchVersion>
<SdkBandVersion>7.0.100</SdkBandVersion>
<PackageVersionNet6>6.0.$([MSBuild]::Add($(PatchVersion), 11))</PackageVersionNet6>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
Expand All @@ -22,8 +22,8 @@
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
<UsingToolXliff>false</UsingToolXliff>
<LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.9</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.9</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.10</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.10</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
</PropertyGroup>
<ItemGroup>
<!-- The bands we want to produce workload manifests for -->
Expand Down Expand Up @@ -53,22 +53,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23313.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23313.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23313.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23313.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23313.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23313.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23313.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23313.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23313.4</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23361.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23361.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23361.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23361.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23361.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23361.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23361.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23361.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23361.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23361.2</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
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": "7.0.107",
"version": "7.0.109",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "7.0.107"
"dotnet": "7.0.109"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23313.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23313.4",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23313.4",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23361.2",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23361.2",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23361.2",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down