Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/codebreaker-azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,12 @@ jobs:
submodules: 'true'

- name: Install azd
uses: Azure/setup-azd@v1.0.0
uses: Azure/setup-azd@v2.0.0

- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

# https://github.com/Azure/azure-dev/issues/4157 - update to azd way after issue is resolved
- name: Setup .NET Aspire
run: dotnet workload install aspire
dotnet-version: 9.0.x

# issue with azd package: nothing created
# - name: Package Application
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,12 @@ jobs:
submodules: 'true'

- name: Install azd
uses: Azure/setup-azd@v1.0.0
uses: Azure/setup-azd@v2.0.0

- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

# https://github.com/Azure/azure-dev/issues/4157 - update to azd way after issue is resolved
- name: Setup .NET Aspire
run: dotnet workload install aspire
dotnet-version: 9.0.x

- name: Log in with Azure (Federated Credentials)
run: |
Expand Down
7 changes: 7 additions & 0 deletions src/Codebreaker.Backend.sln
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeBreaker.Blazor.Client",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeBreaker.Blazor.UI", "services\Codebreaker.Blazor\src\CodeBreaker.Blazor.UI\CodeBreaker.Blazor.UI.csproj", "{852E383D-210D-4828-8516-66AA75E00A5B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Codebreaker.ApiGateway.Identities.Client", "services\gateway\Codebreaker.ApiGateway.Identities\Codebreaker.ApiGateway.Identities.Client\Codebreaker.ApiGateway.Identities.Client.csproj", "{FD5F2A5A-C746-699A-8799-6DD6C4C2A8FA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -140,6 +142,10 @@ Global
{852E383D-210D-4828-8516-66AA75E00A5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{852E383D-210D-4828-8516-66AA75E00A5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{852E383D-210D-4828-8516-66AA75E00A5B}.Release|Any CPU.Build.0 = Release|Any CPU
{FD5F2A5A-C746-699A-8799-6DD6C4C2A8FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD5F2A5A-C746-699A-8799-6DD6C4C2A8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD5F2A5A-C746-699A-8799-6DD6C4C2A8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD5F2A5A-C746-699A-8799-6DD6C4C2A8FA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -164,6 +170,7 @@ Global
{7CC49E47-99DB-4093-9DBE-51F119E21DC5} = {D88DEDE8-217E-43CE-AB08-BF381441E6C8}
{6D302E91-0C76-4C56-BE5D-AF16A7D353C6} = {D88DEDE8-217E-43CE-AB08-BF381441E6C8}
{852E383D-210D-4828-8516-66AA75E00A5B} = {D88DEDE8-217E-43CE-AB08-BF381441E6C8}
{FD5F2A5A-C746-699A-8799-6DD6C4C2A8FA} = {2AFD0767-0648-4B93-9A5F-883C07F47FB7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5DE33962-11C6-4B2F-A356-DDE0B4F5CC56}
Expand Down
100 changes: 100 additions & 0 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Aspire.Azure.Messaging.EventHubs" Version="9.0.0" />
<PackageVersion Include="Aspire.Azure.Security.KeyVault" Version="9.0.0" />
<PackageVersion Include="Aspire.Azure.Storage.Blobs" Version="9.0.0" />
<PackageVersion Include="Aspire.Azure.Storage.Queues" Version="9.0.0" />
<PackageVersion Include="Aspire.Confluent.Kafka" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Azure" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Azure.AppConfiguration" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Azure.ApplicationInsights" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Azure.CosmosDB" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Azure.EventHubs" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Azure.KeyVault" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Azure.SignalR" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Azure.Sql" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Kafka" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.0.0" />
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.Cosmos" Version="9.0.0" />
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
<PackageVersion Include="Aspire.Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
<PackageVersion Include="Aspire.StackExchange.Redis.DistributedCaching" Version="9.0.0" />
<PackageVersion Include="Azure.Identity" Version="1.13.1" />
<PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0" />
<PackageVersion Include="BlazorApplicationInsights" Version="3.1.0" />
<PackageVersion Include="CNinnovation.Codebreaker.BackendModels" Version="3.8.0" />
<PackageVersion Include="CNinnovation.Codebreaker.Cosmos" Version="3.8.0" />
<PackageVersion Include="CNinnovation.Codebreaker.GamesClient" Version="3.8.0" />
<PackageVersion Include="CNinnovation.Codebreaker.SqlServer" Version="3.8.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="FluentValidation" Version="11.11.0" />
<PackageVersion Include="Google.Protobuf" Version="3.29.2" />
<PackageVersion Include="Grpc.AspNetCore" Version="2.67.0" />
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.67.0" />
<PackageVersion Include="Grpc.Tools" Version="2.68.1" />
<PackageVersion Include="idunno.Authentication.Basic" Version="2.4.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.QuickGrid" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="9.0.0" />
<PackageVersion Include="Microsoft.Authentication.WebAssembly.Msal" Version="9.0.0" />
<PackageVersion Include="Microsoft.Azure.SignalR" Version="1.29.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Localization" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.0.0" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.0" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.10.4" />
<PackageVersion Include="Microsoft.Graph" Version="5.67.0" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.66.2" />
<PackageVersion Include="Microsoft.Identity.Web" Version="3.5.0" />
<PackageVersion Include="Microsoft.Identity.Web.DownstreamApi" Version="3.5.0" />
<PackageVersion Include="Microsoft.Identity.Web.UI" Version="3.5.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Microsoft.Playwright" Version="1.49.0" />
<PackageVersion Include="Microsoft.Playwright.NUnit" Version="1.49.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="NUnit" Version="4.3.1" />
<PackageVersion Include="NUnit.Analyzers" Version="4.5.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.10.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="7.2.0" />
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="7.2.0" />
<PackageVersion Include="System.Formats.Asn1" Version="9.0.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
<PackageVersion Include="Yarp.ReverseProxy" Version="2.2.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Grpc.Net.ClientFactory" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CodeBreaker.Bot\CodeBreaker.Bot.csproj" />
</ItemGroup>

</Project>
</Project>
53 changes: 24 additions & 29 deletions src/services/bot/CodeBreaker.Bot/CodeBreaker.Bot.csproj
Original file line number Diff line number Diff line change
@@ -1,30 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Configurations>Debug;Release</Configurations>
<EnableSdkContainerSupport>true</EnableSdkContainerSupport>
</PropertyGroup>

<PropertyGroup>
<ContainerRepository>codebreaker-bot</ContainerRepository>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CNinnovation.Codebreaker.GamesClient" Version="3.7.0" />
<PackageReference Include="Grpc.AspNetCore" Version="2.65.0" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\common\Codebreaker.ServiceDefaults\Codebreaker.ServiceDefaults.csproj" />
</ItemGroup>

<ItemGroup>
<Protobuf Include="..\..\gameapis\Codebreaker.GameAPIs\Protos\GameService.proto" GrpcServices="Client" />
</ItemGroup>

</Project>
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Configurations>Debug;Release</Configurations>
<EnableSdkContainerSupport>true</EnableSdkContainerSupport>
</PropertyGroup>
<PropertyGroup>
<ContainerRepository>codebreaker-bot</ContainerRepository>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CNinnovation.Codebreaker.GamesClient" />
<PackageReference Include="Grpc.AspNetCore" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
<PackageReference Include="Swashbuckle.AspNetCore" />
<PackageReference Include="Grpc.Net.ClientFactory" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\common\Codebreaker.ServiceDefaults\Codebreaker.ServiceDefaults.csproj" />
</ItemGroup>
<ItemGroup>
<Protobuf Include="..\..\gameapis\Codebreaker.GameAPIs\Protos\GameService.proto" GrpcServices="Client" />
</ItemGroup>
</Project>
33 changes: 14 additions & 19 deletions src/services/bot/Codebreaker.BotQ/Codebreaker.BotQ.csproj
Original file line number Diff line number Diff line change
@@ -1,31 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Azure.Storage.Queues" Version="8.2.0" />
<PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" Version="8.2.0" />
<PackageReference Include="CNinnovation.Codebreaker.GamesClient" Version="3.7.0" />
<PackageReference Include="Google.Protobuf" Version="3.28.0" />
<PackageReference Include="Grpc.Net.ClientFactory" Version="2.65.0" />
<PackageReference Include="Grpc.Tools" Version="2.66.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Aspire.Azure.Storage.Queues" />
<PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" />
<PackageReference Include="CNinnovation.Codebreaker.GamesClient" />
<PackageReference Include="Google.Protobuf" />
<PackageReference Include="Grpc.Net.ClientFactory" />
<PackageReference Include="Grpc.Tools">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\common\Codebreaker.ServiceDefaults\Codebreaker.ServiceDefaults.csproj" />
<ProjectReference Include="..\..\common\Codebreaker.ServiceDefaults\Codebreaker.ServiceDefaults.csproj" />
</ItemGroup>

<ItemGroup>
<Protobuf Include="..\..\gameapis\Codebreaker.GameAPIs\Protos\GameService.proto" GrpcServices="Client" />
<Protobuf Include="..\..\gameapis\Codebreaker.GameAPIs\Protos\GameService.proto" GrpcServices="Client" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireSharedProject>true</IsAspireSharedProject>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.9.1" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.2.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.7.0-rc.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="7.3.0" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0" />
</ItemGroup>

</Project>
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireSharedProject>true</IsAspireSharedProject>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" />
<PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" />
<PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" />
</ItemGroup>
</Project>
Loading