Fix CsWinRT

Thanks to Manodasan, this fixes the CsWinRT support. :-)

Author: jeffstall

Samples/Islands/DrawingIsland/DrawingCppTestApp/WinMain.cpp

@@ -15,7 +15,7 @@ namespace winrt
     using namespace DrawingIslandComponents;
 }
 
-int __stdcall wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
+int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
 {
     winrt::init_apartment(winrt::apartment_type::single_threaded);
 

Samples/Islands/DrawingIsland/DrawingCsTestApp/DrawingCsTestApp.csproj

@@ -1,11 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <OutputType>WinExe</OutputType>
+
+    <!-- TODO: Why do we need to specify a specific Windows version? -->
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>x64;ARM64;x86</Platforms>
+
+    <!-- TODO: Why do we need to specify the explicit RIDs? -->   
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -21,18 +26,15 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <!-- Added CsWinRT reference to avoid WinMD error as a result of WinMD leaking via project reference. -->
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.7" />
+
+    <!-- Reference WASDK for types -->
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\DrawingIslandCsProjection\DrawingIslandCsProjection.csproj" />
   </ItemGroup>
 
-  <!-- Workaround for "error NETSDK1082: There was no runtime pack for Microsoft.NETCore.App available for the specified RuntimeIdentifier 'win10-arm'." -->
-  <ItemGroup>
-    <KnownRuntimePack Update="@(KnownRuntimePack)">
-      <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'TARGETFRAMEWORK'">EXISTINGVERSION</LatestRuntimeFrameworkVersion>
-    </KnownRuntimePack>
-  </ItemGroup>
-
 </Project>

Samples/Islands/DrawingIsland/DrawingCsTestApp/Program.cs

@@ -1,4 +1,35 @@
 using System;
+
+using Microsoft.UI;
+using Microsoft.UI.Composition;
+using Microsoft.UI.Content;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Input;
+using Microsoft.UI.Windowing;
 
-// See https://aka.ms/new-console-template for more information
-Console.WriteLine("Hello, World!");
+using DrawingIslandComponents;
+
+var controller = DispatcherQueueController.CreateOnCurrentThread();
+var queue = controller.DispatcherQueue;
+
+var window = AppWindow.Create();
+window.AssociateWithDispatcherQueue(queue);
+window.Closing +=(sender, args) =>
+    {
+        queue.EnqueueEventLoopExit();
+    };
+
+window.Title = "Drawing C# .NET TestApp";
+window.Show();
+
+var compositor = new Compositor();
+var drawing = new DrawingIsland(compositor);
+
+var siteBridge = DesktopChildSiteBridge.Create(compositor, window.Id);
+siteBridge.ResizePolicy = ContentSizePolicy.ResizeContentToParentWindow;
+siteBridge.Show();
+siteBridge.Connect(drawing.Island);
+
+queue.RunEventLoop();
+
+controller.ShutdownQueue();

Samples/Islands/DrawingIsland/DrawingIslandCsProjection/DrawingIslandCsProjection.csproj

@@ -1,10 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.18362.0</TargetFramework>
+    <!-- TODO: Why do we need to specify the latest Win11 SDK instead of RS5 SDK? -->
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>x64;x86;ARM64</Platforms>
+
+    <!-- TODO: Why do we need to specify the explicit RIDs? -->   
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <!-- See "Edit the project file to execute C#/WinRT" from https://learn.microsoft.com/en-us/windows/apps/develop/platform/csharp-winrt/net-projection-from-cppwinrt-component. -->