Skip to content

Commit 5ac92c5

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/8.0' changes
2 parents 11c506c + ad329b2 commit 5ac92c5

File tree

8 files changed

+189
-364
lines changed

8 files changed

+189
-364
lines changed

‎azure-pipelines-PR.yml‎

Lines changed: 2 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,9 @@ variables:
3030
- name: PostBuildSign
3131
value: true
3232

33-
# Set the target blob feed for package publish during official and validation builds.
34-
- name: _DotNetArtifactsCategory
35-
value: .NETCore
36-
- name: _DotNetValidationArtifactsCategory
37-
value: .NETCoreValidation
38-
3933
# Produce test-signed build for PR and Public builds
40-
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
41-
- name: SignType
42-
value: test
43-
44-
# Set up non-PR build from internal project
45-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
46-
- name: SignType
47-
value: $[ coalesce(variables.OfficialSignType, 'real') ]
34+
- name: SignType
35+
value: test
4836

4937
stages:
5038
- stage: Build
@@ -67,47 +55,3 @@ stages:
6755
parameters:
6856
name: win_arm64
6957
targetArchitecture: arm64
70-
71-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
72-
- stage: PrepareForPublish
73-
displayName: Prepare for Publish
74-
dependsOn: Build
75-
jobs:
76-
# Prep artifacts: sign them and upload pipeline artifacts expected by stages-based publishing.
77-
- template: /eng/pipelines/jobs/prepare-signed-artifacts-PR.yml
78-
parameters:
79-
PublishRidAgnosticPackagesFromJobName: win_x64
80-
# Publish to Build Asset Registry in order to generate the ReleaseConfigs artifact.
81-
- template: /eng/common/templates/job/publish-build-assets.yml
82-
parameters:
83-
publishUsingPipelines: true
84-
dependsOn: PrepareSignedArtifacts
85-
pool:
86-
name: NetCore1ESPool-Internal
87-
demands: ImageOverride -equals windows.vs2022preview.amd64
88-
89-
# Stages-based publishing entry point
90-
- template: /eng/common/templates/post-build/post-build.yml
91-
parameters:
92-
publishingInfraVersion: 3
93-
validateDependsOn:
94-
- PrepareForPublish
95-
enableSymbolValidation: false
96-
enableSigningValidation: false
97-
enableNugetValidation: false
98-
enableSourceLinkValidation: false
99-
100-
SDLValidationParameters:
101-
enable: false
102-
params: >-
103-
-SourceToolsList @("policheck","credscan")
104-
-TsaInstanceURL https://devdiv.visualstudio.com/
105-
-TsaProjectName DEVDIV
106-
-TsaNotificationEmail wffteam@microsoft.com
107-
-TsaCodebaseAdmin REDMOND\advolker
108-
-TsaBugAreaPath "DevDiv\NET Fundamentals\WindowsDesktop"
109-
-TsaIterationPath DevDiv
110-
-TsaRepositoryName WindowsDesktop
111-
-TsaCodebaseName WindowsDesktop
112-
-TsaOnboard $True
113-
-TsaPublish $True

‎azure-pipelines.yml‎

