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.

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

Jump to bottom

[release/6.0-rc1] Update dependencies from dotnet/arcade #57628

Merged
merged 6 commits into from
Aug 19, 2021
Merged

[release/6.0-rc1] Update dependencies from dotnet/arcade #57628

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbf8303
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Aug 18, 2021
f830311
Unpin compiler version
ViktorHofer Aug 18, 2021
2020069
Update source-index-stage1.yml
ViktorHofer Aug 18, 2021
5bfa124
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Aug 19, 2021
8c4567f
Partial cherry pick from a169ca9da716a710a576667206b4d8cdf40a7f79
ViktorHofer Aug 19, 2021
e484ced
Merge branch 'release/6.0-rc1' into darc-release/6.0-rc1-17874243-6df…
ViktorHofer Aug 19, 2021
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
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,73 +14,73 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21413.4">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</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 @@ -202,9 +202,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21413.4">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21417.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9b7027ba718462aa6410cef61a8be5a4283e7528</Sha>
<Sha>df04f7bfcf0bdd315d5468e158a8cf6696760190</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
30 changes: 14 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<!-- Opt-in/out repo features -->
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
<!-- TODO: Upgrade compiler version to enable Static Abstracts in Interfaces, interpolated string handlers, and caller arg expressions; remove this once the employed SDK uses a new enough version. -->
<MicrosoftNetCompilersToolsetVersion>4.0.0-3.21376.12</MicrosoftNetCompilersToolsetVersion>
<UsingToolMicrosoftNetILLinkTasks>true</UsingToolMicrosoftNetILLinkTasks>
<UsingToolIbcOptimization>false</UsingToolIbcOptimization>
<UsingToolXliff>false</UsingToolXliff>
Expand Down Expand Up @@ -54,20 +52,20 @@
<!-- SDK dependencies -->
<MicrosoftDotNetPackageValidationVersion>1.0.0-rc.1.21404.21</MicrosoftDotNetPackageValidationVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21413.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21413.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21413.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21413.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21413.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21413.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21413.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21413.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21413.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21413.4</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21417.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21417.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21417.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21417.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21417.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21417.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21417.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21417.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21417.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21417.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21417.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21417.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21417.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21417.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
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.21413.4",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21413.4",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21413.4",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21413.4",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21417.1",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21417.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21417.1",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21417.1",
"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