Skip to content

Commit

Permalink
Merge branch 'release/6.0-staging' into darc-release/6.0-staging-21c6…
Browse files Browse the repository at this point in the history
…66c9-8520-4318-8a0b-deadf11a5fe8
  • Loading branch information
ericstj authored Apr 12, 2024
2 parents e3ac744 + 0e7d0c9 commit b1bc4a2
Show file tree
Hide file tree
Showing 71 changed files with 3,040 additions and 1,898 deletions.
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": "6.0.0-prerelease.23531.3",
"version": "6.0.0-prerelease.24154.4",
"commands": [
"xharness"
]
Expand Down
1 change: 1 addition & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +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-5a6205a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5a6205aa/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-wcf -->
<!-- End: Package sources from dotnet-wcf -->
Expand Down
2 changes: 1 addition & 1 deletion THIRD-PARTY-NOTICES.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ https://github.com/madler/zlib
https://zlib.net/zlib_license.html

/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.2.13, October 13th, 2022
version 1.3.1, January 22nd, 2024

Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler

Expand Down
96 changes: 48 additions & 48 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,95 +8,95 @@
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>7312355e44fd230b7aa26c7190f3870391751476</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.28">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.29">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>ee3546a41338fd3c82167b62d7ff989934c6cb01</Sha>
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.28">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.29">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>ee3546a41338fd3c82167b62d7ff989934c6cb01</Sha>
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.28">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.29">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>ee3546a41338fd3c82167b62d7ff989934c6cb01</Sha>
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
<Uri>https://github.com/dotnet/wcf</Uri>
<Sha>04c3656e0325277aefa18378f24238d39b259222</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24113.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -214,17 +214,17 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>c8499798a2a09639174e2f5c694d6652794cc73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.23531.3">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.24154.4">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>9cffd0b49204fa44c7577fa1a132e39e7cf4d038</Sha>
<Sha>e3f823d9e7dd5b42dde2fc3cdc1fb3650dd197f2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.23531.3">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.24154.4">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>9cffd0b49204fa44c7577fa1a132e39e7cf4d038</Sha>
<Sha>e3f823d9e7dd5b42dde2fc3cdc1fb3650dd197f2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24113.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24163.13">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
<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>6.0.29</ProductVersion>
<ProductVersion>6.0.30</ProductVersion>
<!-- File version numbers -->
<MajorVersion>6</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>29</PatchVersion>
<PatchVersion>30</PatchVersion>
<SdkBandVersion>6.0.400</SdkBandVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration>
Expand Down Expand Up @@ -42,21 +42,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24113.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24113.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24113.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24113.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24113.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24113.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24113.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24113.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24113.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24163.13</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24163.13</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24163.13</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24163.13</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24163.13</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24163.13</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24163.13</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24163.13</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24163.13</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -143,8 +143,8 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>6.0.0-prerelease.23531.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>6.0.0-prerelease.23531.3</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>6.0.0-prerelease.24154.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>6.0.0-prerelease.24154.4</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.24115.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.23367.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2-pre.9</XUnitVersion>
Expand Down Expand Up @@ -176,9 +176,9 @@
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<!-- emscripten / Node -->
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.28</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.28</MicrosoftNETWorkloadEmscriptenManifest60300Version>
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.28</MicrosoftNETWorkloadEmscriptenManifest60400Version>
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.29</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.29</MicrosoftNETWorkloadEmscriptenManifest60300Version>
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.29</MicrosoftNETWorkloadEmscriptenManifest60400Version>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
Expand Down
Loading

0 comments on commit b1bc4a2

Please sign in to comment.