deploy.sh fix

armutcom · Mar 29, 2018 · ac8e64d · ac8e64d
1 parent 26dec49
commit ac8e64d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/deploy.sh b/deploy.sh
@@ -1,13 +1,15 @@
+#!/usr/bin/env bash
+
 ApiKey=$1
 Source=$2
 BuildNumber=$3
 
 echo $BuildNumber
 
-if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
+if [ $TRAVIS_OS_NAME == 'linux' ]; then
 
-(cd ./src/Nancy.Serialization.Hyperion && exec dotnet pack -c Release /p:TargetFramework=net452 /p:TargetFrameworks=net452 /p:BuildNumber=$3 --verbosity normal)
-(cd ./src/Nancy.Serialization.Hyperion && exec dotnet pack -c Release /p:TargetFramework=netstandard1.6 /p:TargetFrameworks=netstandard1.6 /p:BuildNumber=$3 --verbosity normal)
+(cd ./src/Nancy.Serialization.Hyperion && exec dotnet pack -c Release /p:TargetFramework=net452 /p:TargetFrameworks=net452 /p:BuildNumber=$3 /p:PackageVersion=1.0.1.$3 --verbosity normal)
+(cd ./src/Nancy.Serialization.Hyperion && exec dotnet pack -c Release /p:TargetFramework=netstandard1.6 /p:TargetFrameworks=netstandard1.6 /p:BuildNumber=$3 /p:PackageVersion=2.0.1.$3-pre --verbosity normal)
 
 (cd ./src/Nancy.Serialization.Hyperion/bin/Release && exec dotnet nuget push *.nupkg -k $ApiKey -s $Source)
 

diff --git a/src/Nancy.Serialization.Hyperion/Nancy.Serialization.Hyperion.csproj b/src/Nancy.Serialization.Hyperion/Nancy.Serialization.Hyperion.csproj
@@ -1,14 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard1.6</TargetFrameworks>
 
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">0</BuildNumber>
-    <PackVersion Condition=" '$(TargetFramework)' == 'net452' ">1.0.1.$(BuildNumber)</PackVersion>
-    <PackVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">2.0.1.$(BuildNumber)</PackVersion>
-
-    <VersionPrefix>$(PackVersion)</VersionPrefix>
-    <VersionSuffix Condition=" '$(TargetFramework)' == 'netstandard1.6' ">beta</VersionSuffix>
+    <AssemblyVersion Condition=" '$(TargetFramework)' == 'net452' ">1.0.1.$(BuildNumber)</AssemblyVersion>
+    <AssemblyVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">2.0.1.$(BuildNumber)</AssemblyVersion>
 
     <Authors>Armut Teknoloji A.Ş.</Authors>
     <Description>Provides polymorphic (de)serialization support using Hyperion.</Description>