Merge branch 'main' of https:/macel94/cloudnativeblazorpong

macel94 · Mar 17, 2024 · da0e2ab · da0e2ab
2 parents 0920fdd + 548deb1
commit da0e2ab
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 48 deletions.
diff --git a/src/BlazorPong.Backend.Defaults/BlazorPong.Backend.Defaults.csproj b/src/BlazorPong.Backend.Defaults/BlazorPong.Backend.Defaults.csproj
@@ -4,17 +4,18 @@
  <TargetFramework>net8.0</TargetFramework>
  <ImplicitUsings>enable</ImplicitUsings>
  <Nullable>enable</Nullable>
+ <Configurations>Debug;Release</Configurations>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1" />
  <PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.4" />
  <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
- <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
- <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
  <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
  <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
  <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
- <PackageReference Include="AspNetCore.SignalR.OpenTelemetry" Version="1.1.0" />
+ <PackageReference Include="AspNetCore.SignalR.OpenTelemetry" Version="1.1.1" />
  <PackageReference Include="OpenTelemetry.Api" Version="1.7.0" />
  </ItemGroup>
 

diff --git a/src/BlazorPong.SignalR/BlazorPong.SignalR.csproj b/src/BlazorPong.SignalR/BlazorPong.SignalR.csproj
@@ -6,27 +6,28 @@
  <ImplicitUsings>enable</ImplicitUsings>
  <UserSecretsId>afca5fd7-889a-4b24-b1b5-d4870744eb51</UserSecretsId>
  <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+ <Configurations>Debug;Release</Configurations>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="AspNetCore.SignalR.OpenTelemetry" Version="1.1.0" />
+ <PackageReference Include="AspNetCore.SignalR.OpenTelemetry" Version="1.1.1" />
  <PackageReference Include="OpenTelemetry.Api" Version="1.7.0" />
  <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
- <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
- <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
+ <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>
- <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
- <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.1" />
- <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.1" />
- <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.6.0-beta.3" />
- <PackageReference Include="StackExchange.Redis" Version="2.7.17" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
+ <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.2" />
+ <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.2" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.7.0-beta.1" />
+ <PackageReference Include="StackExchange.Redis" Version="2.7.27" />
 
- <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1" />
  <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
- <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
- <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
  <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
  <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
  <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />

diff --git a/src/BlazorPong.Web.Components/BlazorPong.Web.Components.csproj b/src/BlazorPong.Web.Components/BlazorPong.Web.Components.csproj
@@ -4,7 +4,7 @@
  <TargetFramework>net8.0</TargetFramework>
  <Nullable>enable</Nullable>
  <ImplicitUsings>enable</ImplicitUsings>
- <Configurations>Debug;Release;ReleaseAOT</Configurations>
+ <Configurations>Debug;Release</Configurations>
  </PropertyGroup>
 
 
@@ -13,8 +13,8 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.1" />
- <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.1" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2" />
+ <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.2" />
  <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.*-* " />
  <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.*-* " />
  </ItemGroup>

diff --git a/src/BlazorPong.Web/Client/BlazorPong.Web.Client.csproj b/src/BlazorPong.Web/Client/BlazorPong.Web.Client.csproj
@@ -4,10 +4,7 @@
  <TargetFramework>net8.0</TargetFramework>
  <Nullable>enable</Nullable>
  <ImplicitUsings>enable</ImplicitUsings>
- <Configurations>Debug;Release;ReleaseAOT</Configurations>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAOT|AnyCPU'">
- <RunAOTCompilation>true</RunAOTCompilation>
+ <Configurations>Debug;Release</Configurations>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/BlazorPong.Web/Server/BlazorPong.Web.Server.csproj b/src/BlazorPong.Web/Server/BlazorPong.Web.Server.csproj
@@ -8,17 +8,17 @@
  <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
  <DockerfileContext>..\..</DockerfileContext>
  <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
