Skip to content

Commit 90d3b6b

Browse files
christiannagelchristiannagel
authored
Merge branch 'main' into 295-aspire9features
2 parents 6782bb1 + bb90974 commit 90d3b6b

25 files changed

Lines changed: 1072 additions & 27 deletions

‎.github/workflows/codebreaker-azure.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
submodules: 'true'
4343

4444
- name: Install azd
45-
uses: Azure/setup-azd@v2.0.0
45+
uses: Azure/setup-azd@v2.1.0
4646

4747
- name: Setup .NET
4848
uses: actions/setup-dotnet@v4

‎.github/workflows/codebreaker-lib-postgresql.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: PostgreSQL data lib
2+
3+
on:
4+
5+
# Automatically trigger it when detected changes in repo
6+
push:
7+
branches:
8+
[ main ]
9+
paths:
10+
- 'src/services/common/Codebreaker.Data.Postgres/**'
11+
12+
# Allow manually trigger
13+
workflow_dispatch:
14+
15+
jobs:
16+
build:
17+
uses: CodebreakerApp/Codebreaker.Backend/.github/workflows/createnuget-withbuildnumber.yml@main
18+
with:
19+
version-suffix: preview.1.
20+
version-number: ${{ github.run_number }}
21+
version-offset: 5
22+
solutionfile-path: src/Codebreaker.Backend.Postgres.sln
23+
projectfile-path: src/services/common/Codebreaker.Data.Postgres/Codebreaker.Data.Postgres.csproj
24+
dotnet-version: '9.0.x'
25+
artifact-name: codebreaker-postgres
26+
branch-name: main
27+
28+
publishdevops:
29+
uses: CodebreakerApp/Codebreaker.Backend/.github/workflows/publishnuget-azuredevops.yml@main
30+
needs: build
31+
with:
32+
artifact-name: codebreaker-postgres
33+
secrets: inherit
34+
35+
publishnuget:
36+
uses: CodebreakerApp/Codebreaker.Backend/.github/workflows/publishnuget-nugetserver.yml@main
37+
needs: publishdevops
38+
with:
39+
artifact-name: codebreaker-postgres
40+
secrets: inherit

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
submodules: 'true'
3131

3232
- name: Install azd
33-
uses: Azure/setup-azd@v2.0.0
33+
uses: Azure/setup-azd@v2.1.0
3434

3535
- name: Setup .NET
3636
uses: actions/setup-dotnet@v4

‎src/Codebreaker.Backend.Postgres.sln‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31903.59
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Codebreaker.Data.Postgres", "services\common\Codebreaker.Data.Postgres\Codebreaker.Data.Postgres.csproj", "{2EB171A0-C848-7C0F-62E9-C0229013D73F}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Release|Any CPU = Release|Any CPU
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{2EB171A0-C848-7C0F-62E9-C0229013D73F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{2EB171A0-C848-7C0F-62E9-C0229013D73F}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{2EB171A0-C848-7C0F-62E9-C0229013D73F}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{2EB171A0-C848-7C0F-62E9-C0229013D73F}.Release|Any CPU.Build.0 = Release|Any CPU
20+
EndGlobalSection
21+
GlobalSection(SolutionProperties) = preSolution
22+
HideSolutionNode = FALSE
23+
EndGlobalSection
24+
GlobalSection(ExtensibilityGlobals) = postSolution
25+
SolutionGuid = {B92B3E5A-CD74-42B9-A371-11A3256C6CEF}
26+
EndGlobalSection
27+
EndGlobal

‎src/Codebreaker.GameAPIs.Client.sln‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Codebreaker.GameAPIs.Client
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Codebreaker.GameAPIs.Client.Tests", "clients\Codebreaker.GameAPIs.Client.Tests\Codebreaker.GameAPIs.Client.Tests.csproj", "{EF2D1638-A6FA-4FF1-88BD-CFAADDE80E37}"
99
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{089100B1-113F-4E66-888A-E83F3999EAFD}"
11+
ProjectSection(SolutionItems) = preProject
12+
Directory.Packages.props = Directory.Packages.props
13+
EndProjectSection
14+
EndProject
1015
Global
1116
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1217
Debug|Any CPU = Debug|Any CPU

‎src/Directory.Packages.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@
7979
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
8080
<PackageVersion Include="Microsoft.Playwright" Version="1.55.0" />
8181
<PackageVersion Include="Microsoft.Playwright.NUnit" Version="1.55.0" />
82+
<PackageVersion Include="Microsoft.Testing.Platform" Version="1.7.0" />
83+
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.7.0" />
8284
<PackageVersion Include="Moq" Version="4.20.72" />
8385
<PackageVersion Include="NUnit" Version="4.4.0" />
8486
<PackageVersion Include="NUnit.Analyzers" Version="4.10.0" />
@@ -96,5 +98,7 @@
9698
<PackageVersion Include="xunit" Version="2.9.3" />
9799
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
98100
<PackageVersion Include="Yarp.ReverseProxy" Version="2.3.0" />
101+
<PackageVersion Include="xunit.analyzers" Version="1.21.0" />
102+
<PackageVersion Include="xunit.v3" Version="2.0.2" />
99103
</ItemGroup>
100104
</Project>

‎src/clients/Codebreaker.GameAPIs.Client.Tests/Codebreaker.GameAPIs.Client.Tests.csproj‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,31 @@
44
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<OutputType>Exe</OutputType>
78

89
<IsPackable>false</IsPackable>
910
<IsTestProject>true</IsTestProject>
11+
<UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
12+
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
1013
</PropertyGroup>
1114

1215
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
15-
<PackageReference Include="Moq" Version="4.20.72" />
16-
<PackageReference Include="xunit" Version="2.9.2" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
16+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
17+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
18+
<PackageReference Include="Microsoft.Testing.Platform" />
19+
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
21+
<PackageReference Include="Moq" />
22+
<PackageReference Include="xunit.v3" />
23+
<PackageReference Include="xunit.runner.visualstudio">
1824
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1925
<PrivateAssets>all</PrivateAssets>
2026
</PackageReference>
21-
<PackageReference Include="coverlet.collector" Version="6.0.2">
27+
<PackageReference Include="coverlet.collector">
2228
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2329
<PrivateAssets>all</PrivateAssets>
2430
</PackageReference>
31+
<PackageReference Include="xunit.analyzers" />
2532
</ItemGroup>
2633

2734
<ItemGroup>

0 commit comments

Comments
 (0)