diff options
| author | Dan Siegel <me@dansiegel.net> | 2017-05-21 22:51:31 +0300 |
|---|---|---|
| committer | Dan Siegel <me@dansiegel.net> | 2017-05-21 23:14:21 +0300 |
| commit | e922764ed8b9565b07a3ce8b645d9b1d4ee53e34 (patch) | |
| tree | 55e90fde0a04b261050a263d43d35ad46758768a | |
| parent | b5300a5d72dd235a2e2b4940c3bc9c5ad593fcac (diff) | |
fix versioning
6 files changed, 18 insertions, 13 deletions
diff --git a/Source/Prism/Prism.csproj b/Source/Prism/Prism.csproj index 9452485..a14c630 100644 --- a/Source/Prism/Prism.csproj +++ b/Source/Prism/Prism.csproj @@ -19,8 +19,9 @@ <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl> <PackageOutputPath>../../Build</PackageOutputPath> <VersionPrefix>7.0.0</VersionPrefix> - <VersionSuffix Condition=" '$(BUILD_BUILDNUMBER)' != '' ">beta$(BUILD_BUILDNUMBER)</VersionSuffix> - <VersionSuffix Condition=" '$(PREVIEW_NUMBER)' != '' ">pre$(PREVIEW_NUMBER)</VersionSuffix> + <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version> + <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">7.0.0</VersionPrefix> + <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">beta$(APPVEYOR_BUILD_NUMBER)</VersionSuffix> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> diff --git a/Source/Xamarin/Prism.Autofac.Forms/Prism.Autofac.Forms.csproj b/Source/Xamarin/Prism.Autofac.Forms/Prism.Autofac.Forms.csproj index 91b7c1c..9174bc9 100644 --- a/Source/Xamarin/Prism.Autofac.Forms/Prism.Autofac.Forms.csproj +++ b/Source/Xamarin/Prism.Autofac.Forms/Prism.Autofac.Forms.csproj @@ -20,8 +20,9 @@ <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl> <PackageOutputPath>../../Build</PackageOutputPath> <VersionPrefix>7.0.0</VersionPrefix> - <VersionSuffix Condition=" '$(BUILD_BUILDNUMBER)' != '' ">beta$(BUILD_BUILDNUMBER)</VersionSuffix> - <VersionSuffix Condition=" '$(PREVIEW_NUMBER)' != '' ">pre$(PREVIEW_NUMBER)</VersionSuffix> + <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version> + <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">7.0.0</VersionPrefix> + <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">beta$(APPVEYOR_BUILD_NUMBER)</VersionSuffix> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> diff --git a/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj b/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj index 979a18e..0ddaad8 100644 --- a/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj +++ b/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj @@ -20,8 +20,9 @@ <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl> <PackageOutputPath>../../Build</PackageOutputPath> <VersionPrefix>7.0.0</VersionPrefix> - <VersionSuffix Condition=" '$(BUILD_BUILDNUMBER)' != '' ">beta$(BUILD_BUILDNUMBER)</VersionSuffix> - <VersionSuffix Condition=" '$(PREVIEW_NUMBER)' != '' ">pre$(PREVIEW_NUMBER)</VersionSuffix> + <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version> + <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">7.0.0</VersionPrefix> + <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">beta$(APPVEYOR_BUILD_NUMBER)</VersionSuffix> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> diff --git a/Source/Xamarin/Prism.Forms/Prism.Forms.csproj b/Source/Xamarin/Prism.Forms/Prism.Forms.csproj index a1a07f4..2ee1526 100644 --- a/Source/Xamarin/Prism.Forms/Prism.Forms.csproj +++ b/Source/Xamarin/Prism.Forms/Prism.Forms.csproj @@ -20,8 +20,9 @@ <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl> <PackageOutputPath>../../Build</PackageOutputPath> <VersionPrefix>7.0.0</VersionPrefix> - <VersionSuffix Condition=" '$(BUILD_BUILDNUMBER)' != '' ">beta$(BUILD_BUILDNUMBER)</VersionSuffix> - <VersionSuffix Condition=" '$(PREVIEW_NUMBER)' != '' ">pre$(PREVIEW_NUMBER)</VersionSuffix> + <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version> + <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">7.0.0</VersionPrefix> + <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">beta$(APPVEYOR_BUILD_NUMBER)</VersionSuffix> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)' == 'Release' "> diff --git a/Source/Xamarin/Prism.Ninject.Forms/Prism.Ninject.Forms.csproj b/Source/Xamarin/Prism.Ninject.Forms/Prism.Ninject.Forms.csproj index 60dc6c3..e27a94b 100644 --- a/Source/Xamarin/Prism.Ninject.Forms/Prism.Ninject.Forms.csproj +++ b/Source/Xamarin/Prism.Ninject.Forms/Prism.Ninject.Forms.csproj @@ -22,8 +22,9 @@ <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl> <PackageOutputPath>../../Build</PackageOutputPath> <VersionPrefix>7.0.0</VersionPrefix> - <VersionSuffix Condition=" '$(BUILD_BUILDNUMBER)' != '' ">beta$(BUILD_BUILDNUMBER)</VersionSuffix> - <VersionSuffix Condition=" '$(PREVIEW_NUMBER)' != '' ">pre$(PREVIEW_NUMBER)</VersionSuffix> + <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version> + <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">7.0.0</VersionPrefix> + <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">beta$(APPVEYOR_BUILD_NUMBER)</VersionSuffix> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> diff --git a/Source/Xamarin/Prism.Unity.Forms/Prism.Unity.Forms.csproj b/Source/Xamarin/Prism.Unity.Forms/Prism.Unity.Forms.csproj index b7a3291..bba1c5d 100644 --- a/Source/Xamarin/Prism.Unity.Forms/Prism.Unity.Forms.csproj +++ b/Source/Xamarin/Prism.Unity.Forms/Prism.Unity.Forms.csproj @@ -21,9 +21,9 @@ <RepositoryType>git</RepositoryType> <RepositoryUrl>https://github.com/PrismLibrary/Prism</RepositoryUrl> <PackageOutputPath>../../Build</PackageOutputPath> - <VersionPrefix>7.0.0</VersionPrefix> - <VersionSuffix Condition=" '$(BUILD_BUILDNUMBER)' != '' ">beta$(BUILD_BUILDNUMBER)</VersionSuffix> - <VersionSuffix Condition=" '$(PREVIEW_NUMBER)' != '' ">pre$(PREVIEW_NUMBER)</VersionSuffix> + <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version> + <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' ">7.0.0</VersionPrefix> + <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">beta$(APPVEYOR_BUILD_NUMBER)</VersionSuffix> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|AnyCPU'"> |