- <Configurations>Debug;Release;ReleaseAOT</Configurations>
+ <Configurations>Debug;Release</Configurations>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.2" />
  <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
 
- <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1" />
  <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
- <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
- <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
+ <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
  <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
  <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
  </ItemGroup>

diff --git a/src/BlazorPong.Web/Shared/BlazorPong.Web.Shared.csproj b/src/BlazorPong.Web/Shared/BlazorPong.Web.Shared.csproj
@@ -4,7 +4,7 @@
  <TargetFramework>net8.0</TargetFramework>
  <Nullable>enable</Nullable>
  <ImplicitUsings>enable</ImplicitUsings>
- <Configurations>Debug;Release;ReleaseAOT</Configurations>
+ <Configurations>Debug;Release</Configurations>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/BlazorPong.sln b/src/BlazorPong.sln
@@ -23,65 +23,47 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorPong.Web.Components",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorPong.SignalR", "BlazorPong.SignalR\BlazorPong.SignalR.csproj", "{7F5AC8D2-4CDC-4F14-9F31-267A0F08EBB2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorPong.Backend.Defaults", "BlazorPong.Backend.Defaults\BlazorPong.Backend.Defaults.csproj", "{C2F7FB59-356C-476A-800A-B69DB26D1208}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorPong.Backend.Defaults", "BlazorPong.Backend.Defaults\BlazorPong.Backend.Defaults.csproj", "{C2F7FB59-356C-476A-800A-B69DB26D1208}"
 EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
  Release|Any CPU = Release|Any CPU
