Try fix pipeline again

CorruptComputer · Aug 24, 2024 · 515f515 · 515f515
1 parent fdd0e99
commit 515f515
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 22 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,28 +6,47 @@ updates:
     schedule:
       interval: "daily"
     groups:
-      microsoft:
+      Autofac:
+        patterns:
+          - "Autofac"
+          - "Autofac.*"
+      DnsClient:
+        patterns:
+          - "DnsClient"
+      FluentValidation:
+        patterns:
+          - "FluentValidation"
+          - "FluentValidation.*"
+      GeoJSON:
+        patterns:
+          - "GeoJSON.Text"
+      MediatR:
+        patterns:
+          - "MediatR"
+          - "MediatR.*"
+      Microsoft:
         patterns:
           - "Microsoft.*"
         exclude-patterns:
           - "Microsoft.NET.Test.Sdk"
-      mediatr:
+      MudBlazor:
         patterns:
-          - "MediatR"
-          - "MediatR.*"
-      postgresql:
+          - "MudBlazor"
+      Npgsql:
         patterns:
           - "Npgsql.EntityFrameworkCore.PostgreSQL"
-          - "Npgsql.EntityFrameworkCore.PostgreSQL.*"
-      autofac:
+          - "Npgsql.EntityFrameworkCore.PostgreSQL.Design"
+      NSwag:
         patterns:
-          - "Autofac"
-          - "Autofac.*"
-      serilog:
+          - "NSwag.ApiDescription.Client"
+      Serilog:
         patterns:
           - "Serilog"
           - "Serilog.*"
-      testing:
+      Swashbuckle:
+        patterns:
+          - "Swashbuckle.AspNetCore"
+      Testing:
         patterns:
           - "FluentAssertions"
           - "Microsoft.NET.Test.Sdk"

diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -16,6 +16,9 @@ jobs:
   test:
     name: .NET Build & Test
     runs-on: ubuntu-latest
+    env:
+      # Shouldn't be needed, but just in case want to force this with an environment variable
+      Database__UseInMemoryDb: true
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -27,8 +30,6 @@ jobs:
 
       - name: Build
         run: dotnet build --no-incremental
-        env: 
-          BUILD_ENVIRONMENT: 'GitHub'
 
       - name: Test
         run: dotnet test --no-build

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -17,6 +17,9 @@ jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
+    env:
+      # Shouldn't be needed, but just in case want to force this with an environment variable
+      Database__UseInMemoryDb: true
     steps:
       # Setup
       - name: Checkout Repo
@@ -40,7 +43,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          BUILD_ENVIRONMENT: 'GitHub'
         run: |
           dotnet tool install --global dotnet-sonarscanner
           dotnet-sonarscanner begin /k:"CorruptComputer_Bones" /o:"corruptcomputer" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths=./Tests/*.UnitTests/TestResults/*/coverage.opencover.xml

diff --git a/Bones.Api/Bones.Api.csproj b/Bones.Api/Bones.Api.csproj
@@ -27,8 +27,8 @@
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.1" />
     </ItemGroup>
 
-    <Target Name="CreateSwaggerJson" AfterTargets="Build" Condition="$(Configuration) == 'Debug' And $(BUILD_ENVIRONMENT) != 'GitHub'">
-        <Exec Command="dotnet swagger tofile --output ./OpenApi/swagger.json $(OutputPath)$(AssemblyName).dll develop" WorkingDirectory="$(ProjectDir)" />
+    <Target Name="CreateSwaggerJson" AfterTargets="Build" Condition="$(Configuration) == 'Debug'">
+        <Exec Command="Database__UseInMemoryDb=true dotnet swagger tofile --output OpenApi/swagger.json $(OutputPath)$(AssemblyName).dll develop" WorkingDirectory="$(ProjectDir)" />
     </Target>
 
     <ItemGroup>

diff --git a/Bones.Database/Bones.Database.csproj b/Bones.Database/Bones.Database.csproj
@@ -10,8 +10,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentValidation" Version="11.9.2" />
-        <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.8" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.8" />

diff --git a/Bones.Shared/Bones.Shared.csproj b/Bones.Shared/Bones.Shared.csproj
@@ -11,6 +11,8 @@
 
     <ItemGroup>
         <PackageReference Include="DnsClient" Version="1.8.0" />
+        <PackageReference Include="FluentValidation" Version="11.9.2" />
+        <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.2" />
     </ItemGroup>
 
 </Project>
diff --git a/Bones.WebUI/Bones.WebUI.csproj b/Bones.WebUI/Bones.WebUI.csproj
@@ -29,7 +29,7 @@
         </PackageReference>
     </ItemGroup>
 
-    <Target Name="GenerateApiClients" BeforeTargets="BeforeBuild" Condition="$(Configuration) == 'Debug' And $(BUILD_ENVIRONMENT) != 'GitHub'">
+    <Target Name="GenerateApiClients" BeforeTargets="BeforeBuild" Condition="$(Configuration) == 'Debug'">
         <Message Text="Generating API Clients" Importance="High" />
         <Exec Command="dotnet nswag run nswag.json" />
     </Target>

diff --git a/Bones.sln.DotSettings b/Bones.sln.DotSettings
@@ -10,4 +10,5 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=appsettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=consts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=mediat/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=postgre/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Tests/Bones.Api.UnitTests/Bones.Api.UnitTests.csproj b/Tests/Bones.Api.UnitTests/Bones.Api.UnitTests.csproj
@@ -15,7 +15,6 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="xunit" Version="2.9.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Tests/Bones.Database.UnitTests/Bones.Database.UnitTests.csproj b/Tests/Bones.Database.UnitTests/Bones.Database.UnitTests.csproj
@@ -15,7 +15,6 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="xunit" Version="2.9.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Tests/Bones.Shared.UnitTests/Bones.Shared.UnitTests.csproj b/Tests/Bones.Shared.UnitTests/Bones.Shared.UnitTests.csproj
@@ -15,7 +15,6 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="xunit" Version="2.9.0" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>