Skip to content

[main] Update dependencies from dotnet/arcade #105105

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

Closed
wants to merge 7 commits into from
Closed

[main] Update dependencies from dotnet/arcade #105105

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
14f0ab6
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 18, 2024
b305c0d
Merge branch 'main' into darc-main-308deaee-5962-42a1-929e-64342a5d42a8
ViktorHofer Jul 19, 2024
b35e93a
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 19, 2024
637fef4
Revert llvm changes
akoeplinger Jul 19, 2024
c3b14ca
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 20, 2024
85dacff
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 21, 2024
aaf0ac2
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jul 22, 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.24360.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.8.1-beta.24360.4">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.8.1-beta.24360.4">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24358.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -332,9 +332,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>65d0584b517952962b7a79195b5d7606b52fcbfe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24360.4">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24368.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
<Sha>b4e499d1f6e6b3a981feabfed290d99261762382</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
<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 (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.7.24358.3</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24360.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24360.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24360.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24360.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.8.1-beta.24360.4</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24360.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.8.1-beta.24360.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24360.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24360.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24360.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24360.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24360.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24360.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24360.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24360.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24360.4</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24368.9</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24368.9</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24368.9</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24368.9</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.0-beta.24368.9</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24368.9</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.0-beta.24368.9</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24368.9</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24368.9</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24368.9</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24368.9</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24368.9</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24368.9</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24368.9</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24368.9</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24368.9</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
5 changes: 3 additions & 2 deletions eng/common/core-templates/job/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,10 @@ jobs:
scriptType: ps
scriptLocation: scriptPath
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
arguments: -BuildId $(BARBuildId)
arguments: >
-BuildId $(BARBuildId)
-PublishingInfraVersion 3
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-AzdoToken '$(System.AccessToken)'
-WaitPublishingFinish true
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
Expand Down
5 changes: 3 additions & 2 deletions eng/common/core-templates/post-build/post-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,9 +307,10 @@ stages:
scriptType: ps
scriptLocation: scriptPath
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
arguments: -BuildId $(BARBuildId)
arguments: >
-BuildId $(BARBuildId)
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
-AzdoToken '$(System.AccessToken)'
-WaitPublishingFinish true
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
16 changes: 15 additions & 1 deletion eng/common/core-templates/steps/get-federated-access-token.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,31 @@ parameters:
type: string
- name: outputVariableName
type: string
- name: is1ESPipeline
type: boolean
- name: stepName
type: string
default: 'getFederatedAccessToken'
- name: condition
type: string
default: ''
# Resource to get a token for. Common values include:
# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps
# - 'https://storage.azure.com/' for storage
# Defaults to Azure DevOps
- name: resource
type: string
default: '499b84ac-1321-427f-aa17-267ca6975798'
- name: isStepOutputVariable
type: boolean
default: false

steps:
- task: AzureCLI@2
displayName: 'Getting federated access token for feeds'
name: ${{ parameters.stepName }}
${{ if ne(parameters.condition, '') }}:
condition: ${{ parameters.condition }}
inputs:
azureSubscription: ${{ parameters.federatedServiceConnection }}
scriptType: 'pscore'
Expand All @@ -25,4 +39,4 @@ steps:
exit 1
}
Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value"
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken"
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken"
1 change: 0 additions & 1 deletion eng/common/core-templates/steps/publish-logs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ steps:
'$(MaestroAccessToken)'
'$(dn-bot-all-orgs-artifact-feeds-rw)'
'$(akams-client-id)'
'$(akams-client-secret)'
'$(microsoft-symbol-server-pat)'
'$(symweb-symbol-server-pat)'
'$(dn-bot-all-orgs-build-rw-code-rw)'
Expand Down
1 change: 1 addition & 0 deletions eng/common/post-build/publish-using-darc.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ try {
--azdev-pat "$AzdoToken" `
--bar-uri "$MaestroApiEndPoint" `
--ci `
--verbose `
@optionalParams

if ($LastExitCode -ne 0) {
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.5.24307.3"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24360.4",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24360.4",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24360.4",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24368.9",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24368.9",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24368.9",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "9.0.0-preview.7.24357.2"
Expand Down