Initial port to WinUI3.

azchohfi · azchohfi · commit 7b8289e11d3a · 2019-12-03T18:18:07.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -300,8 +300,8 @@ __pycache__/
 *.pyc
 
 # Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
+/build/tools/**
+!/build/tools/packages.config
 
 # Tabs Studio
 *.tss
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,16 +13,15 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <IsDesignProject>$(MSBuildProjectName.Contains('.Design'))</IsDesignProject>
     <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
-    <IsUwpProject Condition="'$(IsDesignProject)' != 'true'">$(MSBuildProjectName.Contains('Uwp'))</IsUwpProject>
     <IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
     <IsWpfProject>$(MSBuildProjectName.Contains('Wpf'))</IsWpfProject>
-    <DefaultTargetPlatformVersion>17763</DefaultTargetPlatformVersion>
-    <DefaultTargetPlatformMinVersion>16299</DefaultTargetPlatformMinVersion>
+    <DefaultTargetPlatformVersion>18362</DefaultTargetPlatformVersion>
+    <DefaultTargetPlatformMinVersion>17134</DefaultTargetPlatformMinVersion>
     <PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
   </PropertyGroup>
 
   <PropertyGroup>
-    <SignAssembly Condition="'$(SignAssembly)' == '' and '$(IsUwpProject)' != 'true'" >true</SignAssembly>
+    <SignAssembly Condition="'$(SignAssembly)' == ''" >true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)toolkit.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
@@ -34,14 +33,6 @@
     </When>
   </Choose>
 
-  <Choose>
-    <When Condition="('$(IsUwpProject)' == 'true') and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'">
-      <PropertyGroup>
-        <GenerateLibraryLayout>true</GenerateLibraryLayout>
-      </PropertyGroup>
-    </When>
-  </Choose>
-
   <Choose>
     <When Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'">
       <PropertyGroup>
@@ -75,13 +66,6 @@
     </When>
   </Choose>
 
-  <PropertyGroup Condition="'$(IsUwpProject)' == 'true'">
-
-    <!-- 8002 is a strong named -> non-strong-named reference -->
-    <!-- This is valid for platforms other than .NET Framework (and is needed for the UWP targets -->
-    <NoWarn>$(NoWarn);8002</NoWarn>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version=" 2.1.65" PrivateAssets="all" />
   </ItemGroup>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,6 +1,6 @@
 <Project>
   <Choose>
-    <When Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.16299' or '$(TargetFramework)' == 'native' or '$(TargetFramework)' == 'net461'">
+    <When Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.17134' or '$(TargetFramework)' == 'native' or '$(TargetFramework)' == 'net461'">
       <!-- UAP versions for uap10.0 where TPMV isn't implied -->
       <PropertyGroup>
         <TargetPlatformVersion>10.0.$(DefaultTargetPlatformVersion).0</TargetPlatformVersion>
diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.Properties.cs b/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.Properties.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.Graph;
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
 
 namespace Microsoft.Toolkit.Graph.Controls
 {
diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.cs b/Microsoft.Toolkit.Graph.Controls/Controls/LoginButton/LoginButton.cs
@@ -7,9 +7,9 @@
 using System.Threading.Tasks;
 using Microsoft.Graph.Auth;
 using Microsoft.Toolkit.Graph.Providers;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 
 namespace Microsoft.Toolkit.Graph.Controls
 {
diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.Properties.cs b/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.Properties.cs
@@ -5,7 +5,7 @@
 using System.Collections.ObjectModel;
 using Microsoft.Graph;
 using Microsoft.Toolkit.Uwp.UI.Controls;
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
 
 namespace Microsoft.Toolkit.Graph.Controls
 {
diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.cs b/Microsoft.Toolkit.Graph.Controls/Controls/PeoplePicker/PeoplePicker.cs
@@ -9,8 +9,8 @@
 using Microsoft.Toolkit.Graph.Providers;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.Toolkit.Graph.Controls
 {
diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.Properties.cs b/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.Properties.cs
@@ -8,8 +8,8 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Graph;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Media.Imaging;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media.Imaging;
 
 namespace Microsoft.Toolkit.Graph.Controls
 {
diff --git a/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.cs b/Microsoft.Toolkit.Graph.Controls/Controls/PersonView/PersonView.cs
@@ -9,9 +9,9 @@
 using Microsoft.Graph;
 using Microsoft.Toolkit.Graph.Extensions;
 using Microsoft.Toolkit.Graph.Providers;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media.Imaging;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Imaging;
 
 namespace Microsoft.Toolkit.Graph.Controls
 {
diff --git a/Microsoft.Toolkit.Graph.Controls/Converters/UserToPersonConverter.cs b/Microsoft.Toolkit.Graph.Controls/Converters/UserToPersonConverter.cs
@@ -5,7 +5,7 @@
 using System;
 using Microsoft.Graph;
 using Microsoft.Toolkit.Graph.Extensions;
-using Windows.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Data;
 
 namespace Microsoft.Toolkit.Graph.Converters
 {
diff --git a/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj b/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFramework>uap10.0.16299</TargetFramework>
+    <TargetFramework>uap10.0.17134</TargetFramework>
     <Title>Windows Community Toolkit Graph Controls</Title>
     <PackageId>Microsoft.Toolkit.Graph.Controls</PackageId>
     <Description>
@@ -17,16 +17,22 @@
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <Configurations>Debug;Release;CI</Configurations>
     <Platforms>AnyCPU;ARM;ARM64;x64;x86</Platforms>
+    <NoWarn>$(NoWarn);CS8002;CS8305</NoWarn> <!-- Temporary since WinUI3 is not stable yet -->
+    <IsWinUIAlpha Condition="'$(IsWinUIAlpha)' == ''">true</IsWinUIAlpha>
+    <WindowsKitsPath Condition="'$(IsWinUIAlpha)' == 'true'">WinUI-Alpha-Projects-Don-t-Use-SDK-Xaml-Tools</WindowsKitsPath>
   </PropertyGroup>
 
   <ItemGroup>
     <Content Include="Assets\person.png" />
   </ItemGroup> 
 
 	<ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="6.0.0-rc1.2" />
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="6.0.0-rc1.2" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="7.0.0-*" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="7.0.0-*" />
     <ProjectReference Include="..\Microsoft.Toolkit.Graph\Microsoft.Toolkit.Graph.csproj" />
+    <PackageReference Include="Microsoft.WinUI">
+      <Version>3.0.0-alpha.191101.0</Version>
+    </PackageReference>
   </ItemGroup>
  
   <ItemGroup>
diff --git a/Microsoft.Toolkit.Graph.Controls/Providers/CommonProviderBehaviorBase.Properties.cs b/Microsoft.Toolkit.Graph.Controls/Providers/CommonProviderBehaviorBase.Properties.cs
@@ -5,7 +5,7 @@
 #if DOTNET
 using System.Windows;
 #else
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
 #endif
 
 #if DOTNET
diff --git a/Microsoft.Toolkit.Graph.Controls/Providers/CommonProviderBehaviorBase.cs b/Microsoft.Toolkit.Graph.Controls/Providers/CommonProviderBehaviorBase.cs
@@ -7,7 +7,7 @@
 using Microsoft.Toolkit.Wpf.UI.Behaviors;
 #else
 using Microsoft.Toolkit.Uwp.UI.Behaviors;
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
 #endif
 
 #if DOTNET
diff --git a/Microsoft.Toolkit.Graph.Controls/Providers/MockProviderBehavior.cs b/Microsoft.Toolkit.Graph.Controls/Providers/MockProviderBehavior.cs
@@ -9,7 +9,7 @@
 using Microsoft.Toolkit.Graph.Providers;
 #else
 using System.Linq;
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
 #endif
 
 #if DOTNET
diff --git a/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj b/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>uap10.0.16299;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>uap10.0.17134;netstandard2.0</TargetFrameworks>
     <Title>Windows Community Toolkit .NET Standard Graph Services</Title>
     <Description>
       This package includes .NET Standard code helpers such as:
@@ -16,13 +16,13 @@
     <Platforms>AnyCPU;ARM;ARM64;x64;x86</Platforms>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.17134'">
     <DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);WINRT</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Graph.Beta" Version="0.8.0-preview" />
     <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.2" />
-    <PackageReference Include="Microsoft.Toolkit" Version="6.0.0-rc1.2" />
+    <PackageReference Include="Microsoft.Toolkit" Version="7.0.0-*" />
   </ItemGroup>
 </Project>
diff --git a/SampleTest/App.xaml.cs b/SampleTest/App.xaml.cs
@@ -11,13 +11,13 @@
 using Windows.ApplicationModel.Activation;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
 
 namespace SampleTest
 {
diff --git a/SampleTest/MainPage.xaml.cs b/SampleTest/MainPage.xaml.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Windows.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 
 namespace SampleTest
 {
diff --git a/SampleTest/SampleTest.csproj b/SampleTest/SampleTest.csproj
@@ -12,12 +12,14 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <IsWinUIAlpha Condition="'$(IsWinUIAlpha)' == ''">true</IsWinUIAlpha>
+    <WindowsKitsPath Condition="'$(IsWinUIAlpha)' == 'true'">WinUI-Alpha-Projects-Don-t-Use-SDK-Xaml-Tools</WindowsKitsPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -153,6 +155,9 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.9</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.WinUI">
+      <Version>3.0.0-alpha.191101.0</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Toolkit.Graph.Controls\Microsoft.Toolkit.Graph.Controls.csproj">
diff --git a/Samples/XAML Islands/UWP-XamlApplication/App.xaml.cs b/Samples/XAML Islands/UWP-XamlApplication/App.xaml.cs
@@ -11,13 +11,13 @@
 using Windows.ApplicationModel.Activation;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
 
 namespace UWP_XamlApplication
 {
diff --git a/Samples/XAML Islands/UWP-XamlApplication/SamplePage.xaml.cs b/Samples/XAML Islands/UWP-XamlApplication/SamplePage.xaml.cs
@@ -9,13 +9,13 @@
 using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
 
 // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
 
diff --git a/build/build.cake b/build/build.cake
@@ -1,7 +1,7 @@
-#module nuget:?package=Cake.LongPath.Module&version=0.5.0
+#module nuget:?package=Cake.LongPath.Module&version=0.7.0
 
-#addin "Cake.FileHelpers"
-#addin "Cake.Powershell"
+#addin nuget:?package=Cake.FileHelpers&version=3.2.1
+#addin nuget:?package=Cake.Powershell&version=0.4.8
 
 using System;
 using System.Linq;
@@ -53,7 +53,7 @@ void VerifyHeaders(bool Replace)
     Func<IFileSystemInfo, bool> exclude_objDir =
         fileSystemInfo => !fileSystemInfo.Path.Segments.Contains("obj");
 
-    var files = GetFiles(baseDir + "/**/*.cs", exclude_objDir).Where(file =>
+    var files = GetFiles(baseDir + "/**/*.cs", new GlobberSettings { Predicate = exclude_objDir }).Where(file =>
     {
         var path = file.ToString();
         return !(path.EndsWith(".g.cs") || path.EndsWith(".i.cs") || System.IO.Path.GetFileName(path).Contains("TemporaryGeneratedFile"));
@@ -246,7 +246,7 @@ Task("StyleXaml")
     Func<IFileSystemInfo, bool> exclude_objDir =
         fileSystemInfo => !fileSystemInfo.Path.Segments.Contains("obj");
 
-    var files = GetFiles(baseDir + "/**/*.xaml", exclude_objDir);
+    var files = GetFiles(baseDir + "/**/*.xaml", new GlobberSettings { Predicate = exclude_objDir });
     Information("\nChecking " + files.Count() + " file(s) for XAML Structure");
     foreach(var file in files)
     {
diff --git a/build/tools/packages.config b/build/tools/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+    <package id="Cake" version="0.35.0" />
+</packages>
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "2.0.43"
+    "MSBuild.Sdk.Extras": "2.0.54"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`	`5`	`using Microsoft.Graph;`
`6`		`-using Windows.UI.Xaml;`
	`6`	`+using Microsoft.UI.Xaml;`
`7`	`7`
`8`	`8`	`namespace Microsoft.Toolkit.Graph.Controls`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System.Collections.ObjectModel;`
`6`	`6`	`using Microsoft.Graph;`
`7`	`7`	`using Microsoft.Toolkit.Uwp.UI.Controls;`
`8`		`-using Windows.UI.Xaml;`
	`8`	`+using Microsoft.UI.Xaml;`
`9`	`9`
`10`	`10`	`namespace Microsoft.Toolkit.Graph.Controls`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System;`
`6`	`6`	`using Microsoft.Graph;`
`7`	`7`	`using Microsoft.Toolkit.Graph.Extensions;`
`8`		`-using Windows.UI.Xaml.Data;`
	`8`	`+using Microsoft.UI.Xaml.Data;`
`9`	`9`
`10`	`10`	`namespace Microsoft.Toolkit.Graph.Converters`
`11`	`11`	`{`