[main] Update dependencies from dotnet/arcade (#18190)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
parent
c744093ce7
commit
3e93f43292
7 changed files with 28 additions and 16 deletions
|
@ -206,18 +206,18 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24055.2">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24060.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>bab85ba4579526962b0dbb0aa4db625c50da8859</Sha>
|
<Sha>e96d0e9f197ef2be216415e19ec927adfaefb82a</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24055.2">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24060.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>bab85ba4579526962b0dbb0aa4db625c50da8859</Sha>
|
<Sha>e96d0e9f197ef2be216415e19ec927adfaefb82a</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24055.2">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24060.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>bab85ba4579526962b0dbb0aa4db625c50da8859</Sha>
|
<Sha>e96d0e9f197ef2be216415e19ec927adfaefb82a</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23621.3">
|
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23621.3">
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
|
@ -227,9 +227,9 @@
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
<Sha>702f946f89ace6197fdca2ac309d32187c4bc1bd</Sha>
|
<Sha>702f946f89ace6197fdca2ac309d32187c4bc1bd</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24055.2">
|
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24060.1">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>bab85ba4579526962b0dbb0aa4db625c50da8859</Sha>
|
<Sha>e96d0e9f197ef2be216415e19ec927adfaefb82a</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">
|
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24055.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24060.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||||
|
|
|
@ -182,12 +182,12 @@ while :; do
|
||||||
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
|
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
|
||||||
__QEMUArch=riscv64
|
__QEMUArch=riscv64
|
||||||
__UbuntuArch=riscv64
|
__UbuntuArch=riscv64
|
||||||
__UbuntuRepo="http://deb.debian.org/debian-ports"
|
__UbuntuRepo="http://deb.debian.org/debian"
|
||||||
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
|
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
|
||||||
unset __LLDB_Package
|
unset __LLDB_Package
|
||||||
|
|
||||||
if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
|
if [[ -e "/usr/share/keyrings/debian-archive-keyring.gpg" ]]; then
|
||||||
__Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring"
|
__Keyring="--keyring /usr/share/keyrings/debian-archive-keyring.gpg --include=debian-archive-keyring"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
ppc64le)
|
ppc64le)
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
deb http://deb.debian.org/debian-ports sid main
|
deb http://deb.debian.org/debian sid main
|
||||||
|
|
|
@ -63,6 +63,10 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
- ${{ 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
|
- task: DownloadBuildArtifacts@0
|
||||||
displayName: Download artifact
|
displayName: Download artifact
|
||||||
inputs:
|
inputs:
|
||||||
|
|
|
@ -596,7 +596,15 @@ function InitializeBuildTool() {
|
||||||
ExitWithExitCode 1
|
ExitWithExitCode 1
|
||||||
}
|
}
|
||||||
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
|
$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") {
|
} elseif ($msbuildEngine -eq "vs") {
|
||||||
try {
|
try {
|
||||||
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
|
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.21.0"
|
"cmake": "3.21.0"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24055.2",
|
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24060.1",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24055.2"
|
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24060.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue