Skip to content

Commit 41a793d

Browse files
committed
Merged branch master into develop
2 parents fba7da3 + 214f7d0 commit 41a793d

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Build.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ $revision = "{0:D4}" -f [convert]::ToInt32($revision, 10)
33

44
dotnet restore .\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj
55
dotnet build .\src\JsonApiDotNetCore -c Release
6-
dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$revision
6+
7+
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 }

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ Install-Package JsonApiDotnetCore
4343

4444
- project.json
4545
```json
46-
"JsonApiDotNetCore": "1.0.1"
46+
"JsonApiDotNetCore": "1.1.0"
4747
```
4848

4949
- *.csproj
5050
```xml
5151
<ItemGroup>
5252
<!-- ... -->
53-
<PackageReference Include="JsonApiDotNetCore" Version="1.0.1" />
53+
<PackageReference Include="JsonApiDotNetCore" Version="1.1.0" />
5454
</ItemGroup>
5555
```
5656

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ build_script:
1313
- ps: .\Build.ps1
1414
test: off
1515
artifacts:
16-
- path: .\artifacts\**\*.nupkg
16+
- path: .\**\artifacts\**\*.nupkg
1717
name: NuGet
1818
deploy:
1919
- provider: NuGet

0 commit comments

Comments
 (0)