aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-12-31 06:21:22 -0800
committerRob Mensching <rob@firegiant.com>2024-12-31 06:25:23 -0800
commit2ece9993ce6810bdb49882922f31eebff71f747b (patch)
tree16feafdd364508503afeb1b64e51e3bef6ae597e
parent523c66a62a619e6aa9f30070173ea33edfb5e328 (diff)
downloadwix-robmen/build-cleanup.tar.gz
wix-robmen/build-cleanup.tar.bz2
wix-robmen/build-cleanup.zip
Minor build improvements and cleanuprobmen/build-cleanup
-rw-r--r--.github/workflows/build.yml5
-rw-r--r--src/Directory.vcxproj.props2
-rw-r--r--src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj2
-rw-r--r--src/wix/WixToolset.Sdk/tools/wix.targets11
4 files changed, 9 insertions, 11 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 247a0442..602a4817 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,9 +9,6 @@ on:
9 branches: 9 branches:
10 - main 10 - main
11 workflow_dispatch: 11 workflow_dispatch:
12 inputs:
13 tags:
14 manual: true
15 12
16env: 13env:
17 DOTNET_NOLOGO: true 14 DOTNET_NOLOGO: true
@@ -39,7 +36,7 @@ jobs:
39 - name: Install sign tool 36 - name: Install sign tool
40 if: (github.ref == 'refs/heads/master') 37 if: (github.ref == 'refs/heads/master')
41 shell: cmd 38 shell: cmd
42 run: dotnet tool install --tool-path build\.tools sign --version 0.9.1-beta.24170.3 39 run: dotnet tool install --tool-path build\.tools sign --version 0.9.1-beta.24529.1
43 40
44 - name: Configure automated logging and crash dumps 41 - name: Configure automated logging and crash dumps
45 shell: cmd 42 shell: cmd
diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props
index 078309a2..1ed4b07a 100644
--- a/src/Directory.vcxproj.props
+++ b/src/Directory.vcxproj.props
@@ -39,7 +39,7 @@
39 <ExceptionHandling>false</ExceptionHandling> 39 <ExceptionHandling>false</ExceptionHandling>
40 <ControlFlowGuard>Guard</ControlFlowGuard> 40 <ControlFlowGuard>Guard</ControlFlowGuard>
41 <AdditionalOptions>/Zc:threadSafeInit- -YlprecompDefine /w44263</AdditionalOptions> 41 <AdditionalOptions>/Zc:threadSafeInit- -YlprecompDefine /w44263</AdditionalOptions>
42 <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation> 42 <MultiProcessorCompilation>true</MultiProcessorCompilation>
43 </ClCompile> 43 </ClCompile>
44 <ResourceCompile> 44 <ResourceCompile>
45 <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> 45 <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj b/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj
index 1b713a0d..4e1c3c26 100644
--- a/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj
+++ b/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj
@@ -4,7 +4,7 @@
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 5
6 <PropertyGroup> 6 <PropertyGroup>
7 <TargetFrameworks>net6.0;net472</TargetFrameworks> 7 <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
8 <IsPackable>true</IsPackable> 8 <IsPackable>true</IsPackable>
9 <DebugType>embedded</DebugType> 9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl> 10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 1ba6746b..f2cdd703 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -99,7 +99,7 @@
99 99
100 <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" /> 100 <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
101 101
102 <!-- 102 <!--
103 This will override some targets that get defined in Microsoft.Common just like Microsoft.NET.DisableStandardFrameworkResolution.targets 103 This will override some targets that get defined in Microsoft.Common just like Microsoft.NET.DisableStandardFrameworkResolution.targets
104 so this needs to be imported after 104 so this needs to be imported after
105 --> 105 -->
@@ -287,7 +287,8 @@
287 Projects="@(_MSBuildProjectReferenceExistent)" 287 Projects="@(_MSBuildProjectReferenceExistent)"
288 Targets="GetNativeTargetPath" 288 Targets="GetNativeTargetPath"
289 Properties="%(_MSBuildProjectReferenceExistent.SetConfiguration);%(_MSBuildProjectReferenceExistent.SetPlatform)" 289 Properties="%(_MSBuildProjectReferenceExistent.SetConfiguration);%(_MSBuildProjectReferenceExistent.SetPlatform)"
290 Condition=" '@(ProjectReferenceWithConfiguration)' != '' and '%(_MSBuildProjectReferenceExistent.Extension)' == '.vcxproj' "> 290 Condition=" '@(ProjectReferenceWithConfiguration)' != '' and '%(_MSBuildProjectReferenceExistent.Extension)' == '.vcxproj' "
291 BuildInParallel="true">
291 292
292 <Output TaskParameter="TargetOutputs" ItemName="_WixResolvedProjectReference" /> 293 <Output TaskParameter="TargetOutputs" ItemName="_WixResolvedProjectReference" />
293 </MSBuild> 294 </MSBuild>
@@ -570,7 +571,7 @@
570 @(_ResolvedWixExtensionPaths); 571 @(_ResolvedWixExtensionPaths);
571 @(_BindInputs)" 572 @(_BindInputs)"
572 Outputs="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension);@(_BindBuiltOutputs)" 573 Outputs="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension);@(_BindBuiltOutputs)"
573 DependsOnTargets="$(CoreCompileDependsOn)" 574 DependsOnTargets="$(CoreCompileDependsOn)"
574 Condition=" '@(Compile)' != '' "> 575 Condition=" '@(Compile)' != '' ">
575 576
576 <PropertyGroup> 577 <PropertyGroup>
@@ -578,7 +579,7 @@
578 <_WixBuildCabinetCachePath Condition=" '$(CabinetCachePath)'!='' ">$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %(CultureGroup.OutputFolder)))</_WixBuildCabinetCachePath> 579 <_WixBuildCabinetCachePath Condition=" '$(CabinetCachePath)'!='' ">$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %(CultureGroup.OutputFolder)))</_WixBuildCabinetCachePath>
579 </PropertyGroup> 580 </PropertyGroup>
580 581
581 <Warning Text="@(UnsupportedWixExtension->'%(Identity)') does not have support for WiX Toolset v$(WixToolsetVersion)." 582 <Warning Text="@(UnsupportedWixExtension->'%(Identity)') does not have support for WiX Toolset v$(WixToolsetVersion)."
582 Condition=" '@(UnsupportedWixExtension)' != '' "/> 583 Condition=" '@(UnsupportedWixExtension)' != '' "/>
583 584
584 <WixBuild 585 <WixBuild
@@ -632,7 +633,7 @@
632 633
633 <Target 634 <Target
634 Name="WindowsInstallerValidation" 635 Name="WindowsInstallerValidation"
635 DependsOnTargets="CoreCompile" 636 DependsOnTargets="CoreCompile"
636 Condition=" '$(_WixBuildExitCode)' != '' and '$(SuppressValidation)' != 'true' and ('$(OutputType)' == 'Package' or '$(OutputType)' == 'Module') "> 637 Condition=" '$(_WixBuildExitCode)' != '' and '$(SuppressValidation)' != 'true' and ('$(OutputType)' == 'Package' or '$(OutputType)' == 'Module') ">
637 <WindowsInstallerValidation 638 <WindowsInstallerValidation
638 DatabaseFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)" 639 DatabaseFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)"