Skip to content

[release/7.0] Update dependencies from dotnet/arcade #87648

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
carlossanlop merged 1 commit into from
Jun 20, 2023
Merged

[release/7.0] Update dependencies from dotnet/arcade #87648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,77 +58,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23228.7">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23179.6">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -258,9 +258,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2105520c1f824406b7738d715ad132bbd42a6d6b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23228.7">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23313.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>df8799988af6503cbcd9544713d30732328c8c57</Sha>
<Sha>59ac824080b9807fd91dbc8a6d2b4447e74874ab</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
<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 @@ -53,22 +53,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23228.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23228.7</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23228.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23228.7</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23228.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23228.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23228.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23228.7</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23228.7</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23228.7</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23313.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23313.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23313.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23313.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23313.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23313.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23313.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23313.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23313.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23313.4</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
Binary file modified eng/common/loc/P22DotNetHtmlLocalization.lss
View file
Open in desktop
Binary file not shown.
16 changes: 11 additions & 5 deletions eng/common/templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ jobs:
- ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}:
- name: EnableRichCodeNavigation
value: 'true'
# Retry signature validation up to three times, waiting 2 seconds between attempts.
# See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures
- name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY
value: 3,2000
- ${{ each variable in parameters.variables }}:
# handle name-value variable syntax
# example:
Expand All @@ -81,7 +85,7 @@ jobs:
- ${{ if ne(variable.name, '') }}:
- name: ${{ variable.name }}
value: ${{ variable.value }}

# handle variable groups
- ${{ if ne(variable.group, '') }}:
- group: ${{ variable.group }}
Expand Down Expand Up @@ -145,15 +149,17 @@ jobs:
- template: /eng/common/templates/steps/component-governance.yml
parameters:
${{ if eq(parameters.disableComponentGovernance, '') }}:
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}:
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
disableComponentGovernance: false
${{ else }}:
disableComponentGovernance: true
${{ else }}:
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}

- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: MicroBuildCleanup@1
displayName: Execute Microbuild cleanup tasks
displayName: Execute Microbuild cleanup tasks
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
continueOnError: ${{ parameters.continueOnError }}
env:
Expand Down Expand Up @@ -221,7 +227,7 @@ jobs:
displayName: Publish XUnit Test Results
inputs:
testResultsFormat: 'xUnit'
testResultsFiles: '*.xml'
testResultsFiles: '*.xml'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit
mergeTestResults: ${{ parameters.mergeTestResults }}
Expand All @@ -232,7 +238,7 @@ jobs:
displayName: Publish TRX Test Results
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '*.trx'
testResultsFiles: '*.trx'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)'
testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx
mergeTestResults: ${{ parameters.mergeTestResults }}
Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "7.0.105",
"version": "7.0.107",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "7.0.105"
"dotnet": "7.0.107"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23228.7",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23228.7",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23228.7",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23313.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23313.4",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23313.4",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down