diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d235bb82..e44f1ad8 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "dotnet-reportgenerator-globaltool": { - "version": "5.3.11", + "version": "5.4.1", "commands": [ "reportgenerator" ] diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 633fd8d7..aba3733a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/dotnet/aspnet:6.0-bookworm-slim AS dotnet-lts-runtime +FROM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim AS dotnet-lts-runtime FROM docker.io/library/mono AS mono # https://hub.docker.com/_/microsoft-dotnet-sdk/ -FROM mcr.microsoft.com/dotnet/sdk:8.0 +FROM mcr.microsoft.com/dotnet/sdk:9.0 -# install ASP.NET Core 6.0 Runtime +# install ASP.NET Core 8.0 Runtime COPY --from=dotnet-lts-runtime /usr/share/dotnet /usr/share/dotnet # install msbuild for Mono diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0a8390f0..db326a63 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -15,7 +15,7 @@ ], "portsAttributes": { "3000": { - "label": "ASP.NET Core Spa proxy", + "label": "ASP.NET Core SPA proxy", "protocol": "https" }, "5001": { diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..604f0712 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,26 @@ +# All file types +* text=auto + +# Solutions +*.sln text=auto eol=crlf +*.slnx text=auto + +# Projects +*.csproj text=auto +*.props text=auto + +# Sources +*.cs text=auto diff=csharp + +# Scripts +*.sh text eol=lf + +# Images +*.ico binary +*.png binary +*.jpg binary +*.gif binary + +# Keys +*.snk binary +*.p12 binary \ No newline at end of file diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a2f2d1b1..398f0a8b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,3 +1,4 @@ +--- version: 2 updates: - package-ecosystem: github-actions @@ -11,4 +12,4 @@ updates: - package-ecosystem: nuget directory: / schedule: - interval: monthly \ No newline at end of file + interval: monthly diff --git a/.github/release.yml b/.github/release.yml index 3cad9d3b..fa302539 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -1,3 +1,4 @@ +--- changelog: exclude: labels: diff --git a/.github/stale.yml b/.github/stale.yml index 16953832..354433f4 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,3 +1,4 @@ +--- # Configuration for probot-stale - https://github.com/probot/stale # Number of days of inactivity before an issue becomes stale diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8e612c2..978cea92 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: - name: Set up .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Build run: | dotnet --info @@ -50,6 +50,7 @@ jobs: with: dotnet-version: | 8.0.x + 9.0.x - name: Test run: | dotnet test --collect:"XPlat Code Coverage" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e28d1744..475a1d00 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: - name: Set up .NET SDK uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Build packages run: | dotnet --info diff --git a/.netconfig b/.netconfig index 4db7267b..54f15108 100644 --- a/.netconfig +++ b/.netconfig @@ -2,4 +2,4 @@ [ReportGenerator] reports = "**/coverage.cobertura.xml" targetdir = "coverage" - reporttypes = "Cobertura;TextSummary" \ No newline at end of file + reporttypes = Cobertura,TextSummary \ No newline at end of file diff --git a/CAS.sln b/CAS.sln index 40137a1e..40df6749 100644 --- a/CAS.sln +++ b/CAS.sln @@ -49,8 +49,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreReactSample", "sa EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreSample", "samples\AspNetCoreSample\AspNetCoreSample.csproj", "{9E34C625-CE58-4630-AF42-C5237660AE27}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OwinSample", "samples\OwinSample\OwinSample.csproj", "{BB89E35B-F73F-426F-8E66-456D6A49FDF3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorSample", "samples\BlazorSample\BlazorSample.csproj", "{35775C99-782F-4502-B31D-B13E966D0A90}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetCoreMvcSample", "samples\AspNetCoreMvcSample\AspNetCoreMvcSample.csproj", "{F98E8D5E-DB3C-4716-A440-392457A5784B}" @@ -101,8 +99,6 @@ Global {9E34C625-CE58-4630-AF42-C5237660AE27}.Debug|Any CPU.Build.0 = Debug|Any CPU {9E34C625-CE58-4630-AF42-C5237660AE27}.Release|Any CPU.ActiveCfg = Release|Any CPU {9E34C625-CE58-4630-AF42-C5237660AE27}.Release|Any CPU.Build.0 = Release|Any CPU - {BB89E35B-F73F-426F-8E66-456D6A49FDF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB89E35B-F73F-426F-8E66-456D6A49FDF3}.Release|Any CPU.ActiveCfg = Release|Any CPU {35775C99-782F-4502-B31D-B13E966D0A90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {35775C99-782F-4502-B31D-B13E966D0A90}.Debug|Any CPU.Build.0 = Debug|Any CPU {35775C99-782F-4502-B31D-B13E966D0A90}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -126,7 +122,6 @@ Global {AB5054E3-28CE-4FF1-B9CA-4F6D8EC43EFF} = {EF050CD3-59F8-432E-9E77-7CF8A5F5CD91} {AF9F6FAF-873B-4C4C-BD6D-0CA09D189B6B} = {EF050CD3-59F8-432E-9E77-7CF8A5F5CD91} {9E34C625-CE58-4630-AF42-C5237660AE27} = {EF050CD3-59F8-432E-9E77-7CF8A5F5CD91} - {BB89E35B-F73F-426F-8E66-456D6A49FDF3} = {EF050CD3-59F8-432E-9E77-7CF8A5F5CD91} {35775C99-782F-4502-B31D-B13E966D0A90} = {EF050CD3-59F8-432E-9E77-7CF8A5F5CD91} {F98E8D5E-DB3C-4716-A440-392457A5784B} = {EF050CD3-59F8-432E-9E77-7CF8A5F5CD91} EndGlobalSection diff --git a/CAS.slnx b/CAS.slnx index 204000b4..ebe73b7d 100644 --- a/CAS.slnx +++ b/CAS.slnx @@ -1,14 +1,10 @@  - + - - - - - + diff --git a/Directory.Packages.props b/Directory.Packages.props index 0e5ab63a..8031dd5e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -16,31 +16,31 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + @@ -58,7 +58,6 @@ - diff --git a/Owin.slnf b/Owin.slnf deleted file mode 100644 index aa1b00f1..00000000 --- a/Owin.slnf +++ /dev/null @@ -1,15 +0,0 @@ -{ - "solution": { - "path": "CAS.sln", - "projects": [ - "samples\\OwinSample\\OwinSample.csproj", - "src\\GSS.Authentication.CAS.Core\\GSS.Authentication.CAS.Core.csproj", - "src\\GSS.Authentication.CAS.DistributedCache\\GSS.Authentication.CAS.DistributedCache.csproj", - "src\\GSS.Authentication.CAS.Owin\\GSS.Authentication.CAS.Owin.csproj", - "test\\GSS.Authentication.CAS.Core.Tests\\GSS.Authentication.CAS.Core.Tests.csproj", - "test\\GSS.Authentication.CAS.DistributedCache.Tests\\GSS.Authentication.CAS.DistributedCache.Tests.csproj", - "test\\GSS.Authentication.CAS.Owin.Tests\\GSS.Authentication.CAS.Owin.Tests.csproj", - "test\\GSS.Authentication.CAS.Testing\\GSS.Authentication.CAS.Testing.csproj" - ] - } -} \ No newline at end of file diff --git a/samples/AspNetCoreIdentitySample/AspNetCoreIdentitySample.csproj b/samples/AspNetCoreIdentitySample/AspNetCoreIdentitySample.csproj index a4b05506..b60627c8 100644 --- a/samples/AspNetCoreIdentitySample/AspNetCoreIdentitySample.csproj +++ b/samples/AspNetCoreIdentitySample/AspNetCoreIdentitySample.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable diff --git a/samples/AspNetCoreIdentitySample/Program.cs b/samples/AspNetCoreIdentitySample/Program.cs index 369ffeae..895184c0 100644 --- a/samples/AspNetCoreIdentitySample/Program.cs +++ b/samples/AspNetCoreIdentitySample/Program.cs @@ -83,13 +83,13 @@ } app.UseHttpsRedirection(); -app.UseStaticFiles(); +app.MapStaticAssets(); app.UseRouting(); app.UseAuthentication(); app.UseAuthorization(); -app.MapRazorPages(); +app.MapRazorPages().WithStaticAssets(); app.Run(); \ No newline at end of file diff --git a/samples/AspNetCoreMvcSample/AspNetCoreMvcSample.csproj b/samples/AspNetCoreMvcSample/AspNetCoreMvcSample.csproj index 64abf851..dc6a3f9c 100644 --- a/samples/AspNetCoreMvcSample/AspNetCoreMvcSample.csproj +++ b/samples/AspNetCoreMvcSample/AspNetCoreMvcSample.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable diff --git a/samples/AspNetCoreMvcSample/Properties/launchSettings.json b/samples/AspNetCoreMvcSample/Properties/launchSettings.json index e670bfe3..c7788f74 100644 --- a/samples/AspNetCoreMvcSample/Properties/launchSettings.json +++ b/samples/AspNetCoreMvcSample/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "AspNetCoreMvcSample": { "commandName": "Project", - "dotnetRunMessages": "true", + "dotnetRunMessages": true, "launchBrowser": true, "applicationUrl": "https://localhost:5001;http://localhost:5000", "environmentVariables": { diff --git a/samples/AspNetCoreReactSample/AspNetCoreReactSample.csproj b/samples/AspNetCoreReactSample/AspNetCoreReactSample.csproj index a918d16b..84190e1b 100644 --- a/samples/AspNetCoreReactSample/AspNetCoreReactSample.csproj +++ b/samples/AspNetCoreReactSample/AspNetCoreReactSample.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable true Latest diff --git a/samples/AspNetCoreReactSample/ClientApp/package.json b/samples/AspNetCoreReactSample/ClientApp/package.json index 71373f5e..0e0dc303 100644 --- a/samples/AspNetCoreReactSample/ClientApp/package.json +++ b/samples/AspNetCoreReactSample/ClientApp/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "type": "module", "private": true, - "packageManager": "pnpm@9.12.3", + "packageManager": "pnpm@9.13.0", "scripts": { "prestart": "node aspnetcore-https && node aspnetcore-react", "start": "vite", @@ -18,16 +18,16 @@ "react-router-bootstrap": "^0.26.3", "rimraf": "^6.0.1", "typescript": "~5.6.3", - "typescript-eslint": "^8.12.2", + "typescript-eslint": "^8.14.0", "web-vitals": "^4.2.4", "wouter": "^3.3.5" }, "devDependencies": { - "@types/node": "^22.8.6", + "@types/node": "^22.9.0", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", "@vitejs/plugin-react": "^4.3.3", - "eslint": "^9.13.0", - "vite": "^5.4.10" + "eslint": "^9.14.0", + "vite": "^5.4.11" } } diff --git a/samples/AspNetCoreReactSample/ClientApp/pnpm-lock.yaml b/samples/AspNetCoreReactSample/ClientApp/pnpm-lock.yaml index 5eb10818..62216bf5 100644 --- a/samples/AspNetCoreReactSample/ClientApp/pnpm-lock.yaml +++ b/samples/AspNetCoreReactSample/ClientApp/pnpm-lock.yaml @@ -30,8 +30,8 @@ importers: specifier: ~5.6.3 version: 5.6.3 typescript-eslint: - specifier: ^8.12.2 - version: 8.12.2(eslint@9.13.0)(typescript@5.6.3) + specifier: ^8.14.0 + version: 8.14.0(eslint@9.14.0)(typescript@5.6.3) web-vitals: specifier: ^4.2.4 version: 4.2.4 @@ -40,8 +40,8 @@ importers: version: 3.3.5(react@18.3.1) devDependencies: '@types/node': - specifier: ^22.8.6 - version: 22.8.6 + specifier: ^22.9.0 + version: 22.9.0 '@types/react': specifier: ^18.3.12 version: 18.3.12 @@ -50,13 +50,13 @@ importers: version: 18.3.1 '@vitejs/plugin-react': specifier: ^4.3.3 - version: 4.3.3(vite@5.4.10(@types/node@22.8.6)) + version: 4.3.3(vite@5.4.11(@types/node@22.9.0)) eslint: - specifier: ^9.13.0 - version: 9.13.0 + specifier: ^9.14.0 + version: 9.14.0 vite: - specifier: ^5.4.10 - version: 5.4.10(@types/node@22.8.6) + specifier: ^5.4.11 + version: 5.4.11(@types/node@22.9.0) packages: @@ -303,6 +303,10 @@ packages: resolution: {integrity: sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + '@eslint-community/regexpp@4.12.1': + resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + '@eslint/config-array@0.18.0': resolution: {integrity: sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -315,8 +319,8 @@ packages: resolution: {integrity: sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/js@9.13.0': - resolution: {integrity: sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==} + '@eslint/js@9.14.0': + resolution: {integrity: sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/object-schema@2.1.4': @@ -327,12 +331,12 @@ packages: resolution: {integrity: sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@humanfs/core@0.19.0': - resolution: {integrity: sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==} + '@humanfs/core@0.19.1': + resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} engines: {node: '>=18.18.0'} - '@humanfs/node@0.16.5': - resolution: {integrity: sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==} + '@humanfs/node@0.16.6': + resolution: {integrity: sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==} engines: {node: '>=18.18.0'} '@humanwhocodes/module-importer@1.0.1': @@ -343,6 +347,10 @@ packages: resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==} engines: {node: '>=18.18'} + '@humanwhocodes/retry@0.4.1': + resolution: {integrity: sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==} + engines: {node: '>=18.18'} + '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} @@ -486,8 +494,8 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/node@22.8.6': - resolution: {integrity: sha512-tosuJYKrIqjQIlVCM4PEGxOmyg3FCPa/fViuJChnGeEIhjA46oy8FMVoF9su1/v8PNs2a8Q0iFNyOx0uOF91nw==} + '@types/node@22.9.0': + resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==} '@types/prop-types@15.7.11': resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==} @@ -498,8 +506,8 @@ packages: '@types/react@18.3.12': resolution: {integrity: sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==} - '@typescript-eslint/eslint-plugin@8.12.2': - resolution: {integrity: sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==} + '@typescript-eslint/eslint-plugin@8.14.0': + resolution: {integrity: sha512-tqp8H7UWFaZj0yNO6bycd5YjMwxa6wIHOLZvWPkidwbgLCsBMetQoGj7DPuAlWa2yGO3H48xmPwjhsSPPCGU5w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 @@ -509,8 +517,8 @@ packages: typescript: optional: true - '@typescript-eslint/parser@8.12.2': - resolution: {integrity: sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==} + '@typescript-eslint/parser@8.14.0': + resolution: {integrity: sha512-2p82Yn9juUJq0XynBXtFCyrBDb6/dJombnz6vbo6mgQEtWHfvHbQuEa9kAOVIt1c9YFwi7H6WxtPj1kg+80+RA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -519,12 +527,12 @@ packages: typescript: optional: true - '@typescript-eslint/scope-manager@8.12.2': - resolution: {integrity: sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==} + '@typescript-eslint/scope-manager@8.14.0': + resolution: {integrity: sha512-aBbBrnW9ARIDn92Zbo7rguLnqQ/pOrUguVpbUwzOhkFg2npFDwTgPGqFqE0H5feXcOoJOfX3SxlJaKEVtq54dw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@8.12.2': - resolution: {integrity: sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==} + '@typescript-eslint/type-utils@8.14.0': + resolution: {integrity: sha512-Xcz9qOtZuGusVOH5Uk07NGs39wrKkf3AxlkK79RBK6aJC1l03CobXjJbwBPSidetAOV+5rEVuiT1VSBUOAsanQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -532,12 +540,12 @@ packages: typescript: optional: true - '@typescript-eslint/types@8.12.2': - resolution: {integrity: sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==} + '@typescript-eslint/types@8.14.0': + resolution: {integrity: sha512-yjeB9fnO/opvLJFAsPNYlKPnEM8+z4og09Pk504dkqonT02AyL5Z9SSqlE0XqezS93v6CXn49VHvB2G7XSsl0g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.12.2': - resolution: {integrity: sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==} + '@typescript-eslint/typescript-estree@8.14.0': + resolution: {integrity: sha512-OPXPLYKGZi9XS/49rdaCbR5j/S14HazviBlUQFvSKz3npr3NikF+mrgK7CFVur6XEt95DZp/cmke9d5i3vtVnQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -545,14 +553,14 @@ packages: typescript: optional: true - '@typescript-eslint/utils@8.12.2': - resolution: {integrity: sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==} + '@typescript-eslint/utils@8.14.0': + resolution: {integrity: sha512-OGqj6uB8THhrHj0Fk27DcHPojW7zKwKkPmHXHvQ58pLYp4hy8CSUdTKykKeh+5vFqTTVmjz0zCOOPKRovdsgHA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 - '@typescript-eslint/visitor-keys@8.12.2': - resolution: {integrity: sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==} + '@typescript-eslint/visitor-keys@8.14.0': + resolution: {integrity: sha512-vG0XZo8AdTH9OE6VFRwAZldNc7qtJ/6NLGWak+BtENuEUXGZgFpihILPiBvKXvJ2nFu27XNGC6rKiwuaoMbYzQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@vitejs/plugin-react@4.3.3': @@ -566,8 +574,8 @@ packages: peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 - acorn@8.12.1: - resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==} + acorn@8.14.0: + resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==} engines: {node: '>=0.4.0'} hasBin: true @@ -716,20 +724,20 @@ packages: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} - eslint-scope@8.1.0: - resolution: {integrity: sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==} + eslint-scope@8.2.0: + resolution: {integrity: sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} eslint-visitor-keys@3.4.3: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - eslint-visitor-keys@4.1.0: - resolution: {integrity: sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==} + eslint-visitor-keys@4.2.0: + resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - eslint@9.13.0: - resolution: {integrity: sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==} + eslint@9.14.0: + resolution: {integrity: sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} hasBin: true peerDependencies: @@ -738,8 +746,8 @@ packages: jiti: optional: true - espree@10.2.0: - resolution: {integrity: sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==} + espree@10.3.0: + resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} esquery@1.5.0: @@ -1185,8 +1193,8 @@ packages: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} - typescript-eslint@8.12.2: - resolution: {integrity: sha512-UbuVUWSrHVR03q9CWx+JDHeO6B/Hr9p4U5lRH++5tq/EbFq1faYZe50ZSBePptgfIKLEti0aPQ3hFgnPVcd8ZQ==} + typescript-eslint@8.14.0: + resolution: {integrity: sha512-K8fBJHxVL3kxMmwByvz8hNdBJ8a0YqKzKDX6jRlrjMuNXyd5T2V02HIq37+OiWXvUUOXgOOGiSSOh26Mh8pC3w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -1216,8 +1224,8 @@ packages: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 - vite@5.4.10: - resolution: {integrity: sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==} + vite@5.4.11: + resolution: {integrity: sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -1477,13 +1485,15 @@ snapshots: '@esbuild/win32-x64@0.21.5': optional: true - '@eslint-community/eslint-utils@4.4.0(eslint@9.13.0)': + '@eslint-community/eslint-utils@4.4.0(eslint@9.14.0)': dependencies: - eslint: 9.13.0 + eslint: 9.14.0 eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.11.0': {} + '@eslint-community/regexpp@4.12.1': {} + '@eslint/config-array@0.18.0': dependencies: '@eslint/object-schema': 2.1.4 @@ -1498,7 +1508,7 @@ snapshots: dependencies: ajv: 6.12.6 debug: 4.3.4 - espree: 10.2.0 + espree: 10.3.0 globals: 14.0.0 ignore: 5.3.1 import-fresh: 3.3.0 @@ -1508,7 +1518,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@eslint/js@9.13.0': {} + '@eslint/js@9.14.0': {} '@eslint/object-schema@2.1.4': {} @@ -1516,17 +1526,19 @@ snapshots: dependencies: levn: 0.4.1 - '@humanfs/core@0.19.0': {} + '@humanfs/core@0.19.1': {} - '@humanfs/node@0.16.5': + '@humanfs/node@0.16.6': dependencies: - '@humanfs/core': 0.19.0 + '@humanfs/core': 0.19.1 '@humanwhocodes/retry': 0.3.1 '@humanwhocodes/module-importer@1.0.1': {} '@humanwhocodes/retry@0.3.1': {} + '@humanwhocodes/retry@0.4.1': {} + '@isaacs/cliui@8.0.2': dependencies: string-width: 5.1.2 @@ -1645,7 +1657,7 @@ snapshots: '@types/json-schema@7.0.15': {} - '@types/node@22.8.6': + '@types/node@22.9.0': dependencies: undici-types: 6.19.8 @@ -1660,15 +1672,15 @@ snapshots: '@types/prop-types': 15.7.11 csstype: 3.1.3 - '@typescript-eslint/eslint-plugin@8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.13.0)(typescript@5.6.3))(eslint@9.13.0)(typescript@5.6.3)': + '@typescript-eslint/eslint-plugin@8.14.0(@typescript-eslint/parser@8.14.0(eslint@9.14.0)(typescript@5.6.3))(eslint@9.14.0)(typescript@5.6.3)': dependencies: '@eslint-community/regexpp': 4.11.0 - '@typescript-eslint/parser': 8.12.2(eslint@9.13.0)(typescript@5.6.3) - '@typescript-eslint/scope-manager': 8.12.2 - '@typescript-eslint/type-utils': 8.12.2(eslint@9.13.0)(typescript@5.6.3) - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0)(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.12.2 - eslint: 9.13.0 + '@typescript-eslint/parser': 8.14.0(eslint@9.14.0)(typescript@5.6.3) + '@typescript-eslint/scope-manager': 8.14.0 + '@typescript-eslint/type-utils': 8.14.0(eslint@9.14.0)(typescript@5.6.3) + '@typescript-eslint/utils': 8.14.0(eslint@9.14.0)(typescript@5.6.3) + '@typescript-eslint/visitor-keys': 8.14.0 + eslint: 9.14.0 graphemer: 1.4.0 ignore: 5.3.1 natural-compare: 1.4.0 @@ -1678,28 +1690,28 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.12.2(eslint@9.13.0)(typescript@5.6.3)': + '@typescript-eslint/parser@8.14.0(eslint@9.14.0)(typescript@5.6.3)': dependencies: - '@typescript-eslint/scope-manager': 8.12.2 - '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/typescript-estree': 8.12.2(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.12.2 + '@typescript-eslint/scope-manager': 8.14.0 + '@typescript-eslint/types': 8.14.0 + '@typescript-eslint/typescript-estree': 8.14.0(typescript@5.6.3) + '@typescript-eslint/visitor-keys': 8.14.0 debug: 4.3.4 - eslint: 9.13.0 + eslint: 9.14.0 optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.12.2': + '@typescript-eslint/scope-manager@8.14.0': dependencies: - '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/visitor-keys': 8.12.2 + '@typescript-eslint/types': 8.14.0 + '@typescript-eslint/visitor-keys': 8.14.0 - '@typescript-eslint/type-utils@8.12.2(eslint@9.13.0)(typescript@5.6.3)': + '@typescript-eslint/type-utils@8.14.0(eslint@9.14.0)(typescript@5.6.3)': dependencies: - '@typescript-eslint/typescript-estree': 8.12.2(typescript@5.6.3) - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0)(typescript@5.6.3) + '@typescript-eslint/typescript-estree': 8.14.0(typescript@5.6.3) + '@typescript-eslint/utils': 8.14.0(eslint@9.14.0)(typescript@5.6.3) debug: 4.3.4 ts-api-utils: 1.3.0(typescript@5.6.3) optionalDependencies: @@ -1708,12 +1720,12 @@ snapshots: - eslint - supports-color - '@typescript-eslint/types@8.12.2': {} + '@typescript-eslint/types@8.14.0': {} - '@typescript-eslint/typescript-estree@8.12.2(typescript@5.6.3)': + '@typescript-eslint/typescript-estree@8.14.0(typescript@5.6.3)': dependencies: - '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/visitor-keys': 8.12.2 + '@typescript-eslint/types': 8.14.0 + '@typescript-eslint/visitor-keys': 8.14.0 debug: 4.3.4 fast-glob: 3.3.2 is-glob: 4.0.3 @@ -1725,38 +1737,38 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.12.2(eslint@9.13.0)(typescript@5.6.3)': + '@typescript-eslint/utils@8.14.0(eslint@9.14.0)(typescript@5.6.3)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.13.0) - '@typescript-eslint/scope-manager': 8.12.2 - '@typescript-eslint/types': 8.12.2 - '@typescript-eslint/typescript-estree': 8.12.2(typescript@5.6.3) - eslint: 9.13.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.14.0) + '@typescript-eslint/scope-manager': 8.14.0 + '@typescript-eslint/types': 8.14.0 + '@typescript-eslint/typescript-estree': 8.14.0(typescript@5.6.3) + eslint: 9.14.0 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/visitor-keys@8.12.2': + '@typescript-eslint/visitor-keys@8.14.0': dependencies: - '@typescript-eslint/types': 8.12.2 + '@typescript-eslint/types': 8.14.0 eslint-visitor-keys: 3.4.3 - '@vitejs/plugin-react@4.3.3(vite@5.4.10(@types/node@22.8.6))': + '@vitejs/plugin-react@4.3.3(vite@5.4.11(@types/node@22.9.0))': dependencies: '@babel/core': 7.25.2 '@babel/plugin-transform-react-jsx-self': 7.24.7(@babel/core@7.25.2) '@babel/plugin-transform-react-jsx-source': 7.24.7(@babel/core@7.25.2) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 5.4.10(@types/node@22.8.6) + vite: 5.4.11(@types/node@22.9.0) transitivePeerDependencies: - supports-color - acorn-jsx@5.3.2(acorn@8.12.1): + acorn-jsx@5.3.2(acorn@8.14.0): dependencies: - acorn: 8.12.1 + acorn: 8.14.0 - acorn@8.12.1: {} + acorn@8.14.0: {} ajv@6.12.6: dependencies: @@ -1908,27 +1920,27 @@ snapshots: escape-string-regexp@4.0.0: {} - eslint-scope@8.1.0: + eslint-scope@8.2.0: dependencies: esrecurse: 4.3.0 estraverse: 5.3.0 eslint-visitor-keys@3.4.3: {} - eslint-visitor-keys@4.1.0: {} + eslint-visitor-keys@4.2.0: {} - eslint@9.13.0: + eslint@9.14.0: dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.13.0) - '@eslint-community/regexpp': 4.11.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.14.0) + '@eslint-community/regexpp': 4.12.1 '@eslint/config-array': 0.18.0 '@eslint/core': 0.7.0 '@eslint/eslintrc': 3.1.0 - '@eslint/js': 9.13.0 + '@eslint/js': 9.14.0 '@eslint/plugin-kit': 0.2.0 - '@humanfs/node': 0.16.5 + '@humanfs/node': 0.16.6 '@humanwhocodes/module-importer': 1.0.1 - '@humanwhocodes/retry': 0.3.1 + '@humanwhocodes/retry': 0.4.1 '@types/estree': 1.0.6 '@types/json-schema': 7.0.15 ajv: 6.12.6 @@ -1936,9 +1948,9 @@ snapshots: cross-spawn: 7.0.3 debug: 4.3.4 escape-string-regexp: 4.0.0 - eslint-scope: 8.1.0 - eslint-visitor-keys: 4.1.0 - espree: 10.2.0 + eslint-scope: 8.2.0 + eslint-visitor-keys: 4.2.0 + espree: 10.3.0 esquery: 1.5.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 @@ -1957,11 +1969,11 @@ snapshots: transitivePeerDependencies: - supports-color - espree@10.2.0: + espree@10.3.0: dependencies: - acorn: 8.12.1 - acorn-jsx: 5.3.2(acorn@8.12.1) - eslint-visitor-keys: 4.1.0 + acorn: 8.14.0 + acorn-jsx: 5.3.2(acorn@8.14.0) + eslint-visitor-keys: 4.2.0 esquery@1.5.0: dependencies: @@ -2354,11 +2366,11 @@ snapshots: dependencies: prelude-ls: 1.2.1 - typescript-eslint@8.12.2(eslint@9.13.0)(typescript@5.6.3): + typescript-eslint@8.14.0(eslint@9.14.0)(typescript@5.6.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.13.0)(typescript@5.6.3))(eslint@9.13.0)(typescript@5.6.3) - '@typescript-eslint/parser': 8.12.2(eslint@9.13.0)(typescript@5.6.3) - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0)(typescript@5.6.3) + '@typescript-eslint/eslint-plugin': 8.14.0(@typescript-eslint/parser@8.14.0(eslint@9.14.0)(typescript@5.6.3))(eslint@9.14.0)(typescript@5.6.3) + '@typescript-eslint/parser': 8.14.0(eslint@9.14.0)(typescript@5.6.3) + '@typescript-eslint/utils': 8.14.0(eslint@9.14.0)(typescript@5.6.3) optionalDependencies: typescript: 5.6.3 transitivePeerDependencies: @@ -2383,13 +2395,13 @@ snapshots: dependencies: react: 18.3.1 - vite@5.4.10(@types/node@22.8.6): + vite@5.4.11(@types/node@22.9.0): dependencies: esbuild: 0.21.5 postcss: 8.4.47 rollup: 4.24.0 optionalDependencies: - '@types/node': 22.8.6 + '@types/node': 22.9.0 fsevents: 2.3.3 web-vitals@4.2.4: {} diff --git a/samples/AspNetCoreReactSample/Program.cs b/samples/AspNetCoreReactSample/Program.cs index 90579f97..59018d30 100644 --- a/samples/AspNetCoreReactSample/Program.cs +++ b/samples/AspNetCoreReactSample/Program.cs @@ -77,14 +77,14 @@ // Configure the HTTP request pipeline. app.UseHttpsRedirection(); -app.UseStaticFiles(); +app.MapStaticAssets(); app.UseRouting(); app.UseAuthentication(); app.UseAuthorization(); -app.MapControllers(); +app.MapControllers().WithStaticAssets(); app.MapFallbackToFile("index.html").AllowAnonymous(); app.Run(); \ No newline at end of file diff --git a/samples/AspNetCoreSample/AspNetCoreSample.csproj b/samples/AspNetCoreSample/AspNetCoreSample.csproj index 12111731..30389b65 100644 --- a/samples/AspNetCoreSample/AspNetCoreSample.csproj +++ b/samples/AspNetCoreSample/AspNetCoreSample.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable diff --git a/samples/AspNetCoreSample/Program.cs b/samples/AspNetCoreSample/Program.cs index 12ac9f3f..76369519 100644 --- a/samples/AspNetCoreSample/Program.cs +++ b/samples/AspNetCoreSample/Program.cs @@ -130,7 +130,7 @@ options.SPOptions.ServiceCertificates.Add(new ServiceCertificate { Use = CertificateUse.Signing, - Certificate = new X509Certificate2( + Certificate = X509CertificateLoader.LoadPkcs12FromFile( signingCertPath, builder.Configuration["SAML2:SP:SigningCertificate:Pass"], X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet) @@ -173,7 +173,7 @@ } app.UseHttpsRedirection(); -app.UseStaticFiles(); +app.MapStaticAssets(); app.UseRouting(); @@ -185,6 +185,6 @@ app.UseAuthentication(); app.UseAuthorization(); -app.MapRazorPages(); +app.MapRazorPages().WithStaticAssets(); app.Run(); diff --git a/samples/BlazorSample/BlazorSample.csproj b/samples/BlazorSample/BlazorSample.csproj index 0752de4c..ab287322 100644 --- a/samples/BlazorSample/BlazorSample.csproj +++ b/samples/BlazorSample/BlazorSample.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable diff --git a/samples/BlazorSample/Components/App.razor b/samples/BlazorSample/Components/App.razor index 61e7835c..0898409e 100644 --- a/samples/BlazorSample/Components/App.razor +++ b/samples/BlazorSample/Components/App.razor @@ -6,14 +6,14 @@ - - + + - + diff --git a/samples/BlazorSample/Components/Layout/MainLayout.razor b/samples/BlazorSample/Components/Layout/MainLayout.razor index a63828e8..b06e71ef 100644 --- a/samples/BlazorSample/Components/Layout/MainLayout.razor +++ b/samples/BlazorSample/Components/Layout/MainLayout.razor @@ -10,6 +10,6 @@
An unhandled error has occurred. - Reload + Reload 🗙
\ No newline at end of file diff --git a/samples/BlazorSample/Components/Layout/MainLayout.razor.css b/samples/BlazorSample/Components/Layout/MainLayout.razor.css new file mode 100644 index 00000000..e69de29b diff --git a/samples/BlazorSample/Program.cs b/samples/BlazorSample/Program.cs index cea8a449..1480d9f5 100644 --- a/samples/BlazorSample/Program.cs +++ b/samples/BlazorSample/Program.cs @@ -85,7 +85,7 @@ } app.UseHttpsRedirection(); -app.UseStaticFiles(); +app.MapStaticAssets(); app.UseRouting(); @@ -94,7 +94,7 @@ app.UseAntiforgery(); -app.MapRazorPages(); +app.MapRazorPages().WithStaticAssets(); app.MapRazorComponents() .AddInteractiveServerRenderMode(); diff --git a/samples/Owin.sln b/samples/Owin.sln new file mode 100644 index 00000000..54e68b5d --- /dev/null +++ b/samples/Owin.sln @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{fae04ec0-301f-11d3-bf4b-00c04f79efbc}") = "OwinSample", "OwinSample\OwinSample.csproj", "{BB89E35B-F73F-426F-8E66-456D6A49FDF3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GSS.Authentication.CAS.Core", "..\src\GSS.Authentication.CAS.Core\GSS.Authentication.CAS.Core.csproj", "{C41BBB42-F6C3-4DC0-B5D6-B6F18AC2EB9D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GSS.Authentication.CAS.Owin", "..\src\GSS.Authentication.CAS.Owin\GSS.Authentication.CAS.Owin.csproj", "{F0F064C5-9A25-4879-AC2D-2AAAF75C7FDC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BB89E35B-F73F-426F-8E66-456D6A49FDF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB89E35B-F73F-426F-8E66-456D6A49FDF3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB89E35B-F73F-426F-8E66-456D6A49FDF3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB89E35B-F73F-426F-8E66-456D6A49FDF3}.Release|Any CPU.Build.0 = Release|Any CPU + {C41BBB42-F6C3-4DC0-B5D6-B6F18AC2EB9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C41BBB42-F6C3-4DC0-B5D6-B6F18AC2EB9D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C41BBB42-F6C3-4DC0-B5D6-B6F18AC2EB9D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C41BBB42-F6C3-4DC0-B5D6-B6F18AC2EB9D}.Release|Any CPU.Build.0 = Release|Any CPU + {F0F064C5-9A25-4879-AC2D-2AAAF75C7FDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F0F064C5-9A25-4879-AC2D-2AAAF75C7FDC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F0F064C5-9A25-4879-AC2D-2AAAF75C7FDC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F0F064C5-9A25-4879-AC2D-2AAAF75C7FDC}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/samples/OwinSample/web.config b/samples/OwinSample/web.config index fa32d9e2..4868b319 100644 --- a/samples/OwinSample/web.config +++ b/samples/OwinSample/web.config @@ -23,38 +23,38 @@ - - + + - - + + - + - + - - + + - - + + @@ -107,14 +107,14 @@ - - + + - + @@ -159,6 +159,12 @@ + + + + + + diff --git a/test/GSS.Authentication.CAS.AspNetCore.Tests/CasSingleLogoutMiddlewareTests.cs b/test/GSS.Authentication.CAS.AspNetCore.Tests/CasSingleLogoutMiddlewareTests.cs index 65b0fcfd..80057090 100644 --- a/test/GSS.Authentication.CAS.AspNetCore.Tests/CasSingleLogoutMiddlewareTests.cs +++ b/test/GSS.Authentication.CAS.AspNetCore.Tests/CasSingleLogoutMiddlewareTests.cs @@ -94,6 +94,7 @@ public async Task RetrievedTicketStoreFromDI_ShouldNotThrows() var host = new HostBuilder() .ConfigureWebHostDefaults(builder => { + builder.UseTestServer(); builder.ConfigureServices(services => services.AddSingleton(Mock.Of())); builder.Configure(app => app.UseCasSingleLogout()); }) diff --git a/test/GSS.Authentication.CAS.AspNetCore.Tests/GSS.Authentication.CAS.AspNetCore.Tests.csproj b/test/GSS.Authentication.CAS.AspNetCore.Tests/GSS.Authentication.CAS.AspNetCore.Tests.csproj index 8047f8f7..7ae23b4e 100644 --- a/test/GSS.Authentication.CAS.AspNetCore.Tests/GSS.Authentication.CAS.AspNetCore.Tests.csproj +++ b/test/GSS.Authentication.CAS.AspNetCore.Tests/GSS.Authentication.CAS.AspNetCore.Tests.csproj @@ -1,19 +1,19 @@ - net8.0;net6.0 + net9.0;net8.0 - + - - + + diff --git a/test/GSS.Authentication.CAS.Core.Tests/GSS.Authentication.CAS.Core.Tests.csproj b/test/GSS.Authentication.CAS.Core.Tests/GSS.Authentication.CAS.Core.Tests.csproj index b35f9e44..9c71b024 100644 --- a/test/GSS.Authentication.CAS.Core.Tests/GSS.Authentication.CAS.Core.Tests.csproj +++ b/test/GSS.Authentication.CAS.Core.Tests/GSS.Authentication.CAS.Core.Tests.csproj @@ -1,7 +1,7 @@ - net8.0;net6.0;net48 + net9.0;net8.0;net48 diff --git a/test/GSS.Authentication.CAS.Testing/GSS.Authentication.CAS.Testing.csproj b/test/GSS.Authentication.CAS.Testing/GSS.Authentication.CAS.Testing.csproj index c704342f..d4fbfb62 100644 --- a/test/GSS.Authentication.CAS.Testing/GSS.Authentication.CAS.Testing.csproj +++ b/test/GSS.Authentication.CAS.Testing/GSS.Authentication.CAS.Testing.csproj @@ -1,7 +1,7 @@ - net6.0;net48 + net8.0;net48