[release/8.0.1xx] Update dependencies from dotnet/arcade (#17222)
[release/8.0.1xx] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23412.1 to 1.0.0-beta.23416.1 (parent: Microsoft.DotNet.Arcade.Sdk)
This commit is contained in:
parent
001d8e4465
commit
ae2e05b97b
8 changed files with 20 additions and 15 deletions
|
@ -206,18 +206,18 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23414.5">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23417.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>d3b8861e20aaf0179034c6076d156e2442b26f9b</Sha>
|
<Sha>7837a0b504ed9a598daebd50f20520ccda5fe2b1</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23414.5">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23417.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>d3b8861e20aaf0179034c6076d156e2442b26f9b</Sha>
|
<Sha>7837a0b504ed9a598daebd50f20520ccda5fe2b1</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23414.5">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23417.3">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>d3b8861e20aaf0179034c6076d156e2442b26f9b</Sha>
|
<Sha>7837a0b504ed9a598daebd50f20520ccda5fe2b1</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23416.3">
|
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23416.3">
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
|
@ -236,9 +236,9 @@
|
||||||
<Sha>45f5554ac6813e1e155c47fd80ec146c684f65e8</Sha>
|
<Sha>45f5554ac6813e1e155c47fd80ec146c684f65e8</Sha>
|
||||||
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
|
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23412.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23416.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||||
<Sha>676974258e23c108cd6cb6fff97f5c3b5796693b</Sha>
|
<Sha>1d688e4b21c1782d802beb1e9478535f647a28ec</Sha>
|
||||||
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23414.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23417.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||||
|
|
|
@ -153,7 +153,7 @@ if ($dotnet31Source -ne $null) {
|
||||||
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
|
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
|
||||||
}
|
}
|
||||||
|
|
||||||
$dotnetVersions = @('5','6','7')
|
$dotnetVersions = @('5','6','7','8')
|
||||||
|
|
||||||
foreach ($dotnetVersion in $dotnetVersions) {
|
foreach ($dotnetVersion in $dotnetVersions) {
|
||||||
$feedPrefix = "dotnet" + $dotnetVersion;
|
$feedPrefix = "dotnet" + $dotnetVersion;
|
||||||
|
|
|
@ -105,7 +105,7 @@ if [ "$?" == "0" ]; then
|
||||||
PackageSources+=('dotnet3.1-internal-transport')
|
PackageSources+=('dotnet3.1-internal-transport')
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DotNetVersions=('5' '6' '7')
|
DotNetVersions=('5' '6' '7' '8')
|
||||||
|
|
||||||
for DotNetVersion in ${DotNetVersions[@]} ; do
|
for DotNetVersion in ${DotNetVersions[@]} ; do
|
||||||
FeedPrefix="dotnet${DotNetVersion}";
|
FeedPrefix="dotnet${DotNetVersion}";
|
||||||
|
|
|
@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then
|
||||||
# Set default versions
|
# Set default versions
|
||||||
if [ -z "$majorVersion" ]; then
|
if [ -z "$majorVersion" ]; then
|
||||||
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
|
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
|
||||||
if [ "$compiler" = "clang" ]; then versions="16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
|
if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
|
||||||
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
|
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
|
||||||
|
|
||||||
for version in $versions; do
|
for version in $versions; do
|
||||||
|
|
|
@ -25,7 +25,7 @@ function Install-VersionTools-Cli {
|
||||||
Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
|
Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
|
||||||
$feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
|
$feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
|
||||||
|
|
||||||
$argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
|
$argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed")
|
||||||
Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
|
Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -105,6 +105,11 @@ jobs:
|
||||||
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
|
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
|
||||||
checkDownloadedFiles: true
|
checkDownloadedFiles: true
|
||||||
|
|
||||||
|
- powershell: eng/common/sdl/trim-assets-version.ps1
|
||||||
|
-InputPath $(Build.ArtifactStagingDirectory)\artifacts
|
||||||
|
displayName: Trim the version from the NuGet packages
|
||||||
|
continueOnError: ${{ parameters.sdlContinueOnError }}
|
||||||
|
|
||||||
- powershell: eng/common/sdl/extract-artifact-packages.ps1
|
- powershell: eng/common/sdl/extract-artifact-packages.ps1
|
||||||
-InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
|
-InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
|
||||||
-ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
|
-ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.21.0"
|
"cmake": "3.21.0"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23414.5",
|
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23417.3",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23414.5"
|
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23417.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue