diff --git a/.github/workflows/ci.yml b/.github/workflows/build.yml
similarity index 52%
rename from .github/workflows/ci.yml
rename to .github/workflows/build.yml
index c2fd5ba..eeeaec5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/build.yml
@@ -1,18 +1,17 @@
-name: NETCore
+name: NET
on:
push:
branches:
- main
pull_request:
- types: [labeled]
branches:
- main
+
env:
BuildConfig: Release
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
- DOTNET_VERSION: '6.0.101' # https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/6.0/releases.json
jobs:
build:
@@ -20,42 +19,60 @@ jobs:
steps:
- name: Cancel previous builds in PR
- uses: styfle/cancel-workflow-action@0.9.1
+ uses: styfle/cancel-workflow-action@0.12.1
with:
access_token: ${{ github.token }}
- - name: Checkout
- uses: actions/checkout@v2
+ - name: Checkout code
+ uses: actions/checkout@v4
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
- - name: 'Install .NET SDK'
- uses: actions/setup-dotnet@v1
+ - name: Setup .NET SDK
+ uses: actions/setup-dotnet@v4
with:
- dotnet-version: ${{ env.DOTNET_VERSION }}
+ global-json-file: ./global.json
+
+ - name: Restore dependencies
+ run: dotnet restore
- - name: Versioning
+ - name: Setup Git Versioning
uses: dotnet/nbgv@master
id: nbgv
- - name: Version Info
+ - name: Show Version Info
run: |
echo 'SemVer2: ${{ steps.nbgv.outputs.SemVer2 }}'
+
- name: Build with dotnet
run: dotnet build
- --configuration ${{ env.BuildConfig }}
+ --no-restore --configuration ${{ env.BuildConfig }}
/p:Version=${{ steps.nbgv.outputs.AssemblyVersion }}
- name: Test with dotnet
run: dotnet test
+ --no-build --configuration ${{ env.BuildConfig }}
+ --logger "trx;LogFileName=test-results.trx" --results-directory ./artifacts/testResults
+ continue-on-error: true
+
+ - name: Test Report
+ uses: dorny/test-reporter@v1
+ if: always()
+ with:
+ name: DotNET Tests
+ path: "./artifacts/testResults/test-results.trx"
+ reporter: dotnet-trx
+ fail-on-error: true
- name: Pack NuGet
run: dotnet pack
--configuration ${{ env.BuildConfig }}
+ /p:ContinuousIntegrationBuild=true
/p:Version=${{ steps.nbgv.outputs.NuGetPackageVersion }}
- name: Push to NuGet
run: dotnet nuget push **/*.nupkg
--api-key ${{ secrets.NUGET_DEPLOY_KEY }}
--source https://api.nuget.org/v3/index.json
- --no-symbols 1
+ --no-symbols
+ --skip-duplicate
diff --git a/hcaptchanet.sln b/BenjaminAbt.HCaptchaNET.sln
similarity index 96%
rename from hcaptchanet.sln
rename to BenjaminAbt.HCaptchaNET.sln
index fe11afe..351ee25 100644
--- a/hcaptchanet.sln
+++ b/BenjaminAbt.HCaptchaNET.sln
@@ -16,8 +16,9 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_", "_", "{246E4F1E-C4B3-4180-906C-605E72C69097}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
- .github\workflows\ci.yml = .github\workflows\ci.yml
+ .github\workflows\build.yml = .github\workflows\build.yml
Directory.Build.props = Directory.Build.props
+ Directory.Packages.props = Directory.Packages.props
global.json = global.json
README.md = README.md
version.json = version.json
diff --git a/BenjaminAbt.HCaptchaNET.snk b/BenjaminAbt.HCaptchaNET.snk
new file mode 100644
index 0000000..f118320
Binary files /dev/null and b/BenjaminAbt.HCaptchaNET.snk differ
diff --git a/Directory.Build.props b/Directory.Build.props
index 8f37e32..bcef4ef 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -6,19 +6,45 @@
https://github.com/BenjaminAbt/hcaptcha
MIT
en-US
- true
- preview
- enable
true
true
embedded
+ false
+ true
+ snupkg
+
+
+
$(MSBuildProjectName.Contains('Test'))
$(MsBuildProjectName.Contains('Benchmark'))
- false
true
+
+ net8.0
+
+
+
+ preview
+ enable
+ enable
+ true
+
+
+
+ true
+ $(MSBuildThisFileDirectory)BenjaminAbt.HCaptchaNET.snk
+
+
+ 0024000004800000940000000602000000240000525341310004000001000100a9ba6ecd5a2e4a
+ a9095322a9baebe05966db4f05bf23df1457fc7b084079d7b320a3b0bcf5bb278d9e66f8f70d7e
+ 3d813aeb6a96baf75ef83033a5e0e5558df774d575599cdafbe6e047522db722b6244860a0d5b3
+ b3bfbe24c50d698411c5d19e3d3765c9599809e2808ed0d6b2f9129395a95468484eac0815b070
+ ea5b95dc
+
+
+
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 0000000..ff021a9
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+
+
+
+
+
+
+
diff --git a/global.json b/global.json
index 2a9ec01..76474f0 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "6.0.101"
+ "version": "9.0.100"
}
}
diff --git a/public.snk b/public.snk
new file mode 100644
index 0000000..c708c4c
Binary files /dev/null and b/public.snk differ
diff --git a/sample/sample.aspnetcore/sample.aspnetcore.csproj b/sample/sample.aspnetcore/sample.aspnetcore.csproj
index 6a177a0..ba76029 100644
--- a/sample/sample.aspnetcore/sample.aspnetcore.csproj
+++ b/sample/sample.aspnetcore/sample.aspnetcore.csproj
@@ -1,7 +1,6 @@
- net6.0
BenjaminAbt.HCaptcha.Samples.AspNetCore
BenjaminAbt.HCaptcha.Samples.AspNetCore
diff --git a/src/HCaptcha.AspNetCore/HCaptcha.AspNetCore.csproj b/src/HCaptcha.AspNetCore/HCaptcha.AspNetCore.csproj
index 6728da3..00d3da8 100644
--- a/src/HCaptcha.AspNetCore/HCaptcha.AspNetCore.csproj
+++ b/src/HCaptcha.AspNetCore/HCaptcha.AspNetCore.csproj
@@ -2,16 +2,9 @@
HCaptcha for ASP.NET Core
- net6.0
BenjaminAbt.HCaptcha.AspNetCore
BenjaminAbt.HCaptcha.AspNetCore
- true
embedded
-
-
-
- true
- snupkg
true
@@ -34,7 +27,7 @@
-
+
diff --git a/src/HCaptcha/HCaptcha.csproj b/src/HCaptcha/HCaptcha.csproj
index d4190ee..15986f6 100644
--- a/src/HCaptcha/HCaptcha.csproj
+++ b/src/HCaptcha/HCaptcha.csproj
@@ -4,14 +4,7 @@
HCaptcha for .NET
BenjaminAbt.HCaptcha
BenjaminAbt.HCaptcha
- net6.0
- true
embedded
-
-
-
- true
- snupkg
true
@@ -30,9 +23,9 @@
-
-
-
+
+
+
diff --git a/version.json b/version.json
index 1a05557..1dc6bc7 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
- "version": "0.9",
+ "version": "1.0",
"assemblyVersion": {
"precision": "revision" // optional. Use when you want a more precise assembly version than the default major.minor.
},