Skip to content

Commit

Permalink
[release/6.0] Update dependencies from dotnet/arcade (#107220)
Browse files Browse the repository at this point in the history 
* 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 <lewing@microsoft.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
  • Loading branch information
@dotnet-maestro @lewing @carlossanlop
4 people authored Sep 5, 2024
1 parent de4f4fa commit ec3f6ab
Show file tree
Hide file tree
Showing 25 changed files with 286 additions and 396 deletions.
6 changes: 6 additions & 0 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
<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-ec74ec8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f/nuget/v3/index.json" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<!-- 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
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.24360.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24360.7">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</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>d1dd9c2ce3fc0b9358d2cda64c52d052d1a612c1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24360.7">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24413.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fbc993a9e8fb4926ce04c95ba2e48852c9d9df65</Sha>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</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
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
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.24360.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24360.7</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24360.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24360.7</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24360.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24360.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24360.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24360.7</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24360.7</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24360.7</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24413.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24413.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24413.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24413.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24413.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24413.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24413.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24413.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24413.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -154,7 +154,7 @@
<SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
<MoqVersion>4.12.0</MoqVersion>
<FsCheckVersion>2.14.3</FsCheckVersion>
<SdkVersionForWorkloadTesting>6.0.400-rtm.22371.2</SdkVersionForWorkloadTesting>
<SdkVersionForWorkloadTesting>6.0.425</SdkVersionForWorkloadTesting>
<SdkChannelForWorkloadTesting>6.0.4xx</SdkChannelForWorkloadTesting>
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>6.0.0-preview-20211019.1</MicrosoftPrivateIntellisenseVersion>
Expand Down
48 changes: 0 additions & 48 deletions eng/common/post-build/add-build-to-channel.ps1
View file

This file was deleted.

10 changes: 9 additions & 1 deletion eng/common/post-build/check-channel-consistency.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@ param(
)

try {
. $PSScriptRoot\post-build-utils.ps1
$ErrorActionPreference = 'Stop'
Set-StrictMode -Version 2.0

# `tools.ps1` checks $ci to perform some actions. Since the post-build
# scripts don't necessarily execute in the same agent that run the
# build.ps1/sh script this variable isn't automatically set.
$ci = $true
$disableConfigureToolsetImport = $true
. $PSScriptRoot\..\tools.ps1

if ($PromoteToChannels -eq "") {
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."
Expand Down
13 changes: 2 additions & 11 deletions eng/common/post-build/nuget-validation.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,11 @@
# tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage

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

try {
. $PSScriptRoot\post-build-utils.ps1

$url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1'

New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force

Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1

& ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg
& $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg
}
catch {
Write-Host $_.ScriptStackTrace
Expand Down
Loading

0 comments on commit ec3f6ab

Please sign in to comment.