diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..06b72da
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,34 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
+{
+ "name": "C# (.NET)",
+ // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+ "image": "mcr.microsoft.com/devcontainers/dotnet:2-10.0-noble",
+ "customizations": {
+ "vscode": {
+ "extensions": [
+ "ms-dotnettools.csdevkit"
+ ]
+ }
+ }
+
+ // Features to add to the dev container. More info: https://containers.dev/features.
+ // "features": {},
+
+ // Use 'forwardPorts' to make a list of ports inside the container available locally.
+ // "forwardPorts": [5000, 5001],
+ // "portsAttributes": {
+ // "5001": {
+ // "protocol": "https"
+ // }
+ // }
+
+ // Use 'postCreateCommand' to run commands after the container is created.
+ // "postCreateCommand": "dotnet restore",
+
+ // Configure tool-specific properties.
+ // "customizations": {},
+
+ // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+ // "remoteUser": "root"
+}
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 7602432..7df3ef9 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -1,6 +1,6 @@
name: .NET build and test
env:
- CURRENT_VERSION: 3.2.${{ github.run_number }}
+ CURRENT_VERSION: 4.0.${{ github.run_number }}
LAST_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
on:
@@ -23,8 +23,6 @@ jobs:
uses: actions/setup-dotnet@v5
with:
dotnet-version: |
- 8.0.x
- 9.0.x
10.0.x
- name: Check formatting
run: dotnet format --verify-no-changes
@@ -69,8 +67,6 @@ jobs:
uses: actions/setup-dotnet@v5
with:
dotnet-version: |
- 8.0.x
- 9.0.x
10.0.x
- name: Restore dependencies
run: dotnet restore
@@ -97,7 +93,7 @@ jobs:
gh release create ${{env.CURRENT_VERSION}} ./SkiaSharpCompare/bin/Release/*.*nupkg cli-artifacts.zip --generate-notes
deployTest:
- if: ${{ !startsWith(github.ref, 'refs/heads/release') }}
+ if: ${{ github.ref == 'refs/heads/main') }}
runs-on: ubuntu-latest
needs: build
steps:
@@ -106,8 +102,6 @@ jobs:
uses: actions/setup-dotnet@v5
with:
dotnet-version: |
- 8.0.x
- 9.0.x
10.0.x
- name: Restore dependencies
run: dotnet restore
@@ -123,12 +117,4 @@ jobs:
if: env.NUGET_TOKEN_EXISTS != ''
run: |
ls ./SkiaSharpCompare/bin/Release
- dotnet nuget push ./SkiaSharpCompare/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TEST_TOKEN}} --source https://apiint.nugettest.org/v3/index.json
- - name: Github prerelease
- shell: bash
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- if: env.GITHUB_TOKEN != ''
- run: |
- zip -r cli-artifacts.zip ./artifacts_download
- gh release create ${{env.CURRENT_VERSION}} ./SkiaSharpCompare/bin/Release/*.*nupkg cli-artifacts.zip --prerelease --generate-notes
+ dotnet nuget push ./SkiaSharpCompare/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TEST_TOKEN}} --source https://apiint.nugettest.org/v3/index.json
\ No newline at end of file
diff --git a/SkiaSharpCompare.Cli.Tests/SkiaSharpCompare.Cli.Tests.csproj b/SkiaSharpCompare.Cli.Tests/SkiaSharpCompare.Cli.Tests.csproj
index 0414ea4..76b895c 100644
--- a/SkiaSharpCompare.Cli.Tests/SkiaSharpCompare.Cli.Tests.csproj
+++ b/SkiaSharpCompare.Cli.Tests/SkiaSharpCompare.Cli.Tests.csproj
@@ -8,9 +8,9 @@
-
-
-
+
+
+
diff --git a/SkiaSharpCompare/SkiaSharpCompare.csproj b/SkiaSharpCompare/SkiaSharpCompare.csproj
index 47deb62..7ba71ec 100644
--- a/SkiaSharpCompare/SkiaSharpCompare.csproj
+++ b/SkiaSharpCompare/SkiaSharpCompare.csproj
@@ -1,6 +1,6 @@
- net8.0;net9.0;net10.0
+ net10.0
true
true
https://github.com/Codeuctivity/SkiaSharp.Compare
@@ -45,9 +45,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/SkiaSharpCompareTestNunit/SkiaSharpCompareTestNunit.csproj b/SkiaSharpCompareTestNunit/SkiaSharpCompareTestNunit.csproj
index c52bec6..6c5d67d 100644
--- a/SkiaSharpCompareTestNunit/SkiaSharpCompareTestNunit.csproj
+++ b/SkiaSharpCompareTestNunit/SkiaSharpCompareTestNunit.csproj
@@ -13,7 +13,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -21,7 +21,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+