Skip to content

[main] Update dependencies from dotnet/arcade #100401

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
merged 8 commits into from
Apr 4, 2024
Merged

[main] Update dependencies from dotnet/arcade #100401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
18e78a6
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Mar 28, 2024
193ea10
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Mar 29, 2024
9ad1bab
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Mar 30, 2024
73b3b5f
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Mar 31, 2024
7a338f7
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Apr 1, 2024
0eaf941
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Apr 2, 2024
0d72395
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Apr 3, 2024
feb804e
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Apr 4, 2024
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
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 @@ -92,87 +92,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24176.6">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24176.6">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24170.12">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -332,9 +332,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>006ea312a94e8b7f5b7ae47a6470f733ddd1738a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24176.6">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24203.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687</Sha>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24106.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.4.24175.4</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24176.6</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24176.6</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24176.6</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24176.6</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24176.6</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24176.6</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24176.6</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24176.6</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24176.6</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24176.6</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24176.6</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24176.6</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24176.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24176.6</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24176.6</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24176.6</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24203.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24203.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24203.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24203.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24203.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24203.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24203.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24203.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24203.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24203.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24203.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24203.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24203.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24203.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24203.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24203.1</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/onelocbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows

steps:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/templates-official/job/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ jobs:
os: windows
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
os: windows
steps:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
image: 1es-mariner-2-pt
image: 1es-mariner-2
os: linux

${{ if ne(parameters.platform.pool, '') }}:
Expand Down
10 changes: 5 additions & 5 deletions eng/common/templates-official/post-build/post-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows

steps:
Expand Down Expand Up @@ -150,7 +150,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
Expand Down Expand Up @@ -208,7 +208,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
Expand Down Expand Up @@ -261,8 +261,8 @@ stages:
os: windows
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
os: windows
steps:
- template: setup-maestro-vars.yml
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/variables/pool-providers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# image: 1es-windows-2022-pt
# image: 1es-windows-2022

variables:
# Coalesce the target and source branches so we know when a PR targets a release branch
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "9.0.100-preview.1.24101.2"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24176.6",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24176.6",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24176.6",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24203.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24203.1",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24203.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24175.1"
Expand Down