Update dependencies from https://github.com/dotnet/arcade build 20240112.5 (#6957)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23628.1 -> To Version 9.0.0-beta.24062.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
Родитель
b824ed2a09
Коммит
e46b80889c
|
@ -7,25 +7,25 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23628.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24062.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
|
||||
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23628.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24062.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
|
||||
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.23628.1">
|
||||
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24062.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
|
||||
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23628.1">
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24062.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
|
||||
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.23628.1">
|
||||
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24062.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
|
||||
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
|
@ -39,9 +39,9 @@
|
|||
<Uri>https://github.com/dotnet/xharness</Uri>
|
||||
<Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23628.1">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24062.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
|
||||
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
|
@ -63,9 +63,9 @@
|
|||
<Uri>https://github.com/dotnet/symreader-converter</Uri>
|
||||
<Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23628.1">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24062.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9e5fd26c0d1a187dfa08242d83e341634d4b1b07</Sha>
|
||||
<Sha>d731f58a502086842739a358ab490bec08fdb8a7</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
@ -81,7 +81,7 @@
|
|||
<DotNetRuntime80Version>8.0.0</DotNetRuntime80Version>
|
||||
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
|
||||
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.23628.1</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24062.5</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
|
||||
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
|
||||
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
|
||||
|
|
|
@ -182,12 +182,12 @@ while :; do
|
|||
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
|
||||
__QEMUArch=riscv64
|
||||
__UbuntuArch=riscv64
|
||||
__UbuntuRepo="http://deb.debian.org/debian-ports"
|
||||
__UbuntuRepo="http://deb.debian.org/debian"
|
||||
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
|
||||
unset __LLDB_Package
|
||||
|
||||
if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
|
||||
__Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring"
|
||||
if [[ -e "/usr/share/keyrings/debian-archive-keyring.gpg" ]]; then
|
||||
__Keyring="--keyring /usr/share/keyrings/debian-archive-keyring.gpg --include=debian-archive-keyring"
|
||||
fi
|
||||
;;
|
||||
ppc64le)
|
||||
|
|
|
@ -1 +1 @@
|
|||
deb http://deb.debian.org/debian-ports sid main
|
||||
deb http://deb.debian.org/debian sid main
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
|
||||
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
|
||||
<Project>
|
||||
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
|
||||
|
@ -27,4 +28,5 @@
|
|||
|
||||
<!-- Repository extensibility point -->
|
||||
<Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -63,6 +63,10 @@ jobs:
|
|||
|
||||
steps:
|
||||
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
- checkout: self
|
||||
fetchDepth: 3
|
||||
clean: true
|
||||
|
||||
- task: DownloadBuildArtifacts@0
|
||||
displayName: Download artifact
|
||||
inputs:
|
||||
|
|
|
@ -596,7 +596,15 @@ function InitializeBuildTool() {
|
|||
ExitWithExitCode 1
|
||||
}
|
||||
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
|
||||
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net9.0' }
|
||||
|
||||
# Use override if it exists - commonly set by source-build
|
||||
if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) {
|
||||
$initializeBuildToolFramework="net9.0"
|
||||
} else {
|
||||
$initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
|
||||
}
|
||||
|
||||
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
|
||||
} elseif ($msbuildEngine -eq "vs") {
|
||||
try {
|
||||
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
}
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23628.1",
|
||||
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23628.1",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24062.5",
|
||||
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24062.5",
|
||||
"Microsoft.Build.Traversal": "3.2.0",
|
||||
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
|
||||
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"
|
||||
|
|
Загрузка…
Ссылка в новой задаче