update to Prism 7.1 RTM

dansiegel · Oct 16, 2018 · 3e943ca · 3e943ca
1 parent 404c12b
commit 3e943ca
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 81 deletions.
diff --git a/Directory.build.props b/Directory.build.props
@@ -4,62 +4,53 @@
  <PropertyGroup>
  <Product>$(AssemblyName) ($(TargetFramework))</Product>
  <Authors>Dan Siegel</Authors>
+ <Copyright>© Dan Siegel. All rights reserved.</Copyright>
  <VersionPrefix>2.1.0</VersionPrefix>
- <VersionPrefix Condition=" '$(BUILD_BUILDNUMBER)' != '' ">$(VersionPrefix).$(BUILD_BUILDNUMBER)</VersionPrefix>
- <VersionSuffix Condition=" '$(BUILD_BUILDNUMBER)' != '' ">ci</VersionSuffix>
- <VersionSuffix Condition=" '$(IS_PREVIEW)' == 'true' ">pre</VersionSuffix>
- <VersionSuffix Condition=" '$(IS_RELEASE)' == 'true' "></VersionSuffix>
- <PackageOutputPath Condition=" '$(BUILD_BUILDNUMBER)' == '' ">$(MSBuildThisFileDirectory)Build</PackageOutputPath>
- <PackageOutputPath Condition=" '$(BUILD_BUILDNUMBER)' != '' ">$(BUILD_ARTIFACTSTAGINGDIRECTORY)</PackageOutputPath>
- <NeutralLanguage>en</NeutralLanguage>
+ <NeutralLanguage>en-US</NeutralLanguage>
  <IncludeSymbols>True</IncludeSymbols>
  <IncludeSource>True</IncludeSource>
- <LicenseUrl>https://github.com/dansiegel/Prism.Plugin.Popups/blob/master/LICENSE</LicenseUrl>
- <ProjectUrl>https://github.com/dansiegel/Prism.Plugin.Popups</ProjectUrl>
- <Tags>prism,popups,xamarin forms</Tags>
- <ReleaseNotes>
-v2.1.0-pre1
-- Updates to Rg.Plugins.Popup 1.1.4.154
-- Bumping to 2.1 to make it clearer that this targets Prism 7.1
-v2.0.0-pre7
-- Updates for Prism 7.1 compatibility
-v2.0.0-pre6
-- Fixes issue that prevented PopupNavigationService from properly being registered on DryIoc
-- Fixes registration to include missing registration for PopupPageBehaviorFactory
-- Adds Unit Tests
-- Updates Sample Application
-v2.0.0-pre4
-- Targets Prism 7.0.0-pre5 with IOC abstraction
-- Deprecates Container Specific pacakges
-- Updates to NetStandard version of Rg.Plugins.Popup (1.1.3.73-pre)
-v2.0.0-pre3
--Targets Prism 7.0.0-pre1
-v2.0.0-pre2
--Adds NetStandard support
--Updates to Prism 7
--Ensures that `IPopupNavigation` is registered when registering the PopupNavigationService
--Various refractorings &amp; fixes to the PopupNavigationService
--Fixes issue where the BindingContext would be null after calling GoBackAsync()
--Requires NuGet source https://www.myget.org/F/prism/api/v3/index.json
-v2.0.0-pre1
--Adds PopupPageNavigationService
--Marks `PopupGoBackAsync` and `PushPopupAsync` extension methods as obsolete in favor of directly using the `INavigationService.GoBackAsync` &amp; `INavigationService.NavigateAsync` methods
--Adds Registration extension for all DI Containers with overload so that users can add custom logic to the `PopupPageNavigationService`
-v1.1.0
--Adds support for Prism.Forms IDestructible
--Adds support for new INavigationAware paradigm with `INavigatingAware` and `INavigatedAware`
--Breaking Change: Removes Non-Async version of ClearPopupStack
--Ensures OnNavigatingTo will fire on the 'Current Page' of any `NavigationPage`, `MasterDetailPage`, or `TabbedPage`
--Ensures OnNavigatingFrom will be called when pushing a PopupPage
-v1.0.1: 
-- Fixes issue where the appropriate ViewModel was not being loaded 
-- Adds overload to PushPopupAsync to directly add a single navigation parameter 
-v1.0.0: 
-- Initial Prerelease Package
- </ReleaseNotes>
+ <PackageIconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</PackageIconUrl>
+ <PackageProjectUrl>https://github.com/dansiegel/Prism.Plugin.Popups</PackageProjectUrl>
+ <RepositoryUrl>https://github.com/dansiegel/Prism.Plugin.Popups.git</RepositoryUrl>
+ <RepositoryType>git</RepositoryType>
+ <PackageLicenseUrl>https://github.com/dansiegel/Prism.Plugin.Popups/blob/master/LICENSE</PackageLicenseUrl>
+ <PackageTags>prism popups xamarin.forms</PackageTags>
+ <PackageReleaseNotes>- Targets Prism 7.1
+- Targets Rg.Plugins.Popup 1.1.4.154
+- Deprecates all container specific packages in favor of abstracted Prism.Plugin.Popups package
+- v1 Navigation Extensions `PopupGoBackAsync` &amp; `PushPopupAsync` have been removed in favor of new PopupPage NavigationService
+- Adds IContainerRegistry extension to register the PopupPageNavigationService, IPopupNavigation and PopupPageBehaviorFactory
+ </PackageReleaseNotes>
  </PropertyGroup>
 
