Fix merge

- Niklas and Adib created conflict with UIA refactoring.
- Aligned sample "main" steps for Cs and Cpp.

Author: jeffstall

Samples/Islands/DrawingIsland/DrawingCppTestApp/WinMain.cpp

@@ -21,9 +21,6 @@ int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
     auto controller{ winrt::DispatcherQueueController::CreateOnCurrentThread() };
     auto queue = controller.DispatcherQueue();
 
-    auto compositor = winrt::Compositor();
-    auto island = winrt::DrawingIsland(compositor).Island();
-
     // Associating the AppWindow with the DispatcherQueue on which the ContentIsland is created
     // will ensure that the ContentIsland is Closed when the AppWindow closes.
     auto window = winrt::AppWindow::Create();
@@ -38,6 +35,10 @@ int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
     window.Title(L"Drawing C++ TestApp");
     window.Show();
 
+    // Create the Island content in the window.
+    auto compositor = winrt::Compositor();
+    auto island = winrt::DrawingIsland(compositor).Island();
+
     // Create a ContentSiteBridge and connect the ContentIsland to it.
     auto siteBridge = winrt::DesktopChildSiteBridge::Create(compositor, window.Id());
     siteBridge.ResizePolicy(winrt::ContentSizePolicy::ResizeContentToParentWindow);

Samples/Islands/DrawingIsland/DrawingCsTestApp/Program.cs

@@ -1,9 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
-
-using Microsoft.UI;
 using Microsoft.UI.Composition;
 using Microsoft.UI.Content;
 using Microsoft.UI.Dispatching;

Samples/Islands/DrawingIsland/DrawingIslandComponents/DrawingIslandComponents.vcxproj

@@ -130,8 +130,6 @@
     <ClInclude Include="AutomationFragment.h" />
     <ClInclude Include="AutomationPeer.h" />
     <ClInclude Include="DeviceLostHelper.h" />
-    <ClInclude Include="IslandFragmentRoot.h" />
-    <ClInclude Include="NodeSimpleFragment.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="DrawingIsland.h">
       <DependentUpon>Components.idl</DependentUpon>
@@ -144,8 +142,6 @@
     <ClCompile Include="AutomationFragmentRoot.cpp" />
     <ClCompile Include="AutomationFragment.cpp" />
     <ClCompile Include="DeviceLostHelper.cpp" />
-    <ClCompile Include="IslandFragmentRoot.cpp" />
-    <ClCompile Include="NodeSimpleFragment.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>