Skip to content

Commit edaa1cc

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#1768)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 0a162fa commit edaa1cc

File tree

10 files changed

+162
-203
lines changed

10 files changed

+162
-203
lines changed

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22068.3">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22074.13">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
6+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22068.3">
8+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22074.13">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
10+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22068.3">
12+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22074.13">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
14+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
1515
</Dependency>
1616
</ToolsetDependencies>
1717
<!-- ProductDependencies -->

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- Disabling the check for End of live TFMs since we still target netcoreapp 2.1 -->
55
<CheckEolTargetFramework>false</CheckEolTargetFramework>
66
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
7-
<MicrosoftDotNetGenAPIPackageVersion>7.0.0-beta.22068.3</MicrosoftDotNetGenAPIPackageVersion>
7+
<MicrosoftDotNetGenAPIPackageVersion>7.0.0-beta.22074.13</MicrosoftDotNetGenAPIPackageVersion>
88
<!-- dotnet/corefx dependencies -->
99
<SystemDrawingCommonPackageVersion>5.0.3</SystemDrawingCommonPackageVersion>
1010
<SystemIOPortsPackageVersion>5.0.1</SystemIOPortsPackageVersion>

‎eng/common/internal/NuGet.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="dotnet-core-internal" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal/nuget/v3/index.json" />
6+
</packageSources>
7+
</configuration>

‎eng/common/templates/job/execute-sdl.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ parameters:
2929
# Optional: download a list of pipeline artifacts. 'downloadArtifacts' controls build artifacts,
3030
# not pipeline artifacts, so doesn't affect the use of this parameter.
3131
pipelineArtifactNames: []
32-
# Optional: location and ID of the AzDO build that the build/pipeline artifacts should be
33-
# downloaded from. By default, uses runtime expressions to decide based on the variables set by
34-
# the 'setupMaestroVars' dependency. Overriding this parameter is necessary if SDL tasks are
35-
# running without Maestro++/BAR involved, or to download artifacts from a specific existing build
36-
# to iterate quickly on SDL changes.
37-
AzDOProjectName: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
38-
AzDOPipelineId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
39-
AzDOBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
4032

4133
jobs:
4234
- job: Run_SDL
@@ -55,11 +47,20 @@ jobs:
5547
- name: GuardianVersion
5648
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
5749
pool:
58-
vmImage: windows-2019
50+
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
51+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
52+
name: VSEngSS-MicroBuild2022-1ES
53+
demands: Cmd
54+
# If it's not devdiv, it's dnceng
55+
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
56+
name: NetCore1ESPool-Internal
57+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
5958
steps:
6059
- checkout: self
6160
clean: true
6261

62+
- template: /eng/common/templates/post-build/setup-maestro-vars.yml
63+
6364
- ${{ if ne(parameters.downloadArtifacts, 'false')}}:
6465
- ${{ if ne(parameters.artifactNames, '') }}:
6566
- ${{ each artifactName in parameters.artifactNames }}:

‎eng/common/templates/job/onelocbuild.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ parameters:
33
dependsOn: ''
44

55
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
6-
pool:
7-
vmImage: 'windows-2019'
8-
6+
pool: ''
7+
98
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
109
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1110

@@ -31,7 +30,18 @@ jobs:
3130

3231
displayName: OneLocBuild
3332

34-
pool: ${{ parameters.pool }}
33+
${{ if ne(parameters.pool, '') }}:
34+
pool: ${{ parameters.pool }}
35+
${{ if eq(parameters.pool, '') }}:
36+
pool:
37+
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
38+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
39+
name: VSEngSS-MicroBuild2022-1ES
40+
demands: Cmd
41+
# If it's not devdiv, it's dnceng
42+
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
43+
name: NetCore1ESPool-Internal
44+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
3545

3646
variables:
3747
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat

‎eng/common/templates/jobs/jobs.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,15 @@ jobs:
8383
- ${{ if eq(parameters.enableSourceBuild, true) }}:
8484
- Source_Build_Complete
8585
pool:
86-
vmImage: 'windows-2019'
86+
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
87+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
88+
name: VSEngSS-MicroBuild2022-1ES
89+
demands: Cmd
90+
# If it's not devdiv, it's dnceng
91+
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
92+
name: NetCore1ESPool-Internal
93+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
94+
8795
runAsPublic: ${{ parameters.runAsPublic }}
8896
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
8997
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}

‎eng/common/templates/post-build/common-variables.yml‎

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,6 @@ variables:
44
- group: DotNet-DotNetCli-Storage
55
- group: DotNet-MSRC-Storage
66
- group: Publish-Build-Assets
7-
8-
# .NET Core 3.1 Dev
9-
- name: PublicDevRelease_31_Channel_Id
10-
value: 128
11-
12-
# .NET 5 Dev
13-
- name: Net_5_Dev_Channel_Id
14-
value: 131
15-
16-
# .NET Eng - Validation
17-
- name: Net_Eng_Validation_Channel_Id
18-
value: 9
19-
20-
# .NET Eng - Latest
21-
- name: Net_Eng_Latest_Channel_Id
22-
value: 2
23-
24-
# .NET 3 Eng - Validation
25-
- name: NET_3_Eng_Validation_Channel_Id
26-
value: 390
27-
28-
# .NET 3 Eng
29-
- name: NetCore_3_Tools_Channel_Id
30-
value: 344
31-
32-
# .NET Core 3.0 Internal Servicing
33-
- name: InternalServicing_30_Channel_Id
34-
value: 184
35-
36-
# .NET Core 3.0 Release
37-
- name: PublicRelease_30_Channel_Id
38-
value: 19
39-
40-
# .NET Core 3.1 Release
41-
- name: PublicRelease_31_Channel_Id
42-
value: 129
43-
44-
# General Testing
45-
- name: GeneralTesting_Channel_Id
46-
value: 529
47-
48-
# .NET Core 3.1 Blazor Features
49-
- name: NetCore_31_Blazor_Features_Channel_Id
50-
value: 531
51-
52-
# .NET Core Experimental
53-
- name: NetCore_Experimental_Channel_Id
54-
value: 562
557

568
# Whether the build is internal or not
579
- name: IsInternalBuild
@@ -70,27 +22,6 @@ variables:
7022
- name: SymbolToolVersion
7123
value: 1.0.1
7224

73-
# Feed Configurations
74-
# These should include the suffix "/index.json"
75-
76-
# Default locations for Installers and checksums
77-
# Public Locations
78-
- name: ChecksumsBlobFeedUrl
79-
value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json
80-
- name: InstallersBlobFeedUrl
81-
value: https://dotnetcli.blob.core.windows.net/dotnet/index.json
82-
83-
# Private Locations
84-
- name: InternalChecksumsBlobFeedUrl
85-
value: https://dotnetclichecksumsmsrc.blob.core.windows.net/dotnet/index.json
86-
- name: InternalChecksumsBlobFeedKey
87-
value: $(dotnetclichecksumsmsrc-storage-key)
88-
89-
- name: InternalInstallersBlobFeedUrl
90-
value: https://dotnetclimsrc.blob.core.windows.net/dotnet/index.json
91-
- name: InternalInstallersBlobFeedKey
92-
value: $(dotnetclimsrc-access-key)
93-
9425
# Skip component governance and codesign validation for SDL. These jobs
9526
# create no content.
9627
- name: skipComponentGovernanceDetection

‎eng/common/templates/post-build/post-build.yml‎