- <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+ <!-- CI Helpers -->
+ <PropertyGroup>
+ <PackageOutputPath>$(MSBuildThisFileDirectory)/Artifacts</PackageOutputPath>
+ <PackageOutputPath Condition=" $(BUILD_ARTIFACTSTAGINGDIRECTORY) != '' ">$(BUILD_ARTIFACTSTAGINGDIRECTORY)</PackageOutputPath>
+ <IsPackable>true</IsPackable>
+ <IsPackable Condition=" $(ProjectName.Contains('Sample')) ">false</IsPackable>
+ <IsPackable Condition=" $(ProjectName.Contains('Test')) ">false</IsPackable>
+ <GeneratePackageOnBuild>$(IsPackable)</GeneratePackageOnBuild>
+ <IS_PREVIEW Condition=" $(IS_PREVIEW) == '' ">false</IS_PREVIEW>
+ <IS_RELEASE Condition=" $(IS_RELEASE) == '' ">false</IS_RELEASE>
+ <VersionPrefix Condition=" $(BUILD_BUILDNUMBER) != '' ">$(VersionPrefix).$(BUILD_BUILDNUMBER)</VersionPrefix>
+ <VersionSuffix>ci</VersionSuffix>
+ <VersionSuffix Condition=" $(IS_PREVIEW) ">pre</VersionSuffix>
+ <VersionSuffix Condition=" $(IS_RELEASE) "></VersionSuffix>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <!-- Nuget source link -->
+ <PublishRepositoryUrl>true</PublishRepositoryUrl>
+ <EmbedUntrackedSources>true</EmbedUntrackedSources>
+ <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+ </PropertyGroup>
+
+ <ItemGroup Condition=" $(IsPackable) ">
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
+ </ItemGroup>
+
+ <PropertyGroup Condition=" '$(Configuration)' == 'Release' And '$(IsPackable)' ">
  <GenerateDocumentationFile>True</GenerateDocumentationFile>
  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  </PropertyGroup>

diff --git a/samples/src/PopupPluginSample.Droid/PopupPluginSample.Droid.csproj b/samples/src/PopupPluginSample.Droid/PopupPluginSample.Droid.csproj
@@ -109,9 +109,9 @@
  </ItemGroup>
  <ItemGroup>
  <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" PrivateAssets="all" />
- <PackageReference Include="Prism.Autofac.Forms" Version="7.1.0.279-pre" />
- <PackageReference Include="Prism.DryIoc.Forms" Version="7.1.0.279-pre" />
- <PackageReference Include="Prism.Unity.Forms" Version="7.1.0.279-pre" />
+ <PackageReference Include="Prism.Autofac.Forms" Version="7.1.0.431" />
+ <PackageReference Include="Prism.DryIoc.Forms" Version="7.1.0.431" />
+ <PackageReference Include="Prism.Unity.Forms" Version="7.1.0.431" />
  <PackageReference Include="Xamarin.Forms" Version="3.2.0.871581" />
  <PackageReference Include="Mobile.BuildTools" Version="1.4.0.638" PrivateAssets="all" />
  <PackageReference Include="Prism.QuickStart.MFractor.Config" Version="1.0.3" PrivateAssets="all" />

