From c8a832c931f6c34892e596a11c14e9181d5eee16 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 10 Nov 2022 23:35:31 -0800 Subject: Minimize calls into GitInfo by caching results during build_init --- src/Directory.Build.targets | 9 +++++- src/Directory.csproj.targets | 7 ++++- src/Directory.vcxproj.targets | 2 +- .../WixToolset.BootstrapperCore.Native.proj | 1 - src/api/burn/balutil/balutil.vcxproj | 1 - src/api/burn/bextutil/bextutil.vcxproj | 1 - src/api/burn/mbanative/mbanative.vcxproj | 1 - src/burn/engine/engine.vcxproj | 3 +- src/burn/stub/stub.vcxproj | 1 - src/dtf/SfxCA/SfxCA.vcxproj | 1 - .../Bal/Samples/bafunctions/bafunctions.vcxproj | 1 - .../WixToolset.Dnc.HostGenerator.csproj | 2 +- src/ext/Bal/dnchost/dnchost.vcxproj | 1 - src/ext/Bal/mbahost/mbahost.vcxproj | 1 - .../examples/TestEngine/Example.TestEngine.vcxproj | 1 - src/ext/Bal/wixiuiba/wixiuiba.vcxproj | 1 - src/ext/Bal/wixlib/bal.wixproj | 1 - src/ext/Bal/wixstdba/wixstdba.vcxproj | 1 - src/ext/ComPlus/ca/complusca.vcxproj | 1 - src/ext/ComPlus/wixlib/complus.wixproj | 1 - src/ext/Dependency/ca/dependencyca.vcxproj | 1 - src/ext/Dependency/wixlib/dependency.wixproj | 1 - src/ext/DifxApp/wixlib/difxapp.wixproj | 1 - src/ext/DirectX/ca/directxca.vcxproj | 1 - src/ext/DirectX/wixlib/directx.wixproj | 1 - src/ext/Firewall/ca/fwca.vcxproj | 1 - src/ext/Firewall/wixlib/firewall.wixproj | 4 ++- src/ext/Http/ca/httpca.vcxproj | 1 - src/ext/Http/wixlib/http.wixproj | 1 - src/ext/Iis/ca/iisca.vcxproj | 1 - src/ext/Iis/wixlib/iis.wixproj | 1 - src/ext/Msmq/ca/msmqca.vcxproj | 1 - src/ext/Msmq/wixlib/msmq.wixproj | 1 - src/ext/NetFx/be/netfxbe.vcxproj | 1 - src/ext/NetFx/ca/netfxca.vcxproj | 1 - src/ext/NetFx/netcoresearch/netcoresearch.vcxproj | 1 - src/ext/NetFx/wixlib/netfx.wixproj | 1 - src/ext/PowerShell/wixlib/powershell.wixproj | 1 - src/ext/Sql/ca/sqlca.vcxproj | 1 - src/ext/Sql/wixlib/sql.wixproj | 1 - src/ext/UI/ca/uica.vcxproj | 1 - src/ext/UI/wixlib/ui.wixproj | 1 - src/ext/Util/be/utilbe.vcxproj | 1 - src/ext/Util/ca/utilca.vcxproj | 1 - src/ext/Util/wixlib/util.wixproj | 1 - src/ext/VisualStudio/ca/vsca.vcxproj | 1 - src/ext/VisualStudio/wixlib/vs.wixproj | 1 - src/internal/SetBuildNumber/SetBuildNumber.proj | 32 ++++++++++++++++++++++ src/internal/SetBuildNumber/wixver.props.pp | 13 +++++++++ .../WixBuildFinalize/WixBuildFinalize.proj | 4 --- .../WixBuildTools.MsgGen.csproj | 5 ---- .../WixBuildTools.XsdGen.csproj | 1 - .../build/WixInternal.TestSupport.Native.targets | 2 -- .../WixInternal.TestSupport.Native/packages.config | 1 - src/libs/dutil/WixToolset.DUtil/dutil.vcxproj | 1 - .../wcautil/WixToolset.WcaUtil/wcautil.vcxproj | 1 - .../ThmViewerPackage/ThmViewerPackage.wixproj | 5 ---- .../WixAdditionalTools/WixAdditionalTools.wixproj | 1 - src/tools/thmviewer/thmviewer.vcxproj | 1 - .../WixToolset.Core.Burn.csproj | 3 +- src/wix/WixToolset.Core/WixToolset.Core.csproj | 3 +- src/wix/wix.cmd | 4 +-- src/wix/wixnative/wixnative.vcxproj | 1 - 63 files changed, 69 insertions(+), 77 deletions(-) create mode 100644 src/internal/SetBuildNumber/wixver.props.pp (limited to 'src') diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index ab19de2c..58c18b26 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -17,6 +17,9 @@ + + + $(GitBaseVersion.Replace('{apiversion}', '$(ApiVersion)')) @@ -30,9 +33,13 @@ $(GetPackageVersionDependsOn); __SetPropertiesFromGit; + + <__SetPropertiesFromGitDependsOn Condition=" '$(GitInfoFromCache)'!='true' "> + GitVersion + - + $(GitBaseVersionMajor).$(GitBaseVersionMinor).0.0 $(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits) diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets index 51b14c06..d2e0c4c7 100644 --- a/src/Directory.csproj.targets +++ b/src/Directory.csproj.targets @@ -8,8 +8,14 @@ false $(OutputPath)\$(AssemblyName).xml $(DefineConstants);DEBUG + + $(RootBuildFolder)ThisAssembly.WixVer.cs + + + + @@ -26,6 +32,5 @@ - diff --git a/src/Directory.vcxproj.targets b/src/Directory.vcxproj.targets index 97f65b4c..16e9f80c 100644 --- a/src/Directory.vcxproj.targets +++ b/src/Directory.vcxproj.targets @@ -10,7 +10,7 @@ + Condition=" '$(ConfigurationType)'=='Application' or '$(ConfigurationType)'=='DynamicLibrary' "> <_ResourceFileType Condition=" '$(ConfigurationType)'=='Application' ">VFT_APP <_ResourceFileType Condition=" '$(ConfigurationType)'=='DynamicLibrary' ">VFT_DLL diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj index b83084d0..7f1b27c2 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj @@ -10,7 +10,6 @@ - - diff --git a/src/api/burn/bextutil/bextutil.vcxproj b/src/api/burn/bextutil/bextutil.vcxproj index 6af9cd56..69222b4c 100644 --- a/src/api/burn/bextutil/bextutil.vcxproj +++ b/src/api/burn/bextutil/bextutil.vcxproj @@ -71,7 +71,6 @@ - diff --git a/src/api/burn/mbanative/mbanative.vcxproj b/src/api/burn/mbanative/mbanative.vcxproj index e6376ca7..47d09591 100644 --- a/src/api/burn/mbanative/mbanative.vcxproj +++ b/src/api/burn/mbanative/mbanative.vcxproj @@ -67,7 +67,6 @@ - diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj index b5cfcb45..ba26f68e 100644 --- a/src/burn/engine/engine.vcxproj +++ b/src/burn/engine/engine.vcxproj @@ -180,7 +180,7 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc" #endif "/> - + @@ -188,7 +188,6 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc" - diff --git a/src/burn/stub/stub.vcxproj b/src/burn/stub/stub.vcxproj index 0a2e1cae..29da8d05 100644 --- a/src/burn/stub/stub.vcxproj +++ b/src/burn/stub/stub.vcxproj @@ -91,7 +91,6 @@ - diff --git a/src/dtf/SfxCA/SfxCA.vcxproj b/src/dtf/SfxCA/SfxCA.vcxproj index 96aa69e0..5c4f674f 100644 --- a/src/dtf/SfxCA/SfxCA.vcxproj +++ b/src/dtf/SfxCA/SfxCA.vcxproj @@ -72,7 +72,6 @@ - diff --git a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj index a294a608..7e41313f 100644 --- a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj +++ b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj @@ -63,7 +63,6 @@ - diff --git a/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.csproj b/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.csproj index 2c33ac3c..750db40e 100644 --- a/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.csproj +++ b/src/ext/Bal/WixToolset.Dnc.HostGenerator/WixToolset.Dnc.HostGenerator.csproj @@ -9,7 +9,7 @@ WiX Toolset .NET Core BA Host Generator embedded AnyCPU - true + true diff --git a/src/ext/Bal/dnchost/dnchost.vcxproj b/src/ext/Bal/dnchost/dnchost.vcxproj index fc96580a..5860e968 100644 --- a/src/ext/Bal/dnchost/dnchost.vcxproj +++ b/src/ext/Bal/dnchost/dnchost.vcxproj @@ -83,7 +83,6 @@ - diff --git a/src/ext/Bal/mbahost/mbahost.vcxproj b/src/ext/Bal/mbahost/mbahost.vcxproj index a8fbbcc2..7764e4d4 100644 --- a/src/ext/Bal/mbahost/mbahost.vcxproj +++ b/src/ext/Bal/mbahost/mbahost.vcxproj @@ -71,7 +71,6 @@ - diff --git a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj index 1ce5737c..42c51c9e 100644 --- a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -64,7 +64,6 @@ - diff --git a/src/ext/Bal/wixiuiba/wixiuiba.vcxproj b/src/ext/Bal/wixiuiba/wixiuiba.vcxproj index dfadbb95..29c7cb50 100644 --- a/src/ext/Bal/wixiuiba/wixiuiba.vcxproj +++ b/src/ext/Bal/wixiuiba/wixiuiba.vcxproj @@ -65,7 +65,6 @@ - diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj index 64552f1a..64c9c122 100644 --- a/src/ext/Bal/wixlib/bal.wixproj +++ b/src/ext/Bal/wixlib/bal.wixproj @@ -32,6 +32,5 @@ - diff --git a/src/ext/Bal/wixstdba/wixstdba.vcxproj b/src/ext/Bal/wixstdba/wixstdba.vcxproj index 9273c1ed..9df3d5fd 100644 --- a/src/ext/Bal/wixstdba/wixstdba.vcxproj +++ b/src/ext/Bal/wixstdba/wixstdba.vcxproj @@ -75,7 +75,6 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - diff --git a/src/ext/ComPlus/ca/complusca.vcxproj b/src/ext/ComPlus/ca/complusca.vcxproj index a5b0622e..93abb3b0 100644 --- a/src/ext/ComPlus/ca/complusca.vcxproj +++ b/src/ext/ComPlus/ca/complusca.vcxproj @@ -93,7 +93,6 @@ - diff --git a/src/ext/ComPlus/wixlib/complus.wixproj b/src/ext/ComPlus/wixlib/complus.wixproj index 41f31a0d..0d9a64cf 100644 --- a/src/ext/ComPlus/wixlib/complus.wixproj +++ b/src/ext/ComPlus/wixlib/complus.wixproj @@ -22,6 +22,5 @@ - diff --git a/src/ext/Dependency/ca/dependencyca.vcxproj b/src/ext/Dependency/ca/dependencyca.vcxproj index 336196bc..f2eb7a0f 100644 --- a/src/ext/Dependency/ca/dependencyca.vcxproj +++ b/src/ext/Dependency/ca/dependencyca.vcxproj @@ -63,7 +63,6 @@ - diff --git a/src/ext/Dependency/wixlib/dependency.wixproj b/src/ext/Dependency/wixlib/dependency.wixproj index 32261349..2c43c3a9 100644 --- a/src/ext/Dependency/wixlib/dependency.wixproj +++ b/src/ext/Dependency/wixlib/dependency.wixproj @@ -24,6 +24,5 @@ - diff --git a/src/ext/DifxApp/wixlib/difxapp.wixproj b/src/ext/DifxApp/wixlib/difxapp.wixproj index 71e88ffc..62e7cb3e 100644 --- a/src/ext/DifxApp/wixlib/difxapp.wixproj +++ b/src/ext/DifxApp/wixlib/difxapp.wixproj @@ -8,6 +8,5 @@ - diff --git a/src/ext/DirectX/ca/directxca.vcxproj b/src/ext/DirectX/ca/directxca.vcxproj index abc54156..00b4fcb0 100644 --- a/src/ext/DirectX/ca/directxca.vcxproj +++ b/src/ext/DirectX/ca/directxca.vcxproj @@ -57,7 +57,6 @@ - diff --git a/src/ext/DirectX/wixlib/directx.wixproj b/src/ext/DirectX/wixlib/directx.wixproj index ea0f3330..109b7e37 100644 --- a/src/ext/DirectX/wixlib/directx.wixproj +++ b/src/ext/DirectX/wixlib/directx.wixproj @@ -19,6 +19,5 @@ - diff --git a/src/ext/Firewall/ca/fwca.vcxproj b/src/ext/Firewall/ca/fwca.vcxproj index 0f08bc72..227242cb 100644 --- a/src/ext/Firewall/ca/fwca.vcxproj +++ b/src/ext/Firewall/ca/fwca.vcxproj @@ -67,7 +67,6 @@ - diff --git a/src/ext/Firewall/wixlib/firewall.wixproj b/src/ext/Firewall/wixlib/firewall.wixproj index 51941541..efb0b64b 100644 --- a/src/ext/Firewall/wixlib/firewall.wixproj +++ b/src/ext/Firewall/wixlib/firewall.wixproj @@ -5,18 +5,20 @@ true en-us + + + - \ No newline at end of file diff --git a/src/ext/Http/ca/httpca.vcxproj b/src/ext/Http/ca/httpca.vcxproj index 9e6fbd56..42acd85d 100644 --- a/src/ext/Http/ca/httpca.vcxproj +++ b/src/ext/Http/ca/httpca.vcxproj @@ -65,7 +65,6 @@ - diff --git a/src/ext/Http/wixlib/http.wixproj b/src/ext/Http/wixlib/http.wixproj index 651a32ef..0b229f1b 100644 --- a/src/ext/Http/wixlib/http.wixproj +++ b/src/ext/Http/wixlib/http.wixproj @@ -20,6 +20,5 @@ - diff --git a/src/ext/Iis/ca/iisca.vcxproj b/src/ext/Iis/ca/iisca.vcxproj index 3ac9cdcf..e148c520 100644 --- a/src/ext/Iis/ca/iisca.vcxproj +++ b/src/ext/Iis/ca/iisca.vcxproj @@ -139,7 +139,6 @@ - diff --git a/src/ext/Iis/wixlib/iis.wixproj b/src/ext/Iis/wixlib/iis.wixproj index f4e6ae1b..6304e00a 100644 --- a/src/ext/Iis/wixlib/iis.wixproj +++ b/src/ext/Iis/wixlib/iis.wixproj @@ -21,6 +21,5 @@ - diff --git a/src/ext/Msmq/ca/msmqca.vcxproj b/src/ext/Msmq/ca/msmqca.vcxproj index 8460179d..6957c24f 100644 --- a/src/ext/Msmq/ca/msmqca.vcxproj +++ b/src/ext/Msmq/ca/msmqca.vcxproj @@ -63,7 +63,6 @@ - \ No newline at end of file diff --git a/src/ext/Msmq/wixlib/msmq.wixproj b/src/ext/Msmq/wixlib/msmq.wixproj index e2887823..903259d2 100644 --- a/src/ext/Msmq/wixlib/msmq.wixproj +++ b/src/ext/Msmq/wixlib/msmq.wixproj @@ -20,6 +20,5 @@ - diff --git a/src/ext/NetFx/be/netfxbe.vcxproj b/src/ext/NetFx/be/netfxbe.vcxproj index 00588764..d1084dd1 100644 --- a/src/ext/NetFx/be/netfxbe.vcxproj +++ b/src/ext/NetFx/be/netfxbe.vcxproj @@ -70,7 +70,6 @@ - diff --git a/src/ext/NetFx/ca/netfxca.vcxproj b/src/ext/NetFx/ca/netfxca.vcxproj index 0158a656..ea9d2d90 100644 --- a/src/ext/NetFx/ca/netfxca.vcxproj +++ b/src/ext/NetFx/ca/netfxca.vcxproj @@ -64,7 +64,6 @@ - diff --git a/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj b/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj index b5f12f07..a73192d0 100644 --- a/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj +++ b/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj @@ -62,7 +62,6 @@ - diff --git a/src/ext/NetFx/wixlib/netfx.wixproj b/src/ext/NetFx/wixlib/netfx.wixproj index 734e64da..1ab72e8e 100644 --- a/src/ext/NetFx/wixlib/netfx.wixproj +++ b/src/ext/NetFx/wixlib/netfx.wixproj @@ -35,7 +35,6 @@ - diff --git a/src/ext/PowerShell/wixlib/powershell.wixproj b/src/ext/PowerShell/wixlib/powershell.wixproj index b28eb626..67bea57a 100644 --- a/src/ext/PowerShell/wixlib/powershell.wixproj +++ b/src/ext/PowerShell/wixlib/powershell.wixproj @@ -7,6 +7,5 @@ - diff --git a/src/ext/Sql/ca/sqlca.vcxproj b/src/ext/Sql/ca/sqlca.vcxproj index a6e85afb..4013351f 100644 --- a/src/ext/Sql/ca/sqlca.vcxproj +++ b/src/ext/Sql/ca/sqlca.vcxproj @@ -74,7 +74,6 @@ - diff --git a/src/ext/Sql/wixlib/sql.wixproj b/src/ext/Sql/wixlib/sql.wixproj index ef2080c4..d896bbb3 100644 --- a/src/ext/Sql/wixlib/sql.wixproj +++ b/src/ext/Sql/wixlib/sql.wixproj @@ -20,6 +20,5 @@ - diff --git a/src/ext/UI/ca/uica.vcxproj b/src/ext/UI/ca/uica.vcxproj index 17e39046..0803b252 100644 --- a/src/ext/UI/ca/uica.vcxproj +++ b/src/ext/UI/ca/uica.vcxproj @@ -65,7 +65,6 @@ - diff --git a/src/ext/UI/wixlib/ui.wixproj b/src/ext/UI/wixlib/ui.wixproj index ead77af4..d7c6e638 100644 --- a/src/ext/UI/wixlib/ui.wixproj +++ b/src/ext/UI/wixlib/ui.wixproj @@ -34,6 +34,5 @@ - diff --git a/src/ext/Util/be/utilbe.vcxproj b/src/ext/Util/be/utilbe.vcxproj index fa39dcf3..d2697bbd 100644 --- a/src/ext/Util/be/utilbe.vcxproj +++ b/src/ext/Util/be/utilbe.vcxproj @@ -70,7 +70,6 @@ - diff --git a/src/ext/Util/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj index 352d7723..8fe26942 100644 --- a/src/ext/Util/ca/utilca.vcxproj +++ b/src/ext/Util/ca/utilca.vcxproj @@ -97,7 +97,6 @@ - diff --git a/src/ext/Util/wixlib/util.wixproj b/src/ext/Util/wixlib/util.wixproj index fa82fea2..c1975af2 100644 --- a/src/ext/Util/wixlib/util.wixproj +++ b/src/ext/Util/wixlib/util.wixproj @@ -22,6 +22,5 @@ - diff --git a/src/ext/VisualStudio/ca/vsca.vcxproj b/src/ext/VisualStudio/ca/vsca.vcxproj index 6eb78fd7..466275d8 100644 --- a/src/ext/VisualStudio/ca/vsca.vcxproj +++ b/src/ext/VisualStudio/ca/vsca.vcxproj @@ -56,7 +56,6 @@ - diff --git a/src/ext/VisualStudio/wixlib/vs.wixproj b/src/ext/VisualStudio/wixlib/vs.wixproj index 61b4a93a..85b9120a 100644 --- a/src/ext/VisualStudio/wixlib/vs.wixproj +++ b/src/ext/VisualStudio/wixlib/vs.wixproj @@ -15,6 +15,5 @@ - diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj index 2ae49e19..23788d52 100644 --- a/src/internal/SetBuildNumber/SetBuildNumber.proj +++ b/src/internal/SetBuildNumber/SetBuildNumber.proj @@ -10,19 +10,27 @@ https://api.nuget.org/v3/index.json true + + C# + .cs + true __SetPropertiesFromGit; + GitThisAssembly; SetAppVeyorBuildNumber; SetGlobalJson; SetDirectoryPackagesProps; + SetOverallWixVersions; InstallSigningClient $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json)) $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\Directory.Packages.props)) + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\wixver.props)) + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\ThisAssembly.WixVer.cs)) + + + <!-- DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\wixver.props.pp --> + $([System.IO.File]::ReadAllText(wixver.props.pp)) + $(OverallWixVersionsText.Replace('{GitBaseVersionMajor}', $(GitBaseVersionMajor))) + $(OverallWixVersionsText.Replace('{GitBaseVersionMinor}', $(GitBaseVersionMinor))) + $(OverallWixVersionsText.Replace('{GitBaseVersionPatch}', $(GitBaseVersionPatch))) + $(OverallWixVersionsText.Replace('{GitCommits}', $(GitCommits))) + $(OverallWixVersionsText.Replace('{GitSemVerDashLabel}', $(GitSemVerDashLabel))) + $(OverallWixVersionsText.Replace('{GitSha}', $(GitSha))) + $(OverallWixVersionsText.Replace('{GitRepositoryUrl}', $(GitRepositoryUrl.Replace('.git','')))) + + + + + + + + diff --git a/src/internal/SetBuildNumber/wixver.props.pp b/src/internal/SetBuildNumber/wixver.props.pp new file mode 100644 index 00000000..3197181f --- /dev/null +++ b/src/internal/SetBuildNumber/wixver.props.pp @@ -0,0 +1,13 @@ + + + true + true + {GitBaseVersionMajor} + {GitBaseVersionMinor} + {GitBaseVersionPatch} + {GitCommits} + {GitSemVerDashLabel} + {GitSha} + {GitRepositoryUrl} + + diff --git a/src/internal/WixBuildFinalize/WixBuildFinalize.proj b/src/internal/WixBuildFinalize/WixBuildFinalize.proj index 18c68245..d161f2cf 100644 --- a/src/internal/WixBuildFinalize/WixBuildFinalize.proj +++ b/src/internal/WixBuildFinalize/WixBuildFinalize.proj @@ -6,10 +6,6 @@ net472 - - - - - - - - - diff --git a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj index 6698bff7..5a45dba7 100644 --- a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj +++ b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj @@ -23,6 +23,5 @@ - diff --git a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets index 6525e65a..ed3d728a 100644 --- a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets +++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets @@ -32,13 +32,11 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - diff --git a/src/internal/WixInternal.TestSupport.Native/packages.config b/src/internal/WixInternal.TestSupport.Native/packages.config index ef2b43c8..603b945a 100644 --- a/src/internal/WixInternal.TestSupport.Native/packages.config +++ b/src/internal/WixInternal.TestSupport.Native/packages.config @@ -6,7 +6,6 @@ Update build\WixInternal.TestSupport.Native.props and build\WixInternal.TestSupport.Native.targets when any of these versions are updated. --> - diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj index dc6b913f..736acd46 100644 --- a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj +++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj @@ -185,7 +185,6 @@ - diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj index 234020bc..5aa8e572 100644 --- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj +++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj @@ -79,7 +79,6 @@ - diff --git a/src/setup/ThmViewerPackage/ThmViewerPackage.wixproj b/src/setup/ThmViewerPackage/ThmViewerPackage.wixproj index 57aeac95..a37a6320 100644 --- a/src/setup/ThmViewerPackage/ThmViewerPackage.wixproj +++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wixproj @@ -3,9 +3,4 @@ - - - - - diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj b/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj index aca83108..b7f2b1a9 100644 --- a/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj +++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj @@ -11,7 +11,6 @@ - diff --git a/src/tools/thmviewer/thmviewer.vcxproj b/src/tools/thmviewer/thmviewer.vcxproj index 3fd87878..6326b4f6 100644 --- a/src/tools/thmviewer/thmviewer.vcxproj +++ b/src/tools/thmviewer/thmviewer.vcxproj @@ -62,7 +62,6 @@ - diff --git a/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj b/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj index d56ed326..03f6343f 100644 --- a/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj +++ b/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj @@ -10,8 +10,7 @@ embedded true true - - true + true diff --git a/src/wix/WixToolset.Core/WixToolset.Core.csproj b/src/wix/WixToolset.Core/WixToolset.Core.csproj index 336cc8e7..c94c0b8e 100644 --- a/src/wix/WixToolset.Core/WixToolset.Core.csproj +++ b/src/wix/WixToolset.Core/WixToolset.Core.csproj @@ -10,8 +10,7 @@ embedded true true - - true + true diff --git a/src/wix/wix.cmd b/src/wix/wix.cmd index 7982fbea..17a2a19a 100644 --- a/src/wix/wix.cmd +++ b/src/wix/wix.cmd @@ -28,9 +28,9 @@ msbuild wixnative\wixnative_t.proj -p:Configuration=%_C% -nologo -m -warnaserror msbuild wix.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\wix_build.binlog || exit /b -msbuild publish_t.proj -p:Configuration=%_C% -nologo -warnaserror -bl:%_L%\wix_publish.binlog || exit /b +msbuild publish_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\wix_publish.binlog || exit /b -msbuild -t:Publish -p:Configuration=%_C% -nologo -warnaserror WixToolset.Sdk\WixToolset.Sdk.csproj -bl:%_L%\wix_sdk_publish.binlog || exit /b +msbuild -t:Publish -p:Configuration=%_C% -nologo -m -warnaserror WixToolset.Sdk\WixToolset.Sdk.csproj -bl:%_L%\wix_sdk_publish.binlog || exit /b :: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test :: msbuild -t:Publish -Restore -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=linux-x86 -p:PublishDir=%_P%WixToolset.Sdk\broken\net472\ wix\wix.csproj || exit /b diff --git a/src/wix/wixnative/wixnative.vcxproj b/src/wix/wixnative/wixnative.vcxproj index 01b073f9..e4474bb1 100644 --- a/src/wix/wixnative/wixnative.vcxproj +++ b/src/wix/wixnative/wixnative.vcxproj @@ -63,7 +63,6 @@ - -- cgit v1.2.3-55-g6feb