chore: Fixing security warnings

unoplatform · Sep 19, 2024 · cba5695 · cba5695
1 parent 82e0db8
commit cba5695
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 16 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -22,6 +22,7 @@
 		<DebugType>portable</DebugType>
 		<DebugSymbols>True</DebugSymbols>
 		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+		<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
 
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -46,7 +46,7 @@
 		<PackageVersion Include="Serilog.Sinks.Debug" Version="2.0.0" />
 		<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
 		<PackageVersion Include="Serilog.Sinks.Xamarin" Version="1.0.0" />
-		<PackageVersion Include="System.Collections.Immutable" Version="1.3.1" /> <!--Lower version breaks build of reactive.<UI|WinUI>-->
+		<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" /> 
 		<PackageVersion Include="System.Linq.Async" Version="4.0.0" />
 		<PackageVersion Include="System.Net.Http.WinHttpHandler" Version="6.0.1" />
 		<PackageVersion Include="System.Text.Json" Version="8.0.4" />
@@ -60,7 +60,7 @@
 		<PackageVersion Include="Uno.Extensions.Markup.Generators" Version="5.3.12" />
 		<PackageVersion Include="Uno.Extensions.Markup.WinUI" Version="5.3.12" />
 		<PackageVersion Include="Uno.Roslyn" Version="1.3.0-dev.12" />
-		<PackageVersion Include="Uno.Toolkit" Version="6.1.7" />
+		<PackageVersion Include="Uno.Toolkit" Version="6.1.8" />
 		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)"/>
 
 		<PackageVersion Include="Uno.UI.RuntimeTests.Engine" Version="0.37.0-dev.126" />
@@ -72,5 +72,9 @@
 		<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />
 		<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
 		<PackageVersion Include="FluentValidation" Version="11.4.0" />
+
+		<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
+		<PackageVersion Include="System.Net.Http" Version="4.3.4" />
+		<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
 	</ItemGroup>
 </Project>
diff --git a/src/Uno.Extensions.Core/Uno.Extensions.Core.csproj b/src/Uno.Extensions.Core/Uno.Extensions.Core.csproj
@@ -12,7 +12,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" />
-		<PackageReference Include="System.Collections.Immutable" /><!--Lower version breaks build of reactive.<UI|WinUI>-->
+		<PackageReference Include="System.Collections.Immutable" />
 		<PackageReference Include="System.Threading.Tasks.Extensions" />
 	</ItemGroup>
 

diff --git a/src/Uno.Extensions.Reactive.Testing/Uno.Extensions.Reactive.Testing.csproj b/src/Uno.Extensions.Reactive.Testing/Uno.Extensions.Reactive.Testing.csproj
@@ -19,7 +19,7 @@
 		<PackageReference Include="MSTest.TestAdapter" />
 		<PackageReference Include="MSTest.TestFramework" />
 		<PackageReference Include="coverlet.collector" />
-		<PackageReference Include="System.Collections.Immutable" VersionOverride="6.0.0" /> <!-- can this be the lower version in Directory.Build.props -->
+		<PackageReference Include="System.Collections.Immutable" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Uno.Extensions.Reactive.Tests/Uno.Extensions.Reactive.Tests.csproj b/src/Uno.Extensions.Reactive.Tests/Uno.Extensions.Reactive.Tests.csproj
@@ -14,12 +14,12 @@
 			<_Parameter1_TypeName>System.Int32</_Parameter1_TypeName>
 		</AssemblyAttribute>
 		<PackageReference Include="FluentAssertions" />
-		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" /><!--For local usage we use the most recent version-->
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" />
 		<PackageReference Include="MSTest.TestAdapter" />
 		<PackageReference Include="MSTest.TestFramework" />
 		<PackageReference Include="coverlet.collector" />
