Skip to content

Remove clones of transitive dependencies available from vcpkg #5399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 22, 2025
Merged

Remove clones of transitive dependencies available from vcpkg #5399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1aeabc9
Remove unused parts of UndockedRegFreeWinRT
florelis Apr 16, 2025
74b4807
Remove zlib from PureLib
florelis Apr 16, 2025
958987e
Use vcxitems for purelib
florelis Apr 21, 2025
0e54ea6
Update readme, cgmanifest
florelis Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"component": {
"type": "git",
"git": {
"repositoryUrl": "https://github.com/madler/zlib.git",
"commitHash": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"
"repositoryUrl": "https://github.com/microsoft/xlang",
"commitHash": "cfe510d0d2b07484fea2c6d77163de017738c100"
}
}
},
Expand Down
37 changes: 6 additions & 31 deletions src/AppInstallerCLI.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32630.192
MinimumVisualStudioVersion = 10.0.40219.1
Expand Down Expand Up @@ -140,8 +141,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{
..\templates\e2e-test.template.yml = ..\templates\e2e-test.template.yml
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PureLib", "PureLib\PureLib.vcxproj", "{BB14D603-F44E-4415-8770-BF3E13F4C17F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AppInstallerSharedLib", "AppInstallerSharedLib\AppInstallerSharedLib.vcxproj", "{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Management.Configuration", "Microsoft.Management.Configuration\Microsoft.Management.Configuration.vcxproj", "{CA460806-5E41-4E97-9A3D-1D74B433B663}"
Expand Down Expand Up @@ -205,6 +204,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "targets", "targets", "{A0B4
targets\ReferenceEmbeddedCsWinRTProject.targets = targets\ReferenceEmbeddedCsWinRTProject.targets
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PureLib", "PureLib\PureLib.vcxitems", "{A33223D2-550B-4D99-A53D-488B1F68683E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
Expand Down Expand Up @@ -774,33 +775,6 @@ Global
{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|x64.Build.0 = Release|x64
{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|x86.ActiveCfg = Release|Win32
{31ED69A8-5310-45A9-953F-56C351D2C3E1}.TestRelease|x86.Build.0 = Release|Win32
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|ARM64.ActiveCfg = Debug|ARM64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|ARM64.Build.0 = Debug|ARM64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|x64.ActiveCfg = Debug|x64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|x64.Build.0 = Debug|x64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|x86.ActiveCfg = Debug|Win32
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Debug|x86.Build.0 = Debug|Win32
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Fuzzing|ARM64.ActiveCfg = Release|ARM64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Fuzzing|x64.ActiveCfg = Release|x64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Fuzzing|x86.ActiveCfg = Release|Win32
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|ARM64.ActiveCfg = Release|ARM64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|ARM64.Build.0 = Release|ARM64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|x64.ActiveCfg = Release|x64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|x64.Build.0 = Release|x64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|x86.ActiveCfg = Release|Win32
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.Release|x86.Build.0 = Release|Win32
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|ARM64.ActiveCfg = ReleaseStatic|ARM64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|ARM64.Build.0 = ReleaseStatic|ARM64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x86.ActiveCfg = ReleaseStatic|Win32
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.ReleaseStatic|x86.Build.0 = ReleaseStatic|Win32
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|ARM64.ActiveCfg = Release|ARM64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|ARM64.Build.0 = Release|ARM64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|x64.ActiveCfg = Release|x64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|x64.Build.0 = Release|x64
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|x86.ActiveCfg = Release|Win32
{BB14D603-F44E-4415-8770-BF3E13F4C17F}.TestRelease|x86.Build.0 = Release|Win32
{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|ARM64.ActiveCfg = Debug|ARM64
{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|ARM64.Build.0 = Debug|ARM64
{F3F6E699-BC5D-4950-8A05-E49DD9EB0D51}.Debug|x64.ActiveCfg = Debug|x64
Expand Down Expand Up @@ -1194,7 +1168,6 @@ Global
{463C0EF3-DF38-4C3D-8E7E-D4901E0CDC6C} = {7C218A3E-9BC8-48FF-B91B-BCACD828C0C9}
{31ED69A8-5310-45A9-953F-56C351D2C3E1} = {60618CAC-2995-4DF9-9914-45C6FC02C995}
{8E43F982-40D5-4DF1-9044-C08047B5F43B} = {8D53D749-D51C-46F8-A162-9371AAA6C2E7}
{BB14D603-F44E-4415-8770-BF3E13F4C17F} = {60618CAC-2995-4DF9-9914-45C6FC02C995}
{1F56BECB-D65D-4BBA-8788-6671B251392A} = {7C218A3E-9BC8-48FF-B91B-BCACD828C0C9}
{167F634B-A3AD-494E-8E67-B888103E35FF} = {7C218A3E-9BC8-48FF-B91B-BCACD828C0C9}
{C54F80ED-B736-49B0-9BD3-662F57024D01} = {7C218A3E-9BC8-48FF-B91B-BCACD828C0C9}
Expand All @@ -1203,6 +1176,7 @@ Global
{1B9077B3-8923-4ECD-8FC9-B3190FCBE4D4} = {60618CAC-2995-4DF9-9914-45C6FC02C995}
{76B26B2C-602A-4AD0-9736-4162D3FCA92A} = {1A5D7A7D-5CB2-47D5-B40D-4E61CAEDC798}
{A0B4F808-B190-41C4-97CB-C8EA1932F84F} = {8D53D749-D51C-46F8-A162-9371AAA6C2E7}
{A33223D2-550B-4D99-A53D-488B1F68683E} = {60618CAC-2995-4DF9-9914-45C6FC02C995}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B6FDB70C-A751-422C-ACD1-E35419495857}
Expand All @@ -1228,6 +1202,7 @@ Global
ManifestSchema\ManifestSchema.vcxitems*{89b1aab4-2bbc-4b65-9ed7-a01d5cf88230}*SharedItemsImports = 4
WinGetSchemas\WinGetSchemas.vcxitems*{89b1aab4-2bbc-4b65-9ed7-a01d5cf88230}*SharedItemsImports = 4
WinGetSchemas\WinGetSchemas.vcxitems*{952b513f-8a00-4d74-9271-925afb3c6252}*SharedItemsImports = 9
PureLib\PureLib.vcxitems*{a33223d2-550b-4d99-a53d-488b1f68683e}*SharedItemsImports = 9
CertificateResources\CertificateResources.vcxitems*{b0bbbd92-943b-408f-b2b2-dbbab4a22d23}*SharedItemsImports = 9
binver\binver.vcxitems*{fb313532-38b0-4676-9303-ab200aa13576}*SharedItemsImports = 4
ManifestSchema\ManifestSchema.vcxitems*{fb313532-38b0-4676-9303-ab200aa13576}*SharedItemsImports = 4
Expand Down
3 changes: 0 additions & 3 deletions src/AppInstallerCLITests/AppInstallerCLITests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,9 +1043,6 @@
<ProjectReference Include="..\SfsClient\SfsClient.vcxproj">
<Project>{1b9077b3-8923-4ecd-8fc9-b3190fcbe4d4}</Project>
</ProjectReference>
<ProjectReference Include="..\PureLib\PureLib.vcxproj">
<Project>{bb14d603-f44e-4415-8770-bf3e13f4c17f}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
26 changes: 26 additions & 0 deletions src/PureLib/PureLib.vcxitems
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<ItemsProjectGuid>{a33223d2-550b-4d99-a53d-488b1f68683e}</ItemsProjectGuid>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectCapability Include="SourceItemsFromImports" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(MSBuildThisFileDirectory)pure\pure.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)pure\pure_constants.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)pure\pure_errors.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)pure\pure_routines.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)pure\pure_signatures.h" />
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)readme.md" />
</ItemGroup>
</Project>
30 changes: 1 addition & 29 deletions src/PureLib/PureLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalIncludeDirectories>pure;pure\zlib;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>pure;</AdditionalIncludeDirectories>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
Expand All @@ -220,34 +220,6 @@
<ClInclude Include="pure\pure_errors.h" />
<ClInclude Include="pure\pure_routines.h" />
<ClInclude Include="pure\pure_signatures.h" />
<ClInclude Include="pure\zlib\crc32.h" />
<ClInclude Include="pure\zlib\deflate.h" />
<ClInclude Include="pure\zlib\gzguts.h" />
<ClInclude Include="pure\zlib\inffast.h" />
<ClInclude Include="pure\zlib\inffixed.h" />
<ClInclude Include="pure\zlib\inflate.h" />
<ClInclude Include="pure\zlib\inftrees.h" />
<ClInclude Include="pure\zlib\trees.h" />
<ClInclude Include="pure\zlib\zconf.h" />
<ClInclude Include="pure\zlib\zlib.h" />
<ClInclude Include="pure\zlib\zutil.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="pure\zlib\adler32.c" />
<ClCompile Include="pure\zlib\compress.c" />
<ClCompile Include="pure\zlib\crc32.c" />
<ClCompile Include="pure\zlib\deflate.c" />
<ClCompile Include="pure\zlib\gzclose.c" />
<ClCompile Include="pure\zlib\gzlib.c" />
<ClCompile Include="pure\zlib\gzread.c" />
<ClCompile Include="pure\zlib\gzwrite.c" />
<ClCompile Include="pure\zlib\infback.c" />
<ClCompile Include="pure\zlib\inffast.c" />
<ClCompile Include="pure\zlib\inflate.c" />
<ClCompile Include="pure\zlib\inftrees.c" />
<ClCompile Include="pure\zlib\trees.c" />
<ClCompile Include="pure\zlib\uncompr.c" />
<ClCompile Include="pure\zlib\zutil.c" />
</ItemGroup>
<ItemGroup>
<None Include="readme.md" />
Expand Down
80 changes: 0 additions & 80 deletions src/PureLib/PureLib.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,86 +30,6 @@
<ClInclude Include="pure\pure_signatures.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pure\zlib\crc32.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pure\zlib\deflate.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pure\zlib\gzguts.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pure\zlib\inffast.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pure\zlib\inffixed.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pure\zlib\inflate.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pure\zlib\inftrees.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pure\zlib\trees.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pure\zlib\zconf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pure\zlib\zlib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pure\zlib\zutil.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="pure\zlib\adler32.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\compress.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\crc32.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\deflate.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\gzclose.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\gzlib.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\gzread.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\gzwrite.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\infback.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\inffast.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\inflate.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\inftrees.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\trees.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\uncompr.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pure\zlib\zutil.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="readme.md" />
Expand Down
9 changes: 0 additions & 9 deletions src/PureLib/pure/README_zlib.md
View file
Open in desktop

This file was deleted.

108 changes: 0 additions & 108 deletions src/PureLib/pure/binding.c
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/PureLib/pure/pure.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "pure_signatures.h"
#include "pure_routines.h"

#include "zlib/zlib.h"
#include "zlib.h"

typedef struct pure_ctx {
uint64_t flags;
Expand Down
Loading