diff --git a/integrationtests/Directory.Build.props b/integrationtests/Directory.Build.props index d057f03053..9e54a3eaca 100644 --- a/integrationtests/Directory.Build.props +++ b/integrationtests/Directory.Build.props @@ -27,7 +27,7 @@ - + diff --git a/integrationtests/IntegrationTests.Android/IntegrationTests.Android.csproj b/integrationtests/IntegrationTests.Android/IntegrationTests.Android.csproj index 254821a843..e6f63da54e 100644 --- a/integrationtests/IntegrationTests.Android/IntegrationTests.Android.csproj +++ b/integrationtests/IntegrationTests.Android/IntegrationTests.Android.csproj @@ -99,8 +99,8 @@ - - + + diff --git a/integrationtests/IntegrationTests.Mac/IntegrationTests.Mac.csproj b/integrationtests/IntegrationTests.Mac/IntegrationTests.Mac.csproj index 7528045bac..0d78704dd3 100644 --- a/integrationtests/IntegrationTests.Mac/IntegrationTests.Mac.csproj +++ b/integrationtests/IntegrationTests.Mac/IntegrationTests.Mac.csproj @@ -50,7 +50,12 @@ - + + c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll + c:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll + c:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll + c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll + @@ -96,4 +101,4 @@ - \ No newline at end of file + diff --git a/integrationtests/IntegrationTests.Shared.Tests/IntegrationTests.Shared.Tests.csproj b/integrationtests/IntegrationTests.Shared.Tests/IntegrationTests.Shared.Tests.csproj index bf001f8b3b..38ad4bb7c9 100644 --- a/integrationtests/IntegrationTests.Shared.Tests/IntegrationTests.Shared.Tests.csproj +++ b/integrationtests/IntegrationTests.Shared.Tests/IntegrationTests.Shared.Tests.csproj @@ -19,7 +19,7 @@ runtime; build; native; contentfiles; analyzers - + diff --git a/integrationtests/IntegrationTests.XamarinForms.Android/IntegrationTests.XamarinForms.Android.csproj b/integrationtests/IntegrationTests.XamarinForms.Android/IntegrationTests.XamarinForms.Android.csproj index 820251b6a0..dd106d54b0 100644 --- a/integrationtests/IntegrationTests.XamarinForms.Android/IntegrationTests.XamarinForms.Android.csproj +++ b/integrationtests/IntegrationTests.XamarinForms.Android/IntegrationTests.XamarinForms.Android.csproj @@ -51,7 +51,11 @@ - + + 1.7.0.2 + + + @@ -99,4 +103,4 @@ - \ No newline at end of file + diff --git a/src/Directory.build.props b/src/Directory.build.props index c882080acf..2e8e79f68b 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -52,7 +52,7 @@ - + diff --git a/src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj b/src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj index ec9989b933..4d38c1695a 100644 --- a/src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj +++ b/src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj @@ -28,11 +28,11 @@ - - - - - + + + + + diff --git a/src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj b/src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj index 44034a0654..e71bae9a1b 100644 --- a/src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj +++ b/src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj b/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj index 920f97caaf..75f5748f15 100644 --- a/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj +++ b/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/ReactiveUI.XamForms.Tests/Activation/ActivatingReactivePagesTests.cs b/src/ReactiveUI.XamForms.Tests/Activation/ActivatingReactivePagesTests.cs index 2c887f3222..3ae8ae78d5 100644 --- a/src/ReactiveUI.XamForms.Tests/Activation/ActivatingReactivePagesTests.cs +++ b/src/ReactiveUI.XamForms.Tests/Activation/ActivatingReactivePagesTests.cs @@ -17,7 +17,7 @@ namespace ReactiveUI.Tests /// public class ActivatingReactivePagesTests : IClassFixture> { - private ApplicationFixture _fixture; + private readonly ApplicationFixture _fixture; /// /// Initializes a new instance of the class. diff --git a/src/ReactiveUI/Platforms/android/ControlFetcherMixin.cs b/src/ReactiveUI/Platforms/android/ControlFetcherMixin.cs index c48b84c1b8..a6e63320e2 100644 --- a/src/ReactiveUI/Platforms/android/ControlFetcherMixin.cs +++ b/src/ReactiveUI/Platforms/android/ControlFetcherMixin.cs @@ -23,7 +23,7 @@ public static partial class ControlFetcherMixin { private static readonly ConcurrentDictionary> _controlIds = new(); - private static readonly ConditionalWeakTable> _viewCache = new(); + private static readonly ConditionalWeakTable> _viewCache = new(); /// /// Gets the control from an activity.