- ReleaseAOT|Any CPU = ReleaseAOT|Any CPU
  EndGlobalSection
  GlobalSection(ProjectConfigurationPlatforms) = postSolution
  {637495F9-538F-42C3-9F7B-3D8DC892A3DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {637495F9-538F-42C3-9F7B-3D8DC892A3DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {637495F9-538F-42C3-9F7B-3D8DC892A3DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {637495F9-538F-42C3-9F7B-3D8DC892A3DE}.Release|Any CPU.Build.0 = Release|Any CPU
- {637495F9-538F-42C3-9F7B-3D8DC892A3DE}.ReleaseAOT|Any CPU.ActiveCfg = ReleaseAOT|Any CPU
- {637495F9-538F-42C3-9F7B-3D8DC892A3DE}.ReleaseAOT|Any CPU.Build.0 = ReleaseAOT|Any CPU
  {F88838B7-58A6-4359-BF14-554C0CC5D71F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {F88838B7-58A6-4359-BF14-554C0CC5D71F}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {F88838B7-58A6-4359-BF14-554C0CC5D71F}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {F88838B7-58A6-4359-BF14-554C0CC5D71F}.Release|Any CPU.Build.0 = Release|Any CPU
- {F88838B7-58A6-4359-BF14-554C0CC5D71F}.ReleaseAOT|Any CPU.ActiveCfg = ReleaseAOT|Any CPU
- {F88838B7-58A6-4359-BF14-554C0CC5D71F}.ReleaseAOT|Any CPU.Build.0 = ReleaseAOT|Any CPU
  {45C7BD30-21B7-46F2-BACC-D90A1F1AF7A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {45C7BD30-21B7-46F2-BACC-D90A1F1AF7A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {45C7BD30-21B7-46F2-BACC-D90A1F1AF7A9}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
  {45C7BD30-21B7-46F2-BACC-D90A1F1AF7A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {45C7BD30-21B7-46F2-BACC-D90A1F1AF7A9}.Release|Any CPU.Deploy.0 = Release|Any CPU
- {45C7BD30-21B7-46F2-BACC-D90A1F1AF7A9}.ReleaseAOT|Any CPU.ActiveCfg = ReleaseAOT|Any CPU
- {45C7BD30-21B7-46F2-BACC-D90A1F1AF7A9}.ReleaseAOT|Any CPU.Build.0 = ReleaseAOT|Any CPU
- {45C7BD30-21B7-46F2-BACC-D90A1F1AF7A9}.ReleaseAOT|Any CPU.Deploy.0 = ReleaseAOT|Any CPU
  {C8122674-880E-43F2-9DC3-B17BA34E02B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {C8122674-880E-43F2-9DC3-B17BA34E02B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {C8122674-880E-43F2-9DC3-B17BA34E02B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {C8122674-880E-43F2-9DC3-B17BA34E02B6}.Release|Any CPU.Build.0 = Release|Any CPU
- {C8122674-880E-43F2-9DC3-B17BA34E02B6}.ReleaseAOT|Any CPU.ActiveCfg = ReleaseAOT|Any CPU
- {C8122674-880E-43F2-9DC3-B17BA34E02B6}.ReleaseAOT|Any CPU.Build.0 = ReleaseAOT|Any CPU
  {46B9AA7A-6C6C-4802-8269-EB9A29ABF5E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {46B9AA7A-6C6C-4802-8269-EB9A29ABF5E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {46B9AA7A-6C6C-4802-8269-EB9A29ABF5E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {46B9AA7A-6C6C-4802-8269-EB9A29ABF5E3}.Release|Any CPU.Build.0 = Release|Any CPU
- {46B9AA7A-6C6C-4802-8269-EB9A29ABF5E3}.ReleaseAOT|Any CPU.ActiveCfg = ReleaseAOT|Any CPU
- {46B9AA7A-6C6C-4802-8269-EB9A29ABF5E3}.ReleaseAOT|Any CPU.Build.0 = ReleaseAOT|Any CPU
  {636FADEB-CD71-4997-BCE2-815075D1ACBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {636FADEB-CD71-4997-BCE2-815075D1ACBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {636FADEB-CD71-4997-BCE2-815075D1ACBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {636FADEB-CD71-4997-BCE2-815075D1ACBD}.Release|Any CPU.Build.0 = Release|Any CPU
- {636FADEB-CD71-4997-BCE2-815075D1ACBD}.ReleaseAOT|Any CPU.ActiveCfg = ReleaseAOT|Any CPU
- {636FADEB-CD71-4997-BCE2-815075D1ACBD}.ReleaseAOT|Any CPU.Build.0 = ReleaseAOT|Any CPU
  {7F5AC8D2-4CDC-4F14-9F31-267A0F08EBB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {7F5AC8D2-4CDC-4F14-9F31-267A0F08EBB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {7F5AC8D2-4CDC-4F14-9F31-267A0F08EBB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {7F5AC8D2-4CDC-4F14-9F31-267A0F08EBB2}.Release|Any CPU.Build.0 = Release|Any CPU
- {7F5AC8D2-4CDC-4F14-9F31-267A0F08EBB2}.ReleaseAOT|Any CPU.ActiveCfg = Release|Any CPU
- {7F5AC8D2-4CDC-4F14-9F31-267A0F08EBB2}.ReleaseAOT|Any CPU.Build.0 = Release|Any CPU
  {C2F7FB59-356C-476A-800A-B69DB26D1208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {C2F7FB59-356C-476A-800A-B69DB26D1208}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {C2F7FB59-356C-476A-800A-B69DB26D1208}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {C2F7FB59-356C-476A-800A-B69DB26D1208}.Release|Any CPU.Build.0 = Release|Any CPU
- {C2F7FB59-356C-476A-800A-B69DB26D1208}.ReleaseAOT|Any CPU.ActiveCfg = Release|Any CPU
- {C2F7FB59-356C-476A-800A-B69DB26D1208}.ReleaseAOT|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE

diff --git a/src/docker-compose.dcproj b/src/docker-compose.dcproj
@@ -10,7 +10,6 @@
  <DockerServiceName>webapp</DockerServiceName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseAOT|AnyCPU'" />
  <ItemGroup>
  <None Include="docker-compose.override.yml">
  <DependentUpon>docker-compose.yml</DependentUpon>