未验证 提交 206fddae 编写于 作者: D dotnet-maestro[bot] 提交者: GitHub

Update dependencies from https://github.com/dotnet/arcade build 20220124.13 (#5985)

[main] Update dependencies from dotnet/arcade
上级 21161c25
...@@ -75,25 +75,25 @@ ...@@ -75,25 +75,25 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22071.6"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22074.13">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha> <Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22071.6"> <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22074.13">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha> <Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22071.6"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22074.13">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha> <Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22071.6"> <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22074.13">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha> <Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22071.6"> <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22074.13">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha> <Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade --> <!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup> <PropertyGroup>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22071.6</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22074.13</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22071.6</MicrosoftDotNetCodeAnalysisPackageVersion> <MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22074.13</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22071.6</MicrosoftDotNetGenAPIVersion> <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22074.13</MicrosoftDotNetGenAPIVersion>
</PropertyGroup> </PropertyGroup>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 --> <!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 --> <!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
......
...@@ -47,8 +47,14 @@ jobs: ...@@ -47,8 +47,14 @@ jobs:
- name: GuardianVersion - name: GuardianVersion
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
pool: pool:
name: NetCore1ESPool-Internal # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
demands: ImageOverride -equals Build.Server.Amd64.VS2019 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps: steps:
- checkout: self - checkout: self
clean: true clean: true
......
...@@ -3,10 +3,8 @@ parameters: ...@@ -3,10 +3,8 @@ parameters:
dependsOn: '' dependsOn: ''
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
pool: pool: ''
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
GithubPat: $(BotAccount-dotnet-bot-repo-PAT) GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
...@@ -32,7 +30,18 @@ jobs: ...@@ -32,7 +30,18 @@ jobs:
displayName: OneLocBuild displayName: OneLocBuild
pool: ${{ parameters.pool }} ${{ if ne(parameters.pool, '') }}:
pool: ${{ parameters.pool }}
${{ if eq(parameters.pool, '') }}:
pool:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
variables: variables:
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat
......
...@@ -83,8 +83,14 @@ jobs: ...@@ -83,8 +83,14 @@ jobs:
- ${{ if eq(parameters.enableSourceBuild, true) }}: - ${{ if eq(parameters.enableSourceBuild, true) }}:
- Source_Build_Complete - Source_Build_Complete
pool: pool:
name: NetCore1ESPool-Internal # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
demands: ImageOverride -equals Build.Server.Amd64.VS2019 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
runAsPublic: ${{ parameters.runAsPublic }} runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
......
...@@ -94,8 +94,14 @@ stages: ...@@ -94,8 +94,14 @@ stages:
displayName: NuGet Validation displayName: NuGet Validation
condition: eq( ${{ parameters.enableNugetValidation }}, 'true') condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
pool: pool:
name: NetCore1ESPool-Internal # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
demands: ImageOverride -equals Build.Server.Amd64.VS2019 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps: steps:
- template: setup-maestro-vars.yml - template: setup-maestro-vars.yml
...@@ -125,8 +131,14 @@ stages: ...@@ -125,8 +131,14 @@ stages:
displayName: Signing Validation displayName: Signing Validation
condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true'))
pool: pool:
name: NetCore1ESPool-Internal # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
demands: ImageOverride -equals Build.Server.Amd64.VS2019 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps: steps:
- template: setup-maestro-vars.yml - template: setup-maestro-vars.yml
parameters: parameters:
...@@ -179,8 +191,14 @@ stages: ...@@ -179,8 +191,14 @@ stages:
displayName: SourceLink Validation displayName: SourceLink Validation
condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
pool: pool:
name: NetCore1ESPool-Internal # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
demands: ImageOverride -equals Build.Server.Amd64.VS2019 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps: steps:
- template: setup-maestro-vars.yml - template: setup-maestro-vars.yml
parameters: parameters:
...@@ -230,14 +248,22 @@ stages: ...@@ -230,14 +248,22 @@ stages:
displayName: Publish Using Darc displayName: Publish Using Darc
timeoutInMinutes: 120 timeoutInMinutes: 120
pool: pool:
name: NetCore1ESPool-Internal # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
demands: ImageOverride -equals Build.Server.Amd64.VS2019 ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps: steps:
- template: setup-maestro-vars.yml - template: setup-maestro-vars.yml
parameters: parameters:
BARBuildId: ${{ parameters.BARBuildId }} BARBuildId: ${{ parameters.BARBuildId }}
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
- task: NuGetAuthenticate@0
- task: PowerShell@2 - task: PowerShell@2
displayName: Publish Using Darc displayName: Publish Using Darc
inputs: inputs:
......
...@@ -16,6 +16,7 @@ steps: ...@@ -16,6 +16,7 @@ steps:
displayName: Set Release Configs Vars displayName: Set Release Configs Vars
inputs: inputs:
targetType: inline targetType: inline
pwsh: true
script: | script: |
try { try {
if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22071.6", "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22074.13",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22071.6" "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22074.13"
}, },
"sdk": { "sdk": {
"version": "7.0.100-alpha.1.22053.1" "version": "7.0.100-alpha.1.22053.1"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册