@@ -71,46 +71,45 @@ steps:
7171 condition : and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
7272
7373# Restore needs to be executed first or MicroBuild targets won't be imported in time
74- - task : MSBuild@1
74+ - task : DotNetCoreCLI@2
7575 displayName : msbuild /t:Restore sign-content.proj
7676 condition : and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
7777 inputs :
78- solution : ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
79- configuration : $(XA.Build.Configuration)
80- msbuildArguments : /t:Restore /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/restore-sign-content.binlog
78+ projects : ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
79+ arguments : /t:Restore /p:Configuration=$(XA.Build.Configuration) -v:n /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/restore-sign-content.binlog
8180
82- - task : MSBuild@1
81+ - task : DotNetCoreCLI@2
8382 displayName : PKG signing - add entitlements and sign
8483 condition : and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
8584 inputs :
86- solution : ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
87- configuration : $(XA.Build.Configuration)
88- msbuildArguments : >-
85+ projects : ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
86+ arguments : >-
8987 /t:AddMachOEntitlements;AddMSBuildFilesUnixSign;AddMSBuildFilesUnixSignAndHarden;Build
88+ /p:Configuration=$(XA.Build.Configuration) -v:n
9089 /p:SignType=$(MicroBuildSignType)
9190 /p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
9291 /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-content.binlog
9392
94- - task : MSBuild@1
93+ - task : DotNetCoreCLI@2
9594 displayName : PKG signing - sign binutils libraries
9695 condition : and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
9796 inputs :
98- solution : ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
99- configuration : $(XA.Build.Configuration)
100- msbuildArguments : >-
97+ projects : ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
98+ arguments : >-
10199 /t:AddBinUtilsFilesUnixSign;Build
100+ /p:Configuration=$(XA.Build.Configuration) -v:n
102101 /p:SignType=$(MicroBuildSignType)
103102 /p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
104103 /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-bu-lib.binlog
105104
106- - task : MSBuild@1
105+ - task : DotNetCoreCLI@2
107106 displayName : PKG signing - sign binutils executables
108107 condition : and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
109108 inputs :
110- solution : ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
111- configuration : $(XA.Build.Configuration)
112- msbuildArguments : >-
109+ projects : ${{ parameters.xaSourcePath }}/build-tools/installers/sign-content.proj
110+ arguments : >-
113111 /t:AddBinUtilsFilesUnixSignAndHarden;Build
112+ /p:Configuration=$(XA.Build.Configuration) -v:n
114113 /p:SignType=$(MicroBuildSignType)
115114 /p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
116115 /bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-bu-ex.binlog
0 commit comments