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.
Rob Mensching committed
Feb 17, 2022 at 13:02 UTC
e103be995f566e42ea4cf91fda5dd0e940e5aabd
27 files changed
+71
-48
src/Directory.Build.props
+1
@@ -11,6 +11,7 @@
11
<ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
12
<RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</RootBuildFolder>
13
<RootPackagesFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\packages\))</RootPackagesFolder>
14
+ <PdbsFolder>$(RootBuildFolder)pdbs\$(Configuration)\</PdbsFolder>
15
<ArtifactsFolder>$(RootBuildFolder)artifacts\</ArtifactsFolder>
16
<ToolsFolder>$(RootBuildFolder).tools</ToolsFolder>
17
<PackageOutputPath>$(ArtifactsFolder)</PackageOutputPath>
src/Directory.Build.targets
-6
@@ -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. -->
3
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
-
5
<PropertyGroup>
6
<SigningToolFolder>$(ToolsFolder)</SigningToolFolder>
7
<SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe>
@@ -76,7 +71,6 @@
71
<NuspecProperties>$(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
72
<NuspecProperties>$(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl)</NuspecProperties>
73
<NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory)</NuspecProperties>
79
- <SymbolPackageFormat>snupkg</SymbolPackageFormat>
74
</PropertyGroup>
75
76
<Message Importance="$(GitInfoReportImportance)" Text="NuSpec info:
src/Directory.vcxproj.targets
+14
-4
@@ -1,8 +1,6 @@
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
-<!--
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
--->
3
+
4
<Project>
5
<PropertyGroup>
6
<PrepareForBuildDependsOn>
@@ -43,4 +41,16 @@
41
</ResourceCompile>
42
</ItemGroup>
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>
56
</Project>
src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
-2
@@ -11,8 +11,6 @@
11
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
12
<IncludeSymbols>true</IncludeSymbols>
13
<CreateDocumentationFile>true</CreateDocumentationFile>
14
- <!-- https://github.com/NuGet/Home/issues/10665 -->
15
- <NoWarn>$(NoWarn);NU5128</NoWarn>
14
</PropertyGroup>
15
16
<ItemGroup Condition=" '$(NCrunch)'=='' ">
src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
+1
@@ -25,6 +25,7 @@
25
<CharacterSet>Unicode</CharacterSet>
26
<CLRSupport>true</CLRSupport>
27
<SignOutput>false</SignOutput>
28
+ <IsWixTestProject>true</IsWixTestProject>
29
</PropertyGroup>
30
31
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
+1
@@ -24,6 +24,7 @@
24
<CharacterSet>Unicode</CharacterSet>
25
<CLRSupport>true</CLRSupport>
26
<SignOutput>false</SignOutput>
27
+ <IsWixTestProject>true</IsWixTestProject>
28
</PropertyGroup>
29
30
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+1
@@ -8,6 +8,7 @@
8
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
9
<SignOutput>false</SignOutput>
10
<RollForward>Major</RollForward>
11
+ <IsWixTestProject>true</IsWixTestProject>
12
</PropertyGroup>
13
14
<ItemGroup>
src/build_all.cmd
+6
@@ -58,6 +58,12 @@ call samples\samples.cmd %_C% || exit /b
58
59
call test\test.cmd %_C% || exit /b
60
61
+
62
+:: finalize build
63
+
64
+call internal\finalize.cmd %_C% || exit /b
65
+
66
+
67
goto LExit
68
69
:StartDeveloperCommandPrompt
src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
+1
@@ -32,6 +32,7 @@
32
<CharacterSet>Unicode</CharacterSet>
33
<CLRSupport>true</CLRSupport>
34
<SignOutput>false</SignOutput>
35
+ <IsWixTestProject>true</IsWixTestProject>
36
</PropertyGroup>
37
38
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj
+1
@@ -35,6 +35,7 @@
35
<ProjectSubSystem>Console</ProjectSubSystem>
36
<TargetName>Example.TestEngine</TargetName>
37
<CharacterSet>Unicode</CharacterSet>
38
+ <IsWixTestProject>true</IsWixTestProject>
39
</PropertyGroup>
40
41
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
-4
@@ -20,9 +20,5 @@
20
<file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
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" />
23
</files>
24
</package>
src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec
-3
@@ -17,8 +17,5 @@
17
<file src="$projectFolder$\$id$.targets" target="build" />
18
19
<file src="$id$.dll" target="tools" />
20
-
21
- <file src="..\x86\*.pdb" target="pdbs\x86" />
22
- <file src="..\x64\*.pdb" target="pdbs\x64" />
20
</files>
21
</package>
src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec
-4
@@ -17,9 +17,5 @@
17
<file src="$projectFolder$\$id$.targets" target="build" />
18
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" />
20
</files>
21
</package>
src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
-4
@@ -20,9 +20,5 @@
20
<file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
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" />
23
</files>
24
</package>
src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec
-4
@@ -17,9 +17,5 @@
17
<file src="$projectFolder$\$id$.targets" target="build" />
18
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" />
20
</files>
21
</package>
src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
-2
@@ -20,7 +20,5 @@
20
<file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
22
<file src="$id$.dll" target="tools" />
23
-
24
- <file src="..\x86\*.pdb" target="pdbs\x86" />
23
</files>
24
</package>
src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
-4
@@ -20,9 +20,5 @@
20
<file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
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" />
23
</files>
24
</package>
src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec
-2
@@ -17,7 +17,5 @@
17
<file src="$projectFolder$\$id$.targets" target="build" />
18
19
<file src="$id$.dll" target="tools" />
20
-
21
- <file src="..\x86\*.pdb" target="pdbs\x86" />
20
</files>
21
</package>
src/internal/SetBuildNumber/global.json.pp
+1
@@ -1,6 +1,7 @@
1
{
2
"msbuild-sdks": {
3
"Microsoft.Build.Traversal": "3.0.23",
4
+ "Microsoft.Build.NoTargets": "3.3.0",
5
"WixToolset.Sdk": "{packageversion}"
6
},
7
"sdk": {
src/internal/WixBuildFinalize/WixBuildFinalize.proj
new
+19
@@ -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>
src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
+1
@@ -33,6 +33,7 @@
33
<CLRSupport>true</CLRSupport>
34
<Description>WixBuildTools C++/CLI Test Support</Description>
35
<SignOutput>false</SignOutput>
36
+ <IsWixTestProject>true</IsWixTestProject>
37
</PropertyGroup>
38
39
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
src/internal/finalize.cmd
new
+14
@@ -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
+
11
+msbuild -Restore WixBuildFinalize\WixBuildFinalize.proj -p:Configuration=%_C% -nologo || exit /b
12
+
13
+@popd
14
+@endlocal
src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+1
@@ -32,6 +32,7 @@
32
<CharacterSet>Unicode</CharacterSet>
33
<CLRSupport>true</CLRSupport>
34
<SignOutput>false</SignOutput>
35
+ <IsWixTestProject>true</IsWixTestProject>
36
</PropertyGroup>
37
38
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj
+9
-1
@@ -1,5 +1,6 @@
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 DefaultTargets="Build" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
<ItemGroup Label="ProjectConfigurations">
6
<ProjectConfiguration Include="Debug|ARM64">
@@ -27,18 +28,23 @@
28
<Platform>x64</Platform>
29
</ProjectConfiguration>
30
</ItemGroup>
31
+
32
<PropertyGroup Label="Globals">
33
<ProjectGuid>{565E99AE-975F-4F26-8A6E-852603386A80}</ProjectGuid>
34
<ConfigurationType>DynamicLibrary</ConfigurationType>
35
<CharacterSet>Unicode</CharacterSet>
36
<TargetName>BafThmUtilTesting</TargetName>
37
<ProjectModuleDefinitionFile>BafThmUtilTesting.def</ProjectModuleDefinitionFile>
38
+ <IsWixTestProject>true</IsWixTestProject>
39
</PropertyGroup>
40
+
41
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
42
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
43
+
44
<PropertyGroup>
45
<ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries>
46
</PropertyGroup>
47
+
48
<ItemGroup>
49
<ClCompile Include="BafThmUtilTesting.cpp" />
50
<ClCompile Include="precomp.cpp">
@@ -54,10 +60,12 @@
60
<ItemGroup>
61
<None Include="BafThmUtilTesting.def" />
62
</ItemGroup>
63
+
64
<ItemGroup>
65
<PackageReference Include="WixToolset.Dutil" />
66
<PackageReference Include="WixToolset.BalUtil" />
67
<PackageReference Include="WixToolset.BootstrapperCore.Native" />
68
</ItemGroup>
69
+
70
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
63
-</Project>
\ No newline at end of file
71
+</Project>
src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj
-2
@@ -8,8 +8,6 @@
8
<DebugType>embedded</DebugType>
9
<Description>WiX Toolset Native Processing</Description>
10
<CreateDocumentationFile>true</CreateDocumentationFile>
11
- <!-- https://github.com/NuGet/Home/issues/10665 -->
12
- <NoWarn>$(NoWarn);NU5128</NoWarn>
11
</PropertyGroup>
12
13
<ItemGroup>
src/wix/WixToolset.Core.Native/WixToolset.Core.Native.nuspec
-3
@@ -33,10 +33,7 @@
33
<file src="$projectFolder$\..\wixnative\x64\mergemod.dll" target="runtimes\win-x64\native" />
34
35
<file src="..\ARM64\wixnative.exe" target="runtimes\win-arm64\native" />
36
- <file src="..\ARM64\wixnative.pdb" target="runtimes\win-arm64\native" />
36
<file src="..\x86\wixnative.exe" target="runtimes\win-x86\native" />
38
- <file src="..\x86\wixnative.pdb" target="runtimes\win-x86\native" />
37
<file src="..\x64\wixnative.exe" target="runtimes\win-x64\native" />
40
- <file src="..\x64\wixnative.pdb" target="runtimes\win-x64\native" />
38
</files>
39
</package>
src/wix/wix/wix.csproj
-3
@@ -38,11 +38,8 @@
38
<NativeLibrary Include="..\wixnative\x64\mergemod.dll" RuntimeIdentifier="win-x64" />
39
<NativeLibrary Include="..\wixnative\Win32\mergemod.dll" RuntimeIdentifier="win-x86" />
40
<NativeLibrary Include="$(BaseOutputPath)$(Configuration)\ARM64\wixnative.exe" RuntimeIdentifier="win-arm64" />
41
- <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\ARM64\wixnative.pdb" RuntimeIdentifier="win-arm64" />
41
<NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.exe" RuntimeIdentifier="win-x64" />
43
- <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x64\wixnative.pdb" RuntimeIdentifier="win-x64" />
42
<NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.exe" RuntimeIdentifier="win-x86" />
45
- <NativeLibrary Include="$(BaseOutputPath)$(Configuration)\x86\wixnative.pdb" RuntimeIdentifier="win-x86" />
43
44
<!--
45
This PackageReference is required so the RuntimeTargetsCopyLocalItems have a package (any package would