diff --git a/Caching-MySQL b/Caching-MySQL index d9dbe15a..78bd9eda 160000 --- a/Caching-MySQL +++ b/Caching-MySQL @@ -1 +1 @@ -Subproject commit d9dbe15a7b5d713430f0ac03c0cb0492f15f45ba +Subproject commit 78bd9edaa3584b299bfdba3883af5155b1372bd1 diff --git a/Dockerfile b/Dockerfile index 9a82cb15..bce0a064 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:experimental -FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim AS build RUN --mount=type=cache,target=/root/.nuget --mount=type=cache,target=/root/.local/share/NuGet --mount=type=cache,target=/root/.npm/ --mount=type=cache,target=./DotnetPlayground.Web/node_modules RUN curl -SLO https://deb.nodesource.com/nsolid_setup_deb.sh && \ chmod 500 nsolid_setup_deb.sh && \ @@ -35,7 +35,7 @@ RUN dotnet publish --no-restore -c $BUILD_CONFIG --self-contained -r linux-x64 \ -FROM mcr.microsoft.com/dotnet/runtime-deps:7.0-bullseye-slim +FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-bullseye-slim WORKDIR /app ENV USER=nobody TZ=Europe/Warsaw ASPNETCORE_URLS=http://+:5000 ARG BUILD_CONFIG=${BUILD_CONFIG:-Release} diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 88f37002..6450a688 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:experimental -FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build RUN --mount=type=cache,target=/root/.nuget --mount=type=cache,target=/root/.local/share/NuGet --mount=type=cache,target=/root/.npm/ --mount=type=cache,target=./DotnetPlayground.Web/node_modules RUN apk add --update nodejs npm WORKDIR /build @@ -32,7 +32,7 @@ RUN dotnet publish --no-restore -c $BUILD_CONFIG --self-contained -r alpine-x64 -FROM mcr.microsoft.com/dotnet/runtime-deps:7.0-alpine +FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine RUN apk add tzdata WORKDIR /app ENV USER=nobody TZ=Europe/Warsaw ASPNETCORE_URLS=http://+:5000 diff --git a/Dotnet-Playground build.sh b/Dotnet-Playground build.sh index 4414498e..a4514290 100755 --- a/Dotnet-Playground build.sh +++ b/Dotnet-Playground build.sh @@ -9,12 +9,12 @@ dockerfile_args='' case $1 in "latest"|"ubuntu"|"default"|"debian") - image="latest"; + image="latest-8"; dockerfile_name="Dockerfile"; echo "image would be $image"; ;; "" | "alpine") - image="alpine"; + image="alpine-8"; dockerfile_name="Dockerfile.alpine"; echo "image would be $image"; ;; diff --git a/DotnetPlayground.Tests/DotnetPlayground.Tests.csproj b/DotnetPlayground.Tests/DotnetPlayground.Tests.csproj index 71bfddcb..7e5b4215 100644 --- a/DotnetPlayground.Tests/DotnetPlayground.Tests.csproj +++ b/DotnetPlayground.Tests/DotnetPlayground.Tests.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 latest false @@ -10,7 +10,7 @@ - + @@ -18,13 +18,13 @@ runtime; build; native; contentfiles; analyzers - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/DotnetPlayground.Tests/WebCamGalleryTests.cs b/DotnetPlayground.Tests/WebCamGalleryTests.cs index c004a6ef..be2e2909 100644 --- a/DotnetPlayground.Tests/WebCamGalleryTests.cs +++ b/DotnetPlayground.Tests/WebCamGalleryTests.cs @@ -216,7 +216,7 @@ public void OnImageGetTest(string imageName) long etagHash = new DateTimeOffset(last.Year, last.Month, last.Day, last.Hour, last.Minute, last.Second, last.Offset) .ToUniversalTime().ToFileTime() ^ fi.Length; var etag_str = '\"' + Convert.ToString(etagHash, 16) + '\"'; - wcim.Request.Headers.Add(HeaderNames.IfNoneMatch, new StringValues(etag_str)); + wcim.Request.Headers.Append(HeaderNames.IfNoneMatch, new StringValues(etag_str)); //Act result = wcim.OnGet(base.Configuration, serverTiming_mock.Object, imageName); diff --git a/DotnetPlayground.Web/Areas/Identity/OAuthHandlers.cs b/DotnetPlayground.Web/Areas/Identity/OAuthHandlers.cs index f2356f03..50165d1a 100644 --- a/DotnetPlayground.Web/Areas/Identity/OAuthHandlers.cs +++ b/DotnetPlayground.Web/Areas/Identity/OAuthHandlers.cs @@ -22,8 +22,8 @@ public class MyGoogleHandler : GoogleHandler { //private readonly IConfiguration _configuration; - public MyGoogleHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock, IConfiguration configuration) - : base(options, logger, encoder, clock) + public MyGoogleHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, IConfiguration configuration) + : base(options, logger, encoder) { //_configuration = configuration; } @@ -38,8 +38,8 @@ public class MyTwitterHandler : TwitterHandler { //private readonly IConfiguration _configuration; - public MyTwitterHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock, IConfiguration configuration) - : base(options, logger, encoder, clock) + public MyTwitterHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, IConfiguration configuration) + : base(options, logger, encoder) { //_configuration = configuration; } @@ -72,8 +72,8 @@ public GitHubOptions() } } - public MyGithubHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock, IConfiguration configuration) - : base(options, logger, encoder, clock) + public MyGithubHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, IConfiguration configuration) + : base(options, logger, encoder) { //_configuration = configuration; } diff --git a/DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs b/DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs index 2682ebed..3a57d209 100644 --- a/DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs +++ b/DotnetPlayground.Web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs @@ -10,10 +10,12 @@ using System.Threading.Tasks; using DotnetPlayground.Models; using DotnetPlayground.Web.Helpers; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Primitives; namespace IdentitySample.DefaultUI { @@ -83,7 +85,7 @@ public override async Task OnPostAsync() personalData.Add($"Authenticator Key", await _userManager.GetAuthenticatorKeyAsync(user)); - Response.Headers.Add("Content-Disposition", "attachment; filename=PersonalData.json"); + Response.Headers.Append("Content-Disposition", "attachment; filename=PersonalData.json"); return new FileContentResult(Encoding.UTF8.GetBytes( JsonSerializer.Serialize(personalData, DictStringString_Context.Default.DictionaryStringString)), "text/json"); diff --git a/DotnetPlayground.Web/DotnetPlayground.Web.csproj b/DotnetPlayground.Web/DotnetPlayground.Web.csproj index 829f1ccc..b4c8027b 100644 --- a/DotnetPlayground.Web/DotnetPlayground.Web.csproj +++ b/DotnetPlayground.Web/DotnetPlayground.Web.csproj @@ -1,8 +1,8 @@ - + 1.0.25-inkball - net7.0 + net8.0 latest DotnetPlayground.Web Exe @@ -36,24 +36,24 @@ - - - - - - - - + + + + + + + + - - - - + + + + @@ -76,9 +76,9 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/DotnetPlayground.Web/Startup.cs b/DotnetPlayground.Web/Startup.cs index 2eb87a1b..85719eee 100644 --- a/DotnetPlayground.Web/Startup.cs +++ b/DotnetPlayground.Web/Startup.cs @@ -431,6 +431,15 @@ public void ConfigureServices(IServiceCollection services) jsonInputFormatter.SupportedMediaTypes.Add(CspReportRequest.ContentType); }) + //.AddRazorRuntimeCompilation(options => + //{ + // //options.AdditionalReferencePaths.Add(Path.Combine( + // // env.ContentRootPath, "../InkBall/src/InkBall.Module" + // // )); + + // var libPath = Path.GetFullPath(Path.Combine(env.ContentRootPath, "../InkBall/src/InkBall.Module")); + // options.FileProviders.Add(new PhysicalFileProvider(libPath)); + //}) .AddSessionStateTempDataProvider(); services.AddRazorPages(); diff --git a/DotnetPlayground.Web/web.config b/DotnetPlayground.Web/web.config index 3d49211e..24f18c29 100644 --- a/DotnetPlayground.Web/web.config +++ b/DotnetPlayground.Web/web.config @@ -7,7 +7,7 @@ - + diff --git a/IdentityManager2 b/IdentityManager2 index 7aace8d6..e0f44331 160000 --- a/IdentityManager2 +++ b/IdentityManager2 @@ -1 +1 @@ -Subproject commit 7aace8d602b91ce4aa45964d1c53e9efe23a923e +Subproject commit e0f4433103f6fd4d6ee9d28a741aa12b4fb9b34b diff --git a/InkBall b/InkBall index 8dcec728..6227b1be 160000 --- a/InkBall +++ b/InkBall @@ -1 +1 @@ -Subproject commit 8dcec7286a430546b147a86f1eb75b0675e09176 +Subproject commit 6227b1bee5499a428316261ee730682a668886d9 diff --git a/global.json b/global.json index 81af15f6..314a3334 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.0", + "version": "8.0.0", "rollForward": "latestMajor" }, "projects": [ "DotnetPlayground.Web", "DotnetPlayground.Tests", "Caching-MySQL", "InkBall", "IdentityManager2" ]