[main] Update dependencies from dotnet/arcade (#4600)

[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2024-08-24 12:31:58 +00:00 коммит произвёл GitHub
Родитель 8c14079b75
Коммит 3280ac77b6
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
7 изменённых файлов: 75 добавлений и 73 удалений

Просмотреть файл

@ -152,29 +152,29 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24421.7">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24423.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c28c6307d0600513219bcd9ab028c0fedbe591ec</Sha>
<Sha>91599268652b51969b8d8088d4f2f2ba7b3ebb19</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

Просмотреть файл

@ -11,8 +11,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- arcade -->
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24421.7</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24421.7</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24423.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24423.2</MicrosoftDotNetBuildTasksInstallersVersion>
<!-- corefx -->
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
<SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>

Просмотреть файл

@ -33,11 +33,6 @@ parameters:
artifactPublishSteps: []
runAsPublic: false
# Sbom related params
enableSbom: true
PackageVersion: 9.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
# 1es specific parameters
is1ESPipeline: ''

Просмотреть файл

@ -4,6 +4,7 @@
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
<BuildWithNetFrameworkHostedCompiler>false</BuildWithNetFrameworkHostedCompiler>
</PropertyGroup>
<ItemGroup>
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->

Просмотреть файл

@ -1,8 +1,22 @@
parameters:
# Sbom related params
enableSbom: true
PackageVersion: 9.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
jobs:
- template: /eng/common/core-templates/job/job.yml
parameters:
is1ESPipeline: true
componentGovernanceSteps:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
- template: /eng/common/templates/steps/generate-sbom.yml
parameters:
PackageVersion: ${{ parameters.packageVersion }}
BuildDropPath: ${{ parameters.buildDropPath }}
publishArtifacts: false
# publish artifacts
# for 1ES managed templates, use the templateContext.output to handle multiple outputs.
templateContext:

Просмотреть файл

@ -32,14 +32,6 @@ jobs:
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}:
- template: /eng/common/templates/steps/generate-sbom.yml
parameters:
PackageVersion: ${{ parameters.packageVersion }}
BuildDropPath: ${{ parameters.buildDropPath }}
publishArtifacts: false
artifactPublishSteps:
- ${{ if ne(parameters.artifacts.publish, '') }}:
- ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}:

Просмотреть файл

@ -3,8 +3,8 @@
"dotnet": "9.0.100-preview.7.24407.12"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24421.7",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24421.7",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24423.2",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24423.2",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0"
}