Lines changed: 55 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -90,25 +90,25 @@ stages:
9090
variables:
9191
- template: common-variables.yml
9292
jobs:
93-
- template: setup-maestro-vars.yml
94-
parameters:
95-
BARBuildId: ${{ parameters.BARBuildId }}
96-
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
97-
9893
- job:
9994
displayName: NuGet Validation
100-
dependsOn: setupMaestroVars
10195
condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
10296
pool:
103-
vmImage: 'windows-2019'
104-
variables:
105-
- name: AzDOProjectName
106-
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
107-
- name: AzDOPipelineId
108-
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
109-
- name: AzDOBuildId
110-
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
97+
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
98+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
99+
name: VSEngSS-MicroBuild2022-1ES
100+
demands: Cmd
101+
# If it's not devdiv, it's dnceng
102+
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
103+
name: NetCore1ESPool-Internal
104+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
105+
111106
steps:
107+
- template: setup-maestro-vars.yml
108+
parameters:
109+
BARBuildId: ${{ parameters.BARBuildId }}
110+
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
111+
112112
- task: DownloadBuildArtifacts@0
113113
displayName: Download Package Artifacts
114114
inputs:
@@ -129,19 +129,22 @@ stages:
129129

130130
- job:
131131
displayName: Signing Validation
132-
dependsOn: setupMaestroVars
133132
condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true'))
134-
variables:
135-
- template: common-variables.yml
136-
- name: AzDOProjectName
137-
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
138-
- name: AzDOPipelineId
139-
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
140-
- name: AzDOBuildId
141-
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
142133
pool:
143-
vmImage: 'windows-2019'
134+
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
135+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
136+
name: VSEngSS-MicroBuild2022-1ES
137+
demands: Cmd
138+
# If it's not devdiv, it's dnceng
139+
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
140+
name: NetCore1ESPool-Internal
141+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
144142
steps:
143+
- template: setup-maestro-vars.yml
144+
parameters:
145+
BARBuildId: ${{ parameters.BARBuildId }}
146+
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
147+
145148
- task: DownloadBuildArtifacts@0
146149
displayName: Download Package Artifacts
147150
inputs:
@@ -186,19 +189,22 @@ stages:
186189

187190
- job:
188191
displayName: SourceLink Validation
189-
dependsOn: setupMaestroVars
190192
condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
191-
variables:
192-
- template: common-variables.yml
193-
- name: AzDOProjectName
194-
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
195-
- name: AzDOPipelineId
196-
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
197-
- name: AzDOBuildId
198-
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]
199193
pool:
200-
vmImage: 'windows-2019'
194+
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
195+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
196+
name: VSEngSS-MicroBuild2022-1ES
197+
demands: Cmd
198+
# If it's not devdiv, it's dnceng
199+
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
200+
name: NetCore1ESPool-Internal
201+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
201202
steps:
203+
- template: setup-maestro-vars.yml
204+
parameters:
205+
BARBuildId: ${{ parameters.BARBuildId }}
206+
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
207+
202208
- task: DownloadBuildArtifacts@0
203209
displayName: Download Blob Artifacts
204210
inputs:
@@ -224,7 +230,6 @@ stages:
224230
- template: /eng/common/templates/job/execute-sdl.yml
225231
parameters:
226232
enable: ${{ parameters.SDLValidationParameters.enable }}
227-
dependsOn: setupMaestroVars
228233
additionalParameters: ${{ parameters.SDLValidationParameters.params }}
229234
continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
230235
artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
@@ -239,21 +244,26 @@ stages:
239244
variables:
240245
- template: common-variables.yml
241246
jobs:
242-
- template: setup-maestro-vars.yml
243-
parameters:
244-
BARBuildId: ${{ parameters.BARBuildId }}
245-
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
246-
247247
- job:
248248
displayName: Publish Using Darc
249-
dependsOn: setupMaestroVars
250249
timeoutInMinutes: 120
251-
variables:
252-
- name: BARBuildId
253-
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
254250
pool:
255-
vmImage: 'windows-2019'
251+
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
252+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
253+
name: VSEngSS-MicroBuild2022-1ES
254+
demands: Cmd
255+
# If it's not devdiv, it's dnceng
256+
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
257+
name: NetCore1ESPool-Internal
258+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
256259
steps:
260+
- template: setup-maestro-vars.yml
261+
parameters:
262+
BARBuildId: ${{ parameters.BARBuildId }}
263+
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
264+
265+
- task: NuGetAuthenticate@0
266+
257267
- task: PowerShell@2
258268
displayName: Publish Using Darc
259269
inputs:

0 commit comments

Comments
 (0)