aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Directory.Build.props1
-rw-r--r--src/Directory.Build.targets6
-rw-r--r--src/Directory.vcxproj.targets18
-rw-r--r--src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj2
-rw-r--r--src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj1
-rw-r--r--src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj1
-rw-r--r--src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj1
-rw-r--r--src/build_all.cmd6
-rw-r--r--src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj1
-rw-r--r--src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj1
-rw-r--r--src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec4
-rw-r--r--src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec3
-rw-r--r--src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec4
-rw-r--r--src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec4
-rw-r--r--src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec4
-rw-r--r--src/ext/UI/wixext/WixToolset.UI.wixext.nuspec2
-rw-r--r--src/ext/Util/wixext/WixToolset.Util.wixext.nuspec4
-rw-r--r--src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec2
-rw-r--r--src/internal/SetBuildNumber/global.json.pp1
-rw-r--r--src/internal/WixBuildFinalize/WixBuildFinalize.proj19
-rw-r--r--src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj1
-rw-r--r--src/internal/finalize.cmd14
-rw-r--r--src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj1
-rw-r--r--src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj10
-rw-r--r--src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj2
-rw-r--r--src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec3
-rw-r--r--src/wix/wix/wix.csproj3
27 files changed, 71 insertions, 48 deletions
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 @@
11 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> 11 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
12 <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</RootBuildFolder> 12 <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</RootBuildFolder>
13 <RootPackagesFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\packages\))</RootPackagesFolder> 13 <RootPackagesFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\packages\))</RootPackagesFolder>
14 <PdbsFolder>$(RootBuildFolder)pdbs\$(Configuration)\</PdbsFolder>
14 <ArtifactsFolder>$(RootBuildFolder)artifacts\</ArtifactsFolder> 15 <ArtifactsFolder>$(RootBuildFolder)artifacts\</ArtifactsFolder>
15 <ToolsFolder>$(RootBuildFolder).tools</ToolsFolder> 16 <ToolsFolder>$(RootBuildFolder).tools</ToolsFolder>
16 <PackageOutputPath>$(ArtifactsFolder)</PackageOutputPath> 17 <PackageOutputPath>$(ArtifactsFolder)</PackageOutputPath>
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 @@
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 3
4<Project> 4<Project>
5 <!-- <ItemGroup>
6 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
7 <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="All" />
8 </ItemGroup> -->
9
10 <PropertyGroup> 5 <PropertyGroup>
11 <SigningToolFolder>$(ToolsFolder)</SigningToolFolder> 6 <SigningToolFolder>$(ToolsFolder)</SigningToolFolder>
12 <SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe> 7 <SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe>
@@ -76,7 +71,6 @@
76 <NuspecProperties>$(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> 71 <NuspecProperties>$(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
77 <NuspecProperties>$(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl)</NuspecProperties> 72 <NuspecProperties>$(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl)</NuspecProperties>
78 <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory)</NuspecProperties> 73 <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory)</NuspecProperties>
79 <SymbolPackageFormat>snupkg</SymbolPackageFormat>
80 </PropertyGroup> 74 </PropertyGroup>
81 75
82 <Message Importance="$(GitInfoReportImportance)" Text="NuSpec info: 76 <Message Importance="$(GitInfoReportImportance)" Text="NuSpec info:
diff --git a/src/Directory.vcxproj.targets b/src/Directory.vcxproj.targets
index 4f278fa6..528edd44 100644
--- a/src/Directory.vcxproj.targets
+++ b/src/Directory.vcxproj.targets
@@ -1,8 +1,6 @@
1<?xml version="1.0" encoding="utf-8"?>
1<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2<!-- 3
3 Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.csproj.targets
4 then update all of the repos.
5-->
6<Project> 4<Project>
7 <PropertyGroup> 5 <PropertyGroup>
8 <PrepareForBuildDependsOn> 6 <PrepareForBuildDependsOn>
@@ -43,4 +41,16 @@
43 </ResourceCompile> 41 </ResourceCompile>
44 </ItemGroup> 42 </ItemGroup>
45 </Target> 43 </Target>
44
45 <PropertyGroup>
46 <AfterLinkTargets>
47 $(AfterLinkTargets);
48 PublicizeNativePdb;
49 </AfterLinkTargets>
50 </PropertyGroup>
51
52 <Target Name="PublicizeNativePdb"
53 Condition=" '@(Link)' != '' and '$(IsWixTestProject)' != 'true' ">
54 <Copy SourceFiles="%(Link.ProgramDatabaseFile)" DestinationFolder="$(PdbsFolder)$(PlatformFolder)" />
55 </Target>
46</Project> 56</Project>
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 @@
11 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> 11 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
12 <IncludeSymbols>true</IncludeSymbols> 12 <IncludeSymbols>true</IncludeSymbols>
13 <CreateDocumentationFile>true</CreateDocumentationFile> 13 <CreateDocumentationFile>true</CreateDocumentationFile>
14 <!-- https://github.com/NuGet/Home/issues/10665 -->
15 <NoWarn>$(NoWarn);NU5128</NoWarn>
16 </PropertyGroup> 14 </PropertyGroup>
17 15
18 <ItemGroup Condition=" '$(NCrunch)'=='' "> 16 <ItemGroup Condition=" '$(NCrunch)'=='' ">
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 @@
25 <CharacterSet>Unicode</CharacterSet> 25 <CharacterSet>Unicode</CharacterSet>
26 <CLRSupport>true</CLRSupport> 26 <CLRSupport>true</CLRSupport>
27 <SignOutput>false</SignOutput> 27 <SignOutput>false</SignOutput>
28 <IsWixTestProject>true</IsWixTestProject>
28 </PropertyGroup> 29 </PropertyGroup>
29 30
30 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 31 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
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 @@
24 <CharacterSet>Unicode</CharacterSet> 24 <CharacterSet>Unicode</CharacterSet>
25 <CLRSupport>true</CLRSupport> 25 <CLRSupport>true</CLRSupport>
26 <SignOutput>false</SignOutput> 26 <SignOutput>false</SignOutput>
27 <IsWixTestProject>true</IsWixTestProject>
27 </PropertyGroup> 28 </PropertyGroup>
28 29
29 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 30 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
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 @@
8 <RuntimeIdentifier>win-x86</RuntimeIdentifier> 8 <RuntimeIdentifier>win-x86</RuntimeIdentifier>
9 <SignOutput>false</SignOutput> 9 <SignOutput>false</SignOutput>
10 <RollForward>Major</RollForward> 10 <RollForward>Major</RollForward>
11 <IsWixTestProject>true</IsWixTestProject>
11 </PropertyGroup> 12 </PropertyGroup>
12 13
13 <ItemGroup> 14 <ItemGroup>
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
58 58
59call test\test.cmd %_C% || exit /b 59call test\test.cmd %_C% || exit /b
60 60
61
62:: finalize build
63
64call internal\finalize.cmd %_C% || exit /b
65
66
61goto LExit 67goto LExit
62 68
63:StartDeveloperCommandPrompt 69: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 @@
32 <CharacterSet>Unicode</CharacterSet> 32 <CharacterSet>Unicode</CharacterSet>
33 <CLRSupport>true</CLRSupport> 33 <CLRSupport>true</CLRSupport>
34 <SignOutput>false</SignOutput> 34 <SignOutput>false</SignOutput>
35 <IsWixTestProject>true</IsWixTestProject>
35 </PropertyGroup> 36 </PropertyGroup>
36 37
37 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 38 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
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 @@
35 <ProjectSubSystem>Console</ProjectSubSystem> 35 <ProjectSubSystem>Console</ProjectSubSystem>
36 <TargetName>Example.TestEngine</TargetName> 36 <TargetName>Example.TestEngine</TargetName>
37 <CharacterSet>Unicode</CharacterSet> 37 <CharacterSet>Unicode</CharacterSet>
38 <IsWixTestProject>true</IsWixTestProject>
38 </PropertyGroup> 39 </PropertyGroup>
39 40
40 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 41 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
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 @@
20 <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" /> 20 <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21 21
22 <file src="$id$.dll" target="tools" /> 22 <file src="$id$.dll" target="tools" />
23
24 <file src="..\x86\*.pdb" target="pdbs\x86" />
25 <file src="..\x64\*.pdb" target="pdbs\x64" />
26 <file src="..\ARM64\*.pdb" target="pdbs\ARM64" />
27 </files> 23 </files>
28</package> 24</package>
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 @@
17 <file src="$projectFolder$\$id$.targets" target="build" /> 17 <file src="$projectFolder$\$id$.targets" target="build" />
18 18
19 <file src="$id$.dll" target="tools" /> 19 <file src="$id$.dll" target="tools" />
20
21 <file src="..\x86\*.pdb" target="pdbs\x86" />
22 <file src="..\x64\*.pdb" target="pdbs\x64" />
23 </files> 20 </files>
24</package> 21</package>
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 @@
17 <file src="$projectFolder$\$id$.targets" target="build" /> 17 <file src="$projectFolder$\$id$.targets" target="build" />
18 18
19 <file src="$id$.dll" target="tools" /> 19 <file src="$id$.dll" target="tools" />
20
21 <file src="..\ARM64\*.pdb" target="pdbs\ARM64" />
22 <file src="..\x86\*.pdb" target="pdbs\x86" />
23 <file src="..\x64\*.pdb" target="pdbs\x64" />
24 </files> 20 </files>
25</package> 21</package>
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 @@
20 <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" /> 20 <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21 21
22 <file src="$id$.dll" target="tools" /> 22 <file src="$id$.dll" target="tools" />
23
24 <file src="..\ARM64\*.pdb" target="pdbs\ARM64" />
25 <file src="..\x86\*.pdb" target="pdbs\x86" />
26 <file src="..\x64\*.pdb" target="pdbs\x64" />
27 </files> 23 </files>
28</package> 24</package>
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 @@
17 <file src="$projectFolder$\$id$.targets" target="build" /> 17 <file src="$projectFolder$\$id$.targets" target="build" />
18 18
19 <file src="$id$.dll" target="tools" /> 19 <file src="$id$.dll" target="tools" />
20
21 <file src="..\ARM64\*.pdb" target="pdbs\ARM64" />
22 <file src="..\x86\*.pdb" target="pdbs\x86" />
23 <file src="..\x64\*.pdb" target="pdbs\x64" />
24 </files> 20 </files>
25</package> 21</package>
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 @@
20 <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" /> 20 <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21 21
22 <file src="$id$.dll" target="tools" /> 22 <file src="$id$.dll" target="tools" />
23
24 <file src="..\x86\*.pdb" target="pdbs\x86" />
25 </files> 23 </files>
26</package> 24</package>
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 @@
20 <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" /> 20 <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21 21
22 <file src="$id$.dll" target="tools" /> 22 <file src="$id$.dll" target="tools" />
23
24 <file src="..\ARM64\*.pdb" target="pdbs\ARM64" />
25 <file src="..\x86\*.pdb" target="pdbs\x86" />
26 <file src="..\x64\*.pdb" target="pdbs\x64" />
27 </files> 23 </files>
28</package> 24</package>
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 @@
17 <file src="$projectFolder$\$id$.targets" target="build" /> 17 <file src="$projectFolder$\$id$.targets" target="build" />
18 18
19 <file src="$id$.dll" target="tools" /> 19 <file src="$id$.dll" target="tools" />
20
21 <file src="..\x86\*.pdb" target="pdbs\x86" />
22 </files> 20 </files>
23</package> 21</package>
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 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "Microsoft.Build.Traversal": "3.0.23", 3 "Microsoft.Build.Traversal": "3.0.23",
4 "Microsoft.Build.NoTargets": "3.3.0",
4 "WixToolset.Sdk": "{packageversion}" 5 "WixToolset.Sdk": "{packageversion}"
5 }, 6 },
6 "sdk": { 7 "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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4<Project Sdk="Microsoft.Build.NoTargets">
5 <PropertyGroup>
6 <TargetFramework>net46</TargetFramework>
7 </PropertyGroup>
8
9 <ItemGroup>
10 <PackageReference Include="GitInfo" PrivateAssets="All" />
11 </ItemGroup>
12
13 <Target Name="ZipPdbs" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="AfterBuild">
14 <ZipDirectory
15 SourceDirectory="$(PdbsFolder)"
16 DestinationFile="$(ArtifactsFolder)\wix$(Version)-pdbs.zip"
17 Overwrite="true" />
18 </Target>
19</Project>
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 @@
33 <CLRSupport>true</CLRSupport> 33 <CLRSupport>true</CLRSupport>
34 <Description>WixBuildTools C++/CLI Test Support</Description> 34 <Description>WixBuildTools C++/CLI Test Support</Description>
35 <SignOutput>false</SignOutput> 35 <SignOutput>false</SignOutput>
36 <IsWixTestProject>true</IsWixTestProject>
36 </PropertyGroup> 37 </PropertyGroup>
37 38
38 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 39 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
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 @@
1@setlocal
2@pushd %~dp0
3
4@set _C=Debug
5:parse_args
6@if /i "%1"=="release" set _C=Release
7@if not "%1"=="" shift & goto parse_args
8
9@echo Finalize build %_C%
10
11msbuild -Restore WixBuildFinalize\WixBuildFinalize.proj -p:Configuration=%_C% -nologo || exit /b
12
13@popd
14@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 @@
32 <CharacterSet>Unicode</CharacterSet> 32 <CharacterSet>Unicode</CharacterSet>
33 <CLRSupport>true</CLRSupport> 33 <CLRSupport>true</CLRSupport>
34 <SignOutput>false</SignOutput> 34 <SignOutput>false</SignOutput>
35 <IsWixTestProject>true</IsWixTestProject>
35 </PropertyGroup> 36 </PropertyGroup>
36 37
37 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 38 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
3<Project DefaultTargets="Build" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4<Project DefaultTargets="Build" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4 <ItemGroup Label="ProjectConfigurations"> 5 <ItemGroup Label="ProjectConfigurations">
5 <ProjectConfiguration Include="Debug|ARM64"> 6 <ProjectConfiguration Include="Debug|ARM64">
@@ -27,18 +28,23 @@
27 <Platform>x64</Platform> 28 <Platform>x64</Platform>
28 </ProjectConfiguration> 29 </ProjectConfiguration>
29 </ItemGroup> 30 </ItemGroup>
31
30 <PropertyGroup Label="Globals"> 32 <PropertyGroup Label="Globals">
31 <ProjectGuid>{565E99AE-975F-4F26-8A6E-852603386A80}</ProjectGuid> 33 <ProjectGuid>{565E99AE-975F-4F26-8A6E-852603386A80}</ProjectGuid>
32 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
33 <CharacterSet>Unicode</CharacterSet> 35 <CharacterSet>Unicode</CharacterSet>
34 <TargetName>BafThmUtilTesting</TargetName> 36 <TargetName>BafThmUtilTesting</TargetName>
35 <ProjectModuleDefinitionFile>BafThmUtilTesting.def</ProjectModuleDefinitionFile> 37 <ProjectModuleDefinitionFile>BafThmUtilTesting.def</ProjectModuleDefinitionFile>
38 <IsWixTestProject>true</IsWixTestProject>
36 </PropertyGroup> 39 </PropertyGroup>
40
37 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 41 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
38 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
43
39 <PropertyGroup> 44 <PropertyGroup>
40 <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries> 45 <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries>
41 </PropertyGroup> 46 </PropertyGroup>
47
42 <ItemGroup> 48 <ItemGroup>
43 <ClCompile Include="BafThmUtilTesting.cpp" /> 49 <ClCompile Include="BafThmUtilTesting.cpp" />
44 <ClCompile Include="precomp.cpp"> 50 <ClCompile Include="precomp.cpp">
@@ -54,10 +60,12 @@
54 <ItemGroup> 60 <ItemGroup>
55 <None Include="BafThmUtilTesting.def" /> 61 <None Include="BafThmUtilTesting.def" />
56 </ItemGroup> 62 </ItemGroup>
63
57 <ItemGroup> 64 <ItemGroup>
58 <PackageReference Include="WixToolset.Dutil" /> 65 <PackageReference Include="WixToolset.Dutil" />
59 <PackageReference Include="WixToolset.BalUtil" /> 66 <PackageReference Include="WixToolset.BalUtil" />
60 <PackageReference Include="WixToolset.BootstrapperCore.Native" /> 67 <PackageReference Include="WixToolset.BootstrapperCore.Native" />
61 </ItemGroup> 68 </ItemGroup>
69
62 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 70 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
63</Project> \ No newline at end of file 71</Project>
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 @@
8 <DebugType>embedded</DebugType> 8 <DebugType>embedded</DebugType>
9 <Description>WiX Toolset Native Processing</Description> 9 <Description>WiX Toolset Native Processing</Description>
10 <CreateDocumentationFile>true</CreateDocumentationFile> 10 <CreateDocumentationFile>true</CreateDocumentationFile>
11 <!-- https://github.com/NuGet/Home/issues/10665 -->
12 <NoWarn>$(NoWarn);NU5128</NoWarn>
13 </PropertyGroup> 11 </PropertyGroup>
14 12
15 <ItemGroup> 13 <ItemGroup>
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 @@
33 <file src="$projectFolder$\..\wixnative\x64\mergemod.dll" target="runtimes\win-x64\native" /> 33 <file src="$projectFolder$\..\wixnative\x64\mergemod.dll" target="runtimes\win-x64\native" />
34 34
35 <file src="..\ARM64\wixnative.exe" target="runtimes\win-arm64\native" /> 35 <file src="..\ARM64\wixnative.exe" target="runtimes\win-arm64\native" />
36 <file src="..\ARM64\wixnative.pdb" target="runtimes\win-arm64\native" />
37 <file src="..\x86\wixnative.exe" target="runtimes\win-x86\native" /> 36 <file src="..\x86\wixnative.exe" target="runtimes\win-x86\native" />
38 <file src="..\x86\wixnative.pdb" target="runtimes\win-x86\native" />
39 <file src="..\x64\wixnative.exe" target="runtimes\win-x64\native" /> 37 <file src="..\x64\wixnative.exe" target="runtimes\win-x64\native" />
40 <file src="..\x64\wixnative.pdb" target="runtimes\win-x64\native" />
41 </files> 38 </files>
42</package> 39</package>
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 @@
38 <NativeLibrary Include="..\wixnative\x64\mergemod.dll" RuntimeIdentifier="win-x64" /> 38 <NativeLibrary Include="..\wixnative\x64\mergemod.dll" RuntimeIdentifier="win-x64" />
39 <NativeLibrary Include="..\wixnative\Win32\mergemod.dll" RuntimeIdentifier="win-x86" /> 39 <NativeLibrary Include="..\wixnative\Win32\mergemod.dll" RuntimeIdentifier="win-x86" />
40 <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\ARM64\wixnative.exe" RuntimeIdentifier="win-arm64" /> 40 <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\ARM64\wixnative.exe" RuntimeIdentifier="win-arm64" />
41 <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\ARM64\wixnative.pdb" RuntimeIdentifier="win-arm64" />
42 <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" RuntimeIdentifier="win-x64" /> 41 <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" RuntimeIdentifier="win-x64" />
43 <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.pdb" RuntimeIdentifier="win-x64" />
44 <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.exe" RuntimeIdentifier="win-x86" /> 42 <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.exe" RuntimeIdentifier="win-x86" />
45 <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.pdb" RuntimeIdentifier="win-x86" />
46 43
47 <!-- 44 <!--
48 This PackageReference is required so the RuntimeTargetsCopyLocalItems have a package (any package would 45 This PackageReference is required so the RuntimeTargetsCopyLocalItems have a package (any package would