updating to Prism 7.2 SR1 fixing DryIoc condition

dansiegel · Nov 21, 2019 · 86b482b · 86b482b
1 parent 0ef313b
commit 86b482b
Show file tree

Hide file tree

Showing 13 changed files with 4,735 additions and 38 deletions.
diff --git a/Prism.Plugin.Popups.sln b/Prism.Plugin.Popups.sln
@@ -130,11 +130,7 @@ Global
 		{2D0D5472-1B70-4C70-8F6D-041515CF5426}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2D0D5472-1B70-4C70-8F6D-041515CF5426}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{2D0D5472-1B70-4C70-8F6D-041515CF5426}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{2D0D5472-1B70-4C70-8F6D-041515CF5426}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{2D0D5472-1B70-4C70-8F6D-041515CF5426}.Debug|iPhone.Deploy.0 = Debug|Any CPU
 		{2D0D5472-1B70-4C70-8F6D-041515CF5426}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{2D0D5472-1B70-4C70-8F6D-041515CF5426}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{2D0D5472-1B70-4C70-8F6D-041515CF5426}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
 		{2D0D5472-1B70-4C70-8F6D-041515CF5426}.DryIoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{2D0D5472-1B70-4C70-8F6D-041515CF5426}.DryIoc|Any CPU.Build.0 = Debug|Any CPU
 		{2D0D5472-1B70-4C70-8F6D-041515CF5426}.DryIoc|Any CPU.Deploy.0 = Debug|Any CPU
@@ -165,6 +161,7 @@ Global
 		{01B18237-622E-4475-9D81-2C87A029B15E}.Debug|Any CPU.ActiveCfg = Debug|iPhone
 		{01B18237-622E-4475-9D81-2C87A029B15E}.Debug|iPhone.ActiveCfg = Debug|iPhone
 		{01B18237-622E-4475-9D81-2C87A029B15E}.Debug|iPhone.Build.0 = Debug|iPhone
+		{01B18237-622E-4475-9D81-2C87A029B15E}.Debug|iPhone.Deploy.0 = Debug|iPhone
 		{01B18237-622E-4475-9D81-2C87A029B15E}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
 		{01B18237-622E-4475-9D81-2C87A029B15E}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
 		{01B18237-622E-4475-9D81-2C87A029B15E}.DryIoc|Any CPU.ActiveCfg = Mock|iPhone

diff --git a/samples/src/PopupPluginSample.Droid/PopupPluginSample.Droid.csproj b/samples/src/PopupPluginSample.Droid/PopupPluginSample.Droid.csproj
@@ -60,8 +60,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="PropertyChanged.Fody" Version="3.1.3" PrivateAssets="all" />
-    <PackageReference Include="Xamarin.Forms" Version="4.3.0.947036" />
-    <PackageReference Include="Prism.QuickStart.MFractor.Config" Version="1.0.3" PrivateAssets="all" />
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />

diff --git a/samples/src/PopupPluginSample.Droid/Resources/Resource.designer.cs b/samples/src/PopupPluginSample.Droid/Resources/Resource.designer.cs
diff --git a/samples/src/PopupPluginSample.iOS/PopupPluginSample.iOS.csproj b/samples/src/PopupPluginSample.iOS/PopupPluginSample.iOS.csproj
@@ -192,8 +192,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="PropertyChanged.Fody" Version="3.1.3" PrivateAssets="all" />
-    <PackageReference Include="Xamarin.Forms" Version="4.3.0.947036" />
-    <PackageReference Include="Prism.QuickStart.MFractor.Config" Version="1.0.3" PrivateAssets="all" />
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Prism.Plugin.Popups\Prism.Plugin.Popups.csproj">

diff --git a/samples/src/PopupPluginSample/App.xaml b/samples/src/PopupPluginSample/App.xaml
@@ -9,7 +9,6 @@
         <Setter Property="BackgroundColor" Value="Gray" />
         <Setter Property="TextColor" Value="White" />
         <Setter Property="CornerRadius" Value="15" />
-        <Setter Property="Padding" Value="15,2" />
       </Style>
     </ResourceDictionary>
   </prism:PrismApplication.Resources>

diff --git a/samples/src/PopupPluginSample/PopupPluginSample.csproj b/samples/src/PopupPluginSample/PopupPluginSample.csproj
@@ -7,9 +7,9 @@
 
   <ItemGroup>
     <PackageReference Include="PropertyChanged.Fody" Version="3.1.3" PrivateAssets="all" />
