Skip to content

Commit 9cd426f

Browse files
btueffersangelazhangmsft
btueffers
and
angelazhangmsft
authored
Btueffers/1.0GAupdate (#132)
* DynamicDependenciesSamplesUpdate1.0 * TextRendering1.0Update * Windowing1.0GAupdate * Unpackaged1.0GAupdate * Fix formatting * ResolvingWindowingMergeConflict * reverting to commit 48782f7 * DWriteCoreBuildToolsPackageUpdate Co-authored-by: Angela Zhang <[email protected]>
1 parent 0eea537 commit 9cd426f

File tree

17 files changed

+43
-50
lines changed

17 files changed

+43
-50
lines changed

‎Samples/DynamicDependencies/DirectX/D3D9ExSample.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ extern float GetFPS();
100100

101101
// Constants for Windows App SDK lookup via bootstrapper
102102
const UINT32 majorMinorVersion{ 0x00010000 };
103-
PCWSTR versionTag{ L"preview3" };
103+
PCWSTR versionTag{ L"" };
104104

105105
int APIENTRY wWinMain( HINSTANCE hInstance,
106106
HINSTANCE hPrevInstance,

‎Samples/DynamicDependencies/DirectX/D3D9ExSample.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.props')" />
34
<Import Project="packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.props')" />
4-
<Import Project="packages\Microsoft.WindowsAppSDK.1.0.0-preview3\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('packages\Microsoft.WindowsAppSDK.1.0.0-preview3\build\native\Microsoft.WindowsAppSDK.props')" />
55
<ItemGroup Label="ProjectConfigurations">
66
<ProjectConfiguration Include="Debug|Win32">
77
<Configuration>Debug</Configuration>
@@ -113,17 +113,17 @@
113113
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
114114
<ImportGroup Label="ExtensionTargets">
115115
<Import Project="packages\Microsoft.Windows.ImplementationLibrary.1.0.210803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('packages\Microsoft.Windows.ImplementationLibrary.1.0.210803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
116-
<Import Project="packages\Microsoft.WindowsAppSDK.1.0.0-preview3\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('packages\Microsoft.WindowsAppSDK.1.0.0-preview3\build\native\Microsoft.WindowsAppSDK.targets')" />
117116
<Import Project="packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.targets')" />
117+
<Import Project="packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.targets')" />
118118
</ImportGroup>
119119
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
120120
<PropertyGroup>
121121
<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>
122122
</PropertyGroup>
123123
<Error Condition="!Exists('packages\Microsoft.Windows.ImplementationLibrary.1.0.210803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.ImplementationLibrary.1.0.210803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
124-
<Error Condition="!Exists('packages\Microsoft.WindowsAppSDK.1.0.0-preview3\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.WindowsAppSDK.1.0.0-preview3\build\native\Microsoft.WindowsAppSDK.props'))" />
125-
<Error Condition="!Exists('packages\Microsoft.WindowsAppSDK.1.0.0-preview3\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.WindowsAppSDK.1.0.0-preview3\build\native\Microsoft.WindowsAppSDK.targets'))" />
126124
<Error Condition="!Exists('packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.props'))" />
127125
<Error Condition="!Exists('packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
126+
<Error Condition="!Exists('packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.props'))" />
127+
<Error Condition="!Exists('packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.targets'))" />
128128
</Target>
129129
</Project>

‎Samples/DynamicDependencies/DirectX/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.210803.1" targetFramework="native" />
44
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22000.196" targetFramework="native" />
5-
<package id="Microsoft.WindowsAppSDK" version="1.0.0-preview3" targetFramework="native" />
5+
<package id="Microsoft.WindowsAppSDK" version="1.0.0" targetFramework="native" />
66
</packages>

‎Samples/TextRendering/cpp-win32/DWriteCoreGallery (packaging)/DWriteCoreGallery (packaging).wapproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
<ProjectReference Include="..\DWriteCoreGallery\DWriteCoreGallery.vcxproj" />
6868
</ItemGroup>
6969
<ItemGroup>
70-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.20348.19" />
71-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-preview1" />
70+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.196" />
71+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
7272
</ItemGroup>
7373
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
7474
</Project>

‎Samples/TextRendering/cpp-win32/DWriteCoreGallery.sln‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWriteCoreGallery", "DWrite
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12-
Debug|Any CPU = Debug|Any CPU
1312
Debug|ARM = Debug|ARM
1413
Debug|ARM64 = Debug|ARM64
1514
Debug|x64 = Debug|x64
1615
Debug|x86 = Debug|x86
17-
Release|Any CPU = Release|Any CPU
1816
Release|ARM = Release|ARM
1917
Release|ARM64 = Release|ARM64
2018
Release|x64 = Release|x64
2119
Release|x86 = Release|x86
2220
EndGlobalSection
2321
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24-
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
2722
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|ARM.ActiveCfg = Debug|ARM
2823
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|ARM.Build.0 = Debug|ARM
2924
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -36,9 +31,6 @@ Global
3631
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|x86.ActiveCfg = Debug|x86
3732
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|x86.Build.0 = Debug|x86
3833
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Debug|x86.Deploy.0 = Debug|x86
39-
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|Any CPU.Deploy.0 = Release|Any CPU
4234
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|ARM.ActiveCfg = Release|ARM
4335
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|ARM.Build.0 = Release|ARM
4436
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|ARM.Deploy.0 = Release|ARM
@@ -51,14 +43,12 @@ Global
5143
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|x86.ActiveCfg = Release|x86
5244
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|x86.Build.0 = Release|x86
5345
{D6EC0907-F515-4F61-93EC-B89E19FA58B4}.Release|x86.Deploy.0 = Release|x86
54-
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|Any CPU.ActiveCfg = Debug|Win32
5546
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|ARM.ActiveCfg = Debug|Win32
5647
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|ARM64.ActiveCfg = Debug|Win32
5748
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|x64.ActiveCfg = Debug|x64
5849
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|x64.Build.0 = Debug|x64
5950
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|x86.ActiveCfg = Debug|Win32
6051
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Debug|x86.Build.0 = Debug|Win32
61-
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Release|Any CPU.ActiveCfg = Release|Win32
6252
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Release|ARM.ActiveCfg = Release|Win32
6353
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Release|ARM64.ActiveCfg = Release|Win32
6454
{D8B2B69B-B493-46F8-A8E7-C40A7C41728D}.Release|x64.ActiveCfg = Release|x64

‎Samples/TextRendering/cpp-win32/DWriteCoreGallery/DWriteCoreGallery.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.WindowsAppSDK.1.0.0-preview1\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.0.0-preview1\build\native\Microsoft.WindowsAppSDK.props')" />
4-
<Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.20348.19\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.20348.19\build\Microsoft.Windows.SDK.BuildTools.props')" />
3+
<Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.props')" />
4+
<Import Project="..\packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.props')" />
55
<Import Project="..\..\..\Build.Common.Cpp.props" />
66
<ItemGroup Label="ProjectConfigurations">
77
<ProjectConfiguration Include="Debug|Win32">
@@ -208,17 +208,17 @@
208208
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
209209
<ImportGroup Label="ExtensionTargets">
210210
<Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.210803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.210803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
211-
<Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.20348.19\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.20348.19\build\Microsoft.Windows.SDK.BuildTools.targets')" />
212-
<Import Project="..\packages\Microsoft.WindowsAppSDK.1.0.0-preview1\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.0.0-preview1\build\native\Microsoft.WindowsAppSDK.targets')" />
211+
<Import Project="..\packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.targets')" />
212+
<Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.targets')" />
213213
</ImportGroup>
214214
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
215215
<PropertyGroup>
216216
<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>
217217
</PropertyGroup>
218218
<Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.210803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.210803.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
219-
<Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.20348.19\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.20348.19\build\Microsoft.Windows.SDK.BuildTools.props'))" />
220-
<Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.20348.19\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.20348.19\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
221-
<Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.0.0-preview1\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.0.0-preview1\build\native\Microsoft.WindowsAppSDK.props'))" />
222-
<Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.0.0-preview1\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.0.0-preview1\build\native\Microsoft.WindowsAppSDK.targets'))" />
219+
<Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.props'))" />
220+
<Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.targets'))" />
221+
<Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.props'))" />
222+
<Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
223223
</Target>
224-
</Project>
224+
</Project>

‎Samples/TextRendering/cpp-win32/DWriteCoreGallery/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.210803.1" targetFramework="native" />
4-
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.20348.19" targetFramework="native" />
5-
<package id="Microsoft.WindowsAppSDK" version="1.0.0-preview1" targetFramework="native" />
4+
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22000.196" targetFramework="native" />
5+
<package id="Microsoft.WindowsAppSDK" version="1.0.0" targetFramework="native" />
66
</packages>

‎Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ HRESULT ExplicitlyInitializeWinAppRuntime()
4646
// Constants for dynamic dependencies lookup.
4747
// Preview tag not needed for GA release, eg: versionTag{ L"" };
4848
const UINT32 majorMinorVersion{ 0x00010000 };
49-
PCWSTR versionTag{ L"preview3" };
49+
PCWSTR versionTag{ L"" };
5050

5151
// Initialize values for the call to the Dynamic Dependencies bootstrapper
5252
const PACKAGE_VERSION minVersion{};

‎Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.props')" />
34
<Import Project="packages\Microsoft.WindowsAppSDK.1.0.0-preview3\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('packages\Microsoft.WindowsAppSDK.1.0.0-preview3\build\native\Microsoft.WindowsAppSDK.props')" />
45
<Import Project="packages\Microsoft.Windows.CppWinRT.2.0.211028.7\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.211028.7\build\native\Microsoft.Windows.CppWinRT.props')" />
56
<Import Project="packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.props')" />
@@ -221,6 +222,7 @@
221222
<Import Project="packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('packages\Microsoft.Windows.SDK.BuildTools.10.0.22000.196\build\Microsoft.Windows.SDK.BuildTools.targets')" />
222223
<Import Project="packages\Microsoft.Windows.CppWinRT.2.0.211028.7\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.211028.7\build\native\Microsoft.Windows.CppWinRT.targets')" />
223224
<Import Project="packages\Microsoft.Windows.ImplementationLibrary.1.0.211019.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('packages\Microsoft.Windows.ImplementationLibrary.1.0.211019.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
225+
<Import Project="packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.targets')" />
224226
</ImportGroup>
225227
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
226228
<PropertyGroup>
@@ -233,5 +235,7 @@
233235
<Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.211028.7\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.211028.7\build\native\Microsoft.Windows.CppWinRT.props'))" />
234236
<Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.211028.7\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.211028.7\build\native\Microsoft.Windows.CppWinRT.targets'))" />
235237
<Error Condition="!Exists('packages\Microsoft.Windows.ImplementationLibrary.1.0.211019.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.ImplementationLibrary.1.0.211019.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
238+
<Error Condition="!Exists('packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.props'))" />
239+
<Error Condition="!Exists('packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.WindowsAppSDK.1.0.0\build\native\Microsoft.WindowsAppSDK.targets'))" />
236240
</Target>
237241
</Project>

‎Samples/Unpackaged/cpp-console-unpackaged/Unpackaged.vcxproj.filters‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
</Filter>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClCompile Include="DynamicDependenciesBasic.cpp">
18+
<ClCompile Include="Unpackaged.cpp">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
2121
</ItemGroup>
2222
<ItemGroup>
2323
<None Include="packages.config" />
2424
</ItemGroup>
2525
<ItemGroup>
26-
<ClInclude Include="DynamicDependenciesBasic.h">
26+
<ClInclude Include="Unpackaged.h">
2727
<Filter>Header Files</Filter>
2828
</ClInclude>
2929
</ItemGroup>

0 commit comments

Comments
 (0)