Updated to WinUI3-preview2.

Author: azchohfi

Directory.Build.props

@@ -18,7 +18,7 @@
     <ShouldAddWinUI Condition="'$(IsUwpProject)'== 'true' or '$(IsDesignProject)' == 'true' or '$(IsSampleProject)' == 'true' or '$(IsTestProject)' == 'true'">true</ShouldAddWinUI>
     <DefaultTargetPlatformVersion>18362</DefaultTargetPlatformVersion>
     <DefaultTargetPlatformMinVersion>17134</DefaultTargetPlatformMinVersion>
-    <MicrosoftWinUIVersion>3.0.0-preview2.200707.3-CI</MicrosoftWinUIVersion>
+    <MicrosoftWinUIVersion>3.0.0-preview2.200713.0</MicrosoftWinUIVersion>
     <MicrosoftCsWinrtVersion>0.1.0-prerelease.200629.3</MicrosoftCsWinrtVersion>
     <TargetPlatformVersion>10.0.$(DefaultTargetPlatformVersion).0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.$(DefaultTargetPlatformMinVersion).0</TargetPlatformMinVersion>

Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.WinUI.3.0.0-preview2.200707.3-CI\build\native\Microsoft.WinUI.props" Condition="Exists('..\packages\Microsoft.WinUI.3.0.0-preview2.200707.3-CI\build\native\Microsoft.WinUI.props')" />
+  <Import Project="..\packages\Microsoft.WinUI.3.0.0-preview2.200713.0\build\native\Microsoft.WinUI.props" Condition="Exists('..\packages\Microsoft.WinUI.3.0.0-preview2.200713.0\build\native\Microsoft.WinUI.props')" />
   <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
@@ -377,15 +377,15 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="..\packages\Microsoft.WinUI.3.0.0-preview2.200707.3-CI\build\native\Microsoft.WinUI.targets" Condition="Exists('..\packages\Microsoft.WinUI.3.0.0-preview2.200707.3-CI\build\native\Microsoft.WinUI.targets')" />
+    <Import Project="..\packages\Microsoft.WinUI.3.0.0-preview2.200713.0\build\native\Microsoft.WinUI.targets" Condition="Exists('..\packages\Microsoft.WinUI.3.0.0-preview2.200713.0\build\native\Microsoft.WinUI.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <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>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.WinUI.3.0.0-preview2.200707.3-CI\build\native\Microsoft.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WinUI.3.0.0-preview2.200707.3-CI\build\native\Microsoft.WinUI.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.WinUI.3.0.0-preview2.200707.3-CI\build\native\Microsoft.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WinUI.3.0.0-preview2.200707.3-CI\build\native\Microsoft.WinUI.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.WinUI.3.0.0-preview2.200713.0\build\native\Microsoft.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WinUI.3.0.0-preview2.200713.0\build\native\Microsoft.WinUI.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.WinUI.3.0.0-preview2.200713.0\build\native\Microsoft.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WinUI.3.0.0-preview2.200713.0\build\native\Microsoft.WinUI.targets'))" />
   </Target>
 </Project>

Microsoft.Toolkit.Uwp.Input.GazeInteraction/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.200514.2" targetFramework="native" />
-  <package id="Microsoft.WinUI" version="3.0.0-preview2.200707.3-CI" targetFramework="native" />
+  <package id="Microsoft.WinUI" version="3.0.0-preview2.200713.0" targetFramework="native" />
 </packages>

Microsoft.Toolkit.Uwp.SampleApp/App.xaml

@@ -16,6 +16,7 @@
 
         <!-- Workaround for https://github.com/microsoft/CsWinRT/issues/345 -->
         <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGrid.xaml"/>
+        <!--<ResourceDictionary Source="ms-appx:///MonacoEditorComponent/Themes/Generic.xaml" />-->
 
       </ResourceDictionary.MergedDictionaries>
 

Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj

@@ -44,7 +44,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ColorCode.WinUI" Version="8.0.0-preview2-g11e7a28d49" />
+    <PackageReference Include="ColorCode.WinUI" Version="8.0.0-preview2" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Animations\Microsoft.Toolkit.Uwp.UI.Animations.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />

UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj

@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Toolkit.Forms.UI.XamlHost" Version="6.0.1" />
     <PackageReference Include="Microsoft.WinUI">
-      <Version>3.0.0-preview2.200707.3-CI</Version>
+      <Version>3.0.0-preview2.200713.0</Version>
     </PackageReference>
   </ItemGroup>
 

build/Microsoft.Toolkit.Uwp.Input.GazeInteraction.nuspec

@@ -14,16 +14,19 @@
     <releaseNotes>v5.0 release https://github.com/windows-toolkit/WindowsCommunityToolkit/releases</releaseNotes>
     <copyright>(c) .NET Foundation and Contributors. All rights reserved.</copyright>
     <tags>UWP Toolkit Windows Eye Gaze EyeTracker </tags>
+    <dependencies>
+      <dependency id="Microsoft.WinUI" version="3.0.0-preview2.200713.0"/>
+    </dependencies>
   </metadata>
 
   <files>
       <!-- WinMd and IntelliSense files -->
       <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\Win32\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.winmd" target="lib\uap10.0.17134"/>
       <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction\Output\Win32\Release\Microsoft.Toolkit.Uwp.Input.GazeInteraction.xml" target="lib\uap10.0.17134"/>
 
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction.Projection\bin\Release\netcoreapp5.0\Microsoft.Toolkit.Uwp.Input.GazeInteraction.Projection.dll" target="lib\netcoreapp5.0"/>
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction.Projection\bin\Release\netcoreapp5.0\Microsoft.Toolkit.Uwp.Input.GazeInteraction.Projection.pri" target="lib\netcoreapp5.0"/>
-      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction.Projection\bin\Release\netcoreapp5.0\Microsoft.Toolkit.Uwp.Input.GazeInteraction.Projection.pdb" target="lib\netcoreapp5.0"/>
+      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction.Projection\bin\Release\net5.0\Microsoft.Toolkit.Uwp.Input.GazeInteraction.Projection.dll" target="lib\net5.0"/>
+      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction.Projection\bin\Release\net5.0\Microsoft.Toolkit.Uwp.Input.GazeInteraction.Projection.pri" target="lib\net5.0"/>
+      <file src="..\Microsoft.Toolkit.Uwp.Input.GazeInteraction.Projection\bin\Release\net5.0\Microsoft.Toolkit.Uwp.Input.GazeInteraction.Projection.pdb" target="lib\net5.0"/>
 
       <!-- DLLs and resources -->
 	  <!-- Not Available on preview versions of WinUI3.

build/build.cake

@@ -1,6 +1,6 @@
 #module nuget:?package=Cake.LongPath.Module&version=0.7.0
 
-#addin nuget:?package=Cake.FileHelpers&version=3.2.1
+#addin nuget:?package=Cake.FileHelpers&version=3.3.0
 #addin nuget:?package=Cake.Powershell&version=0.4.8
 
 #tool nuget:?package=MSTest.TestAdapter&version=2.1.0

nuget.config

@@ -3,7 +3,5 @@
 	<packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="MyGetWCT" value="https://dotnet.myget.org/F/uwpcommunitytoolkit/api/v3/index.json" />
-    <add key="WinUI.Dependencies@Local" value="https://microsoft.pkgs.visualstudio.com/_packaging/WinUI.Dependencies%40Local/nuget/v3/index.json" />
-    <add key="CsWinRT" value="https://microsoft.pkgs.visualstudio.com/_packaging/CsWinRT/nuget/v3/index.json" />
   </packageSources>
 </configuration>