@@ -4,7 +4,6 @@ parameters:
4
4
makeMSBuildArgs : ' '
5
5
nugetArtifactName : $(NuGetArtifactName)
6
6
provisionatorChannel : latest
7
- signClassicPkgContent : true
8
7
testAssembliesArtifactName : $(TestAssembliesArtifactName)
9
8
10
9
steps :
@@ -75,28 +74,15 @@ steps:
75
74
msbuildArguments : /t:Restore /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/restore-sign-content.binlog
76
75
77
76
- task : MSBuild@1
78
- displayName : PKG signing - add entitlements and sign classic libraries
77
+ displayName : PKG signing - add entitlements and sign
79
78
inputs :
80
79
solution : ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
81
80
configuration : $(XA.Build.Configuration)
82
81
msbuildArguments : >-
83
- /t:AddMachOEntitlements;AddMSBuildFilesUnixSign;Build
82
+ /t:AddMachOEntitlements;AddMSBuildFilesUnixSign;AddMSBuildFilesUnixSignAndHarden; Build
84
83
/p:SignType=$(MicroBuildSignType)
85
84
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
86
85
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-content.binlog
87
- condition : and(succeeded(), eq('${{ parameters.signClassicPkgContent }}', 'true'))
88
-
89
- - task : MSBuild@1
90
- displayName : PKG signing - sign classic executables
91
- inputs :
92
- solution : ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
93
- configuration : $(XA.Build.Configuration)
94
- msbuildArguments : >-
95
- /t:AddMSBuildFilesUnixSignAndHarden;Build
96
- /p:SignType=$(MicroBuildSignType)
97
- /p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
98
- /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-content.binlog
99
- condition : and(succeeded(), eq('${{ parameters.signClassicPkgContent }}', 'true'))
100
86
101
87
- task : MSBuild@1
102
88
displayName : PKG signing - sign binutils libraries
@@ -107,8 +93,7 @@ steps:
107
93
/t:AddBinUtilsFilesUnixSign;Build
108
94
/p:SignType=$(MicroBuildSignType)
109
95
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
110
- /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-content.binlog
111
- condition : and(succeeded(), eq('${{ parameters.signClassicPkgContent }}', 'true'))
96
+ /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-bu-lib.binlog
112
97
113
98
- task : MSBuild@1
114
99
displayName : PKG signing - sign binutils executables
@@ -119,8 +104,7 @@ steps:
119
104
/t:AddBinUtilsFilesUnixSignAndHarden;Build
120
105
/p:SignType=$(MicroBuildSignType)
121
106
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
122
- /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-content.binlog
123
- condition : and(succeeded(), eq('${{ parameters.signClassicPkgContent }}', 'true'))
107
+ /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-bu-ex.binlog
124
108
125
109
- script : make create-installers CONFIGURATION=$(XA.Build.Configuration) MSBUILD_ARGS='${{ parameters.makeMSBuildArgs }}'
126
110
workingDirectory : ${{ parameters.xaSourcePath }}
@@ -132,32 +116,6 @@ steps:
132
116
artifactName : ${{ parameters.nugetArtifactName }}
133
117
targetPath : ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/nuget-unsigned
134
118
135
- - script : >
136
- mkdir -p bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName) &&
137
- cp bin/Build$(XA.Build.Configuration)/*.vsix bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName) &&
138
- cp bin/Build$(XA.Build.Configuration)/*.pkg bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName)
139
- workingDirectory : ${{ parameters.xaSourcePath }}
140
- displayName : copy unsigned installers
141
-
142
- - script : >
143
- VERSION=`LANG=C; export LANG && git log --no-color --first-parent -n1 --pretty=format:%ct` &&
144
- echo "d1ec039f-f3db-468b-a508-896d7c382999 $VERSION" > bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName)/updateinfo
145
- workingDirectory : ${{ parameters.xaSourcePath }}
146
- displayName : create updateinfo file
147
-
148
- - task : PublishPipelineArtifact@1
149
- displayName : upload installers
150
- inputs :
151
- artifactName : ${{ parameters.installerArtifactName }}
152
- targetPath : ${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/$(InstallerArtifactName)
153
-
154
- # Upload test assemblies
155
- - script : >
156
- cp -r bin/$(XA.Build.Configuration)/bcl-tests bin/Test$(XA.Build.Configuration)/bcl-tests &&
157
- cp bin/Build$(XA.Build.Configuration)/ProfileAssemblies.projitems bin/Test$(XA.Build.Configuration)/bcl-tests/
158
- workingDirectory : ${{ parameters.xaSourcePath }}
159
- displayName : copy bcl-tests assemblies
160
-
161
119
- task : PublishPipelineArtifact@1
162
120
displayName : upload test assemblies
163
121
inputs :
0 commit comments