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-staging] Update dependencies from xharness, arcade #85725

Merged
merged 2 commits into from
May 4, 2023
Merged

[release/6.0-staging] Update dependencies from xharness, arcade #85725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a05c59d
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] May 3, 2023
dea1a43
Update Arcade - `6.0.0-beta.23211.7` => `6.0.0-beta.23221.7` (from bu…
premun May 4, 2023
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.21404.1",
"version": "6.0.0-prerelease.23253.6",
"commands": [
"xharness"
]
Expand Down
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 @@ -10,6 +10,7 @@
<!--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-275d1fa" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-275d1fa1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-275d1fa-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-275d1fa1-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-275d1fa-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-275d1fa1-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: 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
Expand Up @@ -26,77 +26,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23211.7">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</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 @@ -214,17 +214,17 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>c8499798a2a09639174e2f5c694d6652794cc73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21404.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.23253.6">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
<Sha>bc2e9e39a7b424f6e96af8d677d12ac58606753a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21404.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.23253.6">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
<Sha>bc2e9e39a7b424f6e96af8d677d12ac58606753a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.23211.7">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.23221.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<Sha>3d9c9a4d3d893e903bb3295fd5b55b8e40699888</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 @@ -42,21 +42,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23211.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.23211.7</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23211.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.23211.7</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.23211.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23211.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.23211.7</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.23211.7</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.23211.7</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23221.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.23221.7</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.23221.7</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23221.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.23221.7</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.23221.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23221.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.23221.7</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23221.7</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.23221.7</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23221.7</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.23221.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.23221.7</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.23221.7</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.23221.7</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -143,8 +143,8 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21404.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21404.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>6.0.0-prerelease.23253.6</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>6.0.0-prerelease.23253.6</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.23226.4</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2-pre.9</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
Expand Down
12 changes: 8 additions & 4 deletions eng/common/templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ parameters:
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishUsingPipelines: false
disableComponentGovernance: false
disableComponentGovernance: ''
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
Expand Down Expand Up @@ -141,9 +141,13 @@ jobs:
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
continueOnError: true

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
- task: ComponentGovernanceComponentDetection@0
continueOnError: true
- 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'))) }}:
disableComponentGovernance: false
${{ else }}:
disableComponentGovernance: true

- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down
10 changes: 10 additions & 0 deletions eng/common/templates/steps/component-governance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
parameters:
disableComponentGovernance: false

steps:
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
displayName: Set skipComponentGovernanceDetection variable
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
- task: ComponentGovernanceComponentDetection@0
continueOnError: true
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.23211.7",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23211.7",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23211.7",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23221.7",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23221.7",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23221.7",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23221.7",
"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