chore: use sdk props for dependencies

unoplatform · Nov 20, 2024 · 3aafaa0 · 3aafaa0
1 parent 619f4a8
commit 3aafaa0
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 26 deletions.
diff --git a/samples/MauiEmbedding/Directory.Build.props b/samples/MauiEmbedding/Directory.Build.props
@@ -16,7 +16,10 @@
 
     <_UseTelerik>false</_UseTelerik>
   </PropertyGroup>
-
+  <PropertyGroup>
+		<AndroidXCollectionVersion>1.4.3.1</AndroidXCollectionVersion>
+		<AndroidXNavigationVersion>2.7.7.6</AndroidXNavigationVersion>
+	</PropertyGroup>
   <!-- See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages version properties. -->
   <!-- <PropertyGroup>
     <UnoExtensionsVersion>4.1.24</UnoExtensionsVersion>

diff --git a/samples/MauiEmbedding/Directory.Packages.props b/samples/MauiEmbedding/Directory.Packages.props
@@ -25,13 +25,6 @@
     <PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.3" />
     <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.3" />
     <PackageVersion Include="Microsoft.Maui.Graphics" Version="8.0.3"  />
-
-    <PackageVersion Include="Xamarin.AndroidX.Navigation.UI" Version="2.7.7.1" />
-    <PackageVersion Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.7.7.1"/>
-    <PackageVersion Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.7.7.1"/>
-    <PackageVersion Include="Xamarin.AndroidX.Navigation.Common" Version="2.7.7.1"/>
-    <PackageVersion Include="Xamarin.AndroidX.Collection" Version="1.4.0.1"/>
-    <PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.0.1" />
-    <PackageVersion Include="Xamarin.AndroidX.Collection.Jvm" Version="1.4.0.1" />
+    <PackageVersion Include="Xamarin.AndroidX.Collection.Jvm" Version="1.4.3.1" />
   </ItemGroup>
 </Project>
diff --git a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
@@ -78,12 +78,6 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(IsAndroid)' == 'true'">
-		<PackageReference Include="Xamarin.AndroidX.Navigation.UI" />
-		<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" />
-		<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" />
-		<PackageReference Include="Xamarin.AndroidX.Navigation.Common" />
-		<PackageReference Include="Xamarin.AndroidX.Collection" />
-		<PackageReference Include="Xamarin.AndroidX.Collection.Jvm" />
 		<PackageReference Include="Xamarin.AndroidX.Collection.Ktx"  />
 	</ItemGroup>
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -65,3 +65,4 @@
         <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     </ItemGroup>
 </Project>
+
diff --git a/testing/TestHarness/Directory.Build.props b/testing/TestHarness/Directory.Build.props
@@ -35,4 +35,8 @@
 		<RootNamespace>TestHarness</RootNamespace>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
+
+	<PropertyGroup>
+		<SkiaSharpVersion>2.88.9-preview.2.2</SkiaSharpVersion>
+	</PropertyGroup>
 </Project>
diff --git a/testing/TestHarness/Directory.Packages.props b/testing/TestHarness/Directory.Packages.props
@@ -11,8 +11,8 @@
 		<PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.7" />
 		<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.7" />
 		<PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.7" />
-		<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+		<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
 		<PackageVersion Include="Microsoft.Identity.Client" Version="4.64.1" />
 		<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.2.0" />
 		<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.11" />
@@ -25,14 +25,6 @@
 		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
 		<PackageVersion Include="Refit" Version="7.2.22" />
 		<PackageVersion Include="Refit.HttpClientFactory" Version="7.2.22" />
-		<PackageVersion Include="SkiaSharp" Version="2.88.8" />
-		<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
-		<PackageVersion Include="SkiaSharp.HarfBuzz" Version="2.88.8" />
-		<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.8" />
-		<PackageVersion Include="SkiaSharp.Views" Version="2.88.8" />
-		<PackageVersion Include="SkiaSharp.Views.Uno" Version="2.88.8" />
-		<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.8" />
-		<PackageVersion Include="SkiaSharp.Views.WPF" Version="2.88.8" />
 		<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.2.3" />
 		<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
 		<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI" Version="7.1.100" />
@@ -60,5 +52,4 @@
 		<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
 		<PackageVersion Include="System.Text.Json" Version="8.0.5" />
 	</ItemGroup>
-
 </Project>
diff --git a/testing/TestHarness/TestHarness.UITest/TestHarness.UITest.csproj b/testing/TestHarness/TestHarness.UITest/TestHarness.UITest.csproj
@@ -24,6 +24,11 @@
 		<PackageReference Include="MSTest.TestFramework"/>
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageVersion Include="SkiaSharp" Version="2.88.8" />
+		<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\TestHarness.Core\TestHarness.Core.csproj" />
 	</ItemGroup>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -65,3 +65,4 @@
		<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
		</ItemGroup>
		</Project>