-    <PackageReference Include="Prism.DryIoc.Forms" Version="7.2.0.1367" />
-    <PackageReference Include="Xamarin.Forms" Version="4.3.0.947036" />
-    <PackageReference Include="Mobile.BuildTools" Version="1.4.0.638" PrivateAssets="all" />
+    <PackageReference Include="Prism.DryIoc.Forms" Version="7.2.0.1422" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991211" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/src/PopupPluginSample/Views/MainPage.xaml b/samples/src/PopupPluginSample/Views/MainPage.xaml
@@ -2,16 +2,33 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms" 
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:prism="http://prismlibrary.com"
+             xmlns:essentials="clr-namespace:Xamarin.Essentials;assembly=Xamarin.Essentials"
              prism:ViewModelLocator.AutowireViewModel="True"
              Title="MainPage"
              x:Class="PopupPluginSample.Views.MainPage">
-  <StackLayout HorizontalOptions="Center" VerticalOptions="Center">
-    <Label Text="{Binding Message}" />
-    <Button Text="Launch Popup"
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="*" />
+      <RowDefinition Height="Auto" />
+    </Grid.RowDefinitions>
+    <StackLayout HorizontalOptions="Center" VerticalOptions="Center">
+      <Label Text="{Binding Message}" />
+      <Button Text="Launch Popup"
             Command="{prism:NavigateTo PopupView}" />
-    <Button Text="Sample Dialog"
+      <Button Text="Sample Dialog"
             Command="{prism:ShowDialog SampleDialog}" />
-    <Button Text="Back to Menu"
+      <Button Text="Back to Menu"
             Command="{prism:NavigateTo '/MenuPage'}" />
-  </StackLayout>
+    </StackLayout>
+    <Label Grid.Row="1"
+           Margin="20"
+           HorizontalTextAlignment="Center">
+      <Label.FormattedText>
+        <FormattedString>
+          <Span Text="Version: " />
+          <Span Text="{x:Static essentials:AppInfo.VersionString}" />
+        </FormattedString>
+      </Label.FormattedText>
+    </Label>
+  </Grid>
 </ContentPage>
diff --git a/samples/src/PopupPluginSample/Views/MenuPage.xaml b/samples/src/PopupPluginSample/Views/MenuPage.xaml
@@ -2,15 +2,33 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms" 
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:prism="http://prismlibrary.com"
+             xmlns:essentials="clr-namespace:Xamarin.Essentials;assembly=Xamarin.Essentials"
              x:Class="PopupPluginSample.Views.MenuPage">
-  <StackLayout HorizontalOptions="Center"
+
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="*" />
+      <RowDefinition Height="Auto" />
+    </Grid.RowDefinitions>
+    <StackLayout HorizontalOptions="Center"
                  VerticalOptions="Center">
-    <Label Text="Select the root page to test from" />
-    <Button Text="Master Detail Page" Command="{prism:NavigateTo '/MDPRoot/NavigationRoot/MainPage'}" />
-    <Button Text="Tabbed Page" Command="{prism:NavigateTo '/TabbedRoot'}" />
-    <Button Text="Navigation Page" Command="{prism:NavigateTo '/NavigationRoot/MainPage'}" />
-    <Button Text="Sample Dialog" Command="{prism:ShowDialog SampleDialog}" />
-    <!--        <Button Text="Content Page" Command="NavigateCommand" CommandParameter="MainPage" />-->
-  </StackLayout>
+      <Label Text="Select the root page to test from" />
+      <Button Text="Master Detail Page" Command="{prism:NavigateTo '/MDPRoot/NavigationRoot/MainPage'}" />
+      <Button Text="Tabbed Page" Command="{prism:NavigateTo '/TabbedRoot'}" />
+      <Button Text="Navigation Page" Command="{prism:NavigateTo '/NavigationRoot/MainPage'}" />
+      <Button Text="Sample Dialog" Command="{prism:ShowDialog SampleDialog}" />
+      <!--        <Button Text="Content Page" Command="NavigateCommand" CommandParameter="MainPage" />-->
+    </StackLayout>
+    <Label Grid.Row="1"
+           Margin="20"
+           HorizontalTextAlignment="Center">
+      <Label.FormattedText>
+        <FormattedString>
+          <Span Text="Version: " />
+          <Span Text="{x:Static essentials:AppInfo.VersionString}" />
+        </FormattedString>
+      </Label.FormattedText>
+    </Label>
+  </Grid>
 
 </ContentPage>
