Merge pull request #713 from PrismLibrary/v6.2-PreviewPrism.v6.2.0

getting nuspecs in order

10 files changed, 50 insertions, 46 deletions

diff --git a/Source/Windows10/Prism.SimpleInjector.Windows/Properties/AssemblyInfo.cs b/Source/Windows10/Prism.SimpleInjector.Windows/Properties/AssemblyInfo.cs
index fa1ff6a..2a8de26 100644
--- a/Source/Windows10/Prism.SimpleInjector.Windows/Properties/AssemblyInfo.cs
+++ b/Source/Windows10/Prism.SimpleInjector.Windows/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("6.0")]
 [assembly: AssemblyFileVersion("6.0.0")]
-[assembly: AssemblyInformationalVersion("6.0.0-pre1")]
+[assembly: AssemblyInformationalVersion("6.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Source/Windows10/Prism.Unity.Windows/Properties/AssemblyInfo.cs b/Source/Windows10/Prism.Unity.Windows/Properties/AssemblyInfo.cs
index 779661c..ba0f3e5 100644
--- a/Source/Windows10/Prism.Unity.Windows/Properties/AssemblyInfo.cs
+++ b/Source/Windows10/Prism.Unity.Windows/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("6.2")]
 [assembly: AssemblyFileVersion("6.2.0")]
-[assembly: AssemblyInformationalVersion("6.2.0-pre3")]
+[assembly: AssemblyInformationalVersion("6.2.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Source/Windows10/Prism.Windows/Properties/AssemblyInfo.cs b/Source/Windows10/Prism.Windows/Properties/AssemblyInfo.cs
index 95bc992..8437eff 100644
--- a/Source/Windows10/Prism.Windows/Properties/AssemblyInfo.cs
+++ b/Source/Windows10/Prism.Windows/Properties/AssemblyInfo.cs
@@ -16,5 +16,5 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("6.0")]
 [assembly: AssemblyFileVersion("6.0.2")]
-[assembly: AssemblyInformationalVersion("6.0.2-pre1")]
+[assembly: AssemblyInformationalVersion("6.0.2")]
 [assembly: ComVisible(false)]
diff --git a/Source/nuspecs/CreatePrismNuGetPackages.ps1 b/Source/nuspecs/CreatePrismNuGetPackages.ps1
index 56337c4..55d709a 100644
--- a/Source/nuspecs/CreatePrismNuGetPackages.ps1
+++ b/Source/nuspecs/CreatePrismNuGetPackages.ps1
@@ -1,7 +1,9 @@
 ### This is just the initial script to get the nuget packages out.  We need to refactor this script to make it easier to maintain and update
 ### One idea is to force a Visual Studio build using the Release-Signed build configuration before packing the nuspecs
 
-$releaseNotesUri = 'https://github.com/PrismLibrary/Prism/wiki/Release-Notes--Jan-10,-2016'
+$releaseNotesUri = 'https://github.com/PrismLibrary/Prism/wiki/Release-Notes-6.2.0'
+
+$xamarinFormsVersion = '2.3.1.114'
 
 $nugetFileName = 'nuget.exe'
 
@@ -81,7 +83,7 @@ if ((Test-Path $formsAssemblyPath))
     $fileInfo = Get-Item $formsAssemblyPath
     $formsFileVersion = $fileInfo.VersionInfo.ProductVersion
 
-    Invoke-Expression ".\$($nugetFileName) pack $($formsNuspecPath) -Prop version=$($formsFileVersion) -Prop coreVersion=$($coreFileVersion) -Prop releaseNotes=$($releaseNotesUri)"
+    Invoke-Expression ".\$($nugetFileName) pack $($formsNuspecPath) -Prop xamarinFormsVersion=$($xamarinFormsVersion) -Prop version=$($formsFileVersion) -Prop coreVersion=$($coreFileVersion) -Prop releaseNotes=$($releaseNotesUri)"
 }
 else
 {
@@ -132,7 +134,7 @@ else
     $unityFormsFileInfo = Get-Item $unityFormsAssemblyPath
     $unityFileVersion = $unityFormsFileInfo.VersionInfo.ProductVersion   
 
-    Invoke-Expression ".\$($nugetFileName) pack $($unityFormsNuspecPath) -Prop version=$($unityFileVersion) -Prop formsVersion=$($formsFileVersion) -Prop releaseNotes=$($releaseNotesUri)"
+    Invoke-Expression ".\$($nugetFileName) pack $($unityFormsNuspecPath) -Prop xamarinFormsVersion=$($xamarinFormsVersion) -Prop version=$($unityFileVersion) -Prop formsVersion=$($formsFileVersion) -Prop releaseNotes=$($releaseNotesUri)"
 }
 
 ###########################
@@ -149,7 +151,7 @@ else
     $unityFormsFileInfo = Get-Item $autofacFormsAssemblyPath
     $unityFileVersion = $unityFormsFileInfo.VersionInfo.ProductVersion   
 
-    Invoke-Expression ".\$($nugetFileName) pack $($autofacFormsNuspecPath) -Prop version=$($unityFileVersion) -Prop formsVersion=$($formsFileVersion) -Prop releaseNotes=$($releaseNotesUri)"
+    Invoke-Expression ".\$($nugetFileName) pack $($autofacFormsNuspecPath) -Prop xamarinFormsVersion=$($xamarinFormsVersion) -Prop version=$($unityFileVersion) -Prop formsVersion=$($formsFileVersion) -Prop releaseNotes=$($releaseNotesUri)"
 }
 
 
