Skip to content

Commit cce321c

Browse files
florelisflorelis
committed
Merge branch 'master' into vcpkg-overlay
# Conflicts: # src/cpprestsdk/cpprestsdk.vcxproj
2 parents 24b2426 + 6e092a6 commit cce321c

File tree

47 files changed

+801
-179
lines changed

Some content is hidden

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

47 files changed

+801
-179
lines changed

‎samples/MinimalCallers/C#/Configuration-OutOfProc/C#_Configuration_OutOfProc.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.WindowsPackageManager.Configuration.OutOfProc" Version="1.9.25180" GeneratePathProperty="True" />
13+
<PackageReference Include="Microsoft.WindowsPackageManager.Configuration.OutOfProc" Version="1.10.340" GeneratePathProperty="True" />
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<Content Include="$(PkgMicrosoft_WindowsPackageManager_Configuration_OutOfProc)\runtimes\win10-$(Platform)\native\Microsoft.Management.Configuration.dll" Link="Microsoft.Management.Configuration.dll" CopyToOutputDirectory="PreserveNewest" />
18-
<Content Include="$(PkgMicrosoft_WindowsPackageManager_Configuration_OutOfProc)\runtimes\win10-$(Platform)\native\Microsoft.Management.Configuration.winmd" Link="Microsoft.Management.Configuration.winmd" CopyToOutputDirectory="PreserveNewest" />
17+
<Content Include="$(PkgMicrosoft_WindowsPackageManager_Configuration_OutOfProc)\runtimes\win-$(Platform)\native\Microsoft.Management.Configuration.dll" Link="Microsoft.Management.Configuration.dll" CopyToOutputDirectory="PreserveNewest" />
18+
<Content Include="$(PkgMicrosoft_WindowsPackageManager_Configuration_OutOfProc)\runtimes\win-$(Platform)\native\Microsoft.Management.Configuration.winmd" Link="Microsoft.Management.Configuration.winmd" CopyToOutputDirectory="PreserveNewest" />
1919
</ItemGroup>
2020

2121
</Project>

‎samples/MinimalCallers/C#/WinGet-InProc/C#_WinGet_InProc.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
14-
<PackageReference Include="Microsoft.WindowsPackageManager.InProcCom" Version="1.9.25180">
14+
<PackageReference Include="Microsoft.WindowsPackageManager.InProcCom" Version="1.10.340">
1515
<!-- NU1701: The package targets .NET Framework, but this uses .NET -->
1616
<NoWarn>NU1701</NoWarn>
1717
<GeneratePathProperty>true</GeneratePathProperty>

‎samples/MinimalCallers/C#/WinGet-OutOfProc/C#_WinGet_OutOfProc.csproj‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,14 @@
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99
<Platforms>x64;ARM64;x86</Platforms>
10-
</PropertyGroup>
11-
12-
<ItemGroup>
13-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
14-
<PackageReference Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.9.25180">
15-
<!-- NU1701: The package targets .NET Framework, but this uses .NET -->
16-
<NoWarn>NU1701</NoWarn>
17-
<GeneratePathProperty>true</GeneratePathProperty>
18-
<IncludeAssets>none</IncludeAssets>
19-
</PackageReference>
20-
</ItemGroup>
2110

22-
<!-- Tell CsWinRT to create the projection for the API -->
23-
<PropertyGroup>
24-
<CsWinRTWindowsMetadata>10.0.19041.0</CsWinRTWindowsMetadata>
25-
<CsWinRTIncludes>Microsoft.Management.Deployment</CsWinRTIncludes>
11+
<!-- Use one of static, dynamic, none -->
12+
<MicrosoftManagementDeployment-FactoryLinkage>static</MicrosoftManagementDeployment-FactoryLinkage>
2613
</PropertyGroup>
27-
<ItemGroup>
28-
<CsWinRTInputs Include="$(PkgMicrosoft_WindowsPackageManager_ComInterop)\lib\Microsoft.Management.Deployment.winmd" />
29-
</ItemGroup>
3014

