Skip to content

Commit ec3f6ab

Browse files
dotnet-maestro[bot]lewingcarlossanlop
authored
[release/6.0] Update dependencies from dotnet/arcade (dotnet#107220)
* Update dependencies from https://github.com/dotnet/arcade build 20240813.1 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.24360.7 -> To Version 6.0.0-beta.24413.1 * Update WBT sdk to keep up with global.json --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Larry Ewing <[email protected]> Co-authored-by: Carlos Sánchez López <[email protected]>
1 parent de4f4fa commit ec3f6ab

25 files changed

+286
-396
lines changed

‎NuGet.config

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12+
<add key="darc-pub-dotnet-emsdk-ec74ec8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-ec74ec8-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-5/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-emsdk-ec74ec8-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-4/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-emsdk-ec74ec8-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-3/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-emsdk-ec74ec8-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-2/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-emsdk-ec74ec8-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-1/nuget/v3/index.json" />
1218
<add key="darc-pub-dotnet-emsdk-c68eace" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1/nuget/v3/index.json" />
1319
<!-- End: Package sources from dotnet-emsdk -->
1420
<!-- Begin: Package sources from dotnet-wcf -->

‎eng/Version.Details.xml

+38-38
Original file line numberDiff line numberDiff line change
@@ -26,77 +26,77 @@
2626
</Dependency>
2727
</ProductDependencies>
2828
<ToolsetDependencies>
29-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24360.7">
29+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24413.1">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
31+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24360.7">
33+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24413.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
35+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24360.7">
37+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24413.1">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
39+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24360.7">
41+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24413.1">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
43+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24360.7">
45+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24413.1">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
47+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24360.7">
49+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24413.1">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
51+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24360.7">
53+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24413.1">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
55+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24360.7">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24413.1">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
59+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24360.7">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24413.1">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
63+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24360.7">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24413.1">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
67+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24360.7">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24413.1">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
71+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24360.7">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24413.1">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
75+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24360.7">
77+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24413.1">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
79+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24360.7">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24413.1">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
83+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24360.7">
85+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24413.1">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
87+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24360.7">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24413.1">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
91+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24360.7">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24413.1">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
95+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24360.7">
97+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24413.1">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
99+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
100100
</Dependency>
101101
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
102102
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -222,9 +222,9 @@
222222
<Uri>https://github.com/dotnet/xharness</Uri>
223223
<Sha>d1dd9c2ce3fc0b9358d2cda64c52d052d1a612c1</Sha>
224224
</Dependency>
225-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24360.7">
225+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24413.1">
226226
<Uri>https://github.com/dotnet/arcade</Uri>
227-
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
227+
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
228228
</Dependency>
229229
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
230230
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

+16-16
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@
4242
<!-- SDK dependencies -->
4343
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
4444
<!-- Arcade dependencies -->
45-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24360.7</MicrosoftDotNetApiCompatVersion>
46-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksFeedVersion>
47-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24360.7</MicrosoftDotNetCodeAnalysisVersion>
48-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24360.7</MicrosoftDotNetGenAPIVersion>
49-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24360.7</MicrosoftDotNetGenFacadesVersion>
50-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24360.7</MicrosoftDotNetXUnitExtensionsVersion>
51-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24360.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
52-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksArchivesVersion>
53-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksInstallersVersion>
54-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksPackagingVersion>
55-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksTemplatingVersion>
56-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
57-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24360.7</MicrosoftDotNetRemoteExecutorVersion>
58-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24360.7</MicrosoftDotNetVersionToolsTasksVersion>
59-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24360.7</MicrosoftDotNetPackageTestingVersion>
45+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24413.1</MicrosoftDotNetApiCompatVersion>
46+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksFeedVersion>
47+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24413.1</MicrosoftDotNetCodeAnalysisVersion>
48+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24413.1</MicrosoftDotNetGenAPIVersion>
49+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24413.1</MicrosoftDotNetGenFacadesVersion>
50+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24413.1</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24413.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
52+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksArchivesVersion>
53+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksInstallersVersion>
54+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksPackagingVersion>
55+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksTemplatingVersion>
56+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
57+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24413.1</MicrosoftDotNetRemoteExecutorVersion>
58+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24413.1</MicrosoftDotNetVersionToolsTasksVersion>
59+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24413.1</MicrosoftDotNetPackageTestingVersion>
6060
<!-- NuGet dependencies -->
6161
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
6262
<!-- Installer dependencies -->
@@ -154,7 +154,7 @@
154154
<SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
155155
<MoqVersion>4.12.0</MoqVersion>
156156
<FsCheckVersion>2.14.3</FsCheckVersion>
157-
<SdkVersionForWorkloadTesting>6.0.400-rtm.22371.2</SdkVersionForWorkloadTesting>
157+
<SdkVersionForWorkloadTesting>6.0.425</SdkVersionForWorkloadTesting>
158158
<SdkChannelForWorkloadTesting>6.0.4xx</SdkChannelForWorkloadTesting>
159159
<!-- Docs -->
160160
<MicrosoftPrivateIntellisenseVersion>6.0.0-preview-20211019.1</MicrosoftPrivateIntellisenseVersion>

‎eng/common/post-build/add-build-to-channel.ps1

-48
This file was deleted.

‎eng/common/post-build/check-channel-consistency.ps1

+9-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@ param(
44
)
55

66
try {
7-
. $PSScriptRoot\post-build-utils.ps1
7+
$ErrorActionPreference = 'Stop'
8+
Set-StrictMode -Version 2.0
9+
10+
# `tools.ps1` checks $ci to perform some actions. Since the post-build
11+
# scripts don't necessarily execute in the same agent that run the
12+
# build.ps1/sh script this variable isn't automatically set.
13+
$ci = $true
14+
$disableConfigureToolsetImport = $true
15+
. $PSScriptRoot\..\tools.ps1
816

917
if ($PromoteToChannels -eq "") {
1018
Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."

‎eng/common/post-build/nuget-validation.ps1

+2-11
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,11 @@
22
# tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage
33

44
param(
5-
[Parameter(Mandatory=$true)][string] $PackagesPath, # Path to where the packages to be validated are
6-
[Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to
5+
[Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are
76
)
87

98
try {
10-
. $PSScriptRoot\post-build-utils.ps1
11-
12-
$url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1'
13-
14-
New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force
15-
16-
Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1
17-
18-
& ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg
9+
& $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg
1910
}
2011
catch {
2112
Write-Host $_.ScriptStackTrace

0 commit comments

Comments
 (0)