Skip to content

Do not use Wix targets to sign intermediates #61173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 27, 2025
Merged

Do not use Wix targets to sign intermediates #61173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e57600
Do not use Wix targets to sign intermediates
mmitche Mar 26, 2025
e371a41
Attempt no check-out
mmitche Mar 26, 2025
c3194ba
Remove microbuild imports
mmitche Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .azure/pipelines/jobs/default-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ jobs:
- ${{ if eq(parameters.agentOs, 'macOS') }}:
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
displayName: Use XCode 15.2.0
- checkout: self
clean: true
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
- powershell: ./eng/scripts/InstallProcDump.ps1
displayName: Install ProcDump
Expand Down Expand Up @@ -393,8 +391,6 @@ jobs:
- ${{ if eq(parameters.agentOs, 'macOS') }}:
- script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
displayName: Use XCode 15.2.0
- checkout: self
clean: true
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
- powershell: ./eng/scripts/InstallProcDump.ps1
displayName: Install ProcDump
Expand Down
6 changes: 1 addition & 5 deletions eng/targets/Cpp.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>

<PropertyGroup>
<SignOutput Condition=" '$(SignType)' != '' ">true</SignOutput>
<SignOutput>false</SignOutput>
<IsPackable>false</IsPackable>

<!-- This maps the common MSBuild property name to equivalent C++ project properties. -->
Expand All @@ -25,8 +25,4 @@
<!-- If the following line is updated ensure that the /eng/scripts/vs.17.*.json files are updated to include the same version component too. -->
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
</PropertyGroup>

<Import Project="MicroBuild.Plugin.props" Condition="'$(MicroBuildSentinelFile)' == ''" />
<Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.props" Condition=" '$(MicroBuildPluginDirectory)' != ''" />

</Project>
6 changes: 1 addition & 5 deletions eng/targets/Wix.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@
</ItemGroup>

<PropertyGroup>
<SignOutput Condition=" '$(SignType)' != '' ">true</SignOutput>
<SignOutput>false</SignOutput>
<DarkToolPath>$(WixExtDir)dark.exe</DarkToolPath>
</PropertyGroup>

<Import Project="MicroBuild.Plugin.props" Condition="'$(MicroBuildSentinelFile)' == ''" />
<Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.props" Condition=" '$(MicroBuildPluginDirectory)' != ''" />

</Project>
Loading