Skip to content

Commit 5886fee

Browse files
committed
Make official build assetless and clean-up YML and Versions.props (#5404)
Contributes to dotnet/dotnet#711
1 parent 13305c9 commit 5886fee

File tree

4 files changed

+28
-201
lines changed

4 files changed

+28
-201
lines changed

azure-pipelines-PR.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,17 @@ trigger:
44
include:
55
- main
66
- release/*
7-
- internal/release/*
8-
- experimental/*
97

108
pr:
119
- main
1210
- release/*
13-
- experimental/*
14-
15-
name: $(Date:yyyyMMdd)$(Rev:.r)
1611

1712
variables:
1813
- name: TeamName
1914
value: dotnet-core-acquisition
2015
# Skip Running CI tests
2116
- name: SkipTests
2217
value: false
23-
24-
# Set the target blob feed for package publish during official and validation builds.
25-
- name: _DotNetArtifactsCategory
26-
value: .NETCore
27-
- name: _DotNetValidationArtifactsCategory
28-
value: .NETCoreValidation
29-
3018
# Produce test-signed build for PR and Public builds
3119
- name: _SignType
3220
value: test

azure-pipelines.yml

Lines changed: 21 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,16 @@
1+
variables:
2+
- name: _PublishUsingPipelines
3+
value: false
4+
- template: /eng/common/templates-official/variables/pool-providers.yml@self
5+
16
trigger:
27
batch: true
38
branches:
49
include:
5-
- main
6-
- release/*
7-
- internal/release/*
8-
- experimental/*
9-
10-
name: $(Date:yyyyMMdd)$(Rev:.r)
11-
12-
variables:
13-
- name: TeamName
14-
value: dotnet-core-acquisition
15-
# Skip Running CI tests
16-
- name: SkipTests
17-
value: true
18-
# Set Official Build Id
19-
- name: OfficialBuildId
20-
value: $(Build.BuildNumber)
21-
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
22-
- name: PostBuildSign
23-
value: false
24-
- ${{ else }}:
25-
- name: PostBuildSign
26-
value: true
27-
28-
# Set the target blob feed for package publish during official and validation builds.
29-
- name: _DotNetArtifactsCategory
30-
value: .NETCore
31-
- name: _DotNetValidationArtifactsCategory
32-
value: .NETCoreValidation
10+
- main
11+
- release/*
3312

34-
# Produce test-signed build for PR and Public builds
35-
- name: _SignType
36-
value: $[ coalesce(variables.OfficialSignType, 'real') ]
13+
pr: none
3714

3815
resources:
3916
repositories:
@@ -45,62 +22,20 @@ extends:
4522
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
4623
parameters:
4724
sdl:
48-
policheck:
49-
enabled: true
50-
tsa:
51-
enabled: true
52-
configFile: '$(Build.SourcesDirectory)/eng/pipelines/tsaoptions.json'
53-
featureFlags:
54-
autoBaseline: true
55-
pool:
56-
name: NetCore1ESPool-Internal
57-
image: 1es-windows-2022
58-
os: windows
59-
customBuildTags:
60-
- ES365AIMigrationTooling
25+
createAdoIssuesForJustificationsForDisablement: false
26+
sourceAnalysisPool:
27+
name: $(DncEngInternalBuildPool)
28+
image: 1es-windows-2022
29+
os: windows
6130
stages:
62-
- stage: Build
31+
- stage: build
32+
displayName: Build
6333
jobs:
64-
65-
# Windows x64
66-
- template: /eng/pipelines/jobs/windows-build.yml@self
67-
parameters:
68-
name: win_x64
69-
displayName: win-x64
70-
targetArchitecture: x64
71-
72-
# Windows x86
73-
- template: /eng/pipelines/jobs/windows-build.yml@self
74-
parameters:
75-
name: win_x86
76-
displayName: win-x86
77-
targetArchitecture: x86
78-
79-
# Windows arm64
80-
- template: /eng/pipelines/jobs/windows-build.yml@self
81-
parameters:
82-
name: win_arm64
83-
displayName: win-arm64
84-
targetArchitecture: arm64
85-
86-
# Publish to Build Asset Registry in order to generate the ReleaseConfigs artifact.
87-
- template: /eng/common/templates-official/job/publish-build-assets.yml@self
34+
- template: /eng/common/templates-official/jobs/jobs.yml@self
8835
parameters:
89-
publishUsingPipelines: true
36+
enablePublishBuildArtifacts: true
37+
enablePublishBuildAssets: false
38+
enablePublishTestResults: false
9039
publishAssetsImmediately: true
91-
dependsOn:
92-
- win_x64
93-
- win_x86
94-
- win_arm64
95-
pool:
96-
name: NetCore1ESPool-Internal
97-
demands: ImageOverride -equals windows.vs2022preview.amd64
98-
99-
# Stages-based publishing entry point
100-
- template: /eng/common/templates-official/post-build/post-build.yml@self
101-
parameters:
102-
enableSymbolValidation: false
103-
enableSigningValidation: false
104-
enableNugetValidation: false
105-
enableSourceLinkValidation: false
106-
publishAssetsImmediately: true
40+
isAssetlessBuild: true
41+
enableTelemetry: true

eng/Versions.props

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<Project>
2-
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
2+
3+
<Import Project="Version.Details.props" />
4+
35
<PropertyGroup>
46
<MajorVersion>10</MajorVersion>
57
<MinorVersion>0</MinorVersion>
68
<PatchVersion>1</PatchVersion>
79
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
810
<PreReleaseVersionIteration></PreReleaseVersionIteration>
9-
<!-- Enable to remove prerelease label. -->
10-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
11-
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
11+
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
12+
<DotNetFinalVersionKind></DotNetFinalVersionKind>
1213
</PropertyGroup>
14+
1315
<PropertyGroup>
1416
<!-- corefx -->
1517
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
@@ -37,4 +39,5 @@
3739

3840
<!-- Transport package version for VS insertion packages is defined in Version.Details.props -->
3941
</PropertyGroup>
42+
4043
</Project>

eng/pipelines/jobs/windows-build.yml

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

0 commit comments

Comments
 (0)