Update dependencies from https://github.com/dotnet/arcade build 20231213.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23613.3
This commit is contained in:
parent
3479aaef8d
commit
afc2796202
6 changed files with 16 additions and 26 deletions
|
@ -211,18 +211,18 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23612.2">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23613.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d</Sha>
|
<Sha>b6349a217d7e2f6b5c1831702f8beef5c171da3f</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23612.2">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23613.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d</Sha>
|
<Sha>b6349a217d7e2f6b5c1831702f8beef5c171da3f</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23612.2">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23613.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d</Sha>
|
<Sha>b6349a217d7e2f6b5c1831702f8beef5c171da3f</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
|
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
|
@ -232,9 +232,9 @@
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
<Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
|
<Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23612.2">
|
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23613.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d</Sha>
|
<Sha>b6349a217d7e2f6b5c1831702f8beef5c171da3f</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
|
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
|
||||||
<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.23612.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.23613.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
parameters:
|
parameters:
|
||||||
runAsPublic: false
|
runAsPublic: false
|
||||||
sourceIndexPackageVersion: 1.0.1-20230228.2
|
sourceIndexPackageVersion: 1.0.1-20231213.4
|
||||||
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
|
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"
|
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
|
||||||
preSteps: []
|
preSteps: []
|
||||||
|
@ -30,20 +30,20 @@ jobs:
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
name: $(DncEngPublicBuildPool)
|
name: $(DncEngPublicBuildPool)
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64.open
|
demands: ImageOverride -equals windows.vs2022.amd64.open
|
||||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
name: $(DncEngInternalBuildPool)
|
name: $(DncEngInternalBuildPool)
|
||||||
demands: ImageOverride -equals windows.vs2019.amd64
|
demands: ImageOverride -equals windows.vs2022.amd64
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- ${{ each preStep in parameters.preSteps }}:
|
- ${{ each preStep in parameters.preSteps }}:
|
||||||
- ${{ preStep }}
|
- ${{ preStep }}
|
||||||
|
|
||||||
- task: UseDotNet@2
|
- task: UseDotNet@2
|
||||||
displayName: Use .NET Core SDK 6
|
displayName: Use .NET 8 SDK
|
||||||
inputs:
|
inputs:
|
||||||
packageType: sdk
|
packageType: sdk
|
||||||
version: 6.0.x
|
version: 8.0.x
|
||||||
installationPath: $(Agent.TempDirectory)/dotnet
|
installationPath: $(Agent.TempDirectory)/dotnet
|
||||||
workingDirectory: $(Agent.TempDirectory)
|
workingDirectory: $(Agent.TempDirectory)
|
||||||
|
|
||||||
|
|
|
@ -165,11 +165,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
|
||||||
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
|
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
|
||||||
}
|
}
|
||||||
|
|
||||||
# Source Build uses DotNetCoreSdkDir variable
|
|
||||||
if ($env:DotNetCoreSdkDir -ne $null) {
|
|
||||||
$env:DOTNET_INSTALL_DIR = $env:DotNetCoreSdkDir
|
|
||||||
}
|
|
||||||
|
|
||||||
# Find the first path on %PATH% that contains the dotnet.exe
|
# Find the first path on %PATH% that contains the dotnet.exe
|
||||||
if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) {
|
if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) {
|
||||||
$dotnetExecutable = GetExecutableFileName 'dotnet'
|
$dotnetExecutable = GetExecutableFileName 'dotnet'
|
||||||
|
|
|
@ -123,11 +123,6 @@ function InitializeDotNetCli {
|
||||||
# so it doesn't output warnings to the console.
|
# so it doesn't output warnings to the console.
|
||||||
export LTTNG_HOME="$HOME"
|
export LTTNG_HOME="$HOME"
|
||||||
|
|
||||||
# Source Build uses DotNetCoreSdkDir variable
|
|
||||||
if [[ -n "${DotNetCoreSdkDir:-}" ]]; then
|
|
||||||
export DOTNET_INSTALL_DIR="$DotNetCoreSdkDir"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Find the first path on $PATH that contains the dotnet.exe
|
# Find the first path on $PATH that contains the dotnet.exe
|
||||||
if [[ "$use_installed_dotnet_cli" == true && $global_json_has_runtimes == false && -z "${DOTNET_INSTALL_DIR:-}" ]]; then
|
if [[ "$use_installed_dotnet_cli" == true && $global_json_has_runtimes == false && -z "${DOTNET_INSTALL_DIR:-}" ]]; then
|
||||||
local dotnet_path=`command -v dotnet`
|
local dotnet_path=`command -v dotnet`
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.21.0"
|
"cmake": "3.21.0"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23612.2",
|
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23613.3",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23612.2"
|
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23613.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue