mirror of
https://github.com/VSadov/Satori.git
synced 2025-06-10 18:11:04 +09:00
[main] Update dependencies from dotnet/arcade (#97763)
* Update dependencies from https://github.com/dotnet/arcade build 20240130.3 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 , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24080.1 -> To Version 9.0.0-beta.24080.3 * Update dependencies from https://github.com/dotnet/arcade build 20240131.4 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 , 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.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24080.1 -> To Version 9.0.0-beta.24081.4 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
parent
b787fdba24
commit
113af73aad
6 changed files with 63 additions and 63 deletions
|
@ -111,82 +111,82 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24072.1">
|
||||
<Uri>https://github.com/dotnet/runtime-assets</Uri>
|
||||
|
@ -333,9 +333,9 @@
|
|||
<Uri>https://github.com/dotnet/xharness</Uri>
|
||||
<Sha>f49b5c0db06528a9580686a5b63b0e5b4aba566b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24080.1">
|
||||
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24081.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>dd50030a0278e8c82f45624446fbec120b83c26b</Sha>
|
||||
<Sha>438a8e2488313fb3aa1b24a741a85c2669ee7e0d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24071.2">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
|
||||
|
|
|
@ -81,22 +81,22 @@
|
|||
<!-- SDK dependencies -->
|
||||
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-alpha.1.24072.3</MicrosoftDotNetApiCompatTaskVersion>
|
||||
<!-- Arcade dependencies -->
|
||||
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24080.1</MicrosoftDotNetBuildTasksFeedVersion>
|
||||
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24080.1</MicrosoftDotNetCodeAnalysisVersion>
|
||||
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24080.1</MicrosoftDotNetGenAPIVersion>
|
||||
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24080.1</MicrosoftDotNetGenFacadesVersion>
|
||||
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24080.1</MicrosoftDotNetXUnitAssertVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24080.1</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24080.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
|
||||
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24080.1</MicrosoftDotNetBuildTasksArchivesVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24080.1</MicrosoftDotNetBuildTasksInstallersVersion>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24080.1</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24080.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
|
||||
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24080.1</MicrosoftDotNetBuildTasksTemplatingVersion>
|
||||
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24080.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24080.1</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24080.1</MicrosoftDotNetVersionToolsTasksVersion>
|
||||
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24080.1</MicrosoftDotNetPackageTestingVersion>
|
||||
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24081.4</MicrosoftDotNetBuildTasksFeedVersion>
|
||||
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24081.4</MicrosoftDotNetCodeAnalysisVersion>
|
||||
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24081.4</MicrosoftDotNetGenAPIVersion>
|
||||
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24081.4</MicrosoftDotNetGenFacadesVersion>
|
||||
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24081.4</MicrosoftDotNetXUnitAssertVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24081.4</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24081.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
|
||||
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24081.4</MicrosoftDotNetBuildTasksArchivesVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24081.4</MicrosoftDotNetBuildTasksInstallersVersion>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24081.4</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24081.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
|
||||
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24081.4</MicrosoftDotNetBuildTasksTemplatingVersion>
|
||||
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24081.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24081.4</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24081.4</MicrosoftDotNetVersionToolsTasksVersion>
|
||||
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24081.4</MicrosoftDotNetPackageTestingVersion>
|
||||
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
|
||||
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
|
||||
<!-- NuGet dependencies -->
|
||||
|
|
|
@ -64,7 +64,7 @@ try {
|
|||
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
|
||||
}
|
||||
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
|
||||
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
|
||||
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.5" -MemberType NoteProperty
|
||||
}
|
||||
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
|
||||
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
parameters:
|
||||
runAsPublic: false
|
||||
sourceIndexPackageVersion: 1.0.1-20231213.4
|
||||
sourceIndexPackageVersion: 1.0.1-20240129.2
|
||||
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
|
||||
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
|
||||
preSteps: []
|
||||
|
|
|
@ -379,8 +379,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
|
|||
|
||||
# If the version of msbuild is going to be xcopied,
|
||||
# use this version. Version matches a package here:
|
||||
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
|
||||
$defaultXCopyMSBuildVersion = '17.8.1-2'
|
||||
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.5
|
||||
$defaultXCopyMSBuildVersion = '17.8.5'
|
||||
|
||||
if (!$vsRequirements) {
|
||||
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
|
||||
|
|
|
@ -8,9 +8,9 @@
|
|||
"dotnet": "9.0.100-alpha.1.23615.4"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24080.1",
|
||||
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24080.1",
|
||||
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24080.1",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24081.4",
|
||||
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24081.4",
|
||||
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24081.4",
|
||||
"Microsoft.Build.NoTargets": "3.7.0",
|
||||
"Microsoft.Build.Traversal": "3.4.0",
|
||||
"Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.24072.1"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue