Skip to content
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

Minor build improvements and cleanup #585

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Minor build improvements and cleanup #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ on:
branches:
- main
workflow_dispatch:
inputs:
tags:
manual: true

env:
DOTNET_NOLOGO: true
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.vcxproj.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/internal/WixInternal.TestSupport/WixInternal.TestSupport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 6 additions & 5 deletions src/wix/WixToolset.Sdk/tools/wix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)"
Expand Down
Loading