Fixed issue with Uno WIndows Toolkit

unoplatform/Uno.WindowsCommunityToolkit#133
I-Synergy · Mar 20, 2021 · d86ae01 · d86ae01
1 parent 709d5ab
commit d86ae01
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/ISynergy.Framework.UI/Controls/BladeView/BladeView.cs b/src/ISynergy.Framework.UI/Controls/BladeView/BladeView.cs
@@ -1,5 +1,4 @@
 using Microsoft.Toolkit.Uwp.UI;
-using Microsoft.Toolkit.Uwp.UI.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

diff --git a/src/ISynergy.Framework.UI/ISynergy.Framework.UI.csproj b/src/ISynergy.Framework.UI/ISynergy.Framework.UI.csproj
@@ -21,13 +21,20 @@
 
 	<ItemGroup>
 		<PackageReference Include="Uno.Core" Version="2.3.0" />
-		<PackageReference Include="Uno.UI" Version="3.6.0-dev.529" />
+		<PackageReference Include="Uno.UI" Version="3.6.0-dev.555" />
 		<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.2-uno.81" />
-		<PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls" Version="6.1.0-build.207.gcac670e618" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)' == 'uap10.0.18362' or '$(TargetFramework)' == 'uap10.0.19041'">
+		<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="7.0.0" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net5.0'">
+		<PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls" Version="7.0.0-build.2.g0136fc104d" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <ProjectReference Include="..\ISynergy.Framework.Core\ISynergy.Framework.Core.csproj" />
 	  <ProjectReference Include="..\ISynergy.Framework.Mvvm\ISynergy.Framework.Mvvm.csproj" />