Update dependencies from https://github.com/dotnet/arcade build 20240329.6 (#746)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.24172.4 -> To Version 9.0.0-beta.24179.6 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
dotnet-maestro[bot]
GitHub
Родитель
5773bb5e80
Коммит
5f9b29257e
|
|
@ -207,38 +207,38 @@
|
|||
<Uri>https://github.com/dotnet/llvm-project</Uri>
|
||||
<Sha>04376bba06a48f109738bf36dc8070e2757bc29c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24172.4">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24179.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24172.4">
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24179.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24172.4">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24179.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24172.4">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24179.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24172.4">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24179.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24172.4">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24179.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24172.4">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24179.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24172.4">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24179.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>c936d1bc358744730613d8ce54bc3e0294e5ea56</Sha>
|
||||
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
|
|
|
|||
|
|
@ -50,10 +50,10 @@
|
|||
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24172.4</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24172.4</MicrosoftDotNetBuildTasksTemplatingVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24172.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24172.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24179.6</MicrosoftDotNetBuildTasksPackagingVersion>
|
||||
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24179.6</MicrosoftDotNetBuildTasksTemplatingVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24179.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24179.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ getNonPortableDistroRid()
|
|||
# shellcheck disable=SC1091
|
||||
if [ -e "${rootfsDir}/etc/os-release" ]; then
|
||||
. "${rootfsDir}/etc/os-release"
|
||||
if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then
|
||||
if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ] || [ "${ID}" = "ol" ]; then
|
||||
VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -136,6 +136,7 @@ jobs:
|
|||
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
|
||||
env:
|
||||
TeamName: $(_TeamName)
|
||||
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
|
||||
continueOnError: ${{ parameters.continueOnError }}
|
||||
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ jobs:
|
|||
# If it's not devdiv, it's dnceng
|
||||
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022-pt
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
|
||||
steps:
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@ jobs:
|
|||
os: windows
|
||||
# If it's not devdiv, it's dnceng
|
||||
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022-pt
|
||||
name: NetCore1ESPool-Publishing-Internal
|
||||
image: windows.vs2019.amd64
|
||||
os: windows
|
||||
steps:
|
||||
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ jobs:
|
|||
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
|
||||
image: 1es-mariner-2-pt
|
||||
image: 1es-mariner-2
|
||||
os: linux
|
||||
|
||||
${{ if ne(parameters.platform.pool, '') }}:
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ stages:
|
|||
# If it's not devdiv, it's dnceng
|
||||
${{ else }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022-pt
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
|
||||
steps:
|
||||
|
|
@ -150,7 +150,7 @@ stages:
|
|||
# If it's not devdiv, it's dnceng
|
||||
${{ else }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022-pt
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
steps:
|
||||
- template: setup-maestro-vars.yml
|
||||
|
|
@ -208,7 +208,7 @@ stages:
|
|||
# If it's not devdiv, it's dnceng
|
||||
${{ else }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022-pt
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
steps:
|
||||
- template: setup-maestro-vars.yml
|
||||
|
|
@ -261,8 +261,8 @@ stages:
|
|||
os: windows
|
||||
# If it's not devdiv, it's dnceng
|
||||
${{ else }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022-pt
|
||||
name: NetCore1ESPool-Publishing-Internal
|
||||
image: windows.vs2019.amd64
|
||||
os: windows
|
||||
steps:
|
||||
- template: setup-maestro-vars.yml
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#
|
||||
# pool:
|
||||
# name: $(DncEngInternalBuildPool)
|
||||
# image: 1es-windows-2022-pt
|
||||
# image: 1es-windows-2022
|
||||
|
||||
variables:
|
||||
# Coalesce the target and source branches so we know when a PR targets a release branch
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
"dotnet": "9.0.100-preview.1.24101.2"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24172.4",
|
||||
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24172.4",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24179.6",
|
||||
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24179.6",
|
||||
"Microsoft.Build.Traversal": "3.4.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче