Update dependencies from https://github.com/dotnet/arcade build 20221122.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.22554.2 -> To Version 8.0.0-beta.22572.5 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.22513.1 -> To Version 1.0.0-beta.22555.1 (parent: Microsoft.DotNet.Arcade.Sdk
This commit is contained in:
parent
5a06ace469
commit
56992057ae
10 changed files with 25 additions and 32 deletions
|
@ -192,18 +192,18 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22554.2">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22572.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
|
<Sha>37095730a5eebb50fed86a0d3013d90408a05609</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22554.2">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22572.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
|
<Sha>37095730a5eebb50fed86a0d3013d90408a05609</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22554.2">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22572.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
|
<Sha>37095730a5eebb50fed86a0d3013d90408a05609</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.22573.3">
|
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.22573.3">
|
||||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||||
|
@ -227,9 +227,9 @@
|
||||||
<Sha>d047202874ad79d72c75b6354c0f8a9a12d1b054</Sha>
|
<Sha>d047202874ad79d72c75b6354c0f8a9a12d1b054</Sha>
|
||||||
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22513.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22555.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||||
<Sha>366ad9b9f7af7d0eddbd36d1e13d8fcff0ac99db</Sha>
|
<Sha>52e3661e093095cf353a4531cbfac316e487c4c0</Sha>
|
||||||
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22554.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22572.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
|
set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
|
||||||
|
|
||||||
|
# reset platform variables (e.g. cmake 3.25 sets LINUX=1)
|
||||||
|
unset(LINUX)
|
||||||
|
unset(FREEBSD)
|
||||||
|
unset(ILLUMOS)
|
||||||
|
unset(ANDROID)
|
||||||
|
unset(TIZEN)
|
||||||
|
|
||||||
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
|
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
|
||||||
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
|
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
|
||||||
set(CMAKE_SYSTEM_NAME FreeBSD)
|
set(CMAKE_SYSTEM_NAME FreeBSD)
|
||||||
|
|
|
@ -132,8 +132,8 @@ if [[ -z "$CC" ]]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Only lld version >= 9 can be considered stable
|
# Only lld version >= 9 can be considered stable. lld doesn't support s390x.
|
||||||
if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then
|
if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 && "$build_arch" != "s390x" ]]; then
|
||||||
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
|
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
|
||||||
LDFLAGS="-fuse-ld=lld"
|
LDFLAGS="-fuse-ld=lld"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -64,7 +64,7 @@ try {
|
||||||
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
|
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
|
||||||
}
|
}
|
||||||
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
|
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
|
||||||
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty
|
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty
|
||||||
}
|
}
|
||||||
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
|
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
|
||||||
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
|
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
|
||||||
|
|
|
@ -34,6 +34,7 @@ jobs:
|
||||||
- job: Asset_Registry_Publish
|
- job: Asset_Registry_Publish
|
||||||
|
|
||||||
dependsOn: ${{ parameters.dependsOn }}
|
dependsOn: ${{ parameters.dependsOn }}
|
||||||
|
timeoutInMinutes: 150
|
||||||
|
|
||||||
${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
|
${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
|
||||||
displayName: Publish Assets
|
displayName: Publish Assets
|
||||||
|
@ -73,12 +74,6 @@ jobs:
|
||||||
|
|
||||||
- task: NuGetAuthenticate@0
|
- task: NuGetAuthenticate@0
|
||||||
|
|
||||||
- task: PowerShell@2
|
|
||||||
displayName: Enable cross-org NuGet feed authentication
|
|
||||||
inputs:
|
|
||||||
filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1
|
|
||||||
arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw)
|
|
||||||
|
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
displayName: Publish Build Assets
|
displayName: Publish Build Assets
|
||||||
inputs:
|
inputs:
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
variables:
|
variables:
|
||||||
- group: AzureDevOps-Artifact-Feeds-Pats
|
|
||||||
- group: DotNet-Blob-Feed
|
|
||||||
- group: DotNet-DotNetCli-Storage
|
|
||||||
- group: DotNet-MSRC-Storage
|
|
||||||
- group: Publish-Build-Assets
|
- group: Publish-Build-Assets
|
||||||
|
|
||||||
# Whether the build is internal or not
|
# Whether the build is internal or not
|
||||||
|
|
|
@ -172,12 +172,6 @@ stages:
|
||||||
- task: NuGetAuthenticate@0
|
- task: NuGetAuthenticate@0
|
||||||
displayName: 'Authenticate to AzDO Feeds'
|
displayName: 'Authenticate to AzDO Feeds'
|
||||||
|
|
||||||
- task: PowerShell@2
|
|
||||||
displayName: Enable cross-org publishing
|
|
||||||
inputs:
|
|
||||||
filePath: eng\common\enable-cross-org-publishing.ps1
|
|
||||||
arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
|
|
||||||
|
|
||||||
# Signing validation will optionally work with the buildmanifest file which is downloaded from
|
# Signing validation will optionally work with the buildmanifest file which is downloaded from
|
||||||
# Azure DevOps above.
|
# Azure DevOps above.
|
||||||
- task: PowerShell@2
|
- task: PowerShell@2
|
||||||
|
|
|
@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
|
||||||
|
|
||||||
# If the version of msbuild is going to be xcopied,
|
# If the version of msbuild is going to be xcopied,
|
||||||
# use this version. Version matches a package here:
|
# use this version. Version matches a package here:
|
||||||
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview
|
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview
|
||||||
$defaultXCopyMSBuildVersion = '17.3.1'
|
$defaultXCopyMSBuildVersion = '17.4.1'
|
||||||
|
|
||||||
if (!$vsRequirements) {
|
if (!$vsRequirements) {
|
||||||
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
|
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
|
||||||
|
@ -413,6 +413,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
|
||||||
if($vsMinVersion -lt $vsMinVersionReqd){
|
if($vsMinVersion -lt $vsMinVersionReqd){
|
||||||
Write-Host "Using xcopy-msbuild version of $defaultXCopyMSBuildVersion since VS version $vsMinVersionStr provided in global.json is not compatible"
|
Write-Host "Using xcopy-msbuild version of $defaultXCopyMSBuildVersion since VS version $vsMinVersionStr provided in global.json is not compatible"
|
||||||
$xcopyMSBuildVersion = $defaultXCopyMSBuildVersion
|
$xcopyMSBuildVersion = $defaultXCopyMSBuildVersion
|
||||||
|
$vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0]
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
# If the VS version IS compatible, look for an xcopy msbuild package
|
# If the VS version IS compatible, look for an xcopy msbuild package
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.21.0"
|
"cmake": "3.21.0"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22554.2",
|
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22572.5",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22554.2"
|
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22572.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue