From a14dfa0d9ebe677c867a63aa797e097779d2c06b Mon Sep 17 00:00:00 2001
From: Alexandre Zollinger Chohfi <alzollin@microsoft.com>
Date: Wed, 15 Jul 2020 11:48:38 -0700
Subject: [PATCH] Updated to WinUI3-preview2.

---
 Directory.Build.props                                       | 4 ++++
 .../Microsoft.Toolkit.Graph.Controls.csproj                 | 6 +++---
 Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj      | 2 +-
 SampleTest/SampleTest.csproj                                | 2 +-
 build/build.cake                                            | 4 +---
 nuget.config                                                | 2 --
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 53d76b1..90d8a2f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -23,6 +23,10 @@
     <NoWarn>CS8002;CS8305</NoWarn> <!-- Temporary since WinUI3 is not stable yet -->
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
   <PropertyGroup>
     <SignAssembly Condition="'$(SignAssembly)' == ''" >true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)toolkit.snk</AssemblyOriginatorKeyFile>
diff --git a/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj b/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj
index ec0e8ed..a342697 100644
--- a/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj
+++ b/Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj
@@ -21,11 +21,11 @@
   </ItemGroup>
   
 	<ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="8.0.0-build.52.g07f4dd1bd0" />
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="8.0.0-build.52.g07f4dd1bd0" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="8.0.0-preview2" />
+    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="8.0.0-preview2" />
     <ProjectReference Include="..\Microsoft.Toolkit.Graph\Microsoft.Toolkit.Graph.csproj" />
     <PackageReference Include="Microsoft.WinUI">
-      <Version>3.0.0-preview2.200707.3-CI</Version>
+      <Version>3.0.0-preview2.200713.0</Version>
     </PackageReference>
   </ItemGroup>
 
diff --git a/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj b/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj
index 799d70d..72dc6bc 100644
--- a/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj
+++ b/Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj
@@ -14,6 +14,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Graph.Beta" Version="0.18.0-preview" />
     <PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.4" />
-    <PackageReference Include="Microsoft.Toolkit" Version="8.0.0-build.52.g07f4dd1bd0" />
+    <PackageReference Include="Microsoft.Toolkit" Version="8.0.0-preview2" />
   </ItemGroup>
 </Project>
diff --git a/SampleTest/SampleTest.csproj b/SampleTest/SampleTest.csproj
index fd7e50d..8b7d88e 100644
--- a/SampleTest/SampleTest.csproj
+++ b/SampleTest/SampleTest.csproj
@@ -20,7 +20,7 @@
   
   <ItemGroup>
     <PackageReference Include="Microsoft.WinUI">
-      <Version>3.0.0-preview2.200707.3-CI</Version>
+      <Version>3.0.0-preview2.200713.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.1.0-prerelease.200629.3" />
diff --git a/build/build.cake b/build/build.cake
index 7033b40..1876829 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -180,8 +180,7 @@ Task("Build")
         MaxCpuCount = 0
     }
     .SetConfiguration("CI")
-    .WithTarget("Build")
-    .WithProperty("GenerateLibraryLayout", "true");
+    .WithTarget("Build");
 
     UpdateToolsPath(buildSettings);
 
@@ -228,7 +227,6 @@ Task("Package")
     }
     .SetConfiguration("CI")
     .WithTarget("Pack")
-    .WithProperty("GenerateLibraryLayout", "true")
 	.WithProperty("PackageOutputPath", nupkgDir);
 
     UpdateToolsPath(buildSettings);
diff --git a/nuget.config b/nuget.config
index 613e19b..2e84a9c 100644
--- a/nuget.config
+++ b/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>
\ No newline at end of file