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..45cebfc 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: @@ -18,13 +18,11 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Setup .NET 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 @@ -64,13 +62,11 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Setup .NET uses: actions/setup-dotnet@v5 with: dotnet-version: | - 8.0.x - 9.0.x 10.0.x - name: Restore dependencies run: dotnet restore @@ -97,17 +93,15 @@ 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: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Setup .NET 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.sln b/SkiaSharpCompare.sln deleted file mode 100644 index 55a8a70..0000000 --- a/SkiaSharpCompare.sln +++ /dev/null @@ -1,53 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 18 -VisualStudioVersion = 18.0.11222.15 d18.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A1B6F6C3-ECBE-471C-AE18-199DEF5982C3}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - .github\workflows\cla.yml = .github\workflows\cla.yml - .github\dependabot.yml = .github\dependabot.yml - .github\workflows\dotnet.yml = .github\workflows\dotnet.yml - README.md = README.md - .github\workflows\stale.yml = .github\workflows\stale.yml - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpCompare", "SkiaSharpCompare\SkiaSharpCompare.csproj", "{556DA894-7456-4DE2-9E02-3815FE159D7F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpCompareTestNunit", "SkiaSharpCompareTestNunit\SkiaSharpCompareTestNunit.csproj", "{9CFA9A6F-92FC-40E3-BB85-4C8F95EFC8C7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpCompare.Cli", "SkiaSharpCompare.Cli\SkiaSharpCompare.Cli.csproj", "{296B4D6C-C8F6-81DE-9B65-D4CE48783B52}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpCompare.Cli.Tests", "SkiaSharpCompare.Cli.Tests\SkiaSharpCompare.Cli.Tests.csproj", "{059AD3EF-A494-850F-6457-E5C4D706CC94}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {556DA894-7456-4DE2-9E02-3815FE159D7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {556DA894-7456-4DE2-9E02-3815FE159D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {556DA894-7456-4DE2-9E02-3815FE159D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {556DA894-7456-4DE2-9E02-3815FE159D7F}.Release|Any CPU.Build.0 = Release|Any CPU - {9CFA9A6F-92FC-40E3-BB85-4C8F95EFC8C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9CFA9A6F-92FC-40E3-BB85-4C8F95EFC8C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9CFA9A6F-92FC-40E3-BB85-4C8F95EFC8C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9CFA9A6F-92FC-40E3-BB85-4C8F95EFC8C7}.Release|Any CPU.Build.0 = Release|Any CPU - {296B4D6C-C8F6-81DE-9B65-D4CE48783B52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {296B4D6C-C8F6-81DE-9B65-D4CE48783B52}.Debug|Any CPU.Build.0 = Debug|Any CPU - {296B4D6C-C8F6-81DE-9B65-D4CE48783B52}.Release|Any CPU.ActiveCfg = Release|Any CPU - {296B4D6C-C8F6-81DE-9B65-D4CE48783B52}.Release|Any CPU.Build.0 = Release|Any CPU - {059AD3EF-A494-850F-6457-E5C4D706CC94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {059AD3EF-A494-850F-6457-E5C4D706CC94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {059AD3EF-A494-850F-6457-E5C4D706CC94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {059AD3EF-A494-850F-6457-E5C4D706CC94}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {AC72E02E-48E4-4DDE-B1FF-CEF86C9DFCAB} - EndGlobalSection -EndGlobal diff --git a/SkiaSharpCompare.slnx b/SkiaSharpCompare.slnx new file mode 100644 index 0000000..d19966e --- /dev/null +++ b/SkiaSharpCompare.slnx @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + 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..e144e95 100644 --- a/SkiaSharpCompareTestNunit/SkiaSharpCompareTestNunit.csproj +++ b/SkiaSharpCompareTestNunit/SkiaSharpCompareTestNunit.csproj @@ -1,7 +1,7 @@  - net8.0;net9.0;net10.0 + net10.0 false enable true @@ -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 - +