Minor build improvements and cleanup

wixtoolset · Dec 31, 2024 · 2ece999 · 2ece999
1 parent 523c66a
commit 2ece999
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,9 +9,6 @@ on:
     branches:
       - main
   workflow_dispatch:
-    inputs:
-      tags:
-        manual: true
 
 env:
   DOTNET_NOLOGO: true
@@ -39,7 +36,7 @@ jobs:
       - name: Install sign tool
         if: (github.ref == 'refs/heads/master')
         shell: cmd
-        run: dotnet tool install --tool-path build\.tools sign --version 0.9.1-beta.24170.3
+        run: dotnet tool install --tool-path build\.tools sign --version 0.9.1-beta.24529.1
 
       - name: Configure automated logging and crash dumps
         shell: cmd

diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props
@@ -39,7 +39,7 @@
       <ExceptionHandling>false</ExceptionHandling>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <AdditionalOptions>/Zc:threadSafeInit- -YlprecompDefine /w44263</AdditionalOptions>
-      <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj b/src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj
@@ -4,7 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -99,7 +99,7 @@
 
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
 
-  <!-- 
+  <!--
   This will override some targets that get defined in Microsoft.Common just like Microsoft.NET.DisableStandardFrameworkResolution.targets
   so this needs to be imported after
   -->
@@ -287,7 +287,8 @@
       Projects="@(_MSBuildProjectReferenceExistent)"
       Targets="GetNativeTargetPath"
       Properties="%(_MSBuildProjectReferenceExistent.SetConfiguration);%(_MSBuildProjectReferenceExistent.SetPlatform)"
-      Condition=" '@(ProjectReferenceWithConfiguration)' != '' and '%(_MSBuildProjectReferenceExistent.Extension)' == '.vcxproj' ">
+      Condition=" '@(ProjectReferenceWithConfiguration)' != '' and '%(_MSBuildProjectReferenceExistent.Extension)' == '.vcxproj' "
+      BuildInParallel="true">
 
       <Output TaskParameter="TargetOutputs" ItemName="_WixResolvedProjectReference" />
     </MSBuild>
@@ -570,15 +571,15 @@
       @(_ResolvedWixExtensionPaths);
       @(_BindInputs)"
       Outputs="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.OutputSuffix)$(BindTrackingFileExtension);@(_BindBuiltOutputs)"
-      DependsOnTargets="$(CoreCompileDependsOn)" 
+      DependsOnTargets="$(CoreCompileDependsOn)"
       Condition=" '@(Compile)' != '' ">
 
     <PropertyGroup>
       <CabinetCachePath Condition=" '$(CabinetCachePath)'=='' and '$(ReuseCabinetCache)'=='true' ">$(IntermediateOutputPath)cabcache\</CabinetCachePath>
       <_WixBuildCabinetCachePath Condition=" '$(CabinetCachePath)'!='' ">$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %(CultureGroup.OutputFolder)))</_WixBuildCabinetCachePath>
     </PropertyGroup>
 
-    <Warning Text="@(UnsupportedWixExtension->'%(Identity)') does not have support for WiX Toolset v$(WixToolsetVersion)." 
+    <Warning Text="@(UnsupportedWixExtension->'%(Identity)') does not have support for WiX Toolset v$(WixToolsetVersion)."
         Condition=" '@(UnsupportedWixExtension)' != '' "/>
 
     <WixBuild
@@ -632,7 +633,7 @@
 
   <Target
       Name="WindowsInstallerValidation"
-      DependsOnTargets="CoreCompile" 
+      DependsOnTargets="CoreCompile"
       Condition=" '$(_WixBuildExitCode)' != '' and '$(SuppressValidation)' != 'true' and ('$(OutputType)' == 'Package' or '$(OutputType)' == 'Module') ">
       <WindowsInstallerValidation
           DatabaseFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)"