Skip to content

Commit 3658069

Browse files
committed
fix(ci): update to use new csproj version prefix method
1 parent 6d259d8 commit 3658069

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

Build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ dotnet restore .\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj
55
dotnet build .\src\JsonApiDotNetCore -c Release
66

77
If($env:APPVEYOR_REPO_TAG) { dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts }
8-
Else { dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$revision }
8+
Else { dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=alpha1-$revision }

build.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,8 @@
33
#exit if any command fails
44
set -e
55

6-
artifactsFolder="./artifacts"
7-
8-
if [ -d $artifactsFolder ]; then
9-
rm -R $artifactsFolder
10-
fi
11-
126
dotnet restore ./src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
137
dotnet restore ./src/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
148
dotnet restore ./test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj
159

16-
dotnet test ./test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj
17-
18-
revision=${TRAVIS_JOB_ID:=1}
19-
revision=$(printf "%04d" $revision)
20-
21-
dotnet pack ./src/JsonApiDotNetCore -c Release -o ./artifacts --version-suffix=$revision
10+
dotnet test ./test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj

src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<PackageId>JsonApiDotNetCore</PackageId>
88
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
99
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
10-
<Version>1.1.0-alpha1-*</Version>
1110
</PropertyGroup>
1211

1312
<ItemGroup>

0 commit comments

Comments
 (0)