-		<PackageReference Include="System.Collections.Immutable" VersionOverride="6.0.0" /><!--For local usage we use the most recent version-->
+		<PackageReference Include="System.Collections.Immutable" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/testing/TestHarness/Directory.Build.props b/testing/TestHarness/Directory.Build.props
@@ -7,7 +7,7 @@
 	  <Nullable>annotations</Nullable>
 	  <NoWarn>$(NoWarn);NU5104;NU1504;NU1505;CS1591;MSB3277;XA0101;CS8785;CS8669;CA1416</NoWarn>
 	  <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-
+	  <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     <!--
       Adding NoWarn to remove build warnings
       NU1507: Warning when there are multiple package sources when using CPM with no source mapping

diff --git a/testing/TestHarness/Directory.Packages.props b/testing/TestHarness/Directory.Packages.props
@@ -13,7 +13,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.Identity.Client" Version="4.61.3" />
+		<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" />
 		<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
@@ -25,14 +25,14 @@
 		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
 		<PackageVersion Include="Refit" Version="6.3.2" />
 		<PackageVersion Include="Refit.HttpClientFactory" Version="6.3.2" />
-		<PackageVersion Include="SkiaSharp" Version="2.88.7" />
-		<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
-		<PackageVersion Include="SkiaSharp.HarfBuzz" Version="2.88.7" />
-		<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.7" />
-		<PackageVersion Include="SkiaSharp.Views" Version="2.88.7" />
-		<PackageVersion Include="SkiaSharp.Views.Uno" Version="2.88.7" />
-		<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.7" />
-		<PackageVersion Include="SkiaSharp.Views.WPF" Version="2.88.7" />
+		<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" />
@@ -53,6 +53,12 @@
 		<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.5.0.13" />
 		<PackageVersion Include="Xamarin.UITest" Version="4.3.4" />
 		<PackageVersion Include="coverlet.collector" Version="6.0.2" />
+		<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
+
+		<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
+		<PackageVersion Include="System.Net.Http" Version="4.3.4" />
+		<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+		<PackageVersion Include="System.Text.Json" Version="8.0.4" />
 	</ItemGroup>
 
 

diff --git a/testing/TestHarness/TestHarness.sln b/testing/TestHarness/TestHarness.sln
@@ -123,6 +123,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestHarness", "TestHarness\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.Tests", "..\..\src\Uno.Extensions.Reactive.Tests\Uno.Extensions.Reactive.Tests.csproj", "{A39E9AEC-4F8B-4B6F-A4DD-16201F427948}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.Testing", "..\..\src\Uno.Extensions.Reactive.Testing\Uno.Extensions.Reactive.Testing.csproj", "{1A90701A-FE5D-478A-9D5E-E264D5D0287F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -2255,6 +2257,62 @@ Global
 		{A39E9AEC-4F8B-4B6F-A4DD-16201F427948}.Release|x64.Build.0 = Release|Any CPU
 		{A39E9AEC-4F8B-4B6F-A4DD-16201F427948}.Release|x86.ActiveCfg = Release|Any CPU
 		{A39E9AEC-4F8B-4B6F-A4DD-16201F427948}.Release|x86.Build.0 = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|ARM64.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|x64.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.AppStore|x86.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|x64.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Debug|x86.Build.0 = Debug|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|ARM.Build.0 = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|ARM64.Build.0 = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|iPhone.Build.0 = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|x64.ActiveCfg = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|x64.Build.0 = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|x86.ActiveCfg = Release|Any CPU
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2305,6 +2363,7 @@ Global
 		{87A72917-4D00-4C93-A792-1A00DFD380E6} = {1380679E-0E34-4994-BD7F-1C848B11E761}
 		{FE6C5BE3-3712-446C-BE40-CA9BE0D70EEC} = {5851B37C-ADC6-468D-8684-AC06476569AC}
 		{A39E9AEC-4F8B-4B6F-A4DD-16201F427948} = {A404EC40-25EF-4EFF-8C37-67D7039CF243}
+		{1A90701A-FE5D-478A-9D5E-E264D5D0287F} = {A404EC40-25EF-4EFF-8C37-67D7039CF243}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C7433AE2-B1A0-4C1A-887E-5CAA7AAF67A6}