Skip to content

Commit d24486f

Browse files
authored
Do not use Wix targets to sign intermediates (#61173)
* Do not use Wix targets to sign intermediates * Attempt no check-out * Remove microbuild imports
1 parent c752467 commit d24486f

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

.azure/pipelines/jobs/default-build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ jobs:
166166
- ${{ if eq(parameters.agentOs, 'macOS') }}:
167167
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
168168
displayName: Use XCode 15.2.0
169-
- checkout: self
170-
clean: true
171169
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
172170
- powershell: ./eng/scripts/InstallProcDump.ps1
173171
displayName: Install ProcDump
@@ -393,8 +391,6 @@ jobs:
393391
- ${{ if eq(parameters.agentOs, 'macOS') }}:
394392
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
395393
displayName: Use XCode 15.2.0
396-
- checkout: self
397-
clean: true
398394
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
399395
- powershell: ./eng/scripts/InstallProcDump.ps1
400396
displayName: Install ProcDump

eng/targets/Cpp.Common.props

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33

44
<PropertyGroup>
5-
<SignOutput Condition=" '$(SignType)' != '' ">true</SignOutput>
5+
<SignOutput>false</SignOutput>
66
<IsPackable>false</IsPackable>
77

88
<!-- This maps the common MSBuild property name to equivalent C++ project properties. -->
@@ -25,8 +25,4 @@
2525
<!-- If the following line is updated ensure that the /eng/scripts/vs.17.*.json files are updated to include the same version component too. -->
2626
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
2727
</PropertyGroup>
28-
29-
<Import Project="MicroBuild.Plugin.props" Condition="'$(MicroBuildSentinelFile)' == ''" />
30-
<Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.props" Condition=" '$(MicroBuildPluginDirectory)' != ''" />
31-
3228
</Project>

eng/targets/Wix.Common.props

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@
2424
</ItemGroup>
2525

2626
<PropertyGroup>
27-
<SignOutput Condition=" '$(SignType)' != '' ">true</SignOutput>
27+
<SignOutput>false</SignOutput>
2828
<DarkToolPath>$(WixExtDir)dark.exe</DarkToolPath>
2929
</PropertyGroup>
30-
31-
<Import Project="MicroBuild.Plugin.props" Condition="'$(MicroBuildSentinelFile)' == ''" />
32-
<Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.props" Condition=" '$(MicroBuildPluginDirectory)' != ''" />
33-
3430
</Project>

0 commit comments

Comments
 (0)