[main] Update dependencies from dotnet/arcade (#19049)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
This commit is contained in:
parent
65504e69d3
commit
725a5a46c6
6 changed files with 20 additions and 1481 deletions
|
@ -1,9 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<PublishingVersion>3</PublishingVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<Product>Sdk</Product>
|
||||
|
@ -135,33 +130,7 @@
|
|||
<IsStableBuild Condition="'$(DotNetFinalVersionKind)' == 'release'">true</IsStableBuild>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
Delete PushToAzureDevOpsArtifacts task and remove condition from PushToBuildStorage task
|
||||
after this repo picks up arcade with the following change: https://github.com/dotnet/arcade/pull/14559
|
||||
-->
|
||||
<PushToAzureDevOpsArtifacts
|
||||
Condition="'$(DotNetBuildOrchestrator)' != 'true'"
|
||||
AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
|
||||
AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
|
||||
AzureDevOpsBuildId="$(BUILD_BUILDID)"
|
||||
ItemsToPush="@(SdkAssetsToPushToBlobFeed);@(ChecksumsToPushToBlobFeed)"
|
||||
ItemsToSign="@(ItemsToSignPostBuild)"
|
||||
CertificatesSignInfo="@(CertificatesSignInfo)"
|
||||
StrongNameSignInfo="@(StrongNameSignInfo)"
|
||||
FileSignInfo="@(FileSignInfo)"
|
||||
FileExtensionSignInfo="@(FileExtensionSignInfo)"
|
||||
ManifestBuildData="@(ManifestBuildData)"
|
||||
ManifestRepoName="$(BUILD_REPOSITORY_NAME)"
|
||||
ManifestBranch="$(BUILD_SOURCEBRANCH)"
|
||||
ManifestBuildId="$(BUILD_BUILDNUMBER)"
|
||||
ManifestCommit="$(BUILD_SOURCEVERSION)"
|
||||
AssetManifestPath="$(InstallersAssetManifestFilePath)"
|
||||
PublishFlatContainer="true"
|
||||
IsStableBuild="$(IsStableBuild)"
|
||||
PublishingVersion="3" />
|
||||
|
||||
<PushToBuildStorage
|
||||
Condition="'$(DotNetBuildOrchestrator)' == 'true'"
|
||||
AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
|
||||
AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
|
||||
AzureDevOpsBuildId="$(BUILD_BUILDID)"
|
||||
|
@ -186,4 +155,5 @@
|
|||
NonShippingPackagesLocalStorageDir="$(SourceBuiltNonShippingPackagesDir)"
|
||||
AssetManifestsLocalStorageDir="$(SourceBuiltAssetManifestsDir)" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -243,17 +243,17 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24162.2">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24165.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8</Sha>
|
||||
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24162.2">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24165.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8</Sha>
|
||||
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24162.2">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24165.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8</Sha>
|
||||
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24168.3">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
|
@ -263,14 +263,14 @@
|
|||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>0e9abfee048404d9b994fc64235b42216ce68dad</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24162.2">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24165.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8</Sha>
|
||||
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
|
||||
</Dependency>
|
||||
<!-- Intermediate is necessary for source build. -->
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24162.2">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24165.6">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8</Sha>
|
||||
<Sha>ace00d8719b8d1fdfd0cc05f71bb9af216338d27</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24162.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24165.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||
|
|
|
@ -98,14 +98,16 @@ jobs:
|
|||
inputs:
|
||||
targetType: inline
|
||||
script: |
|
||||
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
|
||||
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
|
||||
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
|
||||
New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force
|
||||
$filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt"
|
||||
Add-Content -Path $filePath -Value $(BARBuildId)
|
||||
Add-Content -Path $filePath -Value "$(DefaultChannels)"
|
||||
Add-Content -Path $filePath -Value $(IsStableBuild)
|
||||
|
||||
- task: 1ES.PublishBuildArtifacts@1
|
||||
displayName: Publish ReleaseConfigs Artifact
|
||||
inputs:
|
||||
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
|
||||
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
|
||||
PublishLocation: Container
|
||||
ArtifactName: ReleaseConfigs
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "latest"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24162.2",
|
||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24162.2"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24165.6",
|
||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24165.6"
|
||||
}
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue