Skip to content

[release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk dotnet/icu #64987

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
safern merged 3 commits into from
Feb 12, 2022
Merged

[release/6.0] Update dependencies from dotnet/arcade dotnet/emsdk dotnet/icu #64987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68387ea
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Feb 8, 2022
fa0f4bf
Update dependencies from https://github.com/dotnet/emsdk build 202202…
dotnet-maestro[bot] Feb 9, 2022
1a2d510
Update dependencies from https://github.com/dotnet/icu build 20220208.1
dotnet-maestro[bot] Feb 9, 2022
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
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
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-ee0a97a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ee0a97a0/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-wcf -->
<!-- End: Package sources from dotnet-wcf -->
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
@@ -1,94 +1,94 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.21519.1">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.22108.1">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>20dc231264fa75c9860b66f295a9ae279fe91df8</Sha>
<Sha>183f41cd63abd8dcba7389c22d19ebad7df65bfa</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-preview.7.21417.1">
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>98129287d56a5e0348c291ce4260e630b4aa510d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.0">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.2">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>1ec2e17fcfd86bdd6f7e7246b6d527e94e34c15a</Sha>
<Sha>ee0a97a0009c0e048789126253fea7994db676ac</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.22104.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22104.4">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</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 @@ -210,9 +210,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22104.4">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22107.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>35cb0d91130a309154a03a7efa39fa6d389c43ec</Sha>
<Sha>fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d</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
34 changes: 17 additions & 17 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.2.21511.46</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22104.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22104.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22104.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22104.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22104.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22104.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22104.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22104.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22104.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22104.4</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22107.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22107.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22107.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22107.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22107.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22107.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22107.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22107.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22107.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22107.2</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -152,7 +152,7 @@
<MicrosoftNETILLinkTasksVersion>6.0.100-1.21459.1</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.21519.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.22108.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<SystemNetMsQuicTransportVersion>6.0.0-preview.7.21417.1</SystemNetMsQuicTransportVersion>
<!-- Mono LLVM -->
Expand All @@ -165,7 +165,7 @@
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<!-- emscripten / Node -->
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.0</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.2</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
Expand Down
15 changes: 9 additions & 6 deletions eng/common/templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ parameters:
# container and pool.
platform: {}

# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
# source-build builds run in Docker, including the default managed platform.
defaultContainerHostPool:
vmImage: ubuntu-20.04

jobs:
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
displayName: Source-Build (${{ parameters.platform.name }})
Expand All @@ -47,7 +42,15 @@ jobs:
container: ${{ parameters.platform.container }}

${{ if eq(parameters.platform.pool, '') }}:
pool: ${{ parameters.defaultContainerHostPool }}
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
# source-build builds run in Docker, including the default managed platform.
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}

Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22104.4",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22104.4",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22104.4",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22104.4",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22107.2",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22107.2",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22107.2",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"
Expand Down