Skip to content

Commit

Permalink
Merge pull request #182 from janusw/snupkg
Browse files Browse the repository at this point in the history
snupkg, release notes, cleanup
  • Loading branch information
xfischer authored Jul 29, 2024
2 parents bae25e5 + 4a0deaa commit 24d4947
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 14 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: nupkg
path: ./src/GeoJSON.Net/bin/Release/*.nupkg
path: |
./src/GeoJSON.Net/bin/Release/*.nupkg
./src/GeoJSON.Net/bin/Release/*.snupkg
- name: Test
run: dotnet test src/GeoJSON.Net.sln --no-restore --verbosity normal
19 changes: 7 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
name: 'Release'
name: 'Release'

on:
release:
types:
types:
- published

env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: true

# Project name to pack and publish
PROJECT_NAME: GeoJSON.Net

# Official NuGet Feed settings
NUGET_FEED: https://api.nuget.org/v3/index.json
NUGET_KEY: ${{ secrets.NUGET_KEY }}
NUGET_VERSIONING_REGEX: "[0-9]+\\.[0-9]+\\.[0-9]+(-[a-zA-Z]+)?"
NUGET_VERSIONING_REGEX: "[0-9]+\\.[0-9]+\\.[0-9]+(-[a-zA-Z]+)?"

jobs:
deploy:
Expand All @@ -35,16 +35,11 @@ jobs:
}
echo "Version to use is - $VERSION"
echo "RELEASE_VERSION=$VERSION" | Out-File -FilePath ${env:GITHUB_ENV} -Append
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
3.1.x
5.0.x
6.0.x
7.0.x
8.0.x
dotnet-version: '8.0.x'
- name: Install dependencies
run: dotnet restore src/${{ env.PROJECT_NAME }}.sln
- name: Build solution
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ If you still need to use Newtonsoft.Json in ASP.Net Core 3.1+, you must overwrit
- add "services.AddControllers().AddNewtonsoftJson();" to your service configuration.

## Contributing
Highly welcome! Just fork away and send a pull request. We try and review most pull requests within a couple of days. There is now a version 2.0.0 branch. I've created this ready for any breaking changes and any extra features and would encourage anything that isn't a bug fix to go in there.
Highly welcome! Just fork away and send a pull request. We try and review most pull requests within a couple of days.

## Thanks
This library would be NOTHING without its [contributors](https://github.com/GeoJSON-Net/GeoJSON.Net/graphs/contributors) - thanks so much!!
Expand Down
15 changes: 15 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Release Notes

## 1.4.0

* Make Feature.properties optional.
* Make Feature.geometry optional.
* Update target frameworks (.NET Framework 4.6.2, .NET 6, .NET 8).
* Update Netwonsoft.Json to 13.0.3.

## 1.3.6

* Fix circular dependency issue.
* Adding typed FeatureCollection.
* Add support for .NET 5.
* Update Netwonsoft.Json to 13.0.1.
2 changes: 2 additions & 0 deletions src/GeoJSON.Net/GeoJSON.Net.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<Company>GeoJSON.Net</Company>
<Copyright>Copyright © Joerg Battermann, Matt Hunt, Xavier Fischer, Janus Weil and Contributors, 2014 - 2024</Copyright>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Version>1.4.0</Version>
<PackageProjectUrl>https://github.com/GeoJSON-Net/GeoJSON.Net</PackageProjectUrl>
<RepositoryUrl>https://github.com/GeoJSON-Net/GeoJSON.Net.git</RepositoryUrl>
Expand Down
Binary file removed tools/nuget/NuGet.exe
Binary file not shown.

0 comments on commit 24d4947

Please sign in to comment.