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

Update Arcade + Workloads #72947

Merged
merged 4 commits into from
Aug 5, 2022
Merged

Update Arcade + Workloads #72947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7055ed4
Update Arcade + Workloads
joeloff Jul 27, 2022
1b37f74
Fix publishing
joeloff Jul 27, 2022
8855672
Fix signing by manually deduping artifacts
joeloff Jul 28, 2022
4a23d1b
Fix greedy glob
joeloff Jul 28, 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
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 @@ -26,77 +26,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22161.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</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 @@ -218,9 +218,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22161.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22314.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</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.22161.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22161.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22161.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22161.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22161.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22161.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22161.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22161.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22161.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22314.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22314.7</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22314.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22314.7</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22314.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22314.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22314.7</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22314.7</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22314.7</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
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.22161.1",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22161.1",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22161.1",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22314.7",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22314.7",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22314.7",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22314.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
18 changes: 14 additions & 4 deletions src/installer/prepare-artifacts.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
</ItemsToPush>

<ItemsToPush Include="@(WorkloadsVSInsertionFile)">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After this is removed, where do the assets from the swix projects get picked up for publishing?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😢 good point. I should probably add the new zip files to the item group

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I fixed this. The zips are unique named, so we can just put them in the same folder

<RelativeBlobPath>$(InstallersRelativePath)workloads/$(SdkBandVersion)/%(Filename)%(Extension)</RelativeBlobPath>
<RelativeBlobPath>$(InstallersRelativePath)workloads/%(Filename)%(Extension)</RelativeBlobPath>
<PublishFlatContainer>true</PublishFlatContainer>
</ItemsToPush>

Expand Down Expand Up @@ -208,11 +208,21 @@
Include="$(DownloadDirectory)**\VS.Redist.Common.*.nupkg"
Exclude="@(DownloadedSymbolNupkgFile)" />

<!-- Workloads VS insertion artifacts produced by src/workloads/workloads.csproj -->
<!--
Workloads VS insertion artifacts produced by src/workloads/workloads.csproj.
Manually dedupe the file set for publishing since we have duplicates files in separate
feature band folders and Distinct() works on the actual Include value.
-->
<_WorkloadsVSInsertionFile
Include="
$(DownloadDirectory)*\workloads-vs\**\*.msi;
$(DownloadDirectory)*\workloads-vs\**\*.json" />
<__WorkloadsVSInsertionFile Include="%(_WorkloadsVSInsertionFile.Filename)%(Extension)" ActualPath="%(FullPath)" />
<___WorkloadsVSInsertionFile Include="@(__WorkloadsVSInsertionFile->Distinct())" />
<WorkloadsVSInsertionFile Include="%(___WorkloadsVSInsertionFile.ActualPath)" />
<WorkloadsVSInsertionFile
Include="
$(DownloadDirectory)*\workloads-vs\**\*.json;
$(DownloadDirectory)*\workloads-vs\**\*.msi" />
$(DownloadDirectory)**\Workloads.VSDrop*.zip" />

<!--
Runtime packages associated with some identity packages. Need to exclude "runtime.native.*"
Expand Down
Loading