31-
<!-- Reference and include necessary binaries -->
3215
<ItemGroup>
33-
<Content Include="$(PkgMicrosoft_WindowsPackageManager_ComInterop)\lib\Microsoft.Management.Deployment.winmd" Link="Microsoft.Management.Deployment.winmd" CopyToOutputDirectory="PreserveNewest" />
34-
<Content Include="$(PkgMicrosoft_WindowsPackageManager_ComInterop)\runtimes\win10-$(Platform)\native\winrtact.dll" Link="winrtact.dll" CopyToOutputDirectory="PreserveNewest" />
35-
<!-- Replace 'dynamic' with 'static' to use binaries compiled with static linking -->
36-
<Content Include="$(PkgMicrosoft_WindowsPackageManager_ComInterop)\bin\win10-$(Platform)\native\dynamic\Microsoft.Management.Deployment.dll" Link="Microsoft.Management.Deployment.dll" CopyToOutputDirectory="PreserveNewest" />
16+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
17+
<PackageReference Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
3718
</ItemGroup>
3819

3920
</Project>

‎samples/MinimalCallers/C++/WinGet-InProc/WinGet-InProc.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<!-- Reference the .winmd so that it can be processed by CppWinRT -->
100100
<ItemGroup>
101101
<Reference Include="Microsoft.Management.Deployment">
102-
<HintPath>..\..\packages\Microsoft.WindowsPackageManager.InProcCom.1.9.25180\lib\Microsoft.Management.Deployment.winmd</HintPath>
102+
<HintPath>..\..\packages\Microsoft.WindowsPackageManager.InProcCom.1.10.340\lib\Microsoft.Management.Deployment.winmd</HintPath>
103103
<IsWinMDFile>true</IsWinMDFile>
104104
</Reference>
105105
</ItemGroup>

‎samples/MinimalCallers/C++/WinGet-InProc/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
4-
<package id="Microsoft.WindowsPackageManager.InProcCom" version="1.9.25180" targetFramework="native" />
4+
<package id="Microsoft.WindowsPackageManager.InProcCom" version="1.10.340" targetFramework="native" />
55
</packages>

‎samples/MinimalCallers/C++/WinGet-OutOfProc/WinGet-OutOfProc.vcxproj‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,33 +96,21 @@
9696
<ItemGroup>
9797
<None Include="packages.config" />
9898
</ItemGroup>
99-
<!-- Reference and include necessary binaries -->
10099
<PropertyGroup>
101-
<WinGetNuGetPlatform Condition="'$(Platform)' == 'Win32'">x86</WinGetNuGetPlatform>
102-
<WinGetNuGetPlatform Condition="'$(Platform)' != 'Win32'">$(Platform)</WinGetNuGetPlatform>
100+
<!-- Use one of static, dynamic, none -->
101+
<MicrosoftManagementDeployment-FactoryLinkage>static</MicrosoftManagementDeployment-FactoryLinkage>
103102
</PropertyGroup>
104-
<ItemGroup>
105-
<WindowsMetadataReference Include="..\..\packages\Microsoft.WindowsPackageManager.ComInterop.1.9.25180\lib\Microsoft.Management.Deployment.winmd" />
106-
<Reference Include="..\..\packages\Microsoft.WindowsPackageManager.ComInterop.1.9.25180\lib\Microsoft.Management.Deployment.winmd">
107-
<Implementation>Microsoft.Management.Deployment.dll</Implementation>
108-
</Reference>
109-
<ReferenceCopyLocalPaths Include="..\..\packages\Microsoft.WindowsPackageManager.ComInterop.1.9.25180\lib\Microsoft.Management.Deployment.winmd">
110-
<Implementation>Microsoft.Management.Deployment.dll</Implementation>
111-
<IsOutOfProcess>true</IsOutOfProcess>
112-
</ReferenceCopyLocalPaths>
113-
<!-- Replace 'dynamic' with 'static' to use binaries compiled with static linking -->
114-
<ReferenceCopyLocalPaths Include="..\..\packages\Microsoft.WindowsPackageManager.ComInterop.1.9.25180\bin\win10-$(WinGetNuGetPlatform)\native\dynamic\Microsoft.Management.Deployment.dll" />
115-
<ReferenceCopyLocalPaths Include="..\..\packages\Microsoft.WindowsPackageManager.ComInterop.1.9.25180\runtimes\win10-$(WinGetNuGetPlatform)\native\winrtact.dll" />
116-
</ItemGroup>
117103
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
118104
<ImportGroup Label="ExtensionTargets">
119105
<Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets')" />
106+
<Import Project="..\..\packages\Microsoft.WindowsPackageManager.ComInterop.1.10.340\build\native\Microsoft.WindowsPackageManager.ComInterop.targets" Condition="Exists('..\..\packages\Microsoft.WindowsPackageManager.ComInterop.1.10.340\build\native\Microsoft.WindowsPackageManager.ComInterop.targets')" />
120107
</ImportGroup>
121108
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
122109
<PropertyGroup>
123110
<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>
124111
</PropertyGroup>
125112
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props'))" />
126113
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.targets'))" />
114+
<Error Condition="!Exists('..\..\packages\Microsoft.WindowsPackageManager.ComInterop.1.10.340\build\native\Microsoft.WindowsPackageManager.ComInterop.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsPackageManager.ComInterop.1.10.340\build\native\Microsoft.WindowsPackageManager.ComInterop.targets'))" />
127115
</Target>
128116
</Project>

