Skip to content

Commit 50c4e13

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20220130.1 (#1605)
Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22071.6 -> To Version 7.0.0-beta.22080.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 6d0e218 commit 50c4e13

File tree

12 files changed

+81
-37
lines changed

12 files changed

+81
-37
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22071.6">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22080.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
8+
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
1111
</ToolsetDependencies>

eng/common/cross/build-rootfs.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ usage()
77
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
88
echo "BuildArch can be: arm(default), armel, arm64, x86"
99
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
10-
echo " for FreeBSD can be: freebsd11, freebsd12, freebsd13"
10+
echo " for FreeBSD can be: freebsd12, freebsd13"
1111
echo " for illumos can be: illumos."
1212
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
1313
echo "--skipunmount - optional, will skip the unmount of rootfs folder."
@@ -60,13 +60,13 @@ __AlpinePackages+=" krb5-dev"
6060
__AlpinePackages+=" openssl-dev"
6161
__AlpinePackages+=" zlib-dev"
6262

63-
__FreeBSDBase="12.2-RELEASE"
64-
__FreeBSDPkg="1.12.0"
63+
__FreeBSDBase="12.3-RELEASE"
64+
__FreeBSDPkg="1.17.0"
6565
__FreeBSDABI="12"
6666
__FreeBSDPackages="libunwind"
6767
__FreeBSDPackages+=" icu"
6868
__FreeBSDPackages+=" libinotify"
69-
__FreeBSDPackages+=" lttng-ust"
69+
__FreeBSDPackages+=" openssl"
7070
__FreeBSDPackages+=" krb5"
7171
__FreeBSDPackages+=" terminfo-db"
7272

@@ -206,10 +206,6 @@ while :; do
206206
__AlpineVersion=3.14
207207
__AlpinePackages+=" llvm11-libs"
208208
;;
209-
freebsd11)
210-
__FreeBSDBase="11.3-RELEASE"
211-
__FreeBSDABI="11"
212-
;&
213209
freebsd12)
214210
__CodeName=freebsd
215211
__BuildArch=x64

eng/common/internal/NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<add key="dotnet-core-internal" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal/nuget/v3/index.json" />
5+
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
66
</packageSources>
77
</configuration>

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,14 @@ jobs:
4747
- name: GuardianVersion
4848
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
4949
pool:
50-
name: NetCore1ESPool-Internal
51-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
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
5258
steps:
5359
- checkout: self
5460
clean: true

eng/common/templates/job/job.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ parameters:
2424
enablePublishBuildAssets: false
2525
enablePublishTestResults: false
2626
enablePublishUsingPipelines: false
27+
disableComponentGovernance: false
2728
mergeTestResults: false
2829
testRunTitle: ''
2930
testResultsFormat: ''
@@ -137,6 +138,9 @@ jobs:
137138
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
138139
continueOnError: true
139140

141+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
142+
- task: ComponentGovernanceComponentDetection@0
143+
140144
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
141145
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
142146
- task: MicroBuildCleanup@1

eng/common/templates/job/onelocbuild.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +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-
name: NetCore1ESPool-Internal
8-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
9-
6+
pool: ''
7+
108
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
119
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
1210

@@ -32,7 +30,18 @@ jobs:
3230

3331
displayName: OneLocBuild
3432

35-
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
3645

3746
variables:
3847
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat

eng/common/templates/job/publish-build-assets.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ jobs:
3838
value: ${{ parameters.configuration }}
3939
- group: Publish-Build-Assets
4040
- group: AzureDevOps-Artifact-Feeds-Pats
41-
# Skip component governance and codesign validation for SDL. These jobs
42-
# create no content.
43-
- name: skipComponentGovernanceDetection
44-
value: true
4541
- name: runCodesignValidationInjection
4642
value: false
4743

eng/common/templates/jobs/jobs.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ parameters:
88
# Optional: Enable publishing using release pipelines
99
enablePublishUsingPipelines: false
1010

11+
# Optional: Disable component governance detection. In general, component governance
12+
# should be on for all jobs. Use only in the event of issues.
13+
disableComponentGovernance: false
14+
1115
# Optional: Enable running the source-build jobs to build repo from source
1216
enableSourceBuild: false
1317

@@ -83,8 +87,14 @@ jobs:
8387
- ${{ if eq(parameters.enableSourceBuild, true) }}:
8488
- Source_Build_Complete
8589
pool:
86-
name: NetCore1ESPool-Internal
87-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
90+
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
91+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
92+
name: VSEngSS-MicroBuild2022-1ES
93+
demands: Cmd
94+
# If it's not devdiv, it's dnceng
95+
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
96+
name: NetCore1ESPool-Internal
97+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
8898

8999
runAsPublic: ${{ parameters.runAsPublic }}
90100
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,5 @@ variables:
2222
- name: SymbolToolVersion
2323
value: 1.0.1
2424

25-
# Skip component governance and codesign validation for SDL. These jobs
26-
# create no content.
27-
- name: skipComponentGovernanceDetection
28-
value: true
2925
- name: runCodesignValidationInjection
3026
value: false

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

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,14 @@ stages:
9494
displayName: NuGet Validation
9595
condition: eq( ${{ parameters.enableNugetValidation }}, 'true')
9696
pool:
97-
name: NetCore1ESPool-Internal
98-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
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
99105

100106
steps:
101107
- template: setup-maestro-vars.yml
@@ -125,8 +131,14 @@ stages:
125131
displayName: Signing Validation
126132
condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true'))
127133
pool:
128-
name: NetCore1ESPool-Internal
129-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
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
130142
steps:
131143
- template: setup-maestro-vars.yml
132144
parameters:
@@ -179,8 +191,14 @@ stages:
179191
displayName: SourceLink Validation
180192
condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
181193
pool:
182-
name: NetCore1ESPool-Internal
183-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
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
184202
steps:
185203
- template: setup-maestro-vars.yml
186204
parameters:
@@ -230,14 +248,22 @@ stages:
230248
displayName: Publish Using Darc
231249
timeoutInMinutes: 120
232250
pool:
233-
name: NetCore1ESPool-Internal
234-
demands: ImageOverride -equals Build.Server.Amd64.VS2019
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
235259
steps:
236260
- template: setup-maestro-vars.yml
237261
parameters:
238262
BARBuildId: ${{ parameters.BARBuildId }}
239263
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
240264

265+
- task: NuGetAuthenticate@0
266+
241267
- task: PowerShell@2
242268
displayName: Publish Using Darc
243269
inputs:

0 commit comments

Comments
 (0)