diff --git a/samples/src/PopupPluginSample.iOS/Info.plist b/samples/src/PopupPluginSample.iOS/Info.plist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+ <dict>
  <key>CFBundleDisplayName</key>
  <string>Popup Sample</string>
  <key>CFBundleName</key>
@@ -18,29 +18,29 @@
  <string>8.0</string>
  <key>UIDeviceFamily</key>
  <array>
-  <integer>1</integer>
-  <integer>2</integer>
+ <integer>1</integer>
+ <integer>2</integer>
  </array>
  <key>UILaunchStoryboardName</key>
  <string>LaunchScreen</string>
  <key>UIRequiredDeviceCapabilities</key>
  <array>
-  <string>armv7</string>
+ <string>armv7</string>
  </array>
  <key>UISupportedInterfaceOrientations</key>
  <array>
-  <string>UIInterfaceOrientationPortrait</string>
-  <string>UIInterfaceOrientationLandscapeLeft</string>
-  <string>UIInterfaceOrientationLandscapeRight</string>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
  </array>
  <key>UISupportedInterfaceOrientations~ipad</key>
  <array>
-  <string>UIInterfaceOrientationPortrait</string>
-  <string>UIInterfaceOrientationPortraitUpsideDown</string>
-  <string>UIInterfaceOrientationLandscapeLeft</string>
-  <string>UIInterfaceOrientationLandscapeRight</string>
+ <string>UIInterfaceOrientationPortrait</string>
+ <string>UIInterfaceOrientationPortraitUpsideDown</string>
+ <string>UIInterfaceOrientationLandscapeLeft</string>
+ <string>UIInterfaceOrientationLandscapeRight</string>
  </array>
  <key>XSAppIconAssets</key>
  <string>Assets.xcassets/AppIcon.appiconset</string>
-</dict>
-</plist>
+ </dict>
+</plist>
diff --git a/samples/src/PopupPluginSample.iOS/PopupPluginSample.iOS.csproj b/samples/src/PopupPluginSample.iOS/PopupPluginSample.iOS.csproj
@@ -258,9 +258,9 @@
  </ItemGroup>
  <ItemGroup>
  <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" PrivateAssets="all" />
- <PackageReference Include="Prism.Autofac.Forms" Version="7.1.0.279-pre" />
- <PackageReference Include="Prism.DryIoc.Forms" Version="7.1.0.279-pre" />
- <PackageReference Include="Prism.Unity.Forms" Version="7.1.0.279-pre" />
+ <PackageReference Include="Prism.Autofac.Forms" Version="7.1.0.431" />
+ <PackageReference Include="Prism.DryIoc.Forms" Version="7.1.0.431" />
+ <PackageReference Include="Prism.Unity.Forms" Version="7.1.0.431" />
  <PackageReference Include="Xamarin.Forms" Version="3.2.0.871581" />
  <PackageReference Include="Mobile.BuildTools" Version="1.4.0.638" PrivateAssets="all" />
  <PackageReference Include="Prism.QuickStart.MFractor.Config" Version="1.0.3" PrivateAssets="all" />

diff --git a/samples/src/PopupPluginSample/PopupPluginSample.csproj b/samples/src/PopupPluginSample/PopupPluginSample.csproj
@@ -8,9 +8,9 @@
 
  <ItemGroup>
  <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" PrivateAssets="all" />
- <PackageReference Include="Prism.Autofac.Forms" Version="7.1.0.279-pre" />
- <PackageReference Include="Prism.DryIoc.Forms" Version="7.1.0.279-pre" />
- <PackageReference Include="Prism.Unity.Forms" Version="7.1.0.279-pre" />
+ <PackageReference Include="Prism.Autofac.Forms" Version="7.1.0.431" />
+ <PackageReference Include="Prism.DryIoc.Forms" Version="7.1.0.431" />
+ <PackageReference Include="Prism.Unity.Forms" Version="7.1.0.431" />
  <PackageReference Include="Xamarin.Forms" Version="3.2.0.871581" />
  <PackageReference Include="Mobile.BuildTools" Version="1.4.0.638" PrivateAssets="all" />
  <PackageReference Include="Prism.QuickStart.MFractor.Config" Version="1.0.3" PrivateAssets="all" />