‎samples/MinimalCallers/C++/WinGet-OutOfProc/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Windows.CppWinRT" version="2.0.240405.15" targetFramework="native" />
4-
<package id="Microsoft.WindowsPackageManager.ComInterop" version="1.9.25180" targetFramework="native" />
4+
<package id="Microsoft.WindowsPackageManager.ComInterop" version="1.10.340" targetFramework="native" />
55
</packages>

‎samples/MinimalCallers/MinimalCallers.sln‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,17 @@ Global
4747
{A7CC8A07-02FC-4035-848F-1EBECCCE9C07}.Release|x86.ActiveCfg = Release|x86
4848
{A7CC8A07-02FC-4035-848F-1EBECCCE9C07}.Release|x86.Build.0 = Release|x86
4949
{DD80F640-5071-4200-9BDE-620FBDFF1725}.Debug|ARM64.ActiveCfg = Debug|ARM64
50+
{DD80F640-5071-4200-9BDE-620FBDFF1725}.Debug|ARM64.Build.0 = Debug|ARM64
5051
{DD80F640-5071-4200-9BDE-620FBDFF1725}.Debug|x64.ActiveCfg = Debug|x64
52+
{DD80F640-5071-4200-9BDE-620FBDFF1725}.Debug|x64.Build.0 = Debug|x64
5153
{DD80F640-5071-4200-9BDE-620FBDFF1725}.Debug|x86.ActiveCfg = Debug|x86
54+
{DD80F640-5071-4200-9BDE-620FBDFF1725}.Debug|x86.Build.0 = Debug|x86
5255
{DD80F640-5071-4200-9BDE-620FBDFF1725}.Release|ARM64.ActiveCfg = Release|ARM64
56+
{DD80F640-5071-4200-9BDE-620FBDFF1725}.Release|ARM64.Build.0 = Release|ARM64
5357
{DD80F640-5071-4200-9BDE-620FBDFF1725}.Release|x64.ActiveCfg = Release|x64
58+
{DD80F640-5071-4200-9BDE-620FBDFF1725}.Release|x64.Build.0 = Release|x64
5459
{DD80F640-5071-4200-9BDE-620FBDFF1725}.Release|x86.ActiveCfg = Release|x86
60+
{DD80F640-5071-4200-9BDE-620FBDFF1725}.Release|x86.Build.0 = Release|x86
5561
{B44C18DE-FE76-4D30-B740-25A5AD99257F}.Debug|ARM64.ActiveCfg = Debug|ARM64
5662
{B44C18DE-FE76-4D30-B740-25A5AD99257F}.Debug|ARM64.Build.0 = Debug|ARM64
5763
{B44C18DE-FE76-4D30-B740-25A5AD99257F}.Debug|x64.ActiveCfg = Debug|x64
@@ -77,11 +83,17 @@ Global
7783
{93B5C28B-04AC-4B35-9253-81C1405D9A72}.Release|x86.ActiveCfg = Release|x86
7884
{93B5C28B-04AC-4B35-9253-81C1405D9A72}.Release|x86.Build.0 = Release|x86
7985
{925454B7-A3FA-40C9-806A-4B64D5764157}.Debug|ARM64.ActiveCfg = Debug|ARM64
86+
{925454B7-A3FA-40C9-806A-4B64D5764157}.Debug|ARM64.Build.0 = Debug|ARM64
8087
{925454B7-A3FA-40C9-806A-4B64D5764157}.Debug|x64.ActiveCfg = Debug|x64
88+
{925454B7-A3FA-40C9-806A-4B64D5764157}.Debug|x64.Build.0 = Debug|x64
8189
{925454B7-A3FA-40C9-806A-4B64D5764157}.Debug|x86.ActiveCfg = Debug|Win32
90+
{925454B7-A3FA-40C9-806A-4B64D5764157}.Debug|x86.Build.0 = Debug|Win32
8291
{925454B7-A3FA-40C9-806A-4B64D5764157}.Release|ARM64.ActiveCfg = Release|ARM64
92+
{925454B7-A3FA-40C9-806A-4B64D5764157}.Release|ARM64.Build.0 = Release|ARM64
8393
{925454B7-A3FA-40C9-806A-4B64D5764157}.Release|x64.ActiveCfg = Release|x64
94+
{925454B7-A3FA-40C9-806A-4B64D5764157}.Release|x64.Build.0 = Release|x64
8495
{925454B7-A3FA-40C9-806A-4B64D5764157}.Release|x86.ActiveCfg = Release|Win32
96+
{925454B7-A3FA-40C9-806A-4B64D5764157}.Release|x86.Build.0 = Release|Win32
8597
{01CB5485-D1F3-421F-8E8A-7BC04B9CA037}.Debug|ARM64.ActiveCfg = Debug|ARM64
8698
{01CB5485-D1F3-421F-8E8A-7BC04B9CA037}.Debug|ARM64.Build.0 = Debug|ARM64
8799
{01CB5485-D1F3-421F-8E8A-7BC04B9CA037}.Debug|x64.ActiveCfg = Debug|x64

