Skip to content
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.

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

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "7.0.0-prerelease.23407.3",
"version": "7.0.0-prerelease.23455.3",
"commands": [
"xharness"
]
Expand Down
2 changes: 2 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<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-9506882" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-95068821/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-44da825" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-44da825c/nuget/v3/index.json" />
carlossanlop marked this conversation as resolved.
Show resolved Hide resolved
<add key="darc-pub-dotnet-emsdk-6f67d4a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6f67d4ab/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
92 changes: 46 additions & 46 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,85 +50,85 @@
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.13">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>6f67d4ab0e07dcc604a884d42fb74414800ddc6f</Sha>
<Sha>44da825cb96e08d28d258c5cda0ba14bbc4f91c3</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.13">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>6f67d4ab0e07dcc604a884d42fb74414800ddc6f</Sha>
<Sha>44da825cb96e08d28d258c5cda0ba14bbc4f91c3</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23408.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</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 @@ -246,21 +246,21 @@
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>53b3303c57b3fe659500fb362a0eef12991c1197</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="7.0.0-prerelease.23407.3">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="7.0.0-prerelease.23455.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>b045958a6c648fbcd322161f5785bc5353e4afab</Sha>
<Sha>dc8fda8988583416f2c76a75d19ad35c583c9eb6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="7.0.0-prerelease.23407.3">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="7.0.0-prerelease.23455.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>b045958a6c648fbcd322161f5785bc5353e4afab</Sha>
<Sha>dc8fda8988583416f2c76a75d19ad35c583c9eb6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="7.0.0-prerelease.23407.3">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="7.0.0-prerelease.23455.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>b045958a6c648fbcd322161f5785bc5353e4afab</Sha>
<Sha>dc8fda8988583416f2c76a75d19ad35c583c9eb6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23408.3">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23511.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha>
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</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
44 changes: 22 additions & 22 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project>
<PropertyGroup>
<!-- The .NET product branding version -->
<ProductVersion>7.0.12</ProductVersion>
<ProductVersion>7.0.13</ProductVersion>
<!-- File version numbers -->
<MajorVersion>7</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>12</PatchVersion>
<PatchVersion>13</PatchVersion>
<SdkBandVersion>7.0.100</SdkBandVersion>
<PackageVersionNet6>6.0.$([MSBuild]::Add($(PatchVersion), 11))</PackageVersionNet6>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
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.23408.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23408.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23408.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23408.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23408.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23408.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23408.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23408.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23408.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23408.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23408.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23408.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23408.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23408.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23408.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23408.3</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23511.9</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23511.9</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23511.9</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23511.9</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23511.9</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23511.9</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23511.9</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23511.9</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23511.9</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23511.9</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23511.9</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23511.9</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23511.9</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23511.9</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23511.9</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23511.9</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -154,9 +154,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.23407.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.23407.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.23407.3</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.23455.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.23455.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.23455.3</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.23411.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2</XUnitVersion>
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
Expand All @@ -179,7 +179,7 @@
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rtm.23409.2</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<MicrosoftNativeQuicMsQuicVersion>2.2.2</MicrosoftNativeQuicMsQuicVersion>
<MicrosoftNativeQuicMsQuicVersion>2.2.3</MicrosoftNativeQuicMsQuicVersion>
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22459.1</SystemNetMsQuicTransportVersion>
<!-- Mono LLVM -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.23115.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
Expand Down
10 changes: 5 additions & 5 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "7.0.110",
"version": "7.0.112",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "7.0.110"
"dotnet": "7.0.112"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23408.3",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23408.3",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23511.9",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23511.9",
"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
Loading