diff --git a/src/Prism.Plugin.Popups/PopupPageNavigationService.cs b/src/Prism.Plugin.Popups/PopupPageNavigationService.cs
@@ -90,7 +90,7 @@ protected override async Task ProcessNavigationForMasterDetailPage(MasterDetailP
             {
                 var newDetail = CreatePageFromSegment(nextSegment);
                 await ProcessNavigation(newDetail, segments, parameters, useModalNavigation, animated);
-                await DoNavigateAction(null, nextSegment, newDetail, parameters, onNavigationActionCompleted: () =>
+                await DoNavigateAction(null, nextSegment, newDetail, parameters, onNavigationActionCompleted: p =>
                 {
                     currentPage.IsPresented = isPresented;
                     currentPage.Detail = newDetail;
@@ -142,7 +142,7 @@ await DoNavigateAction(currentPage, nextSegment, nextPage, parameters, async ()
             if ((detailIsNavPage && reuseNavPage) || (!detailIsNavPage && detail.GetType() == nextSegmentType))
             {
                 await ProcessNavigation(detail, segments, parameters, useModalNavigation, animated);
-                await DoNavigateAction(null, nextSegment, detail, parameters, onNavigationActionCompleted: () =>
+                await DoNavigateAction(null, nextSegment, detail, parameters, onNavigationActionCompleted: p =>
                 {
                     if (detail is TabbedPage && nextSegment.Contains(KnownNavigationParameters.SelectedTab))
                     {
@@ -179,7 +179,7 @@ await DoNavigateAction(oldDetail, nextSegment, newDetail, parameters, navigation
             }
             else
             {
-                await DoNavigateAction(oldDetail, nextSegment, newDetail, parameters, onNavigationActionCompleted: () =>
+                await DoNavigateAction(oldDetail, nextSegment, newDetail, parameters, onNavigationActionCompleted: p =>
                 {
                     if (detailIsNavPage)
                         OnNavigatedFrom(((NavigationPage)oldDetail).CurrentPage, parameters);

diff --git a/src/Prism.Plugin.Popups/PopupRegistrationExtensions.cs b/src/Prism.Plugin.Popups/PopupRegistrationExtensions.cs
@@ -45,13 +45,13 @@ private static void RegisterPopupNavigation(this IContainerRegistry containerReg
 
         private static bool IsDryIocContainer(IContainerRegistry containerRegistry)
         {
+            var type = Type.GetType("DryIoc.IContainer, DryIoc", throwOnError: false);
+            if (type is null) return false;
+
             var regType = containerRegistry.GetType();
             var propInfo = regType.GetRuntimeProperty("Instance");
-#if NETSTANDARD1_0
-            return propInfo?.PropertyType.FullName.Equals("DryIoc.IContainer", StringComparison.OrdinalIgnoreCase) ?? false;
-#else
-            return propInfo?.PropertyType.FullName.Equals("DryIoc.IContainer", StringComparison.InvariantCultureIgnoreCase) ?? false;
-#endif
+
+            return propInfo.PropertyType == type;
         }
     }
 }
diff --git a/src/Prism.Plugin.Popups/Prism.Plugin.Popups.csproj b/src/Prism.Plugin.Popups/Prism.Plugin.Popups.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;Xamarin.iOS10;MonoAndroid81;MonoAndroid90</TargetFrameworks>
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Rg.Plugins.Popup" Version="1.2.0.223" />
-    <PackageReference Include="Prism.Forms" Version="7.2.0.1367" />
+    <PackageReference Include="Prism.Forms" Version="7.2.0.1422" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Prism.Plugin.Popups.DryIoc.Tests/Prism.Plugin.Popups.DryIoc.Tests.csproj b/tests/Prism.Plugin.Popups.DryIoc.Tests/Prism.Plugin.Popups.DryIoc.Tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="Prism.DryIoc.Forms" Version="7.2.0.1367" />
+    <PackageReference Include="Prism.DryIoc.Forms" Version="7.2.0.1422" />
     <PackageReference Include="Rg.Plugins.Popup" Version="1.2.0.223" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

diff --git a/tests/Prism.Plugin.Popups.Unity.Tests/Prism.Plugin.Popups.Unity.Tests.csproj b/tests/Prism.Plugin.Popups.Unity.Tests/Prism.Plugin.Popups.Unity.Tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="Prism.Unity.Forms" Version="7.2.0.1367" />
+    <PackageReference Include="Prism.Unity.Forms" Version="7.2.0.1422" />
     <PackageReference Include="Rg.Plugins.Popup" Version="1.2.0.223" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">