Lines changed: 89 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -6,108 +6,106 @@ trigger:
66
- release/*
77
- internal/release/*
88
- experimental/*
9-
10-
pr:
11-
- main
12-
- release/*
13-
- experimental/*
14-
159
name: $(Date:yyyyMMdd)$(Rev:.r)
1610

1711
variables:
18-
- name: TeamName
19-
value: dotnet-core-acquisition
12+
- name: TeamName
13+
value: dotnet-core-acquisition
2014
# Skip Running CI tests
21-
- name: SkipTests
22-
value: false
15+
- name: SkipTests
16+
value: false
2317
# Set Official Build Id
24-
- name: OfficialBuildId
25-
value: $(Build.BuildNumber)
26-
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
27-
- name: PostBuildSign
28-
value: false
29-
- ${{ else }}:
30-
- name: PostBuildSign
31-
value: true
32-
33-
# Set the target blob feed for package publish during official and validation builds.
34-
- name: _DotNetArtifactsCategory
35-
value: .NETCore
36-
- name: _DotNetValidationArtifactsCategory
37-
value: .NETCoreValidation
18+
- name: OfficialBuildId
19+
value: $(Build.BuildNumber)
20+
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
21+
- name: PostBuildSign
22+
value: false
23+
- ${{ else }}:
24+
- name: PostBuildSign
25+
value: true
3826

39-
# Produce test-signed build for PR and Public builds
40-
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
41-
- name: SignType
42-
value: test
27+
# Set up non-PR build from internal project
28+
- name: SignType
29+
value: $[ coalesce(variables.OfficialSignType, 'real') ]
4330

44-
# Set up non-PR build from internal project
45-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
46-
- name: SignType
47-
value: $[ coalesce(variables.OfficialSignType, 'real') ]
31+
resources:
32+
repositories:
33+
- repository: 1ESPipelineTemplates
34+
type: git
35+
name: 1ESPipelineTemplates/1ESPipelineTemplates
36+
ref: refs/tags/release
37+
extends:
38+
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
39+
parameters:
40+
featureFlags:
41+
autoBaseline: true
42+
pool:
43+
name: NetCore1ESPool-Internal
44+
image: 1es-windows-2022-pt
45+
os: windows
46+
customBuildTags:
47+
- ES365AIMigrationTooling
48+
stages:
49+
- stage: Build
50+
jobs:
4851

49-
stages:
50-
- stage: Build
51-
jobs:
52+
# Windows x64
53+
- template: /eng/pipelines/jobs/windows-build.yml@self
54+
parameters:
55+
name: win_x64
56+
targetArchitecture: x64
5257

53-
# Windows x64
54-
- template: /eng/pipelines/jobs/windows-build.yml
55-
parameters:
56-
name: win_x64
57-
targetArchitecture: x64
58+
# Windows x86
59+
- template: /eng/pipelines/jobs/windows-build.yml@self
60+
parameters:
61+
name: win_x86
62+
targetArchitecture: x86
5863

59-
# Windows x86
60-
- template: /eng/pipelines/jobs/windows-build.yml
61-
parameters:
62-
name: win_x86
63-
targetArchitecture: x86
64+
# Windows arm64
65+
- template: /eng/pipelines/jobs/windows-build.yml@self
66+
parameters:
67+
name: win_arm64
68+
targetArchitecture: arm64
6469

65-
# Windows arm64
66-
- template: /eng/pipelines/jobs/windows-build.yml
67-
parameters:
68-
name: win_arm64
69-
targetArchitecture: arm64
70+
- stage: PrepareForPublish
71+
displayName: Prepare for Publish
72+
dependsOn: Build
73+
jobs:
74+
# Prep artifacts: sign them and upload pipeline artifacts expected by stages-based publishing.
75+
- template: /eng/pipelines/jobs/prepare-signed-artifacts.yml@self
76+
parameters:
77+
PublishRidAgnosticPackagesFromJobName: win_x64
78+
# Publish to Build Asset Registry in order to generate the ReleaseConfigs artifact.
79+
- template: /eng/common/templates-official/job/publish-build-assets.yml@self
80+
parameters:
81+
publishUsingPipelines: true
82+
dependsOn: PrepareSignedArtifacts
83+
pool:
84+
name: NetCore1ESPool-Internal
85+
demands: ImageOverride -equals windows.vs2022preview.amd64
7086

71-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
72-
- stage: PrepareForPublish
73-
displayName: Prepare for Publish
74-
dependsOn: Build
75-
jobs:
76-
# Prep artifacts: sign them and upload pipeline artifacts expected by stages-based publishing.
77-
- template: /eng/pipelines/jobs/prepare-signed-artifacts.yml
78-
parameters:
79-
PublishRidAgnosticPackagesFromJobName: win_x64
80-
# Publish to Build Asset Registry in order to generate the ReleaseConfigs artifact.
81-
- template: /eng/common/templates/job/publish-build-assets.yml
87+
# Stages-based publishing entry point
88+
- template: /eng/common/templates-official/post-build/post-build.yml@self
8289
parameters:
83-
publishUsingPipelines: true
84-
dependsOn: PrepareSignedArtifacts
85-
pool:
86-
name: NetCore1ESPool-Internal
87-
demands: ImageOverride -equals windows.vs2022preview.amd64
88-
89-
# Stages-based publishing entry point
90-
- template: /eng/common/templates/post-build/post-build.yml
91-
parameters:
92-
publishingInfraVersion: 3
93-
validateDependsOn:
94-
- PrepareForPublish
95-
enableSymbolValidation: false
96-
enableSigningValidation: false
97-
enableNugetValidation: false
98-
enableSourceLinkValidation: false
90+
publishingInfraVersion: 3
91+
validateDependsOn:
92+
- PrepareForPublish
93+
enableSymbolValidation: false
94+
enableSigningValidation: false
95+
enableNugetValidation: false
96+
enableSourceLinkValidation: false
9997

100-
SDLValidationParameters:
101-
enable: false
102-
params: >-
103-
-SourceToolsList @("policheck","credscan")
104-
-TsaInstanceURL https://devdiv.visualstudio.com/
105-
-TsaProjectName DEVDIV
106-
-TsaNotificationEmail wffteam@microsoft.com
107-
-TsaCodebaseAdmin REDMOND\advolker
108-
-TsaBugAreaPath "DevDiv\NET Fundamentals\WindowsDesktop"
109-
-TsaIterationPath DevDiv
110-
-TsaRepositoryName WindowsDesktop
111-
-TsaCodebaseName WindowsDesktop
112-
-TsaOnboard $True
113-
-TsaPublish $True
98+
SDLValidationParameters:
99+
enable: false
100+
params: >-
101+
-SourceToolsList @("policheck","credscan")
102+
-TsaInstanceURL https://devdiv.visualstudio.com/
103+
-TsaProjectName DEVDIV
104+
-TsaNotificationEmail wffteam@microsoft.com
105+
-TsaCodebaseAdmin REDMOND\advolker
106+
-TsaBugAreaPath "DevDiv\NET Fundamentals\WindowsDesktop"
107+
-TsaIterationPath DevDiv
108+
-TsaRepositoryName WindowsDesktop
109+
-TsaCodebaseName WindowsDesktop
110+
-TsaOnboard $True
111+
-TsaPublish $True

‎eng/pipelines/jobs/prepare-signed-artifacts-PR.yml‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎eng/pipelines/jobs/prepare-signed-artifacts.yml‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,27 @@ jobs:
66
- job: PrepareSignedArtifacts
77
displayName: Prepare Signed Artifacts
88
dependsOn: ${{ parameters.dependsOn }}
9-
pool:
10-
name: NetCore1ESPool-Svc-Internal
11-
demands: ImageOverride -equals windows.vs2019.amd64
129
# Double the default timeout.
1310
timeoutInMinutes: 120
1411
workspace:
1512
clean: all
16-
13+
templateContext:
14+
outputs:
15+
- output: pipelineArtifact
16+
displayName: 'Publish Artifact BuildLogs'
17+
condition: succeededOrFailed()
18+
targetPath: '$(Build.StagingDirectory)\BuildLogs'
19+
artifactName: Logs-PrepareSignedArtifacts
1720
steps:
21+
- task: NuGetAuthenticate@1
1822

19-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
20-
- task: NuGetAuthenticate@0
21-
22-
- task: MicroBuildSigningPlugin@2
23-
displayName: Install MicroBuild plugin for Signing
24-
inputs:
25-
signType: $(SignType)
26-
zipSources: false
27-
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
28-
condition: and(succeeded(),
29-
in(variables['SignType'], 'real', 'test'))
30-
23+
- task: MicroBuildSigningPlugin@2
24+
displayName: Install MicroBuild plugin for Signing
25+
inputs:
26+
signType: $(SignType)
27+
zipSources: false
28+
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
29+
condition: and(succeeded(), in(variables['SignType'], 'real', 'test'))
3130
- task: DownloadBuildArtifacts@0
3231
displayName: Download IntermediateUnsignedArtifacts
3332
inputs:
@@ -53,11 +52,4 @@ jobs:
5352
**/*.binlog
5453
TargetFolder: '$(Build.StagingDirectory)\BuildLogs'
5554
continueOnError: true
56-
condition: succeededOrFailed()
57-
58-
- task: PublishBuildArtifacts@1
59-
displayName: Publish Artifact BuildLogs
60-
inputs:
61-
PathtoPublish: '$(Build.StagingDirectory)\BuildLogs'
62-
ArtifactName: Logs-PrepareSignedArtifacts
6355
condition: succeededOrFailed()

0 commit comments

Comments
 (0)