From e103be995f566e42ea4cf91fda5dd0e940e5aabd Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 17 Feb 2022 13:02:04 -0800 Subject: Create single .zip file for non-embedded pdb files No longer create .snupkg/.symbols.nupkgs since they don't actually support native pdbs, which are all of our non-embedded pdb files. --- src/Directory.Build.props | 1 + src/Directory.Build.targets | 6 ------ src/Directory.vcxproj.targets | 18 ++++++++++++++---- .../WixToolset.Mba.Core/WixToolset.Mba.Core.csproj | 2 -- .../burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj | 1 + .../test/BextUtilUnitTest/BextUtilUnitTest.vcxproj | 1 + .../WixToolsetTest.Mba.Core.csproj | 1 + src/build_all.cmd | 6 ++++++ src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj | 1 + .../examples/TestEngine/Example.TestEngine.vcxproj | 1 + src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec | 4 ---- .../ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec | 3 --- .../wixext/WixToolset.Dependency.wixext.nuspec | 4 ---- src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec | 4 ---- src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec | 4 ---- src/ext/UI/wixext/WixToolset.UI.wixext.nuspec | 2 -- src/ext/Util/wixext/WixToolset.Util.wixext.nuspec | 4 ---- .../wixext/WixToolset.VisualStudio.wixext.nuspec | 2 -- src/internal/SetBuildNumber/global.json.pp | 1 + src/internal/WixBuildFinalize/WixBuildFinalize.proj | 19 +++++++++++++++++++ .../WixBuildTools.TestSupport.Native.vcxproj | 1 + src/internal/finalize.cmd | 14 ++++++++++++++ .../dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj | 1 + .../BafThmutilTesting/BafThmUtilTesting.vcxproj | 10 +++++++++- .../WixToolset.Core.Native.csproj | 2 -- .../WixToolset.Core.Native.nuspec | 3 --- src/wix/wix/wix.csproj | 3 --- 27 files changed, 71 insertions(+), 48 deletions(-) create mode 100644 src/internal/WixBuildFinalize/WixBuildFinalize.proj create mode 100644 src/internal/finalize.cmd (limited to 'src') diff --git a/src/Directory.Build.props b/src/Directory.Build.props index d068e9e8..36a8c7bd 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -11,6 +11,7 @@ $(MSBuildProjectName) $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\packages\)) + $(RootBuildFolder)pdbs\$(Configuration)\ $(RootBuildFolder)artifacts\ $(RootBuildFolder).tools $(ArtifactsFolder) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index cbf2e648..1170fc62 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -2,11 +2,6 @@ - - $(ToolsFolder) $(SigningToolFolder)\SignClient.exe @@ -76,7 +71,6 @@ $(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title) $(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl) $(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory) - snupkg - + @@ -43,4 +41,16 @@ + + + + $(AfterLinkTargets); + PublicizeNativePdb; + + + + + + diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj index 9d7d9323..74cbe551 100644 --- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj +++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj @@ -11,8 +11,6 @@ $(MSBuildThisFileName).nuspec true true - - $(NoWarn);NU5128 diff --git a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj index 323561b9..113edeaa 100644 --- a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj +++ b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj @@ -25,6 +25,7 @@ Unicode true false + true diff --git a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj index 0fd29eea..b24d1fad 100644 --- a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj +++ b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj @@ -24,6 +24,7 @@ Unicode true false + true diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj index 3ac13b46..a6899d1e 100644 --- a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj +++ b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj @@ -8,6 +8,7 @@ win-x86 false Major + true diff --git a/src/build_all.cmd b/src/build_all.cmd index 050d1ab7..59cecf2b 100644 --- a/src/build_all.cmd +++ b/src/build_all.cmd @@ -58,6 +58,12 @@ call samples\samples.cmd %_C% || exit /b call test\test.cmd %_C% || exit /b + +:: finalize build + +call internal\finalize.cmd %_C% || exit /b + + goto LExit :StartDeveloperCommandPrompt diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj index 248d7bbb..2d141451 100644 --- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj +++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj @@ -32,6 +32,7 @@ Unicode true false + true diff --git a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj index 12abe976..68e66741 100644 --- a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -35,6 +35,7 @@ Console Example.TestEngine Unicode + true diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec index 5bf600fb..4abfa98c 100644 --- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec +++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec @@ -20,9 +20,5 @@ - - - - diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec index 20712f58..7143d993 100644 --- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec +++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec @@ -17,8 +17,5 @@ - - - diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec index da07f591..7143d993 100644 --- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec +++ b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec @@ -17,9 +17,5 @@ - - - - diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec index 73df56ab..4abfa98c 100644 --- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec +++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec @@ -20,9 +20,5 @@ - - - - diff --git a/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec b/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec index da07f591..7143d993 100644 --- a/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec +++ b/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec @@ -17,9 +17,5 @@ - - - - diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec index 33a43d34..4abfa98c 100644 --- a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec +++ b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec @@ -20,7 +20,5 @@ - - diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec index 73df56ab..4abfa98c 100644 --- a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec +++ b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec @@ -20,9 +20,5 @@ - - - - diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec index 504d4458..7143d993 100644 --- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec +++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec @@ -17,7 +17,5 @@ - - diff --git a/src/internal/SetBuildNumber/global.json.pp b/src/internal/SetBuildNumber/global.json.pp index 5907efb0..a3485efa 100644 --- a/src/internal/SetBuildNumber/global.json.pp +++ b/src/internal/SetBuildNumber/global.json.pp @@ -1,6 +1,7 @@ { "msbuild-sdks": { "Microsoft.Build.Traversal": "3.0.23", + "Microsoft.Build.NoTargets": "3.3.0", "WixToolset.Sdk": "{packageversion}" }, "sdk": { diff --git a/src/internal/WixBuildFinalize/WixBuildFinalize.proj b/src/internal/WixBuildFinalize/WixBuildFinalize.proj new file mode 100644 index 00000000..1e0a98d1 --- /dev/null +++ b/src/internal/WixBuildFinalize/WixBuildFinalize.proj @@ -0,0 +1,19 @@ + + + + + + net46 + + + + + + + + + + diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj index a96f8d2f..0eae7750 100644 --- a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj +++ b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj @@ -33,6 +33,7 @@ true WixBuildTools C++/CLI Test Support false + true diff --git a/src/internal/finalize.cmd b/src/internal/finalize.cmd new file mode 100644 index 00000000..bbd6f01a --- /dev/null +++ b/src/internal/finalize.cmd @@ -0,0 +1,14 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release +@if not "%1"=="" shift & goto parse_args + +@echo Finalize build %_C% + +msbuild -Restore WixBuildFinalize\WixBuildFinalize.proj -p:Configuration=%_C% -nologo || exit /b + +@popd +@endlocal diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj index 9fca2608..1c821a7c 100644 --- a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj +++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj @@ -32,6 +32,7 @@ Unicode true false + true diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj index d938b0c9..cb3e14e7 100644 --- a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj +++ b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj @@ -1,5 +1,6 @@ + @@ -27,18 +28,23 @@ x64 + {565E99AE-975F-4F26-8A6E-852603386A80} DynamicLibrary Unicode BafThmUtilTesting BafThmUtilTesting.def + true + + comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib + @@ -54,10 +60,12 @@ + + - \ No newline at end of file + diff --git a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj index 74132155..6553a276 100644 --- a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj +++ b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj @@ -8,8 +8,6 @@ embedded WiX Toolset Native Processing true - - $(NoWarn);NU5128 diff --git a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec index ae5c7c61..e3389bcd 100644 --- a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec +++ b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec @@ -33,10 +33,7 @@ - - - diff --git a/src/wix/wix/wix.csproj b/src/wix/wix/wix.csproj index e0351019..a7df91f6 100644 --- a/src/wix/wix/wix.csproj +++ b/src/wix/wix/wix.csproj @@ -38,11 +38,8 @@ - - -