Updated to WinUI3-preview2.

CommunityToolkit · Jul 15, 2020 · a14dfa0 · a14dfa0
1 parent 066702e
commit a14dfa0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>