From 378c7a491337d1eb118170d132eaecca6493275b Mon Sep 17 00:00:00 2001 From: Alex Yakunin Date: Sun, 20 Oct 2024 12:13:23 -0700 Subject: [PATCH] fix: build errors --- Dockerfile | 24 ++++++++++++------------ src/Blazor/Server/Startup.cs | 2 +- src/HelloBlazorHybrid/Server/Startup.cs | 2 +- src/TodoApp/Host/Program.cs | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 937d0fc..5beac71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,57 +32,57 @@ RUN dotnet build -c:Release --no-restore # Create HelloWorld sample image FROM build AS sample_hello_world WORKDIR /samples/src/HelloWorld -ENTRYPOINT ["dotnet", "bin/Debug/net8.0/Samples.HelloWorld.dll"] +ENTRYPOINT ["dotnet", "bin/Debug/net9.0/Samples.HelloWorld.dll"] # Create HelloCart sample image FROM build AS sample_hello_cart WORKDIR /samples/src/HelloCart -ENTRYPOINT ["dotnet", "bin/Debug/net8.0/Samples.HelloCart.dll"] +ENTRYPOINT ["dotnet", "bin/Debug/net9.0/Samples.HelloCart.dll"] # Create HelloBlazorServer sample image FROM build AS sample_hello_blazor_server WORKDIR /samples/src/HelloBlazorServer -ENTRYPOINT ["dotnet", "bin/Debug/net8.0/Samples.HelloBlazorServer.dll"] +ENTRYPOINT ["dotnet", "bin/Debug/net9.0/Samples.HelloBlazorServer.dll"] # Create HelloBlazorHybrid sample image FROM build AS sample_hello_blazor_hybrid WORKDIR /samples/src/HelloBlazorHybrid/Server -ENTRYPOINT ["dotnet", "bin/Debug/net8.0/Samples.HelloBlazorHybrid.Server.dll"] +ENTRYPOINT ["dotnet", "bin/Debug/net9.0/Samples.HelloBlazorHybrid.Server.dll"] # Create Blazor sample image FROM build AS sample_blazor WORKDIR /samples/src/Blazor/Server -ENTRYPOINT ["dotnet", "bin/Debug/net8.0/Samples.Blazor.Server.dll"] +ENTRYPOINT ["dotnet", "bin/Debug/net9.0/Samples.Blazor.Server.dll"] # Create TodoApp sample image FROM build AS sample_todoapp WORKDIR /samples/src/TodoApp/Host -ENTRYPOINT ["dotnet", "bin/Debug/net8.0/Samples.TodoApp.Host.dll"] +ENTRYPOINT ["dotnet", "bin/Debug/net9.0/Samples.TodoApp.Host.dll"] # Create MiniRpc sample image FROM build AS sample_mini_rpc WORKDIR /samples/src/MiniRpc -ENTRYPOINT ["dotnet", "bin/Release/net8.0/Samples.MiniRpc.dll"] +ENTRYPOINT ["dotnet", "bin/Release/net9.0/Samples.MiniRpc.dll"] # Create MultiServerRpc sample image FROM build AS sample_multi_server_rpc WORKDIR /samples/src/MultiServerRpc -ENTRYPOINT ["dotnet", "bin/Release/net8.0/Samples.MultiServerRpc.dll"] +ENTRYPOINT ["dotnet", "bin/Release/net9.0/Samples.MultiServerRpc.dll"] # Create MeshRpc sample image FROM build AS sample_mesh_rpc WORKDIR /samples/src/MeshRpc -ENTRYPOINT ["dotnet", "bin/Release/net8.0/Samples.MeshRpc.dll"] +ENTRYPOINT ["dotnet", "bin/Release/net9.0/Samples.MeshRpc.dll"] # Create Benchmark sample image FROM build AS sample_benchmark WORKDIR /samples/src/Benchmark -ENTRYPOINT ["dotnet", "bin/Release/net8.0/Samples.Benchmark.dll"] +ENTRYPOINT ["dotnet", "bin/Release/net9.0/Samples.Benchmark.dll"] # Create RpcBenchmark sample image FROM build AS sample_rpc_benchmark WORKDIR /samples/src/RpcBenchmark -ENTRYPOINT ["dotnet", "bin/Release/net8.0/Samples.RpcBenchmark.dll"] +ENTRYPOINT ["dotnet", "bin/Release/net9.0/Samples.RpcBenchmark.dll"] # Websites @@ -101,4 +101,4 @@ WORKDIR /samples/src/Blazor/Server ENV Logging__Console__FormatterName= ENV Server__GitHubClientId=7d519556dd8207a36355 ENV Server__GitHubClientSecret=8e161ca4799b7e76e1c25429728db6b2430f2057 -ENTRYPOINT ["dotnet", "bin/Release/net8.0/publish/Samples.Blazor.Server.dll"] +ENTRYPOINT ["dotnet", "bin/Release/net9.0/publish/Samples.Blazor.Server.dll"] diff --git a/src/Blazor/Server/Startup.cs b/src/Blazor/Server/Startup.cs index 8258075..b230966 100644 --- a/src/Blazor/Server/Startup.cs +++ b/src/Blazor/Server/Startup.cs @@ -166,7 +166,7 @@ public void Configure(IApplicationBuilder app, ILogger log) if (!Directory.Exists(Path.Combine(wwwRootPath, "_framework"))) // This is a regular build, not a build produced w/ "publish", // so we remap wwwroot to the client's wwwroot folder - wwwRootPath = Path.GetFullPath(Path.Combine(baseDir, $"../../../../UI/{binCfgPart}/net8.0/wwwroot")); + wwwRootPath = Path.GetFullPath(Path.Combine(baseDir, $"../../../../UI/{binCfgPart}/net9.0/wwwroot")); Env.WebRootPath = wwwRootPath; Env.WebRootFileProvider = new PhysicalFileProvider(Env.WebRootPath); StaticWebAssetsLoader.UseStaticWebAssets(Env, Cfg); diff --git a/src/HelloBlazorHybrid/Server/Startup.cs b/src/HelloBlazorHybrid/Server/Startup.cs index fe36137..9ec0e33 100644 --- a/src/HelloBlazorHybrid/Server/Startup.cs +++ b/src/HelloBlazorHybrid/Server/Startup.cs @@ -83,7 +83,7 @@ public void Configure(IApplicationBuilder app, ILogger log) if (!Directory.Exists(Path.Combine(wwwRootPath, "_framework"))) // This is a regular build, not a build produced w/ "publish", // so we remap wwwroot to the client's wwwroot folder - wwwRootPath = Path.GetFullPath(Path.Combine(baseDir, $"../../../../UI/{binCfgPart}/net8.0/wwwroot")); + wwwRootPath = Path.GetFullPath(Path.Combine(baseDir, $"../../../../UI/{binCfgPart}/net9.0/wwwroot")); Env.WebRootPath = wwwRootPath; Env.WebRootFileProvider = new PhysicalFileProvider(Env.WebRootPath); StaticWebAssetsLoader.UseStaticWebAssets(Env, Cfg); diff --git a/src/TodoApp/Host/Program.cs b/src/TodoApp/Host/Program.cs index 77c3017..d3b6ddf 100644 --- a/src/TodoApp/Host/Program.cs +++ b/src/TodoApp/Host/Program.cs @@ -290,7 +290,7 @@ void ConfigureApp() if (!Directory.Exists(Path.Combine(wwwRootPath, "_framework"))) // This is a regular build, not a build produced w/ "publish", // so we remap wwwroot to the client's wwwroot folder - wwwRootPath = Path.GetFullPath(Path.Combine(baseDir, $"../../../../UI/{binCfgPart}/net8.0/wwwroot")); + wwwRootPath = Path.GetFullPath(Path.Combine(baseDir, $"../../../../UI/{binCfgPart}/net9.0/wwwroot")); env.WebRootPath = wwwRootPath; env.WebRootFileProvider = new PhysicalFileProvider(env.WebRootPath); StaticWebAssetsLoader.UseStaticWebAssets(env, cfg);