diff options
Diffstat (limited to 'src/api')
48 files changed, 408 insertions, 922 deletions
diff --git a/src/api/wix/Custom.Build.props b/src/api/Directory.Build.props index 889fb62e..9b11624c 100644 --- a/src/api/wix/Custom.Build.props +++ b/src/api/Directory.Build.props | |||
@@ -1,6 +1,10 @@ | |||
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. --> |
3 | |||
2 | <Project> | 4 | <Project> |
3 | <PropertyGroup Condition="'$(Configuration)'=='Release'"> | 5 | <PropertyGroup> |
4 | <TreatWarningsAsErrors>true</TreatWarningsAsErrors> | 6 | <SegmentName>api</SegmentName> |
5 | </PropertyGroup> | 7 | </PropertyGroup> |
8 | |||
9 | <Import Project="..\Directory.Build.props" /> | ||
6 | </Project> | 10 | </Project> |
diff --git a/src/api/api.cmd b/src/api/api.cmd new file mode 100644 index 00000000..e08c10aa --- /dev/null +++ b/src/api/api.cmd | |||
@@ -0,0 +1,43 @@ | |||
1 | @setlocal | ||
2 | @pushd %~dp0 | ||
3 | |||
4 | @set _C=Debug | ||
5 | :parse_args | ||
6 | @if /i "%1"=="release" set _C=Release& shift | ||
7 | @if not "%1"=="" shift & goto parse_args | ||
8 | |||
9 | @echo Building api %_C% | ||
10 | |||
11 | :: burn | ||
12 | |||
13 | nuget restore burn\api_burn.sln || exit /b | ||
14 | |||
15 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 burn\api_burn.sln || exit /b | ||
16 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 burn\api_burn.sln || exit /b | ||
17 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 burn\api_burn.sln || exit /b | ||
18 | |||
19 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 burn\api_burn.sln || exit /b | ||
20 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 burn\api_burn.sln || exit /b | ||
21 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 burn\api_burn.sln || exit /b | ||
22 | |||
23 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 burn\api_burn.sln || exit /b | ||
24 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 burn\api_burn.sln || exit /b | ||
25 | |||
26 | dotnet test -c %_C% --no-build burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b | ||
27 | |||
28 | msbuild -t:PackNative -p:Configuration=%_C% burn\balutil\balutil.vcxproj || exit /b | ||
29 | msbuild -t:PackNative -p:Configuration=%_C% burn\bextutil\bextutil.vcxproj || exit /b | ||
30 | msbuild -t:PackNative -Restore -p:Configuration=%_C% burn\WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj || exit /b | ||
31 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj || exit /b | ||
32 | |||
33 | |||
34 | :: wix | ||
35 | |||
36 | msbuild -Restore -p:Configuration=%_C% wix\api_wix.sln || exit /b | ||
37 | |||
38 | dotnet test -c %_C% --no-build wix\api_wix.sln || exit /b | ||
39 | |||
40 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wix\api_wix.sln || exit /b | ||
41 | |||
42 | @popd | ||
43 | @endlocal | ||
diff --git a/src/api/api.sln b/src/api/api.sln new file mode 100644 index 00000000..4bec2ec3 --- /dev/null +++ b/src/api/api.sln | |||
@@ -0,0 +1,208 @@ | |||
1 | | ||
2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
3 | # Visual Studio Version 16 | ||
4 | VisualStudioVersion = 16.6.30114.105 | ||
5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "wix\WixToolset.Data\WixToolset.Data.csproj", "{6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}" | ||
7 | EndProject | ||
8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Extensibility", "wix\WixToolset.Extensibility\WixToolset.Extensibility.csproj", "{0B5A9161-EDBB-4B60-AE97-24199BCF36A4}" | ||
9 | EndProject | ||
10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Data", "wix\test\WixToolsetTest.Data\WixToolsetTest.Data.csproj", "{D6A57B9F-CF8C-442B-A9CE-F05258AB0046}" | ||
11 | EndProject | ||
12 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wix", "wix", "{A2DB791A-F5A8-44F9-9225-2C8BE1936356}" | ||
13 | EndProject | ||
14 | Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "burn", "burn", "{E5E93B46-D1AD-4F00-B3C2-F459DC670302}" | ||
15 | EndProject | ||
16 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "burn\balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}" | ||
17 | EndProject | ||
18 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "burn\bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}" | ||
19 | EndProject | ||
20 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "burn\mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}" | ||
21 | EndProject | ||
22 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "burn\test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}" | ||
23 | EndProject | ||
24 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "burn\test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}" | ||
25 | EndProject | ||
26 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{17DA3E92-40C5-4328-9BA5-1FE459A13719}" | ||
27 | EndProject | ||
28 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{47029283-43EC-4F22-9417-A02B28594912}" | ||
29 | EndProject | ||
30 | Global | ||
31 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
32 | Debug|Any CPU = Debug|Any CPU | ||
33 | Debug|ARM64 = Debug|ARM64 | ||
34 | Debug|x64 = Debug|x64 | ||
35 | Debug|x86 = Debug|x86 | ||
36 | Release|Any CPU = Release|Any CPU | ||
37 | Release|ARM64 = Release|ARM64 | ||
38 | Release|x64 = Release|x64 | ||
39 | Release|x86 = Release|x86 | ||
40 | EndGlobalSection | ||
41 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
42 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
43 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
44 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
45 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
46 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
47 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|x64.Build.0 = Debug|Any CPU | ||
48 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
49 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Debug|x86.Build.0 = Debug|Any CPU | ||
50 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
51 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|Any CPU.Build.0 = Release|Any CPU | ||
52 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
53 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|ARM64.Build.0 = Release|Any CPU | ||
54 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|x64.ActiveCfg = Release|Any CPU | ||
55 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|x64.Build.0 = Release|Any CPU | ||
56 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|x86.ActiveCfg = Release|Any CPU | ||
57 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}.Release|x86.Build.0 = Release|Any CPU | ||
58 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
59 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
60 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
61 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
62 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
63 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|x64.Build.0 = Debug|Any CPU | ||
64 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
65 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Debug|x86.Build.0 = Debug|Any CPU | ||
66 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
67 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|Any CPU.Build.0 = Release|Any CPU | ||
68 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
69 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|ARM64.Build.0 = Release|Any CPU | ||
70 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|x64.ActiveCfg = Release|Any CPU | ||
71 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|x64.Build.0 = Release|Any CPU | ||
72 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|x86.ActiveCfg = Release|Any CPU | ||
73 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4}.Release|x86.Build.0 = Release|Any CPU | ||
74 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
75 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
76 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
77 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
78 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
79 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|x64.Build.0 = Debug|Any CPU | ||
80 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
81 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Debug|x86.Build.0 = Debug|Any CPU | ||
82 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
83 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|Any CPU.Build.0 = Release|Any CPU | ||
84 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
85 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|ARM64.Build.0 = Release|Any CPU | ||
86 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|x64.ActiveCfg = Release|Any CPU | ||
87 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|x64.Build.0 = Release|Any CPU | ||
88 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|x86.ActiveCfg = Release|Any CPU | ||
89 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046}.Release|x86.Build.0 = Release|Any CPU | ||
90 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
91 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
92 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||
93 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM64.Build.0 = Debug|ARM64 | ||
94 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x64.ActiveCfg = Debug|x64 | ||
95 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x64.Build.0 = Debug|x64 | ||
96 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x86.ActiveCfg = Debug|Win32 | ||
97 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x86.Build.0 = Debug|Win32 | ||
98 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
99 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM64.ActiveCfg = Release|ARM64 | ||
100 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM64.Build.0 = Release|ARM64 | ||
101 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.ActiveCfg = Release|x64 | ||
102 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.Build.0 = Release|x64 | ||
103 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.ActiveCfg = Release|Win32 | ||
104 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.Build.0 = Release|Win32 | ||
105 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
106 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
107 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||
108 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM64.Build.0 = Debug|ARM64 | ||
109 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x64.ActiveCfg = Debug|x64 | ||
110 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x64.Build.0 = Debug|x64 | ||
111 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x86.ActiveCfg = Debug|Win32 | ||
112 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x86.Build.0 = Debug|Win32 | ||
113 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
114 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM64.ActiveCfg = Release|ARM64 | ||
115 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM64.Build.0 = Release|ARM64 | ||
116 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x64.ActiveCfg = Release|x64 | ||
117 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x64.Build.0 = Release|x64 | ||
118 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x86.ActiveCfg = Release|Win32 | ||
119 | {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x86.Build.0 = Release|Win32 | ||
120 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
121 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
122 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||
123 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM64.Build.0 = Debug|ARM64 | ||
124 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x64.ActiveCfg = Debug|x64 | ||
125 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x64.Build.0 = Debug|x64 | ||
126 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x86.ActiveCfg = Debug|Win32 | ||
127 | {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x86.Build.0 = Debug|Win32 | ||
128 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
129 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM64.ActiveCfg = Release|ARM64 | ||
130 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM64.Build.0 = Release|ARM64 | ||
131 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.ActiveCfg = Release|x64 | ||
132 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.Build.0 = Release|x64 | ||
133 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.ActiveCfg = Release|Win32 | ||
134 | {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.Build.0 = Release|Win32 | ||
135 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
136 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
137 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|ARM64.ActiveCfg = Debug|Win32 | ||
138 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x64.ActiveCfg = Debug|Win32 | ||
139 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x86.ActiveCfg = Debug|Win32 | ||
140 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Debug|x86.Build.0 = Debug|Win32 | ||
141 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
142 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|ARM64.ActiveCfg = Release|Win32 | ||
143 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x64.ActiveCfg = Release|Win32 | ||
144 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x86.ActiveCfg = Release|Win32 | ||
145 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}.Release|x86.Build.0 = Release|Win32 | ||
146 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|Any CPU.ActiveCfg = Debug|Win32 | ||
147 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|Any CPU.Build.0 = Debug|Win32 | ||
148 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|ARM64.ActiveCfg = Debug|Win32 | ||
149 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|x64.ActiveCfg = Debug|Win32 | ||
150 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|x86.ActiveCfg = Debug|Win32 | ||
151 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Debug|x86.Build.0 = Debug|Win32 | ||
152 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|Any CPU.ActiveCfg = Release|Win32 | ||
153 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|ARM64.ActiveCfg = Release|Win32 | ||
154 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|x64.ActiveCfg = Release|Win32 | ||
155 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|x86.ActiveCfg = Release|Win32 | ||
156 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9}.Release|x86.Build.0 = Release|Win32 | ||
157 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
158 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
159 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
160 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
161 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
162 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|x64.Build.0 = Debug|Any CPU | ||
163 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
164 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Debug|x86.Build.0 = Debug|Any CPU | ||
165 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
166 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|Any CPU.Build.0 = Release|Any CPU | ||
167 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
168 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|ARM64.Build.0 = Release|Any CPU | ||
169 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|x64.ActiveCfg = Release|Any CPU | ||
170 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|x64.Build.0 = Release|Any CPU | ||
171 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|x86.ActiveCfg = Release|Any CPU | ||
172 | {17DA3E92-40C5-4328-9BA5-1FE459A13719}.Release|x86.Build.0 = Release|Any CPU | ||
173 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
174 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
175 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|ARM64.ActiveCfg = Debug|Any CPU | ||
176 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|ARM64.Build.0 = Debug|Any CPU | ||
177 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
178 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|x64.Build.0 = Debug|Any CPU | ||
179 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
180 | {47029283-43EC-4F22-9417-A02B28594912}.Debug|x86.Build.0 = Debug|Any CPU | ||
181 | {47029283-43EC-4F22-9417-A02B28594912}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
182 | {47029283-43EC-4F22-9417-A02B28594912}.Release|Any CPU.Build.0 = Release|Any CPU | ||
183 | {47029283-43EC-4F22-9417-A02B28594912}.Release|ARM64.ActiveCfg = Release|Any CPU | ||
184 | {47029283-43EC-4F22-9417-A02B28594912}.Release|ARM64.Build.0 = Release|Any CPU | ||
185 | {47029283-43EC-4F22-9417-A02B28594912}.Release|x64.ActiveCfg = Release|Any CPU | ||
186 | {47029283-43EC-4F22-9417-A02B28594912}.Release|x64.Build.0 = Release|Any CPU | ||
187 | {47029283-43EC-4F22-9417-A02B28594912}.Release|x86.ActiveCfg = Release|Any CPU | ||
188 | {47029283-43EC-4F22-9417-A02B28594912}.Release|x86.Build.0 = Release|Any CPU | ||
189 | EndGlobalSection | ||
190 | GlobalSection(SolutionProperties) = preSolution | ||
191 | HideSolutionNode = FALSE | ||
192 | EndGlobalSection | ||
193 | GlobalSection(NestedProjects) = preSolution | ||
194 | {6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60} = {A2DB791A-F5A8-44F9-9225-2C8BE1936356} | ||
195 | {0B5A9161-EDBB-4B60-AE97-24199BCF36A4} = {A2DB791A-F5A8-44F9-9225-2C8BE1936356} | ||
196 | {D6A57B9F-CF8C-442B-A9CE-F05258AB0046} = {A2DB791A-F5A8-44F9-9225-2C8BE1936356} | ||
197 | {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
198 | {06027492-1CB9-48BC-B31E-C1F9356ED07E} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
199 | {665E0441-17F9-4105-B202-EDF274657F6E} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
200 | {9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
201 | {B69E6422-49B0-4E28-92F9-B8A7410A6ED9} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
202 | {17DA3E92-40C5-4328-9BA5-1FE459A13719} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
203 | {47029283-43EC-4F22-9417-A02B28594912} = {E5E93B46-D1AD-4F00-B3C2-F459DC670302} | ||
204 | EndGlobalSection | ||
205 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
206 | SolutionGuid = {43BCDC9F-5870-4B64-8363-FF28585020ED} | ||
207 | EndGlobalSection | ||
208 | EndGlobal | ||
diff --git a/src/api/burn/Directory.Build.props b/src/api/burn/Directory.Build.props deleted file mode 100644 index fb34d54e..00000000 --- a/src/api/burn/Directory.Build.props +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
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 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.props | ||
5 | then update all of the repos. | ||
6 | --> | ||
7 | <Project> | ||
8 | <PropertyGroup> | ||
9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | ||
11 | |||
12 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | ||
13 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | ||
14 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> | ||
15 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> | ||
16 | |||
17 | <Authors>WiX Toolset Team</Authors> | ||
18 | <Company>WiX Toolset</Company> | ||
19 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> | ||
20 | <PackageLicenseExpression>MS-RL</PackageLicenseExpression> | ||
21 | <Product>WiX Toolset</Product> | ||
22 | </PropertyGroup> | ||
23 | |||
24 | <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | ||
25 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
26 | </Project> | ||
diff --git a/src/api/burn/Directory.Build.targets b/src/api/burn/Directory.Build.targets deleted file mode 100644 index 44701fb6..00000000 --- a/src/api/burn/Directory.Build.targets +++ /dev/null | |||
@@ -1,73 +0,0 @@ | |||
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 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.targets | ||
5 | then update all of the repos. | ||
6 | --> | ||
7 | <Project> | ||
8 | <PropertyGroup> | ||
9 | <SigningToolFolder>$(BaseOutputPath)obj\.tools</SigningToolFolder> | ||
10 | <SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe> | ||
11 | <SigningFilelist>$(SigningToolFolder)\empty-filelist.txt</SigningFilelist> | ||
12 | <SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration> | ||
13 | </PropertyGroup> | ||
14 | |||
15 | <PropertyGroup> | ||
16 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
17 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
18 | </PropertyGroup> | ||
19 | |||
20 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
21 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
22 | <PropertyGroup> | ||
23 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
24 | |||
25 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
26 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(MSBuildProjectDirectory)</NuspecBasePath> | ||
27 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors="$(Authors)";Configuration=$(Configuration);Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"</NuspecProperties> | ||
28 | <NuspecProperties>$(NuspecProperties);Version=$(NPMPackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
29 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
30 | <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
31 | </PropertyGroup> | ||
32 | </Target> | ||
33 | |||
34 | <Target Name="PackNative" DependsOnTargets="GetBuildVersion;SetNuspecProperties" | ||
35 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
36 | |||
37 | <Exec Command='nuget pack $(NuspecFile) -OutputDirectory "$(BaseOutputPath)$(Configuration)" -BasePath "$(NuspecBasePath)" -Properties $(NuspecProperties)' | ||
38 | WorkingDirectory="$(MSBuildProjectDirectory)" /> | ||
39 | |||
40 | <ItemGroup> | ||
41 | <NuGetPackOutput Include="$(BaseOutputPath)$(Configuration)\**\$(PackageId)*.nupkg" /> | ||
42 | </ItemGroup> | ||
43 | </Target> | ||
44 | |||
45 | <Target Name="_GetSignClient" | ||
46 | Condition=" !Exists('$(SigningToolExe)') "> | ||
47 | |||
48 | <WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' /> | ||
49 | |||
50 | <Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' /> | ||
51 | </Target> | ||
52 | |||
53 | <Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild" | ||
54 | Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and | ||
55 | ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))"> | ||
56 | |||
57 | <Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' | ||
58 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | ||
59 | </Target> | ||
60 | |||
61 | <Target Name="SignNupkg" DependsOnTargets="_GetSignClient" AfterTargets="Pack;PackNative" | ||
62 | Condition=" '$(SigningUser)'!='' and '@(NuGetPackOutput)'!='' and '$(SignNupkg)'!='false' "> | ||
63 | <ItemGroup> | ||
64 | <SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " /> | ||
65 | </ItemGroup> | ||
66 | |||
67 | <Exec Command='"$(SigningToolExe)" sign -i "@(SigningNupkgs->'%(Identity)')" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"' | ||
68 | WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" /> | ||
69 | </Target> | ||
70 | |||
71 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
72 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
73 | </Project> | ||
diff --git a/src/api/burn/Directory.csproj.props b/src/api/burn/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/api/burn/Directory.csproj.props +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
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 | <!-- | ||
3 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props | ||
4 | then update all of the repos. | ||
5 | --> | ||
6 | <Project> | ||
7 | <PropertyGroup> | ||
8 | <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> | ||
9 | <SignAssembly>true</SignAssembly> | ||
10 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
11 | <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass> | ||
12 | </PropertyGroup> | ||
13 | </Project> | ||
diff --git a/src/api/burn/Directory.vcxproj.props b/src/api/burn/Directory.vcxproj.props deleted file mode 100644 index 9ea7071b..00000000 --- a/src/api/burn/Directory.vcxproj.props +++ /dev/null | |||
@@ -1,115 +0,0 @@ | |||
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> | ||
5 | <PropertyGroup> | ||
6 | <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform> | ||
7 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir> | ||
8 | <OutDir>$(OutputPath)$(Platform)\</OutDir> | ||
9 | |||
10 | <!-- NBGV properties --> | ||
11 | <AssemblyCompany>$(Company)</AssemblyCompany> | ||
12 | <AssemblyCopyright>$(Copyright)</AssemblyCopyright> | ||
13 | |||
14 | <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> | ||
15 | <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker> | ||
16 | </PropertyGroup> | ||
17 | |||
18 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> | ||
19 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
20 | </PropertyGroup> | ||
21 | |||
22 | <PropertyGroup> | ||
23 | <CodeAnalysisRuleSet Condition=" Exists('$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset') ">$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet> | ||
24 | </PropertyGroup> | ||
25 | |||
26 | <ItemDefinitionGroup> | ||
27 | <ClCompile> | ||
28 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | ||
29 | <WarningLevel>Level4</WarningLevel> | ||
30 | <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
31 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
32 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
33 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | ||
34 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> | ||
35 | <TreatWarningAsError>true</TreatWarningAsError> | ||
36 | <ExceptionHandling>false</ExceptionHandling> | ||
37 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | ||
38 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> | ||
39 | <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) > 4 ">true</MultiProcessorCompilation> | ||
40 | </ClCompile> | ||
41 | <ResourceCompile> | ||
42 | <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
43 | <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
44 | </ResourceCompile> | ||
45 | <Lib> | ||
46 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
47 | </Lib> | ||
48 | <Link> | ||
49 | <SubSystem>$(ProjectSubSystem)</SubSystem> | ||
50 | <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile> | ||
51 | <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint> | ||
52 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
53 | <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
54 | <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
55 | <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions> | ||
56 | </Link> | ||
57 | </ItemDefinitionGroup> | ||
58 | |||
59 | <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'"> | ||
60 | <ClCompile> | ||
61 | <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> | ||
62 | </ClCompile> | ||
63 | </ItemDefinitionGroup> | ||
64 | <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' "> | ||
65 | <ClCompile> | ||
66 | <CallingConvention>CDecl</CallingConvention> | ||
67 | </ClCompile> | ||
68 | </ItemDefinitionGroup> | ||
69 | <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' "> | ||
70 | <ClCompile> | ||
71 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
72 | <OmitDefaultLibName>true</OmitDefaultLibName> | ||
73 | <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> | ||
74 | </ClCompile> | ||
75 | </ItemDefinitionGroup> | ||
76 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' "> | ||
77 | <ClCompile> | ||
78 | <Optimization>Disabled</Optimization> | ||
79 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
80 | <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
81 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
82 | </ClCompile> | ||
83 | </ItemDefinitionGroup> | ||
84 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> | ||
85 | <ClCompile> | ||
86 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
87 | <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> | ||
88 | </ClCompile> | ||
89 | </ItemDefinitionGroup> | ||
90 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> | ||
91 | <ClCompile> | ||
92 | <Optimization>MinSpace</Optimization> | ||
93 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
94 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
95 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
96 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
97 | </ClCompile> | ||
98 | <Link> | ||
99 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
100 | <OptimizeReferences>true</OptimizeReferences> | ||
101 | </Link> | ||
102 | </ItemDefinitionGroup> | ||
103 | <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> | ||
104 | <ClCompile> | ||
105 | <BasicRuntimeChecks></BasicRuntimeChecks> | ||
106 | <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> | ||
107 | </ClCompile> | ||
108 | </ItemDefinitionGroup> | ||
109 | <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' "> | ||
110 | <Link> | ||
111 | <KeyFile>$(LinkKeyFile)</KeyFile> | ||
112 | <DelaySign>$(LinkDelaySign)</DelaySign> | ||
113 | </Link> | ||
114 | </ItemDefinitionGroup> | ||
115 | </Project> | ||
diff --git a/src/api/burn/NativeMultiTargeting.Build.props b/src/api/burn/NativeMultiTargeting.Build.props deleted file mode 100644 index 1ff46559..00000000 --- a/src/api/burn/NativeMultiTargeting.Build.props +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
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> | ||
5 | <!-- Overrides the standard Cpp.Build.props to include the PlatformToolset in the output path. --> | ||
6 | <PropertyGroup> | ||
7 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\</IntDir> | ||
8 | <OutDir>$(OutputPath)$(PlatformToolset)\$(PlatformTarget)\</OutDir> | ||
9 | </PropertyGroup> | ||
10 | </Project> | ||
diff --git a/src/api/burn/README.md b/src/api/burn/README.md deleted file mode 100644 index 380bbda3..00000000 --- a/src/api/burn/README.md +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | # balutil | ||
2 | balutil.lib - WiX Toolset Bootstrapper Application Layer native utility library | ||
diff --git a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec index b10b75d2..d86bb3cd 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.nuspec | |||
@@ -1,19 +1,20 @@ | |||
1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
2 | <package > | 2 | <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> |
3 | <metadata> | 3 | <metadata minClientVersion="4.0"> |
4 | <id>$id$</id> | 4 | <id>$id$</id> |
5 | <version>$version$</version> | 5 | <version>$version$</version> |
6 | <authors>WiX Toolset Team</authors> | 6 | <title>$title$</title> |
7 | <owners>WiX Toolset Team</owners> | 7 | <description>$description$</description> |
8 | <authors>$authors$</authors> | ||
8 | <license type="expression">MS-RL</license> | 9 | <license type="expression">MS-RL</license> |
9 | <projectUrl>https://github.com/wixtoolset/BootstrapperCore</projectUrl> | ||
10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> |
11 | <description>$description$</description> | ||
12 | <copyright>$copyright$</copyright> | 11 | <copyright>$copyright$</copyright> |
12 | <projectUrl>$projectUrl$</projectUrl> | ||
13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | ||
13 | </metadata> | 14 | </metadata> |
14 | 15 | ||
15 | <files> | 16 | <files> |
16 | <file src="build\$id$.props" target="build\" /> | 17 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
17 | <file src="inc\*" target="build\native\include" /> | 18 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
18 | </files> | 19 | </files> |
19 | </package> | 20 | </package> |
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 0899bdcf..0bd374c7 100644 --- a/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj +++ b/src/api/burn/WixToolset.BootstrapperCore.Native/WixToolset.BootstrapperCore.Native.proj | |||
@@ -1,19 +1,19 @@ | |||
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 | ||
4 | 4 | <Project Sdk="Microsoft.Build.NoTargets/3.0.4"> | |
5 | <Project ToolsVersion="4.0" DefaultTargets="Pack" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
6 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFramework>netcoreapp3.1</TargetFramework> | ||
7 | <PackageId>WixToolset.BootstrapperCore.Native</PackageId> | 7 | <PackageId>WixToolset.BootstrapperCore.Native</PackageId> |
8 | <Description>WiX Bootstrapper native interfaces</Description> | 8 | <Description>WiX Bootstrapper native interfaces</Description> |
9 | </PropertyGroup> | 9 | </PropertyGroup> |
10 | 10 | ||
11 | <Target Name="PackNative" DependsOnTargets="GetBuildVersion"> | 11 | <ItemGroup> |
12 | <Exec Command='nuget pack $(PackageId).nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Id=$(PackageId);Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)"' /> | 12 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
13 | </Target> | 13 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
14 | 14 | </ItemGroup> | |
15 | <Import Project="..\Directory.Build.props" /> | ||
16 | <!-- <Import Project="..\Directory.Build.targets" /> --> | ||
17 | 15 | ||
18 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | 16 | <Target Name="Pack" |
17 | DependsOnTargets="GitVersion;PackNative" | ||
18 | BeforeTargets="AfterBuild" /> | ||
19 | </Project> | 19 | </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 2bd7ca80..ce8c7105 100644 --- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj +++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj | |||
@@ -13,47 +13,16 @@ | |||
13 | <CreateDocumentationFile>true</CreateDocumentationFile> | 13 | <CreateDocumentationFile>true</CreateDocumentationFile> |
14 | </PropertyGroup> | 14 | </PropertyGroup> |
15 | 15 | ||
16 | <ItemGroup> | 16 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
17 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 17 | <ProjectReference Include="..\mbanative\mbanative.vcxproj" ReferenceOutputAssembly="false" PrivateAssets="All" Properties="Platform=x86" /> |
18 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | ||
19 | </ItemGroup> | 18 | </ItemGroup> |
20 | 19 | ||
21 | <PropertyGroup> | 20 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
22 | <NuspecBasePath>$(OutputPath)</NuspecBasePath> | 21 | <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" /> |
23 | <NativeFileListPath Condition=" '$(NCrunch)'=='' ">$(MSBuildProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath> | 22 | <None Include="$(BaseOutputPath)$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" /> |
24 | <NativeFileListPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalProjectDir)..\..\build\obj\$(ProjectName)\$(Configuration)\NativeFileList.txt</NativeFileListPath> | 23 | </ItemGroup> |
25 | </PropertyGroup> | 24 | <ItemGroup Condition=" '$(NCrunch)'=='1' "> |
26 | 25 | <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.dll" CopyToOutputDirectory="PreserveNewest" /> | |
27 | <Target Name="BuildMbaNative" BeforeTargets="GetCopyToOutputDirectoryItems" Condition=" '$(NCrunch)'=='' "> | 26 | <None Include="$(NCrunchOriginalProjectDir)..\..\build\$(SegmentName)\$(Configuration)\v142\x86\mbanative.pdb" CopyToOutputDirectory="PreserveNewest" /> |
28 | <MSBuild Projects="..\mbanative\mbanative.vcxproj" Properties="Platform=Win32" Targets="Build;BuiltProjectOutputGroup;ContentFilesProjectOutputGroup;DebugSymbolsProjectOutputGroup"> | 27 | </ItemGroup> |
29 | <Output TaskParameter="TargetOutputs" ItemName="_NativeProjectOutput" /> | ||
30 | </MSBuild> | ||
31 | |||
32 | <WriteLinesToFile File="$(NativeFileListPath)" Lines="@(_NativeProjectOutput)" Overwrite="true" /> | ||
33 | |||
34 | <ItemGroup> | ||
35 | <FileWrites Include="$(NativeFileListPath)" /> | ||
36 | |||
37 | <AllItemsFullPathWithTargetPath Include="@(_NativeProjectOutput->'%(FullPath)')"> | ||
38 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | ||
39 | <TargetPath>%(Filename)%(Extension)</TargetPath> | ||
40 | </AllItemsFullPathWithTargetPath> | ||
41 | </ItemGroup> | ||
42 | </Target> | ||
43 | |||
44 | <Target Name="NCrunchCopyNative" AfterTargets="AfterBuild" Condition=" '$(NCrunch)'=='1' "> | ||
45 | <ReadLinesFromFile File="$(NativeFileListPath)"> | ||
46 | <Output TaskParameter="Lines" ItemName="_NCrunchNativeProjectOutput" /> | ||
47 | </ReadLinesFromFile> | ||
48 | |||
49 | <Error Text="You must build $(MSBuildProjectName) to create the referenced native projects. Once built, 'Reload and rebuild' the project in the NCrunch Tests. The $(NativeFileListPath) file must not be empty." Condition=" '@(_NCrunchNativeProjectOutput)'=='' " /> | ||
50 | |||
51 | <Copy SourceFiles="@(_NCrunchNativeProjectOutput)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true"> | ||
52 | <Output TaskParameter="CopiedFiles" ItemName="_NCrunchNativeCopied" /> | ||
53 | </Copy> | ||
54 | |||
55 | <ItemGroup> | ||
56 | <FileWrites Include="@(_NCrunchNativeCopied)" /> | ||
57 | </ItemGroup> | ||
58 | </Target> | ||
59 | </Project> | 28 | </Project> |
diff --git a/src/api/burn/balutil.sln b/src/api/burn/api_burn.sln index cae580f3..858272fb 100644 --- a/src/api/burn/balutil.sln +++ b/src/api/burn/api_burn.sln | |||
@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
3 | # Visual Studio Version 16 | 3 | # Visual Studio Version 16 |
4 | VisualStudioVersion = 16.0.29503.13 | 4 | VisualStudioVersion = 16.0.29503.13 |
5 | MinimumVisualStudioVersion = 15.0.26124.0 | 5 | MinimumVisualStudioVersion = 15.0.26124.0 |
6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "src\balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "balutil", "balutil\balutil.vcxproj", "{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}" |
7 | EndProject | 7 | EndProject |
8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "src\bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}" | 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bextutil", "bextutil\bextutil.vcxproj", "{06027492-1CB9-48BC-B31E-C1F9356ED07E}" |
9 | EndProject | 9 | EndProject |
10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}" | 10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{E7E1841E-A58E-4901-B9CA-4845B807D45F}" |
11 | EndProject | 11 | EndProject |
12 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "src\mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}" | 12 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbanative", "mbanative\mbanative.vcxproj", "{665E0441-17F9-4105-B202-EDF274657F6E}" |
13 | EndProject | 13 | EndProject |
14 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{F54997F7-10D7-409B-B9F2-DB546490EDC0}" | 14 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{F54997F7-10D7-409B-B9F2-DB546490EDC0}" |
15 | EndProject | 15 | EndProject |
16 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "src\test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}" | 16 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "test\BalUtilUnitTest\BalUtilUnitTest.vcxproj", "{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}" |
17 | EndProject | 17 | EndProject |
18 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "src\test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}" | 18 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}" |
19 | EndProject | 19 | EndProject |
20 | Global | 20 | Global |
21 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 21 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
diff --git a/src/api/burn/appveyor.cmd b/src/api/burn/appveyor.cmd deleted file mode 100644 index 26f75243..00000000 --- a/src/api/burn/appveyor.cmd +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | @setlocal | ||
2 | @pushd %~dp0 | ||
3 | @set _C=Release | ||
4 | @if /i "%1"=="debug" set _C=Debug | ||
5 | |||
6 | nuget restore || exit /b | ||
7 | |||
8 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 || exit /b | ||
9 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 || exit /b | ||
10 | |||
11 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 || exit /b | ||
12 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 || exit /b | ||
13 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 || exit /b | ||
14 | |||
15 | msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 || exit /b | ||
16 | msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 || exit /b | ||
17 | msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b | ||
18 | |||
19 | dotnet test -c %_C% --no-build src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b | ||
20 | |||
21 | msbuild -t:PackNative -p:Configuration=%_C% src\balutil\balutil.vcxproj || exit /b | ||
22 | msbuild -t:PackNative -p:Configuration=%_C% src\bextutil\bextutil.vcxproj || exit /b | ||
23 | msbuild -t:PackNative -p:Configuration=%_C% src\WixToolset.BootstrapperCore.Native\WixToolset.BootstrapperCore.Native.proj || exit /b | ||
24 | msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true src\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj || exit /b | ||
25 | |||
26 | @popd | ||
27 | @endlocal \ No newline at end of file | ||
diff --git a/src/api/burn/appveyor.yml b/src/api/burn/appveyor.yml deleted file mode 100644 index e4d25586..00000000 --- a/src/api/burn/appveyor.yml +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
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 | # | ||
3 | # Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml | ||
4 | # then update all of the repos. | ||
5 | |||
6 | branches: | ||
7 | only: | ||
8 | - master | ||
9 | - develop | ||
10 | |||
11 | image: Visual Studio 2019 | ||
12 | |||
13 | version: 0.0.0.{build} | ||
14 | configuration: Release | ||
15 | |||
16 | environment: | ||
17 | DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true | ||
18 | DOTNET_CLI_TELEMETRY_OPTOUT: 1 | ||
19 | NUGET_XMLDOC_MODE: skip | ||
20 | |||
21 | build_script: | ||
22 | - appveyor.cmd | ||
23 | |||
24 | test: off | ||
25 | |||
26 | pull_requests: | ||
27 | do_not_increment_build_number: true | ||
28 | |||
29 | nuget: | ||
30 | disable_publish_on_pr: true | ||
31 | |||
32 | skip_branch_with_pr: true | ||
33 | skip_tags: true | ||
34 | |||
35 | artifacts: | ||
36 | - path: build\Release\**\*.nupkg | ||
37 | name: nuget | ||
38 | |||
39 | notifications: | ||
40 | - provider: Slack | ||
41 | incoming_webhook: | ||
42 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec index e38362ec..82509140 100644 --- a/src/api/burn/balutil/balutil.nuspec +++ b/src/api/burn/balutil/balutil.nuspec | |||
@@ -1,31 +1,32 @@ | |||
1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
2 | <package > | 2 | <package > |
3 | <metadata> | 3 | <metadata minClientVersion="4.0"> |
4 | <id>$id$</id> | 4 | <id>$id$</id> |
5 | <version>$version$</version> | 5 | <version>$version$</version> |
6 | <title>$title$</title> | ||
7 | <description>$description$</description> | ||
6 | <authors>$authors$</authors> | 8 | <authors>$authors$</authors> |
7 | <owners>$authors$</owners> | ||
8 | <license type="expression">MS-RL</license> | 9 | <license type="expression">MS-RL</license> |
9 | <projectUrl>https://github.com/wixtoolset/balutil</projectUrl> | ||
10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> |
11 | <description>$description$</description> | ||
12 | <copyright>$copyright$</copyright> | 11 | <copyright>$copyright$</copyright> |
12 | <projectUrl>$projectUrl$</projectUrl> | ||
13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | ||
13 | <dependencies> | 14 | <dependencies> |
14 | <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" /> | 15 | <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" /> |
15 | <dependency id="WixToolset.DUtil" version="[4,5)" /> | 16 | <dependency id="WixToolset.DUtil" version="[4,5)" /> |
16 | </dependencies> | 17 | </dependencies> |
17 | </metadata> | 18 | </metadata> |
18 | 19 | ||
19 | <files> | 20 | <files> |
20 | <file src="build\$id$.props" target="build\" /> | 21 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
21 | <file src="inc\*" target="build\native\include" /> | 22 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
22 | <file src="..\..\build\$configuration$\v140\x86\balutil.lib" target="build\native\v140\x86" /> | 23 | <!-- <file src="..\..\v140\x86\balutil.lib" target="build\native\v140\x86" /> |
23 | <file src="..\..\build\$configuration$\v140\x64\balutil.lib" target="build\native\v140\x64" /> | 24 | <file src="..\..\v140\x64\balutil.lib" target="build\native\v140\x64" /> |
24 | <file src="..\..\build\$configuration$\v141\x86\balutil.lib" target="build\native\v141\x86" /> | 25 | <file src="..\..\v141\x86\balutil.lib" target="build\native\v141\x86" /> |
25 | <file src="..\..\build\$configuration$\v141\x64\balutil.lib" target="build\native\v141\x64" /> | 26 | <file src="..\..\v141\x64\balutil.lib" target="build\native\v141\x64" /> |
26 | <file src="..\..\build\$configuration$\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" /> | 27 | <file src="..\..\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" /> --> |
27 | <file src="..\..\build\$configuration$\v142\x86\balutil.lib" target="build\native\v142\x86" /> | 28 | <file src="..\..\v142\x86\balutil.lib" target="build\native\v142\x86" /> |
28 | <file src="..\..\build\$configuration$\v142\x64\balutil.lib" target="build\native\v142\x64" /> | 29 | <file src="..\..\v142\x64\balutil.lib" target="build\native\v142\x64" /> |
29 | <file src="..\..\build\$configuration$\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" /> | 30 | <file src="..\..\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" /> |
30 | </files> | 31 | </files> |
31 | </package> | 32 | </package> |
diff --git a/src/api/burn/balutil/balutil.vcxproj b/src/api/burn/balutil/balutil.vcxproj index ab33f159..8f763324 100644 --- a/src/api/burn/balutil/balutil.vcxproj +++ b/src/api/burn/balutil/balutil.vcxproj | |||
@@ -2,9 +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 DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
7 | |||
8 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
9 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
10 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
@@ -44,8 +41,7 @@ | |||
44 | 41 | ||
45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
46 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
47 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | 44 | <Import Project="..\..\..\NativeMultiTargeting.Build.props" /> |
48 | <Import Project="..\NativeMultiTargeting.Build.props" /> | ||
49 | 45 | ||
50 | <ImportGroup Label="ExtensionSettings"> | 46 | <ImportGroup Label="ExtensionSettings"> |
51 | </ImportGroup> | 47 | </ImportGroup> |
@@ -54,7 +50,7 @@ | |||
54 | </ImportGroup> | 50 | </ImportGroup> |
55 | 51 | ||
56 | <PropertyGroup> | 52 | <PropertyGroup> |
57 | <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\inc</ProjectAdditionalIncludeDirectories> | 53 | <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories> |
58 | </PropertyGroup> | 54 | </PropertyGroup> |
59 | 55 | ||
60 | <ItemGroup> | 56 | <ItemGroup> |
@@ -86,16 +82,11 @@ | |||
86 | </ItemGroup> | 82 | </ItemGroup> |
87 | 83 | ||
88 | <ItemGroup> | 84 | <ItemGroup> |
89 | <None Include="packages.config" /> | 85 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
86 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
87 | |||
88 | <PackageReference Include="WixToolset.DUtil" /> | ||
90 | </ItemGroup> | 89 | </ItemGroup> |
91 | 90 | ||
92 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 91 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
93 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 92 | </Project> |
94 | <PropertyGroup> | ||
95 | <ErrorText>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}.</ErrorText> | ||
96 | </PropertyGroup> | ||
97 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
98 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
99 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
100 | </Target> | ||
101 | </Project> \ No newline at end of file | ||
diff --git a/src/api/burn/balutil/packages.config b/src/api/burn/balutil/packages.config deleted file mode 100644 index 08ea3364..00000000 --- a/src/api/burn/balutil/packages.config +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <packages> | ||
3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
5 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
6 | </packages> \ No newline at end of file | ||
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec index 752dbb97..e75c4a43 100644 --- a/src/api/burn/bextutil/bextutil.nuspec +++ b/src/api/burn/bextutil/bextutil.nuspec | |||
@@ -1,31 +1,32 @@ | |||
1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
2 | <package > | 2 | <package > |
3 | <metadata> | 3 | <metadata minClientVersion="4.0"> |
4 | <id>$id$</id> | 4 | <id>$id$</id> |
5 | <version>$version$</version> | 5 | <version>$version$</version> |
6 | <title>$title$</title> | ||
7 | <description>$description$</description> | ||
6 | <authors>$authors$</authors> | 8 | <authors>$authors$</authors> |
7 | <owners>$authors$</owners> | ||
8 | <license type="expression">MS-RL</license> | 9 | <license type="expression">MS-RL</license> |
9 | <projectUrl>https://github.com/wixtoolset/balutil</projectUrl> | ||
10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> |
11 | <description>$description$</description> | ||
12 | <copyright>$copyright$</copyright> | 11 | <copyright>$copyright$</copyright> |
12 | <projectUrl>$projectUrl$</projectUrl> | ||
13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | ||
13 | <dependencies> | 14 | <dependencies> |
14 | <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" /> | 15 | <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" /> |
15 | <dependency id="WixToolset.DUtil" version="[4,5)" /> | 16 | <dependency id="WixToolset.DUtil" version="[4,5)" /> |
16 | </dependencies> | 17 | </dependencies> |
17 | </metadata> | 18 | </metadata> |
18 | 19 | ||
19 | <files> | 20 | <files> |
20 | <file src="build\$id$.props" target="build\" /> | 21 | <file src="$projectFolder$\build\$id$.props" target="build\" /> |
21 | <file src="inc\*" target="build\native\include" /> | 22 | <file src="$projectFolder$\inc\*" target="build\native\include" /> |
22 | <file src="..\..\build\$configuration$\v140\x86\bextutil.lib" target="build\native\v140\x86" /> | 23 | <file src="..\..\v140\x86\bextutil.lib" target="build\native\v140\x86" /> |
23 | <file src="..\..\build\$configuration$\v140\x64\bextutil.lib" target="build\native\v140\x64" /> | 24 | <file src="..\..\v140\x64\bextutil.lib" target="build\native\v140\x64" /> |
24 | <file src="..\..\build\$configuration$\v141\x86\bextutil.lib" target="build\native\v141\x86" /> | 25 | <file src="..\..\v141\x86\bextutil.lib" target="build\native\v141\x86" /> |
25 | <file src="..\..\build\$configuration$\v141\x64\bextutil.lib" target="build\native\v141\x64" /> | 26 | <file src="..\..\v141\x64\bextutil.lib" target="build\native\v141\x64" /> |
26 | <file src="..\..\build\$configuration$\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" /> | 27 | <file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" /> |
27 | <file src="..\..\build\$configuration$\v142\x86\bextutil.lib" target="build\native\v142\x86" /> | 28 | <file src="..\..\v142\x86\bextutil.lib" target="build\native\v142\x86" /> |
28 | <file src="..\..\build\$configuration$\v142\x64\bextutil.lib" target="build\native\v142\x64" /> | 29 | <file src="..\..\v142\x64\bextutil.lib" target="build\native\v142\x64" /> |
29 | <file src="..\..\build\$configuration$\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" /> | 30 | <file src="..\..\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" /> |
30 | </files> | 31 | </files> |
31 | </package> | 32 | </package> |
diff --git a/src/api/burn/bextutil/bextutil.vcxproj b/src/api/burn/bextutil/bextutil.vcxproj index b9334cf3..cbb83b96 100644 --- a/src/api/burn/bextutil/bextutil.vcxproj +++ b/src/api/burn/bextutil/bextutil.vcxproj | |||
@@ -2,9 +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 DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
7 | |||
8 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
9 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
10 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
@@ -44,8 +41,7 @@ | |||
44 | 41 | ||
45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
46 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
47 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | 44 | <Import Project="..\..\..\NativeMultiTargeting.Build.props" /> |
48 | <Import Project="..\NativeMultiTargeting.Build.props" /> | ||
49 | 45 | ||
50 | <ImportGroup Label="ExtensionSettings"> | 46 | <ImportGroup Label="ExtensionSettings"> |
51 | </ImportGroup> | 47 | </ImportGroup> |
@@ -54,7 +50,7 @@ | |||
54 | </ImportGroup> | 50 | </ImportGroup> |
55 | 51 | ||
56 | <PropertyGroup> | 52 | <PropertyGroup> |
57 | <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\inc</ProjectAdditionalIncludeDirectories> | 53 | <ProjectAdditionalIncludeDirectories>inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories> |
58 | </PropertyGroup> | 54 | </PropertyGroup> |
59 | 55 | ||
60 | <ItemGroup> | 56 | <ItemGroup> |
@@ -75,16 +71,11 @@ | |||
75 | </ItemGroup> | 71 | </ItemGroup> |
76 | 72 | ||
77 | <ItemGroup> | 73 | <ItemGroup> |
78 | <None Include="packages.config" /> | 74 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
75 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
76 | |||
77 | <PackageReference Include="WixToolset.DUtil" /> | ||
79 | </ItemGroup> | 78 | </ItemGroup> |
80 | 79 | ||
81 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 80 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
82 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 81 | </Project> |
83 | <PropertyGroup> | ||
84 | <ErrorText>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}.</ErrorText> | ||
85 | </PropertyGroup> | ||
86 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
87 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
88 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
89 | </Target> | ||
90 | </Project> \ No newline at end of file | ||
diff --git a/src/api/burn/bextutil/packages.config b/src/api/burn/bextutil/packages.config deleted file mode 100644 index 08ea3364..00000000 --- a/src/api/burn/bextutil/packages.config +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <packages> | ||
3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
5 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
6 | </packages> \ No newline at end of file | ||
diff --git a/src/api/burn/mbanative/mbanative.vcxproj b/src/api/burn/mbanative/mbanative.vcxproj index f91fe3be..af02f34e 100644 --- a/src/api/burn/mbanative/mbanative.vcxproj +++ b/src/api/burn/mbanative/mbanative.vcxproj | |||
@@ -2,12 +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 DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | ||
6 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" /> | ||
7 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> | ||
8 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> | ||
9 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
10 | |||
11 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
12 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
13 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
@@ -47,18 +41,10 @@ | |||
47 | 41 | ||
48 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
49 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 43 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
50 | <Import Project="..\NativeMultiTargeting.Build.props" /> | 44 | <Import Project="..\..\..\NativeMultiTargeting.Build.props" /> |
51 | |||
52 | <ImportGroup Label="Shared"> | ||
53 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" /> | ||
54 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" /> | ||
55 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" /> | ||
56 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> | ||
57 | </ImportGroup> | ||
58 | 45 | ||
59 | <PropertyGroup> | 46 | <PropertyGroup> |
60 | <ProjectAdditionalIncludeDirectories>..\balutil\inc</ProjectAdditionalIncludeDirectories> | 47 | <ProjectAdditionalIncludeDirectories>..\balutil\inc;..\WixToolset.BootstrapperCore.Native\inc</ProjectAdditionalIncludeDirectories> |
61 | <ProjectAdditionalLinkLibraries>balutil.lib</ProjectAdditionalLinkLibraries> | ||
62 | </PropertyGroup> | 48 | </PropertyGroup> |
63 | 49 | ||
64 | <ItemGroup> | 50 | <ItemGroup> |
@@ -75,28 +61,18 @@ | |||
75 | </ItemGroup> | 61 | </ItemGroup> |
76 | 62 | ||
77 | <ItemGroup> | 63 | <ItemGroup> |
78 | <None Include="packages.config" /> | ||
79 | </ItemGroup> | ||
80 | |||
81 | <ItemGroup> | ||
82 | <ProjectReference Include="..\balutil\balutil.vcxproj"> | 64 | <ProjectReference Include="..\balutil\balutil.vcxproj"> |
83 | <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project> | 65 | <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project> |
66 | <Properties>Configuration=$(Configuration);Platform=$(Platform)</Properties> | ||
84 | </ProjectReference> | 67 | </ProjectReference> |
85 | </ItemGroup> | 68 | </ItemGroup> |
86 | 69 | ||
70 | <ItemGroup> | ||
71 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
72 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
73 | |||
74 | <PackageReference Include="WixToolset.DUtil" /> | ||
75 | </ItemGroup> | ||
76 | |||
87 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 77 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
88 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 78 | </Project> |
89 | <PropertyGroup> | ||
90 | <ErrorText>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}.</ErrorText> | ||
91 | </PropertyGroup> | ||
92 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" /> | ||
93 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" /> | ||
94 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" /> | ||
95 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" /> | ||
96 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" /> | ||
97 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> | ||
98 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | ||
99 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
100 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
101 | </Target> | ||
102 | </Project> \ No newline at end of file | ||
diff --git a/src/api/burn/mbanative/packages.config b/src/api/burn/mbanative/packages.config deleted file mode 100644 index 745fcae9..00000000 --- a/src/api/burn/mbanative/packages.config +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <packages> | ||
3 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | ||
7 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
8 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
9 | </packages> \ No newline at end of file | ||
diff --git a/src/api/burn/nuget.config b/src/api/burn/nuget.config deleted file mode 100644 index 2c6c5608..00000000 --- a/src/api/burn/nuget.config +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <configuration> | ||
3 | <packageSources> | ||
4 | <clear /> | ||
5 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
6 | <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" /> | ||
7 | <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" /> | ||
8 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
9 | </packageSources> | ||
10 | </configuration> \ No newline at end of file | ||
diff --git a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj index d3a81e2a..345c324c 100644 --- a/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj +++ b/src/api/burn/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj | |||
@@ -3,9 +3,8 @@ | |||
3 | 3 | ||
4 | 4 | ||
5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
6 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | 6 | <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" /> |
7 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" /> | 7 | |
8 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
9 | <ItemGroup Label="ProjectConfigurations"> | 8 | <ItemGroup Label="ProjectConfigurations"> |
10 | <ProjectConfiguration Include="Debug|Win32"> | 9 | <ProjectConfiguration Include="Debug|Win32"> |
11 | <Configuration>Debug</Configuration> | 10 | <Configuration>Debug</Configuration> |
@@ -16,6 +15,7 @@ | |||
16 | <Platform>Win32</Platform> | 15 | <Platform>Win32</Platform> |
17 | </ProjectConfiguration> | 16 | </ProjectConfiguration> |
18 | </ItemGroup> | 17 | </ItemGroup> |
18 | |||
19 | <PropertyGroup Label="Globals"> | 19 | <PropertyGroup Label="Globals"> |
20 | <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> | 20 | <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> |
21 | <ProjectGuid>{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}</ProjectGuid> | 21 | <ProjectGuid>{9B507AF9-035E-4DB6-8C0C-5DCC3FEF2631}</ProjectGuid> |
@@ -26,12 +26,15 @@ | |||
26 | <CLRSupport>true</CLRSupport> | 26 | <CLRSupport>true</CLRSupport> |
27 | <SignOutput>false</SignOutput> | 27 | <SignOutput>false</SignOutput> |
28 | </PropertyGroup> | 28 | </PropertyGroup> |
29 | |||
29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 31 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
32 | |||
31 | <PropertyGroup> | 33 | <PropertyGroup> |
32 | <ProjectAdditionalIncludeDirectories>..\..\balutil\inc</ProjectAdditionalIncludeDirectories> | 34 | <ProjectAdditionalIncludeDirectories>..\..\balutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories> |
33 | <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib</ProjectAdditionalLinkLibraries> | 35 | <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries> |
34 | </PropertyGroup> | 36 | </PropertyGroup> |
37 | |||
35 | <ItemGroup> | 38 | <ItemGroup> |
36 | <ClCompile Include="precomp.cpp"> | 39 | <ClCompile Include="precomp.cpp"> |
37 | <PrecompiledHeader>Create</PrecompiledHeader> | 40 | <PrecompiledHeader>Create</PrecompiledHeader> |
@@ -41,36 +44,17 @@ | |||
41 | <ClCompile Include="TestBAFunctions.cpp" /> | 44 | <ClCompile Include="TestBAFunctions.cpp" /> |
42 | <ClCompile Include="TestBootstrapperApplication.cpp" /> | 45 | <ClCompile Include="TestBootstrapperApplication.cpp" /> |
43 | </ItemGroup> | 46 | </ItemGroup> |
47 | |||
44 | <ItemGroup> | 48 | <ItemGroup> |
45 | <ClInclude Include="precomp.h" /> | 49 | <ClInclude Include="precomp.h" /> |
46 | </ItemGroup> | 50 | </ItemGroup> |
47 | <ItemGroup> | 51 | |
48 | <None Include="packages.config" /> | ||
49 | </ItemGroup> | ||
50 | <ItemGroup> | ||
51 | <Reference Include="System" /> | ||
52 | <Reference Include="System.Core" /> | ||
53 | <Reference Include="WixBuildTools.TestSupport"> | ||
54 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath> | ||
55 | </Reference> | ||
56 | <Reference Include="WixBuildTools.TestSupport.Native"> | ||
57 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath> | ||
58 | </Reference> | ||
59 | </ItemGroup> | ||
60 | <ItemGroup> | 52 | <ItemGroup> |
61 | <ProjectReference Include="..\..\balutil\balutil.vcxproj"> | 53 | <ProjectReference Include="..\..\balutil\balutil.vcxproj"> |
62 | <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project> | 54 | <Project>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</Project> |
63 | </ProjectReference> | 55 | </ProjectReference> |
64 | </ItemGroup> | 56 | </ItemGroup> |
57 | |||
65 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 58 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
66 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" /> | 59 | <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" /> |
67 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 60 | </Project> |
68 | <PropertyGroup> | ||
69 | <ErrorText>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}.</ErrorText> | ||
70 | </PropertyGroup> | ||
71 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" /> | ||
72 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" /> | ||
73 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
74 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
75 | </Target> | ||
76 | </Project> \ No newline at end of file | ||
diff --git a/src/api/burn/test/BalUtilUnitTest/packages.config b/src/api/burn/test/BalUtilUnitTest/packages.config deleted file mode 100644 index 6d381fbe..00000000 --- a/src/api/burn/test/BalUtilUnitTest/packages.config +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
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 | <packages> | ||
4 | <package id="WixBuildTools.TestSupport" version="4.0.50" /> | ||
5 | <package id="WixBuildTools.TestSupport.Native" version="4.0.50" /> | ||
6 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
7 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
8 | <package id="xunit.abstractions" version="2.0.3" /> | ||
9 | <package id="xunit.assert" version="2.4.1" /> | ||
10 | <package id="xunit.core" version="2.4.1" /> | ||
11 | <package id="xunit.extensibility.core" version="2.4.1" /> | ||
12 | <package id="xunit.extensibility.execution" version="2.4.1" /> | ||
13 | <package id="xunit.runner.msbuild" version="2.4.1" /> | ||
14 | <package id="xunit.runner.visualstudio" version="2.4.1" /> | ||
15 | </packages> \ No newline at end of file | ||
diff --git a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj index a9937894..fc31ce57 100644 --- a/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj +++ b/src/api/burn/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj | |||
@@ -1,11 +1,9 @@ | |||
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 | ||
4 | |||
5 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
6 | <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" /> | 5 | <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.props" /> |
7 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" /> | 6 | |
8 | <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" /> | ||
9 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
10 | <ProjectConfiguration Include="Debug|Win32"> | 8 | <ProjectConfiguration Include="Debug|Win32"> |
11 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
@@ -16,6 +14,7 @@ | |||
16 | <Platform>Win32</Platform> | 14 | <Platform>Win32</Platform> |
17 | </ProjectConfiguration> | 15 | </ProjectConfiguration> |
18 | </ItemGroup> | 16 | </ItemGroup> |
17 | |||
19 | <PropertyGroup Label="Globals"> | 18 | <PropertyGroup Label="Globals"> |
20 | <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> | 19 | <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes> |
21 | <ProjectGuid>{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}</ProjectGuid> | 20 | <ProjectGuid>{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}</ProjectGuid> |
@@ -26,12 +25,15 @@ | |||
26 | <CLRSupport>true</CLRSupport> | 25 | <CLRSupport>true</CLRSupport> |
27 | <SignOutput>false</SignOutput> | 26 | <SignOutput>false</SignOutput> |
28 | </PropertyGroup> | 27 | </PropertyGroup> |
28 | |||
29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
31 | |||
31 | <PropertyGroup> | 32 | <PropertyGroup> |
32 | <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc</ProjectAdditionalIncludeDirectories> | 33 | <ProjectAdditionalIncludeDirectories>..\..\bextutil\inc;..\..\WixToolset.BootstrapperCore.Native\inc;..\..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories> |
33 | <ProjectAdditionalLinkLibraries></ProjectAdditionalLinkLibraries> | 34 | <ProjectAdditionalLinkLibraries>$(RootBuildFolder)libs\$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\dutil.lib</ProjectAdditionalLinkLibraries> |
34 | </PropertyGroup> | 35 | </PropertyGroup> |
36 | |||
35 | <ItemGroup> | 37 | <ItemGroup> |
36 | <ClCompile Include="precomp.cpp"> | 38 | <ClCompile Include="precomp.cpp"> |
37 | <PrecompiledHeader>Create</PrecompiledHeader> | 39 | <PrecompiledHeader>Create</PrecompiledHeader> |
@@ -40,36 +42,17 @@ | |||
40 | </ClCompile> | 42 | </ClCompile> |
41 | <ClCompile Include="TestBundleExtension.cpp" /> | 43 | <ClCompile Include="TestBundleExtension.cpp" /> |
42 | </ItemGroup> | 44 | </ItemGroup> |
45 | |||
43 | <ItemGroup> | 46 | <ItemGroup> |
44 | <ClInclude Include="precomp.h" /> | 47 | <ClInclude Include="precomp.h" /> |
45 | </ItemGroup> | 48 | </ItemGroup> |
49 | |||
46 | <ItemGroup> | 50 | <ItemGroup> |
47 | <None Include="packages.config" /> | 51 | <ProjectReference Include="..\..\bextutil\bextutil.vcxproj"> |
48 | </ItemGroup> | ||
49 | <ItemGroup> | ||
50 | <Reference Include="System" /> | ||
51 | <Reference Include="System.Core" /> | ||
52 | <Reference Include="WixBuildTools.TestSupport"> | ||
53 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath> | ||
54 | </Reference> | ||
55 | <Reference Include="WixBuildTools.TestSupport.Native"> | ||
56 | <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath> | ||
57 | </Reference> | ||
58 | </ItemGroup> | ||
59 | <ItemGroup> | ||
60 | <ProjectReference Include="..\..\balutil\balutil.vcxproj"> | ||
61 | <Project>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</Project> | 52 | <Project>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</Project> |
62 | </ProjectReference> | 53 | </ProjectReference> |
63 | </ItemGroup> | 54 | </ItemGroup> |
55 | |||
64 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 56 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
65 | <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" /> | 57 | <Import Project="..\..\..\..\internal\WixBuildTools.TestSupport.Native\build\WixBuildTools.TestSupport.Native.targets" /> |
66 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 58 | </Project> |
67 | <PropertyGroup> | ||
68 | <ErrorText>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}.</ErrorText> | ||
69 | </PropertyGroup> | ||
70 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" /> | ||
71 | <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" /> | ||
72 | <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" /> | ||
73 | <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" /> | ||
74 | </Target> | ||
75 | </Project> \ No newline at end of file | ||
diff --git a/src/api/burn/test/BextUtilUnitTest/packages.config b/src/api/burn/test/BextUtilUnitTest/packages.config deleted file mode 100644 index 6d381fbe..00000000 --- a/src/api/burn/test/BextUtilUnitTest/packages.config +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
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 | <packages> | ||
4 | <package id="WixBuildTools.TestSupport" version="4.0.50" /> | ||
5 | <package id="WixBuildTools.TestSupport.Native" version="4.0.50" /> | ||
6 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" /> | ||
7 | <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" /> | ||
8 | <package id="xunit.abstractions" version="2.0.3" /> | ||
9 | <package id="xunit.assert" version="2.4.1" /> | ||
10 | <package id="xunit.core" version="2.4.1" /> | ||
11 | <package id="xunit.extensibility.core" version="2.4.1" /> | ||
12 | <package id="xunit.extensibility.execution" version="2.4.1" /> | ||
13 | <package id="xunit.runner.msbuild" version="2.4.1" /> | ||
14 | <package id="xunit.runner.visualstudio" version="2.4.1" /> | ||
15 | </packages> \ No newline at end of file | ||
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 53d82f7e..bdb6a829 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 | |||
@@ -14,8 +14,7 @@ | |||
14 | </ItemGroup> | 14 | </ItemGroup> |
15 | 15 | ||
16 | <ItemGroup> | 16 | <ItemGroup> |
17 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | 17 | <PackageReference Include="xunit" /> |
18 | <PackageReference Include="xunit" Version="2.4.1" /> | 18 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
19 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | ||
20 | </ItemGroup> | 19 | </ItemGroup> |
21 | </Project> | 20 | </Project> |
diff --git a/src/api/wix/CSharp.Build.props b/src/api/wix/CSharp.Build.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/api/wix/CSharp.Build.props +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
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 | <!-- | ||
3 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props | ||
4 | then update all of the repos. | ||
5 | --> | ||
6 | <Project> | ||
7 | <PropertyGroup> | ||
8 | <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> | ||
9 | <SignAssembly>true</SignAssembly> | ||
10 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
11 | <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass> | ||
12 | </PropertyGroup> | ||
13 | </Project> | ||
diff --git a/src/api/wix/Directory.Build.props b/src/api/wix/Directory.Build.props deleted file mode 100644 index b3c6287c..00000000 --- a/src/api/wix/Directory.Build.props +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
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 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.props | ||
5 | then update all of the repos. | ||
6 | --> | ||
7 | <Project> | ||
8 | <PropertyGroup> | ||
9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> | ||
11 | <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages> | ||
12 | |||
13 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> | ||
14 | <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath> | ||
15 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> | ||
16 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> | ||
17 | |||
18 | <Authors>WiX Toolset Team</Authors> | ||
19 | <Company>WiX Toolset</Company> | ||
20 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> | ||
21 | <PackageLicenseExpression>MS-RL</PackageLicenseExpression> | ||
22 | <Product>WiX Toolset</Product> | ||
23 | </PropertyGroup> | ||
24 | |||
25 | <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> | ||
26 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | ||
27 | </Project> | ||
diff --git a/src/api/wix/Directory.Build.targets b/src/api/wix/Directory.Build.targets deleted file mode 100644 index 2fcc765a..00000000 --- a/src/api/wix/Directory.Build.targets +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
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 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.targets | ||
5 | then update all of the repos. | ||
6 | --> | ||
7 | <!-- | ||
8 | Replace PackageReferences with ProjectReferences when the projects can be found in .sln. | ||
9 | See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284 | ||
10 | --> | ||
11 | <Project> | ||
12 | <PropertyGroup> | ||
13 | <ReplacePackageReferences>true</ReplacePackageReferences> | ||
14 | <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> | ||
15 | <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> | ||
16 | </PropertyGroup> | ||
17 | |||
18 | <Choose> | ||
19 | <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')"> | ||
20 | |||
21 | <PropertyGroup> | ||
22 | <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent> | ||
23 | <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir> | ||
24 | <RegexPattern>(?<="[PackageName]", ")(.*)(?=", ")</RegexPattern> | ||
25 | </PropertyGroup> | ||
26 | |||
27 | <ItemGroup> | ||
28 | <!-- Keep the identity of the PackageReference --> | ||
29 | <SmartPackageReference Include="@(PackageReference)"> | ||
30 | <PackageName>%(Identity)</PackageName> | ||
31 | <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution> | ||
32 | </SmartPackageReference> | ||
33 | |||
34 | <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function --> | ||
35 | <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))"> | ||
36 | <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern> | ||
37 | <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath> | ||
38 | </PackageInSolution> | ||
39 | |||
40 | <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> | ||
41 | |||
42 | <!-- Remove the package references that are now referenced as projects --> | ||
43 | <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/> | ||
44 | </ItemGroup> | ||
45 | |||
46 | </When> | ||
47 | </Choose> | ||
48 | |||
49 | <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " /> | ||
50 | <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " /> | ||
51 | </Project> | ||
diff --git a/src/api/wix/Directory.csproj.props b/src/api/wix/Directory.csproj.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/api/wix/Directory.csproj.props +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
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 | <!-- | ||
3 | Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props | ||
4 | then update all of the repos. | ||
5 | --> | ||
6 | <Project> | ||
7 | <PropertyGroup> | ||
8 | <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> | ||
9 | <SignAssembly>true</SignAssembly> | ||
10 | <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> | ||
11 | <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass> | ||
12 | </PropertyGroup> | ||
13 | </Project> | ||
diff --git a/src/api/wix/Directory.csproj.targets b/src/api/wix/Directory.csproj.targets deleted file mode 100644 index 623228ef..00000000 --- a/src/api/wix/Directory.csproj.targets +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
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 | <!-- | ||
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> | ||
7 | <PropertyGroup> | ||
8 | <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation> | ||
9 | <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
10 | </PropertyGroup> | ||
11 | |||
12 | <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion" | ||
13 | Condition=" Exists('$(MSBuildProjectName).nuspec') "> | ||
14 | <PropertyGroup> | ||
15 | <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl> | ||
16 | |||
17 | <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
18 | <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath> | ||
19 | <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties> | ||
20 | <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties> | ||
21 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
22 | </PropertyGroup> | ||
23 | </Target> | ||
24 | |||
25 | </Project> | ||
diff --git a/src/api/wix/README-Extensibility.md b/src/api/wix/README-Extensibility.md deleted file mode 100644 index 003acd4d..00000000 --- a/src/api/wix/README-Extensibility.md +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | # Extensibility | ||
2 | WixToolset.Extensibility - interfaces to extend the WiX Toolset | ||
diff --git a/src/api/wix/README.md b/src/api/wix/README.md deleted file mode 100644 index 720632c9..00000000 --- a/src/api/wix/README.md +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | # Data | ||
2 | WixToolset.Data - data model for WiX Toolset tools | ||
3 | |||
diff --git a/src/api/wix/WixToolset.Data.v3.ncrunchsolution b/src/api/wix/WixToolset.Data.v3.ncrunchsolution deleted file mode 100644 index 10420ac9..00000000 --- a/src/api/wix/WixToolset.Data.v3.ncrunchsolution +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | <SolutionConfiguration> | ||
2 | <Settings> | ||
3 | <AllowParallelTestExecution>True</AllowParallelTestExecution> | ||
4 | <SolutionConfigured>True</SolutionConfigured> | ||
5 | </Settings> | ||
6 | </SolutionConfiguration> \ No newline at end of file | ||
diff --git a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj index 24b0917b..11c3fd98 100644 --- a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj +++ b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj | |||
@@ -15,15 +15,6 @@ | |||
15 | </PropertyGroup> | 15 | </PropertyGroup> |
16 | 16 | ||
17 | <ItemGroup> | 17 | <ItemGroup> |
18 | <PackageReference Include="System.IO.Compression" Version="4.3.0" /> | ||
19 | </ItemGroup> | ||
20 | |||
21 | <ItemGroup> | ||
22 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
23 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
24 | </ItemGroup> | ||
25 | |||
26 | <ItemGroup> | ||
27 | <Compile Update="WixDataStrings.Designer.cs"> | 18 | <Compile Update="WixDataStrings.Designer.cs"> |
28 | <DesignTime>True</DesignTime> | 19 | <DesignTime>True</DesignTime> |
29 | <AutoGen>True</AutoGen> | 20 | <AutoGen>True</AutoGen> |
@@ -37,4 +28,8 @@ | |||
37 | <LastGenOutput>WixDataStrings.Designer.cs</LastGenOutput> | 28 | <LastGenOutput>WixDataStrings.Designer.cs</LastGenOutput> |
38 | </EmbeddedResource> | 29 | </EmbeddedResource> |
39 | </ItemGroup> | 30 | </ItemGroup> |
31 | |||
32 | <ItemGroup> | ||
33 | <PackageReference Include="System.IO.Compression" /> | ||
34 | </ItemGroup> | ||
40 | </Project> | 35 | </Project> |
diff --git a/src/api/wix/WixToolset.Extensibility.sln b/src/api/wix/WixToolset.Extensibility.sln deleted file mode 100644 index 94ce905c..00000000 --- a/src/api/wix/WixToolset.Extensibility.sln +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
2 | # Visual Studio 15 | ||
3 | VisualStudioVersion = 15.0.26730.8 | ||
4 | MinimumVisualStudioVersion = 15.0.26124.0 | ||
5 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Extensibility", "src\WixToolset.Extensibility\WixToolset.Extensibility.csproj", "{AA049009-D7D9-4C63-8E0D-83206ADCFBD1}" | ||
6 | EndProject | ||
7 | Global | ||
8 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
9 | Debug|Any CPU = Debug|Any CPU | ||
10 | Debug|x64 = Debug|x64 | ||
11 | Debug|x86 = Debug|x86 | ||
12 | Release|Any CPU = Release|Any CPU | ||
13 | Release|x64 = Release|x64 | ||
14 | Release|x86 = Release|x86 | ||
15 | EndGlobalSection | ||
16 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
17 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
18 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
19 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
20 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x64.Build.0 = Debug|Any CPU | ||
21 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
22 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x86.Build.0 = Debug|Any CPU | ||
23 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
24 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|Any CPU.Build.0 = Release|Any CPU | ||
25 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x64.ActiveCfg = Release|Any CPU | ||
26 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x64.Build.0 = Release|Any CPU | ||
27 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x86.ActiveCfg = Release|Any CPU | ||
28 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x86.Build.0 = Release|Any CPU | ||
29 | EndGlobalSection | ||
30 | GlobalSection(SolutionProperties) = preSolution | ||
31 | HideSolutionNode = FALSE | ||
32 | EndGlobalSection | ||
33 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
34 | SolutionGuid = {BB8820D5-723D-426D-B4A0-4D221603C5FA} | ||
35 | EndGlobalSection | ||
36 | EndGlobal | ||
diff --git a/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj b/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj index 8b18c0ed..38bec1b0 100644 --- a/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj +++ b/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj | |||
@@ -13,11 +13,6 @@ | |||
13 | </PropertyGroup> | 13 | </PropertyGroup> |
14 | 14 | ||
15 | <ItemGroup> | 15 | <ItemGroup> |
16 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | 16 | <ProjectReference Include="..\WixToolset.Data\WixToolset.Data.csproj" /> |
17 | </ItemGroup> | ||
18 | |||
19 | <ItemGroup> | ||
20 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | ||
21 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> | ||
22 | </ItemGroup> | 17 | </ItemGroup> |
23 | </Project> | 18 | </Project> |
diff --git a/src/api/wix/WixToolset.Data.sln b/src/api/wix/api_wix.sln index d8c62b1d..6b799e66 100644 --- a/src/api/wix/WixToolset.Data.sln +++ b/src/api/wix/api_wix.sln | |||
@@ -3,9 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 | |||
3 | # Visual Studio 15 | 3 | # Visual Studio 15 |
4 | VisualStudioVersion = 15.0.27004.2009 | 4 | VisualStudioVersion = 15.0.27004.2009 |
5 | MinimumVisualStudioVersion = 10.0.40219.1 | 5 | MinimumVisualStudioVersion = 10.0.40219.1 |
6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "src\WixToolset.Data\WixToolset.Data.csproj", "{73ADBD3A-8FB2-47DB-BC79-9BC61C40F2E0}" | 6 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "WixToolset.Data\WixToolset.Data.csproj", "{73ADBD3A-8FB2-47DB-BC79-9BC61C40F2E0}" |
7 | EndProject | 7 | EndProject |
8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Data", "src\test\WixToolsetTest.Data\WixToolsetTest.Data.csproj", "{6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}" | 8 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Data", "test\WixToolsetTest.Data\WixToolsetTest.Data.csproj", "{6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}" |
9 | EndProject | ||
10 | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Extensibility", "WixToolset.Extensibility\WixToolset.Extensibility.csproj", "{AA049009-D7D9-4C63-8E0D-83206ADCFBD1}" | ||
9 | EndProject | 11 | EndProject |
10 | Global | 12 | Global |
11 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 13 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
@@ -51,6 +53,18 @@ Global | |||
51 | {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x64.Build.0 = Release|Any CPU | 53 | {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x64.Build.0 = Release|Any CPU |
52 | {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x86.ActiveCfg = Release|Any CPU | 54 | {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x86.ActiveCfg = Release|Any CPU |
53 | {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x86.Build.0 = Release|Any CPU | 55 | {6C1FA8B7-BF3C-4735-95F8-26DEEFEF00C8}.Release|x86.Build.0 = Release|Any CPU |
56 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
57 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
58 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x64.ActiveCfg = Debug|Any CPU | ||
59 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x64.Build.0 = Debug|Any CPU | ||
60 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x86.ActiveCfg = Debug|Any CPU | ||
61 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Debug|x86.Build.0 = Debug|Any CPU | ||
62 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
63 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|Any CPU.Build.0 = Release|Any CPU | ||
64 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x64.ActiveCfg = Release|Any CPU | ||
65 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x64.Build.0 = Release|Any CPU | ||
66 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x86.ActiveCfg = Release|Any CPU | ||
67 | {AA049009-D7D9-4C63-8E0D-83206ADCFBD1}.Release|x86.Build.0 = Release|Any CPU | ||
54 | EndGlobalSection | 68 | EndGlobalSection |
55 | GlobalSection(SolutionProperties) = preSolution | 69 | GlobalSection(SolutionProperties) = preSolution |
56 | HideSolutionNode = FALSE | 70 | HideSolutionNode = FALSE |
diff --git a/src/api/wix/appveyor-Extensibility.cmd b/src/api/wix/appveyor-Extensibility.cmd deleted file mode 100644 index e0dfe33f..00000000 --- a/src/api/wix/appveyor-Extensibility.cmd +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | @setlocal | ||
2 | @pushd %~dp0 | ||
3 | |||
4 | dotnet pack -c Release | ||
5 | |||
6 | @popd | ||
7 | @endlocal \ No newline at end of file | ||
diff --git a/src/api/wix/appveyor-Extensibility.yml b/src/api/wix/appveyor-Extensibility.yml deleted file mode 100644 index 7c686b04..00000000 --- a/src/api/wix/appveyor-Extensibility.yml +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
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 | # | ||
3 | # Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml | ||
4 | # then update all of the repos. | ||
5 | |||
6 | branches: | ||
7 | only: | ||
8 | - master | ||
9 | - develop | ||
10 | |||
11 | image: Visual Studio 2019 | ||
12 | |||
13 | version: 0.0.0.{build} | ||
14 | configuration: Release | ||
15 | |||
16 | environment: | ||
17 | DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true | ||
18 | DOTNET_CLI_TELEMETRY_OPTOUT: 1 | ||
19 | NUGET_XMLDOC_MODE: skip | ||
20 | |||
21 | build_script: | ||
22 | - appveyor.cmd | ||
23 | |||
24 | pull_requests: | ||
25 | do_not_increment_build_number: true | ||
26 | |||
27 | nuget: | ||
28 | disable_publish_on_pr: true | ||
29 | |||
30 | skip_branch_with_pr: true | ||
31 | skip_tags: true | ||
32 | |||
33 | artifacts: | ||
34 | - path: build\Release\**\*.nupkg | ||
35 | name: nuget | ||
36 | |||
37 | notifications: | ||
38 | - provider: Slack | ||
39 | incoming_webhook: | ||
40 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/api/wix/appveyor.cmd b/src/api/wix/appveyor.cmd deleted file mode 100644 index 5e5debc9..00000000 --- a/src/api/wix/appveyor.cmd +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | @setlocal | ||
2 | @pushd %~dp0 | ||
3 | @set _C=Release | ||
4 | @if /i "%1"=="debug" set _C=Debug | ||
5 | |||
6 | :: Restore | ||
7 | msbuild -p:Configuration=%_C% -t:Restore || exit /b | ||
8 | |||
9 | :: Build | ||
10 | msbuild -p:Configuration=%_C% || exit /b | ||
11 | |||
12 | :: Test | ||
13 | dotnet test -c %_C% --no-build || exit /b | ||
14 | |||
15 | :: Pack | ||
16 | msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack || exit /b | ||
17 | |||
18 | @popd | ||
19 | @endlocal | ||
diff --git a/src/api/wix/appveyor.yml b/src/api/wix/appveyor.yml deleted file mode 100644 index c53cc9cc..00000000 --- a/src/api/wix/appveyor.yml +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
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 | # | ||
3 | # Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml | ||
4 | # then update all of the repos. | ||
5 | |||
6 | branches: | ||
7 | only: | ||
8 | - master | ||
9 | - develop | ||
10 | |||
11 | image: Visual Studio 2019 | ||
12 | |||
13 | version: 0.0.0.{build} | ||
14 | configuration: Release | ||
15 | |||
16 | environment: | ||
17 | DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true | ||
18 | DOTNET_CLI_TELEMETRY_OPTOUT: 1 | ||
19 | NUGET_XMLDOC_MODE: skip | ||
20 | |||
21 | build_script: | ||
22 | - appveyor.cmd | ||
23 | |||
24 | pull_requests: | ||
25 | do_not_increment_build_number: true | ||
26 | |||
27 | nuget: | ||
28 | disable_publish_on_pr: true | ||
29 | |||
30 | skip_branch_with_pr: true | ||
31 | skip_tags: true | ||
32 | |||
33 | artifacts: | ||
34 | - path: build\Release\**\*.nupkg | ||
35 | name: nuget | ||
36 | - path: build\Release\**\*.snupkg | ||
37 | name: snupkg | ||
38 | |||
39 | notifications: | ||
40 | - provider: Slack | ||
41 | incoming_webhook: | ||
42 | secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= | ||
diff --git a/src/api/wix/nuget-Extensibility.config b/src/api/wix/nuget-Extensibility.config deleted file mode 100644 index 6ab85be3..00000000 --- a/src/api/wix/nuget-Extensibility.config +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <configuration> | ||
3 | <packageSources> | ||
4 | <clear /> | ||
5 | <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> | ||
6 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
7 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
8 | </packageSources> | ||
9 | </configuration> \ No newline at end of file | ||
diff --git a/src/api/wix/nuget.config b/src/api/wix/nuget.config deleted file mode 100644 index d5ef8952..00000000 --- a/src/api/wix/nuget.config +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <configuration> | ||
3 | <packageSources> | ||
4 | <clear /> | ||
5 | <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" /> | ||
6 | <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||
7 | </packageSources> | ||
8 | </configuration> \ No newline at end of file | ||
diff --git a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj index fb0f8594..f6e10488 100644 --- a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj +++ b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj | |||
@@ -1,9 +1,11 @@ | |||
1 | <Project Sdk="Microsoft.NET.Sdk"> | 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 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | ||
3 | <PropertyGroup> | 5 | <PropertyGroup> |
4 | <TargetFramework>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
5 | |||
6 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
8 | <SignOutput>false</SignOutput> | ||
7 | </PropertyGroup> | 9 | </PropertyGroup> |
8 | 10 | ||
9 | <ItemGroup> | 11 | <ItemGroup> |
@@ -11,9 +13,8 @@ | |||
11 | </ItemGroup> | 13 | </ItemGroup> |
12 | 14 | ||
13 | <ItemGroup> | 15 | <ItemGroup> |
14 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" /> | 16 | <PackageReference Include="Microsoft.NET.Test.Sdk" /> |
15 | <PackageReference Include="xunit" Version="2.4.1" /> | 17 | <PackageReference Include="xunit" /> |
16 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 18 | <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" /> |
17 | </ItemGroup> | 19 | </ItemGroup> |
18 | |||
19 | </Project> | 20 | </Project> |