Merge pull request unoplatform#13875 from Youssef1313/update-skiasharp

eriklimakc · Oct 1, 2023 · aeec924 · aeec924
2 parents 19d73f6 + 2a26a61
commit aeec924
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -89,18 +89,26 @@
 		<PackageReference Update="Xamarin.TestCloud.Agent" Version="0.23.2" />
 		<PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
 
-		<PackageReference Update="SkiaSharp.Views" Version="2.88.3" />
-		<PackageReference Update="SkiaSharp.Views.Uno" Version="2.88.3" />
-		<PackageReference Update="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
-		<PackageReference Update="SkiaSharp.Views.WPF" Version="2.88.3" />
-		<PackageReference Update="SkiaSharp" Version="2.88.3" />
-		<PackageReference Update="SkiaSharp.NativeAssets.Linux" Version="2.88.3" />
-		<PackageReference Update="SkiaSharp.Harfbuzz" Version="2.88.3" />
-		<PackageReference Update="SkiaSharp.Skottie" Version="2.88.3" />
-		<PackageReference Update="SkiaSharp.NativeAssets.Android" Version="2.88.3" />
-		<PackageReference Update="SkiaSharp.NativeAssets.iOS" Version="2.88.3" />
-		<PackageReference Update="SkiaSharp.NativeAssets.MacCatalyst" Version="2.88.3" />
-		<PackageReference Update="SkiaSharp.NativeAssets.macos" Version="2.88.3" />
+		<!-- 
+			NoWarn="NU1903" is added to avoid .NET 7 discrepancies added when workloads
+			are incorrectly upgraded by dependencies. This will change in .NET 8, at which
+			time we'll be able to upgrade SkiaSharp.
+			Note that project templats are updated, which means that end users won't
+			be affected.
+		-->
+		<PackageReference Update="SkiaSharp.Views" Version="2.88.3" NoWarn="NU1903" />
+		<PackageReference Update="SkiaSharp.Views.Uno" Version="2.88.3" NoWarn="NU1903" />
+		<PackageReference Update="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" NoWarn="NU1903" />
+		<PackageReference Update="SkiaSharp.Views.WPF" Version="2.88.3" NoWarn="NU1903"  />
+		<PackageReference Update="SkiaSharp" Version="2.88.3" NoWarn="NU1903"  />
+		<PackageReference Update="SkiaSharp.NativeAssets.Linux" Version="2.88.3" NoWarn="NU1903" />
+		<PackageReference Update="SkiaSharp.Harfbuzz" Version="2.88.3" NoWarn="NU1903" />
+		<PackageReference Update="SkiaSharp.Skottie" Version="2.88.3" NoWarn="NU1903" />
+		<PackageReference Update="SkiaSharp.NativeAssets.Android" Version="2.88.3" NoWarn="NU1903"  />
+		<PackageReference Update="SkiaSharp.NativeAssets.iOS" Version="2.88.3" NoWarn="NU1903" />
+		<PackageReference Update="SkiaSharp.NativeAssets.MacCatalyst" Version="2.88.3" NoWarn="NU1903" />
+		<PackageReference Update="SkiaSharp.NativeAssets.macos" Version="2.88.3" NoWarn="NU1903" />
+
 		<PackageReference Update="Svg.Skia" Version="1.0.0.1" />
 
 		<PackageReference Update="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2.3" />