Skip to content

Commit

Permalink
Merge pull request PrismLibrary#713 from PrismLibrary/v6.2-Preview
Browse files Browse the repository at this point in the history
getting nuspecs in order
  • Loading branch information
brianlagunas authored Aug 9, 2016
2 parents 3d1f1cd + e2c603c commit 701d2ad
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 46 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

[assembly: AssemblyVersion("6.0")]
[assembly: AssemblyFileVersion("6.0.0")]
[assembly: AssemblyInformationalVersion("6.0.0-pre1")]
[assembly: AssemblyInformationalVersion("6.0.0")]
[assembly: ComVisible(false)]
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

[assembly: AssemblyVersion("6.2")]
[assembly: AssemblyFileVersion("6.2.0")]
[assembly: AssemblyInformationalVersion("6.2.0-pre3")]
[assembly: AssemblyInformationalVersion("6.2.0")]
[assembly: ComVisible(false)]
2 changes: 1 addition & 1 deletion Source/Windows10/Prism.Windows/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@

[assembly: AssemblyVersion("6.0")]
[assembly: AssemblyFileVersion("6.0.2")]
[assembly: AssemblyInformationalVersion("6.0.2-pre1")]
[assembly: AssemblyInformationalVersion("6.0.2")]
[assembly: ComVisible(false)]
12 changes: 7 additions & 5 deletions Source/nuspecs/CreatePrismNuGetPackages.ps1
Original file line number Diff line number Diff line change
@@ -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'

Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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)"
}

###########################
Expand All @@ -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)"
}


Expand Down Expand Up @@ -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)"
}


Expand Down
20 changes: 10 additions & 10 deletions Source/nuspecs/Prism.Autofac.Forms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion Source/nuspecs/Prism.Autofac.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 10 additions & 10 deletions Source/nuspecs/Prism.Forms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
16 changes: 8 additions & 8 deletions Source/nuspecs/Prism.Ninject.Forms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion Source/nuspecs/Prism.SimpleInjector.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 8 additions & 8 deletions Source/nuspecs/Prism.Unity.Forms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 701d2ad

Please sign in to comment.