diff --git a/src/Prism.Plugin.Popups.Autofac/Prism.Plugin.Popups.Autofac.csproj b/src/Prism.Plugin.Popups.Autofac/Prism.Plugin.Popups.Autofac.csproj
@@ -8,7 +8,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Prism.Autofac.Forms" Version="7.1.0.279-pre" />
+ <PackageReference Include="Prism.Autofac.Forms" Version="7.1.0.431" />
  <ProjectReference Include="../Prism.Plugin.Popups/Prism.Plugin.Popups.csproj" />
  </ItemGroup>
 </Project>
diff --git a/src/Prism.Plugin.Popups.DryIoc/Prism.Plugin.Popups.DryIoc.csproj b/src/Prism.Plugin.Popups.DryIoc/Prism.Plugin.Popups.DryIoc.csproj
@@ -8,7 +8,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Prism.DryIoc.Forms" Version="7.1.0.279-pre" />
+ <PackageReference Include="Prism.DryIoc.Forms" Version="7.1.0.431" />
  <ProjectReference Include="../Prism.Plugin.Popups/Prism.Plugin.Popups.csproj" />
  </ItemGroup>
 

diff --git a/src/Prism.Plugin.Popups.Unity/Prism.Plugin.Popups.Unity.csproj b/src/Prism.Plugin.Popups.Unity/Prism.Plugin.Popups.Unity.csproj
@@ -8,7 +8,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Prism.Unity.Forms" Version="7.1.0.279-pre" />
+ <PackageReference Include="Prism.Unity.Forms" Version="7.1.0.431" />
  <ProjectReference Include="../Prism.Plugin.Popups/Prism.Plugin.Popups.csproj" />
  </ItemGroup>
 </Project>
diff --git a/src/Prism.Plugin.Popups/Prism.Plugin.Popups.csproj b/src/Prism.Plugin.Popups/Prism.Plugin.Popups.csproj
@@ -7,7 +7,7 @@
 
  <ItemGroup>
  <PackageReference Include="Rg.Plugins.Popup" Version="1.1.4.168" />
- <PackageReference Include="Prism.Forms" Version="7.1.0.279-pre" />
+ <PackageReference Include="Prism.Forms" Version="7.1.0.431" />
  </ItemGroup>
 
 </Project>
diff --git a/tests/Prism.Plugin.Popups.Autofac.Tests/Prism.Plugin.Popups.Autofac.Tests.csproj b/tests/Prism.Plugin.Popups.Autofac.Tests/Prism.Plugin.Popups.Autofac.Tests.csproj
@@ -8,7 +8,7 @@
 
  <ItemGroup>
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
- <PackageReference Include="Prism.Autofac.Forms" Version="7.1.0.279-pre" />
+ <PackageReference Include="Prism.Autofac.Forms" Version="7.1.0.431" />
  <PackageReference Include="Rg.Plugins.Popup" Version="1.1.4.168" />
  <PackageReference Include="Xamarin.Forms.Mocks" Version="3.0.0.2" />
  <PackageReference Include="xunit" Version="2.4.0" />

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="15.8.0" />
- <PackageReference Include="Prism.DryIoc.Forms" Version="7.1.0.279-pre" />
+ <PackageReference Include="Prism.DryIoc.Forms" Version="7.1.0.431" />
  <PackageReference Include="Rg.Plugins.Popup" Version="1.1.4.168" />
  <PackageReference Include="Xamarin.Forms.Mocks" Version="3.0.0.2" />
  <PackageReference Include="xunit" Version="2.4.0" />

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
@@ -7,8 +7,8 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
- <PackageReference Include="Prism.Unity.Forms" Version="7.1.0.279-pre" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+ <PackageReference Include="Prism.Unity.Forms" Version="7.1.0.431" />
  <PackageReference Include="Rg.Plugins.Popup" Version="1.1.4.168" />
  <PackageReference Include="Xamarin.Forms.Mocks" Version="3.0.0.2" />
  <PackageReference Include="xunit" Version="2.4.0" />