‎src/AppInstallerCLI.sln‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ EndProject
9191
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1A5D7A7D-5CB2-47D5-B40D-4E61CAEDC798}"
9292
ProjectSection(SolutionItems) = preProject
9393
CodeAnalysis.ruleset = CodeAnalysis.ruleset
94+
Directory.Packages.props = Directory.Packages.props
9495
nuget.config = nuget.config
9596
stylecop.json = stylecop.json
9697
vcpkg.json = vcpkg.json
@@ -180,6 +181,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VcpkgCustomTriplets", "Vcpk
180181
VcpkgCustomTriplets\arm64-release-static.cmake = VcpkgCustomTriplets\arm64-release-static.cmake
181182
VcpkgCustomTriplets\arm64-release.cmake = VcpkgCustomTriplets\arm64-release.cmake
182183
VcpkgCustomTriplets\arm64.cmake = VcpkgCustomTriplets\arm64.cmake
184+
VcpkgCustomTriplets\common.cmake = VcpkgCustomTriplets\common.cmake
183185
VcpkgCustomTriplets\x64-release-static.cmake = VcpkgCustomTriplets\x64-release-static.cmake
184186
VcpkgCustomTriplets\x64-release.cmake = VcpkgCustomTriplets\x64-release.cmake
185187
VcpkgCustomTriplets\x64.cmake = VcpkgCustomTriplets\x64.cmake

‎src/AppInstallerCLICore/AppInstallerCLICore.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@
309309
<ClInclude Include="Commands\DscSourceResource.h" />
310310
<ClInclude Include="Commands\DscTestFileResource.h" />
311311
<ClInclude Include="Commands\DscTestJsonResource.h" />
312+
<ClInclude Include="Commands\DscUserSettingsFileResource.h" />
312313
<ClInclude Include="Commands\ErrorCommand.h" />
313314
<ClInclude Include="Commands\ExperimentalCommand.h" />
314315
<ClInclude Include="Commands\ExportCommand.h" />
@@ -396,6 +397,7 @@
396397
<ClCompile Include="Commands\DscSourceResource.cpp" />
397398
<ClCompile Include="Commands\DscTestFileResource.cpp" />
398399
<ClCompile Include="Commands\DscTestJsonResource.cpp" />
400+
<ClCompile Include="Commands\DscUserSettingsFileResource.cpp" />
399401
<ClCompile Include="Commands\ErrorCommand.cpp" />
400402
<ClCompile Include="Commands\FontCommand.cpp" />
401403
<ClCompile Include="Commands\ImportCommand.cpp" />

0 commit comments

Comments
 (0)