@@ -71,46 +71,45 @@ steps:
71
71
condition : and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
72
72
73
73
# Restore needs to be executed first or MicroBuild targets won't be imported in time
74
- - task : MSBuild@1
74
+ - task : DotNetCoreCLI@2
75
75
displayName : msbuild /t:Restore sign-content.proj
76
76
condition : and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
77
77
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
81
80
82
- - task : MSBuild@1
81
+ - task : DotNetCoreCLI@2
83
82
displayName : PKG signing - add entitlements and sign
84
83
condition : and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
85
84
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 : >-
89
87
/t:AddMachOEntitlements;AddMSBuildFilesUnixSign;AddMSBuildFilesUnixSignAndHarden;Build
88
+ /p:Configuration=$(XA.Build.Configuration) -v:n
90
89
/p:SignType=$(MicroBuildSignType)
91
90
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
92
91
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-content.binlog
93
92
94
- - task : MSBuild@1
93
+ - task : DotNetCoreCLI@2
95
94
displayName : PKG signing - sign binutils libraries
96
95
condition : and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
97
96
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 : >-
101
99
/t:AddBinUtilsFilesUnixSign;Build
100
+ /p:Configuration=$(XA.Build.Configuration) -v:n
102
101
/p:SignType=$(MicroBuildSignType)
103
102
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
104
103
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-bu-lib.binlog
105
104
106
- - task : MSBuild@1
105
+ - task : DotNetCoreCLI@2
107
106
displayName : PKG signing - sign binutils executables
108
107
condition : and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))
109
108
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 : >-
113
111
/t:AddBinUtilsFilesUnixSignAndHarden;Build
112
+ /p:Configuration=$(XA.Build.Configuration) -v:n
114
113
/p:SignType=$(MicroBuildSignType)
115
114
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
116
115
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-bu-ex.binlog
0 commit comments