diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bf71686c..8f8ef095 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1aa176c..ebce6819 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: @@ -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 diff --git a/README.md b/README.md index 02736079..ce8c8421 100644 --- a/README.md +++ b/README.md @@ -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!! diff --git a/ReleaseNotes.md b/ReleaseNotes.md new file mode 100644 index 00000000..9c3642c5 --- /dev/null +++ b/ReleaseNotes.md @@ -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. diff --git a/src/GeoJSON.Net/GeoJSON.Net.csproj b/src/GeoJSON.Net/GeoJSON.Net.csproj index c43a150e..40e86023 100644 --- a/src/GeoJSON.Net/GeoJSON.Net.csproj +++ b/src/GeoJSON.Net/GeoJSON.Net.csproj @@ -7,6 +7,8 @@ GeoJSON.Net Copyright © Joerg Battermann, Matt Hunt, Xavier Fischer, Janus Weil and Contributors, 2014 - 2024 true + true + snupkg 1.4.0 https://github.com/GeoJSON-Net/GeoJSON.Net https://github.com/GeoJSON-Net/GeoJSON.Net.git diff --git a/tools/nuget/NuGet.exe b/tools/nuget/NuGet.exe deleted file mode 100644 index 34ad49b4..00000000 Binary files a/tools/nuget/NuGet.exe and /dev/null differ