Update dependencies

.config/dotnet-tools.json

@@ -2,11 +2,5 @@
  "version": 1,
  "isRoot": true,
  "tools": {
- "fantomas": {
- "version": "5.1.1",
- "commands": [
- "fantomas"
- ]
- }
  }
 }

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
  - name: Setup .NET
  uses: actions/setup-dotnet@v3
  with:
- dotnet-version: 6.0.x
+ dotnet-version: 7.0.x
  - name: Restore
  run: dotnet restore ${SLN_FILE}
  - name: Build

.github/workflows/pull_request.yml

@@ -9,11 +9,7 @@ jobs:
  - name: Setup .NET
  uses: actions/setup-dotnet@v3
  with:
- dotnet-version: 6.0.x
-# - name: Check code formatting
-# run: |
-# dotnet tool restore
-# dotnet fantomas --check -r src
+ dotnet-version: 7.0.x
  avalonia:
  name: GeoblockingMiddleware.sln
  runs-on: macos-12
@@ -24,7 +20,7 @@ jobs:
  - name: Setup .NET
  uses: actions/setup-dotnet@v3
  with:
- dotnet-version: 6.0.x
+ dotnet-version: 7.0.x
  - name: Restore
  run: dotnet restore ${SLN_FILE}
  - name: Build

.github/workflows/release.yml

@@ -16,10 +16,26 @@ jobs:
  - uses: actions/checkout@v2
  - name: Extract version from tag
  uses: damienaicheh/extract-version-from-tag-action@v1.0.0
+ - name: Set release version
+ run: |
+ if [ "${PRE_RELEASE}" == "" ]; then
+ RELEASE_VERSION=${MAJOR}.${MINOR}.${PATCH}
+ else
+ RELEASE_VERSION=${MAJOR}.${MINOR}.${PATCH}-${PRE_RELEASE}
+ fi
+ echo "Release version is $RELEASE_VERSION"
+ echo "RELEASE_VERSION=$RELEASE_VERSION" >> "$GITHUB_ENV"
+ - name: Get Changelog Entry
+ id: changelog_reader
+ uses: mindsers/changelog-reader-action@v2
+ with:
+ validation_level: warn
+ version: '${{ env.RELEASE_VERSION }}'
+ path: ./CHANGELOG.md
  - name: Setup .NET
  uses: actions/setup-dotnet@v1
  with:
- dotnet-version: 6.0.x
+ dotnet-version: 7.0.x
  - name: Restore
  run: dotnet restore ${SLN_FILE}
  - name: Build
@@ -28,7 +44,12 @@ jobs:
  run: dotnet test -p:Version="${MAJOR}.${MINOR}.${PATCH}" --no-build --configuration Release ${SLN_FILE}
  - name: Pack
  run: |
- dotnet pack -p:Version="${MAJOR}.${MINOR}.${PATCH}" --configuration Release --output nupkgs ${SLN_FILE}
+ dotnet pack ${SLN_FILE} -p:Version=${RELEASE_VERSION} -p:PackageReleaseNotes="${{ steps.changelog_reader.outputs.changes }}" -c Release --property PackageOutputPath=${PWD}/nupkgs
+ - name: Upload artifacts
+ uses: actions/upload-artifact@v3
+ with:
+ name: Packages
+ path: nupkgs/
  - name: Push
  run: |
  dotnet nuget push "nupkgs/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_TOKEN }} --skip-duplicate

CHANGELOG.md

@@ -0,0 +1,17 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+_No unreleased changes_
+
+## [1.1.0] - 2023-10-16
+
+### Added
+- Added possibility to easily wire a cleanup cache procedure
+
+[unreleased]: https://github.com/edgarfgp/GeoblockingMiddleware/compare/1.1.0...HEAD
+[1.1.0]: https://github.com/edgarfgp/GeoblockingMiddleware/releases/tag/1.1.0

global.json

@@ -1,6 +1,6 @@
 {
  "sdk": {
- "version": "6.0.403",
+ "version": "7.0.400",
  "rollForward": "minor"
  }
 }

src/GeoblockingMiddleware.Tests/GeoblockingMiddleware.Tests.fsproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
-
+ <TargetFramework>net7.0</TargetFramework>
  <IsPackable>false</IsPackable>
  <GenerateProgramFile>false</GenerateProgramFile>
  </PropertyGroup>

src/GeoblockingMiddleware/GeoblockingMiddleware.fsproj

@@ -1,26 +1,36 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
+ <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+ <IsPackable>true</IsPackable>
  <OutputType>Library</OutputType>
- <PackageId>GeoblockingMiddleware</PackageId>
+ <IsTestProject>false</IsTestProject>
+ </PropertyGroup>
+
+ <!-- NuGet Package -->
+ <PropertyGroup>
+ <Authors>Edgar, Timothé, Tuomas</Authors>
+ <Description>This component will act as middleware for OWIN or AspNetCore pipeline and check the request geolocation if the request comes from allowed country or not.</Description>
  <RepositoryUrl>https://github.com/edgarfgp/GeoblockingMiddleware</RepositoryUrl>
  <PackageTags>owin, geoblocking, location, country, countrycode, geoblock, stop, geographical, block by country, aspnetcore, webserver, kestrel, request, ip, middleware, pipeline, dotnet</PackageTags>
  <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
- <Version>1.0.0</Version>
- <Authors>Edgar, Timothé, Tuomas</Authors>
  <OutputPath>..\bin\</OutputPath>
  <RepositoryType>git</RepositoryType>
- <TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <IsPackable>true</IsPackable>
  <PublishRepositoryUrl>true</PublishRepositoryUrl>
- <IsTestProject>false</IsTestProject>
  <EmbedUntrackedSources>true</EmbedUntrackedSources>
  <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
- <Description>
- This component will act as middleware for OWIN or AspNetCore pipeline and check the request geolocation if the request comes from allowed country or not.
- </Description>
  </PropertyGroup>
+
+ <!-- SourceLink -->
+ <PropertyGroup>
+ <IncludeSymbols>true</IncludeSymbols>
+ <PublishRepositoryUrl>true</PublishRepositoryUrl>
+ <EmbedUntrackedSources>true</EmbedUntrackedSources>
+ </PropertyGroup>
+ <PropertyGroup Condition="$(GITHUB_ACTIONS) == 'true'">
+ <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+ </PropertyGroup>
+
  <PropertyGroup>
  <DefineConstants Condition=" '$(TargetFramework)' != 'net472' ">ASPNETCORE</DefineConstants>
  </PropertyGroup>