Hopefully fixed now

CorruptComputer · Aug 23, 2024 · 8d7cd78 · 8d7cd78
1 parent b4651ec
commit 8d7cd78
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 23 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -24,18 +24,11 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
-
-      - name: Tool Restore
-        run: |
-          cd Bones.Api; 
-          dotnet tool restore; 
-          cd ..;
-          cd Bones.WebUI; 
-          dotnet tool restore; 
-          cd ..;
 
       - 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
@@ -28,15 +28,6 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
-
-      - name: Tool Restore
-        run: |
-          cd Bones.Api; 
-          dotnet tool restore; 
-          cd ..;
-          cd Bones.WebUI; 
-          dotnet tool restore; 
-          cd ..;
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -49,9 +40,10 @@ 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
           dotnet build --no-incremental
-          dotnet test --collect:"XPlat Code Coverage;Format=opencover"
+          dotnet test --no-build --collect:"XPlat Code Coverage;Format=opencover"
           dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
diff --git a/Bones.Api/Bones.Api.csproj b/Bones.Api/Bones.Api.csproj
@@ -27,7 +27,7 @@
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.1" />
     </ItemGroup>
 
-    <Target Name="CreateSwaggerJson" AfterTargets="Build" Condition="$(Configuration)=='Debug'">
+    <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>
 

diff --git a/Bones.Database/BonesDbContext.cs b/Bones.Database/BonesDbContext.cs
@@ -89,6 +89,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
             optionsBuilder.UseNpgsql(connectionString, options =>
             {
+                options.MigrationsHistoryTable("__EFMigrationsHistory", "System");
                 options.MigrationsAssembly(typeof(BonesDbContext).Assembly.FullName);
                 options.EnableRetryOnFailure();
             });

diff --git a/Bones.Database/Extensions/ServiceProviderExtensions.cs b/Bones.Database/Extensions/ServiceProviderExtensions.cs
@@ -22,7 +22,10 @@ public static void MigrateBonesDb(this IServiceProvider serviceProvider)
         if (!useInMemoryDb)
         {
             BonesDbContext db = scope.ServiceProvider.GetRequiredService<BonesDbContext>();
-            db.Database.Migrate();
+            if (db.Database.GetPendingMigrations().Any())
+            {
+                db.Database.Migrate();
+            }
         }
 
         // We don't need to await this, it's fine to just execute in the background

diff --git a/...ations/20240823054817_Initial.Designer.cs → ...ations/20240823070645_Initial.Designer.cs b/...ations/20240823054817_Initial.Designer.cs → ...ations/20240823070645_Initial.Designer.cs
diff --git a/...base/Migrations/20240823054817_Initial.cs → ...base/Migrations/20240823070645_Initial.cs b/...base/Migrations/20240823054817_Initial.cs → ...base/Migrations/20240823070645_Initial.cs
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" >
+    <Target Name="GenerateApiClients" BeforeTargets="BeforeBuild" Condition="$(Configuration) == 'Debug' And $(BUILD_ENVIRONMENT) != 'GitHub'">
         <Message Text="Generating API Clients" Importance="High" />
         <Exec Command="dotnet nswag run nswag.json" />
     </Target>