@@ -248,7 +250,7 @@ else
     $ninjectFormsFileInfo = Get-Item $ninjectFormsAssemblyPath
     $ninjectFormsFileVersion = $ninjectFormsFileInfo.VersionInfo.ProductVersion   
 
-    Invoke-Expression ".\$($nugetFileName) pack $($ninjectFormsNuspecPath) -Prop version=$($ninjectFormsFileVersion) -Prop formsVersion=$($formsFileVersion) -Prop releaseNotes=$($releaseNotesUri)"
+    Invoke-Expression ".\$($nugetFileName) pack $($ninjectFormsNuspecPath) -Prop xamarinFormsVersion=$($xamarinFormsVersion) -Prop version=$($ninjectFormsFileVersion) -Prop formsVersion=$($formsFileVersion) -Prop releaseNotes=$($releaseNotesUri)"
 }
 
 
diff --git a/Source/nuspecs/Prism.Autofac.Forms.nuspec b/Source/nuspecs/Prism.Autofac.Forms.nuspec
index 8452514..67c2351 100644
--- a/Source/nuspecs/Prism.Autofac.Forms.nuspec
+++ b/Source/nuspecs/Prism.Autofac.Forms.nuspec
@@ -4,8 +4,8 @@
     <id>Prism.Autofac.Forms</id>
     <version>$version$</version>
     <title>Autofac for Prism for Xamarin.Forms</title>
-    <authors>Brian Lagunas, Eder Cardoso</authors>
-    <owners>Brian Lagunas, Eder Cardoso</owners>
+    <authors>Brian Lagunas, Brian Noyes</authors>
+    <owners>Brian Lagunas, Brian Noyes</owners>
     <licenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</licenseUrl>
     <projectUrl>http://prismlibrary.com/</projectUrl>
     <iconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</iconUrl>
@@ -18,42 +18,42 @@
     <dependencies>   
       <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Autofac" version="3.5.2" />
       </group>
       <group targetFramework="Xamarin.iOS1.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Autofac" version="3.5.2" />
       </group>
       <group targetFramework="MonoTouch1.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Autofac" version="3.5.2" />
       </group>
       <group targetFramework="MonoAndroid1.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Autofac" version="3.5.2" />
       </group>
       <group targetFramework="Windows8.1">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Autofac" version="3.5.2" />
       </group>
       <group targetFramework="WindowsPhoneApp8.1">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Autofac" version="3.5.2" />
       </group>
       <group targetFramework="UAP10.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Autofac" version="3.5.2" />
       </group>
       <group targetFramework="WindowsPhone8.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Autofac" version="3.5.2" />
       </group>
     </dependencies>
diff --git a/Source/nuspecs/Prism.Autofac.nuspec b/Source/nuspecs/Prism.Autofac.nuspec
index 7e40410..1ad5ed2 100644
--- a/Source/nuspecs/Prism.Autofac.nuspec
+++ b/Source/nuspecs/Prism.Autofac.nuspec
@@ -4,7 +4,8 @@
     <id>Prism.Autofac</id>
     <version>$version$</version>
     <title>Autofac for Prism 6</title>
-    <authors>Brian Lagunas,Brian Noyes</authors>
+    <authors>Brian Lagunas, Brian Noyes</authors>
+    <owners>Brian Lagunas, Brian Noyes</owners>
     <licenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</licenseUrl>
     <projectUrl>http://prismlibrary.com/</projectUrl>
     <iconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</iconUrl>
diff --git a/Source/nuspecs/Prism.Forms.nuspec b/Source/nuspecs/Prism.Forms.nuspec
index 4624f57..6ecf01b 100644
--- a/Source/nuspecs/Prism.Forms.nuspec
+++ b/Source/nuspecs/Prism.Forms.nuspec
@@ -4,8 +4,8 @@
     <id>Prism.Forms</id>
     <version>$version$</version>
     <title>Prism for Xamarin.Forms</title>
-    <authors>Brian Lagunas</authors>
-    <owners>Brian Lagunas</owners>
+    <authors>Brian Lagunas, Brian Noyes</authors>
+    <owners>Brian Lagunas, Brian Noyes</owners>
     <licenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</licenseUrl>
     <projectUrl>http://prismlibrary.com/</projectUrl>
     <iconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</iconUrl>
