Skip to content

[release/6.0] Fix VS component versions #74324

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
lewing merged 8 commits into from
Sep 9, 2022
Merged

[release/6.0] Fix VS component versions #74324

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
6eac56f
Fix VS component versions
joeloff Aug 22, 2022
3372258
Simplify item definition
joeloff Aug 22, 2022
64e51bd
Enable multitargeting support for VS insertions
joeloff Sep 7, 2022
8401564
Update Arcade
joeloff Sep 8, 2022
13543c5
Merge branch 'release/6.0' into workload-versions
joeloff Sep 8, 2022
06d5767
Update macOS version to 11
joeloff Sep 8, 2022
eadd9d1
Disable symbol packages for workload MSIs
joeloff Sep 8, 2022
8212d95
Undo macOS change to work around scream test in DevOps
joeloff Sep 9, 2022
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: 2 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<clear />
<!--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-3f6c45a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-3f6c45a-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-3f6c45a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-wcf -->
Expand Down
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 @@ -30,77 +30,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</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 @@ -222,9 +222,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22418.3">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22457.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b851fe8fbf2be11e6554789187a5315e80667ebd</Sha>
<Sha>60eeccda4868d869c5995a5b68a6e47926b4342d</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: 15 additions & 15 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22418.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22418.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22418.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22418.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22418.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22418.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22418.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22418.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22418.3</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22457.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22457.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22457.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22457.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22457.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22457.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22457.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22457.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22457.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22457.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22457.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22457.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22457.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22457.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22457.3</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/execute-sdl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- checkout: self
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/onelocbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64

variables:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/templates/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ jobs:
# source-build builds run in Docker, including the default managed platform.
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/jobs/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64

runAsPublic: ${{ parameters.runAsPublic }}
Expand Down
8 changes: 4 additions & 4 deletions eng/common/templates/post-build/post-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64

steps:
Expand Down Expand Up @@ -137,7 +137,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: setup-maestro-vars.yml
Expand Down Expand Up @@ -197,7 +197,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: setup-maestro-vars.yml
Expand Down Expand Up @@ -254,7 +254,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: setup-maestro-vars.yml
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.22418.3",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22418.3",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22418.3",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22418.3",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22457.3",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22457.3",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22457.3",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22457.3",
"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
Loading