From 9ab1e2bbf36b0f1bde9b2103070952479d2a438b Mon Sep 17 00:00:00 2001 From: Kris Vandermotten Date: Sun, 18 Oct 2026 15:37:55 +0200 Subject: [PATCH] Update to .NET 10 SDK and .slnx solution file format --- .github/workflows/wf-build-release-ci.yml | 4 +- .github/workflows/wf-build-release.yml | 2 +- .github/workflows/wf-build-test.yml | 4 +- .github/workflows/wf-verify-formatting.yml | 2 +- QRCoder.sln | 211 --------------------- QRCoder.slnx | 42 ++++ QRCoderTests/Helpers/HelperFunctions.cs | 4 +- global.json | 2 +- 8 files changed, 51 insertions(+), 220 deletions(-) delete mode 100644 QRCoder.sln create mode 100644 QRCoder.slnx diff --git a/.github/workflows/wf-build-release-ci.yml b/.github/workflows/wf-build-release-ci.yml index 82d3f292..b0a23d68 100644 --- a/.github/workflows/wf-build-release-ci.yml +++ b/.github/workflows/wf-build-release-ci.yml @@ -55,7 +55,7 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Run trim analysis working-directory: QRCoderTrimAnalysis @@ -78,7 +78,7 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v5 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x source-url: https://nuget.pkg.github.com/Shane32/index.json env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/wf-build-release.yml b/.github/workflows/wf-build-release.yml index 11b43f32..19d2c8d0 100644 --- a/.github/workflows/wf-build-release.yml +++ b/.github/workflows/wf-build-release.yml @@ -32,7 +32,7 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v5 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x source-url: https://api.nuget.org/v3/index.json env: NUGET_AUTH_TOKEN: ${{secrets.NUGET_AUTH_TOKEN}} diff --git a/.github/workflows/wf-build-test.yml b/.github/workflows/wf-build-test.yml index 5a81bf4a..8b800b2c 100644 --- a/.github/workflows/wf-build-test.yml +++ b/.github/workflows/wf-build-test.yml @@ -32,7 +32,7 @@ jobs: with: dotnet-version: | ${{ matrix.dotnet-framework.sdk }} - 8.0.x + 10.0.x - name: Run tests for ${{ matrix.dotnet-framework.name }} working-directory: QRCoderTests @@ -47,7 +47,7 @@ jobs: - name: Install .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Run trim analysis working-directory: QRCoderTrimAnalysis diff --git a/.github/workflows/wf-verify-formatting.yml b/.github/workflows/wf-verify-formatting.yml index 3dbb788e..3cdda618 100644 --- a/.github/workflows/wf-verify-formatting.yml +++ b/.github/workflows/wf-verify-formatting.yml @@ -17,7 +17,7 @@ jobs: - name: Install additional .NET SDKs uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Restore NuGet Packages run: dotnet restore diff --git a/QRCoder.sln b/QRCoder.sln deleted file mode 100644 index b27c2e14..00000000 --- a/QRCoder.sln +++ /dev/null @@ -1,211 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31919.166 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRCoder", "QRCoder\QRCoder.csproj", "{AA6BE23A-7813-4D2A-835E-B673631AE9F1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRCoderConsole", "QRCoderConsole\QRCoderConsole.csproj", "{014F04C6-6099-4552-9A4F-D09C6E39D576}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRCoderDemo", "QRCoderDemo\QRCoderDemo.csproj", "{CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QRCoderDemoUWP", "QRCoderDemoUWP\QRCoderDemoUWP.csproj", "{61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRCoderTests", "QRCoderTests\QRCoderTests.csproj", "{1B51624B-9915-4ED6-8FC1-1B7C472246E5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRCoder.Xaml", "QRCoder.Xaml\QRCoder.Xaml.csproj", "{A7A7E073-2504-4BA2-A63B-87AC34174789}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRCoderApiTests", "QRCoderApiTests\QRCoderApiTests.csproj", "{5FACE5F6-53C9-4B89-91D4-162677893574}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRCoderBenchmarks", "QRCoderBenchmarks\QRCoderBenchmarks.csproj", "{C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QRCoderTrimAnalysis", "QRCoderTrimAnalysis\QRCoderTrimAnalysis.csproj", "{F046136A-7BEA-49F3-9415-70CE50AD533B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A402660A-59F5-43E2-B5B0-69CE5E56DEA1}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - global.json = global.json - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QRCoderSamples", "QRCoderSamples\QRCoderSamples.csproj", "{61ED615B-C22C-5E3E-DAAD-A77A820E16DF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Debug|ARM.ActiveCfg = Debug|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Debug|ARM.Build.0 = Debug|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Debug|x64.ActiveCfg = Debug|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Debug|x64.Build.0 = Debug|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Debug|x86.ActiveCfg = Debug|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Debug|x86.Build.0 = Debug|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Release|Any CPU.Build.0 = Release|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Release|ARM.ActiveCfg = Release|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Release|ARM.Build.0 = Release|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Release|x64.ActiveCfg = Release|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Release|x64.Build.0 = Release|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Release|x86.ActiveCfg = Release|Any CPU - {AA6BE23A-7813-4D2A-835E-B673631AE9F1}.Release|x86.Build.0 = Release|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|Any CPU.Build.0 = Debug|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|ARM.ActiveCfg = Debug|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|ARM.Build.0 = Debug|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|x64.ActiveCfg = Debug|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|x64.Build.0 = Debug|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|x86.ActiveCfg = Debug|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Debug|x86.Build.0 = Debug|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Release|Any CPU.ActiveCfg = Release|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Release|ARM.ActiveCfg = Release|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Release|ARM.Build.0 = Release|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Release|x64.ActiveCfg = Release|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Release|x64.Build.0 = Release|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Release|x86.ActiveCfg = Release|Any CPU - {014F04C6-6099-4552-9A4F-D09C6E39D576}.Release|x86.Build.0 = Release|Any CPU - {CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Debug|ARM.ActiveCfg = Debug|x86 - {CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Debug|x64.ActiveCfg = Debug|x86 - {CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Debug|x86.ActiveCfg = Debug|Any CPU - {CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Debug|x86.Build.0 = Debug|Any CPU - {CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Release|ARM.ActiveCfg = Release|x86 - {CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Release|x64.ActiveCfg = Release|x86 - {CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Release|x86.ActiveCfg = Release|x86 - {CA6DB0F5-DB6C-4DDD-8B5F-EF82FBB963E9}.Release|x86.Build.0 = Release|x86 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Debug|Any CPU.ActiveCfg = Debug|x86 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Debug|ARM.ActiveCfg = Debug|ARM - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Debug|ARM.Build.0 = Debug|ARM - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Debug|ARM.Deploy.0 = Debug|ARM - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Debug|x64.ActiveCfg = Debug|x64 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Debug|x64.Build.0 = Debug|x64 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Debug|x64.Deploy.0 = Debug|x64 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Debug|x86.ActiveCfg = Debug|x86 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Debug|x86.Build.0 = Debug|x86 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Debug|x86.Deploy.0 = Debug|x86 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Release|Any CPU.ActiveCfg = Release|x86 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Release|ARM.ActiveCfg = Release|ARM - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Release|ARM.Build.0 = Release|ARM - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Release|ARM.Deploy.0 = Release|ARM - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Release|x64.ActiveCfg = Release|x64 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Release|x64.Build.0 = Release|x64 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Release|x64.Deploy.0 = Release|x64 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Release|x86.ActiveCfg = Release|x86 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Release|x86.Build.0 = Release|x86 - {61933D20-DB1F-4EE8-AC8E-3A2316CDD20C}.Release|x86.Deploy.0 = Release|x86 - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Debug|ARM.ActiveCfg = Debug|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Debug|ARM.Build.0 = Debug|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Debug|x64.ActiveCfg = Debug|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Debug|x64.Build.0 = Debug|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Debug|x86.ActiveCfg = Debug|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Debug|x86.Build.0 = Debug|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Release|Any CPU.Build.0 = Release|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Release|ARM.ActiveCfg = Release|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Release|ARM.Build.0 = Release|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Release|x64.ActiveCfg = Release|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Release|x64.Build.0 = Release|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Release|x86.ActiveCfg = Release|Any CPU - {1B51624B-9915-4ED6-8FC1-1B7C472246E5}.Release|x86.Build.0 = Release|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Debug|ARM.Build.0 = Debug|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Debug|x64.ActiveCfg = Debug|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Debug|x64.Build.0 = Debug|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Debug|x86.ActiveCfg = Debug|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Debug|x86.Build.0 = Debug|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Release|Any CPU.Build.0 = Release|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Release|ARM.ActiveCfg = Release|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Release|ARM.Build.0 = Release|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Release|x64.ActiveCfg = Release|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Release|x64.Build.0 = Release|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Release|x86.ActiveCfg = Release|Any CPU - {A7A7E073-2504-4BA2-A63B-87AC34174789}.Release|x86.Build.0 = Release|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Debug|ARM.ActiveCfg = Debug|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Debug|ARM.Build.0 = Debug|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Debug|x64.ActiveCfg = Debug|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Debug|x64.Build.0 = Debug|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Debug|x86.ActiveCfg = Debug|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Debug|x86.Build.0 = Debug|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Release|Any CPU.Build.0 = Release|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Release|ARM.ActiveCfg = Release|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Release|ARM.Build.0 = Release|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Release|x64.ActiveCfg = Release|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Release|x64.Build.0 = Release|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Release|x86.ActiveCfg = Release|Any CPU - {5FACE5F6-53C9-4B89-91D4-162677893574}.Release|x86.Build.0 = Release|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Debug|ARM.ActiveCfg = Debug|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Debug|ARM.Build.0 = Debug|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Debug|x64.ActiveCfg = Debug|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Debug|x64.Build.0 = Debug|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Debug|x86.ActiveCfg = Debug|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Debug|x86.Build.0 = Debug|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Release|Any CPU.Build.0 = Release|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Release|ARM.ActiveCfg = Release|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Release|ARM.Build.0 = Release|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Release|x64.ActiveCfg = Release|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Release|x64.Build.0 = Release|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Release|x86.ActiveCfg = Release|Any CPU - {C33AB74A-2AB3-4BEA-A67F-EAB578E74E25}.Release|x86.Build.0 = Release|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Debug|ARM.Build.0 = Debug|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Debug|x64.ActiveCfg = Debug|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Debug|x64.Build.0 = Debug|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Debug|x86.ActiveCfg = Debug|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Debug|x86.Build.0 = Debug|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Release|Any CPU.Build.0 = Release|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Release|ARM.ActiveCfg = Release|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Release|ARM.Build.0 = Release|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Release|x64.ActiveCfg = Release|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Release|x64.Build.0 = Release|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Release|x86.ActiveCfg = Release|Any CPU - {F046136A-7BEA-49F3-9415-70CE50AD533B}.Release|x86.Build.0 = Release|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Debug|ARM.Build.0 = Debug|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Debug|x64.ActiveCfg = Debug|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Debug|x64.Build.0 = Debug|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Debug|x86.ActiveCfg = Debug|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Debug|x86.Build.0 = Debug|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Release|Any CPU.Build.0 = Release|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Release|ARM.ActiveCfg = Release|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Release|ARM.Build.0 = Release|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Release|x64.ActiveCfg = Release|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Release|x64.Build.0 = Release|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Release|x86.ActiveCfg = Release|Any CPU - {61ED615B-C22C-5E3E-DAAD-A77A820E16DF}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F1845CDF-5EE5-456F-B6C8-717E4E2284F4} - EndGlobalSection -EndGlobal diff --git a/QRCoder.slnx b/QRCoder.slnx new file mode 100644 index 00000000..65a427ed --- /dev/null +++ b/QRCoder.slnx @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/QRCoderTests/Helpers/HelperFunctions.cs b/QRCoderTests/Helpers/HelperFunctions.cs index d848fc0b..0f78458b 100644 --- a/QRCoderTests/Helpers/HelperFunctions.cs +++ b/QRCoderTests/Helpers/HelperFunctions.cs @@ -1,5 +1,4 @@ using System.IO; -using System.Security.Cryptography; using System.Reflection; #if TEST_XAML using SW = System.Windows; @@ -8,6 +7,7 @@ #endif namespace QRCoderTests.Helpers; + public static class HelperFunctions { @@ -40,7 +40,7 @@ public static string GetAssemblyPath() #if NET5_0_OR_GREATER => AppDomain.CurrentDomain.BaseDirectory; #else - => Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location)?.Replace("file:\\", "") ?? ""; + => Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)?.Replace("file:\\", "") ?? ""; #endif /// diff --git a/global.json b/global.json index b7e33571..7ca72cbb 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "10.0.100", "allowPrerelease": false, "rollForward": "latestFeature" }