Skip to content

Commit b5bb471

Browse files
jeffstalljeffstall
committed
Create CsWinRT version (not working)
Renamed C++ version into CppTest and created parallel C# / NET CsTest version. The Cs version is not working correctly with CsWinRT and .NET 8 yet. To get the C++ projects to successfully build, unload the Cs projects from the VS solution: - DrawingCsTestApp - DrawingCsTestPackage - DrawingIslandCsProjection
1 parent 9b3b9af commit b5bb471

37 files changed

+275
-31
lines changed

‎Samples/Islands/DrawingIsland/DrawingIslandApp/DrawingIslandApp.exe.manifest‎ renamed to ‎Samples/Islands/DrawingIsland/DrawingCppTestApp/DrawingCppTestApp.exe.manifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3-
<assemblyIdentity version="1.0.0.0" name="DrawingIslandApp.app"/>
3+
<assemblyIdentity version="1.0.0.0" name="DrawingCppTestApp.app"/>
44

55
<application xmlns="urn:schemas-microsoft-com:asm.v3">
66
<windowsSettings>

‎Samples/Islands/DrawingIsland/DrawingIslandApp/DrawingIslandApp.rc‎ renamed to ‎Samples/Islands/DrawingIsland/DrawingCppTestApp/DrawingCppTestApp.rc‎

File renamed without changes.

‎Samples/Islands/DrawingIsland/DrawingIslandApp/DrawingIslandApp.vcxproj‎ renamed to ‎Samples/Islands/DrawingIsland/DrawingCppTestApp/DrawingCppTestApp.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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.5.240428000\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" />
34
<Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.3233\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.3233\build\Microsoft.Windows.SDK.BuildTools.props')" />
45
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240405.15\build\native\Microsoft.Windows.CppWinRT.props')" />
5-
<Import Project="..\packages\Microsoft.WindowsAppSDK.1.5.240404000\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.5.240404000\build\native\Microsoft.WindowsAppSDK.props')" />
66
<PropertyGroup Label="Globals">
77
<CppWinRTOptimized>true</CppWinRTOptimized>
88
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -11,10 +11,10 @@
1111
<VCProjectVersion>15.0</VCProjectVersion>
1212
<ProjectGuid>{74605fc4-2e57-459f-947b-aef9f6921ae8}</ProjectGuid>
1313
<Keyword>Win32Proj</Keyword>
14-
<RootNamespace>DrawingIslandApp</RootNamespace>
14+
<RootNamespace>DrawingCppTestApp</RootNamespace>
1515
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.22621.0</WindowsTargetPlatformVersion>
1616
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
17-
<ProjectName>DrawingIslandApp</ProjectName>
17+
<ProjectName>DrawingCppTestApp</ProjectName>
1818
</PropertyGroup>
1919
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2020
<ItemGroup Label="ProjectConfigurations">
@@ -116,8 +116,8 @@
116116
<ClCompile Include="pch.cpp">
117117
<PrecompiledHeader>Create</PrecompiledHeader>
118118
</ClCompile>
119-
<ResourceCompile Include="DrawingIslandApp.rc" />
120-
<Manifest Include="DrawingIslandApp.exe.manifest" />
119+
<ResourceCompile Include="DrawingCppTestApp.rc" />
120+
<Manifest Include="DrawingCppTestApp.exe.manifest" />
121121
<None Include="packages.config" />
122122
<None Include="PropertySheet.props" />
123123
<Text Include="readme.txt">
@@ -131,19 +131,19 @@
131131
</ItemGroup>
132132
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
133133
<ImportGroup Label="ExtensionTargets">
134-
<Import Project="..\packages\Microsoft.WindowsAppSDK.1.5.240404000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.5.240404000\build\native\Microsoft.WindowsAppSDK.targets')" />
135134
<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')" />
136135
<Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.3233\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.3233\build\Microsoft.Windows.SDK.BuildTools.targets')" />
136+
<Import Project="..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" />
137137
</ImportGroup>
138138
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
139139
<PropertyGroup>
140140
<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>
141141
</PropertyGroup>
142-
<Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.5.240404000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.5.240404000\build\native\Microsoft.WindowsAppSDK.props'))" />
143-
<Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.5.240404000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.5.240404000\build\native\Microsoft.WindowsAppSDK.targets'))" />
144142
<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'))" />
145143
<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'))" />
146144
<Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.3233\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.3233\build\Microsoft.Windows.SDK.BuildTools.props'))" />
147145
<Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.3233\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.3233\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
146+
<Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props'))" />
147+
<Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets'))" />
148148
</Target>
149149
</Project>

‎Samples/Islands/DrawingIsland/DrawingIslandApp/DrawingIslandApp.vcxproj.filters‎ renamed to ‎Samples/Islands/DrawingIsland/DrawingCppTestApp/DrawingCppTestApp.vcxproj.filters‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
<Text Include="readme.txt" />
3939
</ItemGroup>
4040
<ItemGroup>
41-
<Manifest Include="DrawingIslandApp.exe.manifest" />
41+
<Manifest Include="DrawingCppTestApp.exe.manifest" />
4242
</ItemGroup>
4343
<ItemGroup>
44-
<ResourceCompile Include="DrawingIslandApp.rc">
44+
<ResourceCompile Include="DrawingCppTestApp.rc">
4545
<Filter>Resource Files</Filter>
4646
</ResourceCompile>
4747
</ItemGroup>

‎Samples/Islands/DrawingIsland/DrawingIslandApp/PropertySheet.props‎ renamed to ‎Samples/Islands/DrawingIsland/DrawingCppTestApp/PropertySheet.props‎

File renamed without changes.

‎Samples/Islands/DrawingIsland/DrawingIslandApp/WinMain.cpp‎ renamed to ‎Samples/Islands/DrawingIsland/DrawingCppTestApp/WinMain.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ int __stdcall wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
2929
queue.EnqueueEventLoopExit();
3030
});
3131

32-
window.Title(L"Drawing Island");
32+
window.Title(L"Drawing C++ TestApp");
3333
window.Show();
3434

3535
auto compositor = winrt::Compositor();

‎Samples/Islands/DrawingIsland/DrawingIslandApp/packages.config‎ renamed to ‎Samples/Islands/DrawingIsland/DrawingCppTestApp/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.CppWinRT" version="2.0.240405.15" targetFramework="native" />
44
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.3233" targetFramework="native" />
5-
<package id="Microsoft.WindowsAppSDK" version="1.5.240404000" targetFramework="native" />
5+
<package id="Microsoft.WindowsAppSDK" version="1.5.240428000" targetFramework="native" />
66
</packages>

‎Samples/Islands/DrawingIsland/DrawingIslandApp/pch.cpp‎ renamed to ‎Samples/Islands/DrawingIsland/DrawingCppTestApp/pch.cpp‎

File renamed without changes.

‎Samples/Islands/DrawingIsland/DrawingIslandApp/pch.h‎ renamed to ‎Samples/Islands/DrawingIsland/DrawingCppTestApp/pch.h‎

File renamed without changes.

‎Samples/Islands/DrawingIsland/DrawingIslandApp/readme.txt‎ renamed to ‎Samples/Islands/DrawingIsland/DrawingCppTestApp/readme.txt‎

File renamed without changes.

0 commit comments

Comments
 (0)