Skip to content

Commit 0130b01

Browse files
florelisflorelis
authored
Remove clones of transitive dependencies available from vcpkg (#5399)
Follow-up to #5390 We have copies of `PureLib` and `UndockedRegFreeWinRT` in the repo that themselves include code from their dependencies (`catch2`, `zlib`). This PR removes that code in favor of using vcpkg to fetch the dependencies. For `PureLib`, after removing `zlib`, there are only headers left. So I replaced the `.vcxproj` with a `.vcxitems` For `UndockedRegFreeWinRT`, I removed all the test code along with the copy of catch2. Updated the READMEs for the subtrees, although I'm not certain a subtree update would still work... ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/microsoft/winget-cli/pull/5399)
1 parent 248d4a0 commit 0130b01

File tree

327 files changed

+41
-102793
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

327 files changed

+41
-102793
lines changed

‎cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"component": {
2424
"type": "git",
2525
"git": {
26-
"repositoryUrl": "https://github.com/madler/zlib.git",
27-
"commitHash": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"
26+
"repositoryUrl": "https://github.com/microsoft/xlang",
27+
"commitHash": "cfe510d0d2b07484fea2c6d77163de017738c100"
2828
}
2929
}
3030
},

‎src/AppInstallerCLI.sln

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
23
# Visual Studio Version 17
34
VisualStudioVersion = 17.2.32630.192
45
MinimumVisualStudioVersion = 10.0.40219.1
@@ -140,8 +141,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{
140141
..\templates\e2e-test.template.yml = ..\templates\e2e-test.template.yml
141142
EndProjectSection
142143
EndProject
143-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PureLib", "PureLib\PureLib.vcxproj", "{BB14D603-F44E-4415-8770-BF3E13F4C17F}"
144-
EndProject
145144
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppInstallerSharedLib", "AppInstallerSharedLib\AppInstallerSharedLib.vcxproj", "{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}"
146145
EndProject
147146
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Management.Configuration", "Microsoft.Management.Configuration\Microsoft.Management.Configuration.vcxproj", "{CA460806-5E41-4E97-9A3D-1D74B433B663}"
@@ -205,6 +204,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "targets", "targets", "{A0B4
205204
targets\ReferenceEmbeddedCsWinRTProject.targets = targets\ReferenceEmbeddedCsWinRTProject.targets
206205
EndProjectSection
207206
EndProject
207+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PureLib", "PureLib\PureLib.vcxitems", "{A33223D2-550B-4D99-A53D-488B1F68683E}"
208+
EndProject
208209
Global
209210
GlobalSection(SolutionConfigurationPlatforms) = preSolution
210211
Debug|ARM64 = Debug|ARM64
@@ -774,33 +775,6 @@ Global
774775
{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|x64.Build.0 = Release|x64
775776
{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|x86.ActiveCfg = Release|Win32
776777
{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|x86.Build.0 = Release|Win32
777-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|ARM64.ActiveCfg = Debug|ARM64
778-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|ARM64.Build.0 = Debug|ARM64
779-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|x64.ActiveCfg = Debug|x64
780-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|x64.Build.0 = Debug|x64
781-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|x86.ActiveCfg = Debug|Win32
782-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|x86.Build.0 = Debug|Win32
783-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
784-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Fuzzing|x64.ActiveCfg = Release|x64
785-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Fuzzing|x86.ActiveCfg = Release|Win32
786-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|ARM64.ActiveCfg = Release|ARM64
787-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|ARM64.Build.0 = Release|ARM64
788-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|x64.ActiveCfg = Release|x64
789-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|x64.Build.0 = Release|x64
790-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|x86.ActiveCfg = Release|Win32
791-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|x86.Build.0 = Release|Win32
792-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
793-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
794-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
795-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
796-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
797-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
798-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|ARM64.ActiveCfg = Release|ARM64
799-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|ARM64.Build.0 = Release|ARM64
800-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|x64.ActiveCfg = Release|x64
801-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|x64.Build.0 = Release|x64
802-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|x86.ActiveCfg = Release|Win32
803-
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|x86.Build.0 = Release|Win32
804778
{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|ARM64.ActiveCfg = Debug|ARM64
805779
{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|ARM64.Build.0 = Debug|ARM64
806780
{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|x64.ActiveCfg = Debug|x64
@@ -1194,7 +1168,6 @@ Global
11941168
{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C} = {7C218A3E-9BC8-48FF-B91B-BCACD828C0C9}
11951169
{31ED69A8-5310-45A9-953F-56C351D2C3E1} = {60618CAC-2995-4DF9-9914-45C6FC02C995}
11961170
{8E43F982-40D5-4DF1-9044-C08047B5F43B} = {8D53D749-D51C-46F8-A162-9371AAA6C2E7}
1197-
{BB14D603-F44E-4415-8770-BF3E13F4C17F} = {60618CAC-2995-4DF9-9914-45C6FC02C995}
11981171
{1F56BECB-D65D-4BBA-8788-6671B251392A} = {7C218A3E-9BC8-48FF-B91B-BCACD828C0C9}
11991172
{167F634B-A3AD-494E-8E67-B888103E35FF} = {7C218A3E-9BC8-48FF-B91B-BCACD828C0C9}
12001173
{C54F80ED-B736-49B0-9BD3-662F57024D01} = {7C218A3E-9BC8-48FF-B91B-BCACD828C0C9}
@@ -1203,6 +1176,7 @@ Global
12031176
{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4} = {60618CAC-2995-4DF9-9914-45C6FC02C995}
12041177
{76B26B2C-602A-4AD0-9736-4162D3FCA92A} = {1A5D7A7D-5CB2-47D5-B40D-4E61CAEDC798}
12051178
{A0B4F808-B190-41C4-97CB-C8EA1932F84F} = {8D53D749-D51C-46F8-A162-9371AAA6C2E7}
1179+
{A33223D2-550B-4D99-A53D-488B1F68683E} = {60618CAC-2995-4DF9-9914-45C6FC02C995}
12061180
EndGlobalSection
12071181
GlobalSection(ExtensibilityGlobals) = postSolution
12081182
SolutionGuid = {B6FDB70C-A751-422C-ACD1-E35419495857}
@@ -1228,6 +1202,7 @@ Global
12281202
ManifestSchema\ManifestSchema.vcxitems*{89b1aab4-2bbc-4b65-9ed7-a01d5cf88230}*SharedItemsImports = 4
12291203
WinGetSchemas\WinGetSchemas.vcxitems*{89b1aab4-2bbc-4b65-9ed7-a01d5cf88230}*SharedItemsImports = 4
12301204
WinGetSchemas\WinGetSchemas.vcxitems*{952b513f-8a00-4d74-9271-925afb3c6252}*SharedItemsImports = 9
1205+
PureLib\PureLib.vcxitems*{a33223d2-550b-4d99-a53d-488b1f68683e}*SharedItemsImports = 9
12311206
CertificateResources\CertificateResources.vcxitems*{b0bbbd92-943b-408f-b2b2-dbbab4a22d23}*SharedItemsImports = 9
12321207
binver\binver.vcxitems*{fb313532-38b0-4676-9303-ab200aa13576}*SharedItemsImports = 4
12331208
ManifestSchema\ManifestSchema.vcxitems*{fb313532-38b0-4676-9303-ab200aa13576}*SharedItemsImports = 4

‎src/AppInstallerCLITests/AppInstallerCLITests.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,9 +1043,6 @@
10431043
<ProjectReference Include="..\SfsClient\SfsClient.vcxproj">
10441044
<Project>{1b9077b3-8923-4ecd-8fc9-b3190fcbe4d4}</Project>
10451045
</ProjectReference>
1046-
<ProjectReference Include="..\PureLib\PureLib.vcxproj">
1047-
<Project>{bb14d603-f44e-4415-8770-bf3e13f4c17f}</Project>
1048-
</ProjectReference>
10491046
</ItemGroup>
10501047
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
10511048
<ImportGroup Label="ExtensionTargets">

‎src/PureLib/PureLib.vcxitems

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Label="Globals">
4+
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5+
<HasSharedItems>true</HasSharedItems>
6+
<ItemsProjectGuid>{a33223d2-550b-4d99-a53d-488b1f68683e}</ItemsProjectGuid>
7+
</PropertyGroup>
8+
<ItemDefinitionGroup>
9+
<ClCompile>
10+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
11+
</ClCompile>
12+
</ItemDefinitionGroup>
13+
<ItemGroup>
14+
<ProjectCapability Include="SourceItemsFromImports" />
15+
</ItemGroup>
16+
<ItemGroup>
17+
<ClInclude Include="$(MSBuildThisFileDirectory)pure\pure.h" />
18+
<ClInclude Include="$(MSBuildThisFileDirectory)pure\pure_constants.h" />
19+
<ClInclude Include="$(MSBuildThisFileDirectory)pure\pure_errors.h" />
20+
<ClInclude Include="$(MSBuildThisFileDirectory)pure\pure_routines.h" />
21+
<ClInclude Include="$(MSBuildThisFileDirectory)pure\pure_signatures.h" />
22+
</ItemGroup>
23+
<ItemGroup>
24+
<None Include="$(MSBuildThisFileDirectory)readme.md" />
25+
</ItemGroup>
26+
</Project>

‎src/PureLib/PureLib.vcxproj

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
208208
<ClCompile>
209209
<LanguageStandard>stdcpp17</LanguageStandard>
210-
<AdditionalIncludeDirectories>pure;pure\zlib;</AdditionalIncludeDirectories>
210+
<AdditionalIncludeDirectories>pure;</AdditionalIncludeDirectories>
211211
<WarningLevel>TurnOffAllWarnings</WarningLevel>
212212
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
213213
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -220,34 +220,6 @@
220220
<ClInclude Include="pure\pure_errors.h" />
221221
<ClInclude Include="pure\pure_routines.h" />
222222
<ClInclude Include="pure\pure_signatures.h" />
223-
<ClInclude Include="pure\zlib\crc32.h" />
224-
<ClInclude Include="pure\zlib\deflate.h" />
225-
<ClInclude Include="pure\zlib\gzguts.h" />
226-
<ClInclude Include="pure\zlib\inffast.h" />
227-
<ClInclude Include="pure\zlib\inffixed.h" />
228-
<ClInclude Include="pure\zlib\inflate.h" />
229-
<ClInclude Include="pure\zlib\inftrees.h" />
230-
<ClInclude Include="pure\zlib\trees.h" />
231-
<ClInclude Include="pure\zlib\zconf.h" />
232-
<ClInclude Include="pure\zlib\zlib.h" />
233-
<ClInclude Include="pure\zlib\zutil.h" />
234-
</ItemGroup>
235-
<ItemGroup>
236-
<ClCompile Include="pure\zlib\adler32.c" />
237-
<ClCompile Include="pure\zlib\compress.c" />
238-
<ClCompile Include="pure\zlib\crc32.c" />
239-
<ClCompile Include="pure\zlib\deflate.c" />
240-
<ClCompile Include="pure\zlib\gzclose.c" />
241-
<ClCompile Include="pure\zlib\gzlib.c" />
242-
<ClCompile Include="pure\zlib\gzread.c" />
243-
<ClCompile Include="pure\zlib\gzwrite.c" />
244-
<ClCompile Include="pure\zlib\infback.c" />
245-
<ClCompile Include="pure\zlib\inffast.c" />
246-
<ClCompile Include="pure\zlib\inflate.c" />
247-
<ClCompile Include="pure\zlib\inftrees.c" />
248-
<ClCompile Include="pure\zlib\trees.c" />
249-
<ClCompile Include="pure\zlib\uncompr.c" />
250-
<ClCompile Include="pure\zlib\zutil.c" />
251223
</ItemGroup>
252224
<ItemGroup>
253225
<None Include="readme.md" />

‎src/PureLib/PureLib.vcxproj.filters

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -30,86 +30,6 @@
3030
<ClInclude Include="pure\pure_signatures.h">
3131
<Filter>Header Files</Filter>
3232
</ClInclude>
33-
<ClInclude Include="pure\zlib\crc32.h">
34-
<Filter>Header Files</Filter>
35-
</ClInclude>
36-
<ClInclude Include="pure\zlib\deflate.h">
37-
<Filter>Header Files</Filter>
38-
</ClInclude>
39-
<ClInclude Include="pure\zlib\gzguts.h">
40-
<Filter>Header Files</Filter>
41-
</ClInclude>
42-
<ClInclude Include="pure\zlib\inffast.h">
43-
<Filter>Header Files</Filter>
44-
</ClInclude>
45-
<ClInclude Include="pure\zlib\inffixed.h">
46-
<Filter>Header Files</Filter>
47-
</ClInclude>
48-
<ClInclude Include="pure\zlib\inflate.h">
49-
<Filter>Header Files</Filter>
50-
</ClInclude>
51-
<ClInclude Include="pure\zlib\inftrees.h">
52-
<Filter>Header Files</Filter>
53-
</ClInclude>
54-
<ClInclude Include="pure\zlib\trees.h">
55-
<Filter>Header Files</Filter>
56-
</ClInclude>
57-
<ClInclude Include="pure\zlib\zconf.h">
58-
<Filter>Header Files</Filter>
59-
</ClInclude>
60-
<ClInclude Include="pure\zlib\zlib.h">
61-
<Filter>Header Files</Filter>
62-
</ClInclude>
63-
<ClInclude Include="pure\zlib\zutil.h">
64-
<Filter>Header Files</Filter>
65-
</ClInclude>
66-
</ItemGroup>
67-
<ItemGroup>
68-
<ClCompile Include="pure\zlib\adler32.c">
69-
<Filter>Source Files</Filter>
70-
</ClCompile>
71-
<ClCompile Include="pure\zlib\compress.c">
72-
<Filter>Source Files</Filter>
73-
</ClCompile>
74-
<ClCompile Include="pure\zlib\crc32.c">
75-
<Filter>Source Files</Filter>
76-
</ClCompile>
77-
<ClCompile Include="pure\zlib\deflate.c">
78-
<Filter>Source Files</Filter>
79-
</ClCompile>
80-
<ClCompile Include="pure\zlib\gzclose.c">
81-
<Filter>Source Files</Filter>
82-
</ClCompile>
83-
<ClCompile Include="pure\zlib\gzlib.c">
84-
<Filter>Source Files</Filter>
85-
</ClCompile>
86-
<ClCompile Include="pure\zlib\gzread.c">
87-
<Filter>Source Files</Filter>
88-
</ClCompile>
89-
<ClCompile Include="pure\zlib\gzwrite.c">
90-
<Filter>Source Files</Filter>
91-
</ClCompile>
92-
<ClCompile Include="pure\zlib\infback.c">
93-
<Filter>Source Files</Filter>
94-
</ClCompile>
95-
<ClCompile Include="pure\zlib\inffast.c">
96-
<Filter>Source Files</Filter>
97-
</ClCompile>
98-
<ClCompile Include="pure\zlib\inflate.c">
99-
<Filter>Source Files</Filter>
100-
</ClCompile>
101-
<ClCompile Include="pure\zlib\inftrees.c">
102-
<Filter>Source Files</Filter>
103-
</ClCompile>
104-
<ClCompile Include="pure\zlib\trees.c">
105-
<Filter>Source Files</Filter>
106-
</ClCompile>
107-
<ClCompile Include="pure\zlib\uncompr.c">
108-
<Filter>Source Files</Filter>
109-
</ClCompile>
110-
<ClCompile Include="pure\zlib\zutil.c">
111-
<Filter>Source Files</Filter>
112-
</ClCompile>
11333
</ItemGroup>
11434
<ItemGroup>
11535
<None Include="readme.md" />

‎src/PureLib/pure/README_zlib.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/PureLib/pure/binding.c

Lines changed: 0 additions & 108 deletions
This file was deleted.

‎src/PureLib/pure/pure.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "pure_signatures.h"
1515
#include "pure_routines.h"
1616

17-
#include "zlib/zlib.h"
17+
#include "zlib.h"
1818

1919
typedef struct pure_ctx {
2020
uint64_t flags;

0 commit comments

Comments
 (0)