@@ -19,35 +19,35 @@
     <dependencies>
       <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10">
         <dependency id="Prism.Core" version="$coreVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
       </group>
       <group targetFramework="Xamarin.iOS1.0">
         <dependency id="Prism.Core" version="$coreVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
       </group>
       <group targetFramework="MonoTouch1.0">
         <dependency id="Prism.Core" version="$coreVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
       </group>
       <group targetFramework="MonoAndroid1.0">
         <dependency id="Prism.Core" version="$coreVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
       </group>
       <group targetFramework="Windows8.1">
         <dependency id="Prism.Core" version="$coreVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
       </group>
       <group targetFramework="WindowsPhoneApp8.1">
         <dependency id="Prism.Core" version="$coreVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
       </group>
       <group targetFramework="UAP10.0">
         <dependency id="Prism.Core" version="$coreVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
       </group>
       <group targetFramework="WindowsPhone8.0">
         <dependency id="Prism.Core" version="$coreVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
       </group>
     </dependencies>
   </metadata>
diff --git a/Source/nuspecs/Prism.Ninject.Forms.nuspec b/Source/nuspecs/Prism.Ninject.Forms.nuspec
index 563af34..98aef71 100644
--- a/Source/nuspecs/Prism.Ninject.Forms.nuspec
+++ b/Source/nuspecs/Prism.Ninject.Forms.nuspec
@@ -18,42 +18,42 @@
     <dependencies>   
       <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Portable.Ninject" version="3.3.1" />
       </group>
       <group targetFramework="Xamarin.iOS1.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Portable.Ninject" version="3.3.1" />
       </group>
       <group targetFramework="MonoTouch1.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Portable.Ninject" version="3.3.1" />
       </group>
       <group targetFramework="MonoAndroid1.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Portable.Ninject" version="3.3.1" />
       </group>
       <group targetFramework="Windows8.1">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Portable.Ninject" version="3.3.1" />
       </group>
       <group targetFramework="WindowsPhoneApp8.1">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Portable.Ninject" version="3.3.1" />
       </group>
       <group targetFramework="UAP10.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Portable.Ninject" version="3.3.1" />
       </group>
       <group targetFramework="WindowsPhone8.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Portable.Ninject" version="3.3.1" />
       </group>
     </dependencies>
diff --git a/Source/nuspecs/Prism.SimpleInjector.nuspec b/Source/nuspecs/Prism.SimpleInjector.nuspec
index da1ccae..9170ddf 100644
--- a/Source/nuspecs/Prism.SimpleInjector.nuspec
+++ b/Source/nuspecs/Prism.SimpleInjector.nuspec
@@ -4,7 +4,8 @@
     <id>Prism.SimpleInjector</id>
     <version>$version$</version>
     <title>Simple Injector for Prism 6</title>
-    <authors>Brian Lagunas,Brian Noyes</authors>
+    <authors>Brian Lagunas, Brian Noyes</authors>
+    <owners>Brian Lagunas, Brian Noyes</owners>
     <licenseUrl>https://github.com/PrismLibrary/Prism/blob/master/LICENSE</licenseUrl>
     <projectUrl>http://prismlibrary.com/</projectUrl>
     <iconUrl>http://prismlibrary.github.io/images/prism-logo-graphic-128.png</iconUrl>
diff --git a/Source/nuspecs/Prism.Unity.Forms.nuspec b/Source/nuspecs/Prism.Unity.Forms.nuspec
index c9be370..0c7a1b3 100644
--- a/Source/nuspecs/Prism.Unity.Forms.nuspec
+++ b/Source/nuspecs/Prism.Unity.Forms.nuspec
@@ -18,42 +18,42 @@
     <dependencies>   
       <group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Unity" version="4.0.1" />
       </group>
       <group targetFramework="Xamarin.iOS1.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Unity" version="4.0.1" />
       </group>
       <group targetFramework="MonoTouch1.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Unity" version="4.0.1" />
       </group>
       <group targetFramework="MonoAndroid1.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Unity" version="4.0.1" />
       </group>
       <group targetFramework="Windows8.1">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Unity" version="4.0.1" />
       </group>
       <group targetFramework="WindowsPhoneApp8.1">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Unity" version="4.0.1" />
       </group>
       <group targetFramework="UAP10.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Unity" version="4.0.1" />
       </group>
       <group targetFramework="WindowsPhone8.0">
         <dependency id="Prism.Forms" version="$formsVersion$" />
-        <dependency id="Xamarin.Forms" version="2.3.1.111-pre2" />
+        <dependency id="Xamarin.Forms" version="$xamarinFormsVersion$" />
         <dependency id="Unity" version="4.0.1" />
       </group>
     </dependencies>