dotnet 8 (#119)

* dotnet 8

Author: sei-tspencer

.github/workflows/client.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
 
       - name: Setup Package Name
         id: package_name

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: Publish Docker Images
+name: Build and Publish Image
 
 on:
   pull_request:
@@ -8,66 +8,13 @@ on:
     branches: [ development, staging ]
   release:
     types: [ "published" ]
-  workflow_dispatch:
-    inputs:
-      tagName:
-        description: 'Tag of the image you want to build and push'
-        required: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Prepare
-      id: prep
-      run: |
-        DOCKER_IMAGE=cmusei/blueprint-api
-        VERSION=development
-        if [[ ! -z "${{ github.event.inputs.tagName }}" ]]; then
-          VERSION=${{ github.event.inputs.tagName }}
-          TAGS="${DOCKER_IMAGE}:${VERSION}"
-        elif [[ $GITHUB_REF == refs/tags/* ]]; then
-          VERSION=${GITHUB_REF#refs/tags/}
-          MAJORMINORVERSION=$(echo $VERSION | grep -oP '(\d+)\.(\d+)')
-          TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${MAJORMINORVERSION}"
-        elif [[ $GITHUB_REF == refs/heads/* ]]; then
-          VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
-          TAGS="${DOCKER_IMAGE}:${VERSION}"
-        fi
-        if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-          echo ::set-output name=push::false
-          echo "event is pull_request, not pushing image"
-        else
-          echo ::set-output name=push::true
-          echo "event is not pull_request, pushing image"
-        fi
-        echo ::set-output name=version::${VERSION}
-        echo ::set-output name=tags::${TAGS}
-        echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Login to DockerHub
-      if: github.event_name != 'pull_request'
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-    - name: Build and push
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./Dockerfile
-        push: ${{ steps.prep.outputs.push }}
-        pull: true
-        tags: ${{ steps.prep.outputs.tags }}
-        labels: |
-          org.opencontainers.image.source=${{ github.event.repository.clone_url }}
-          org.opencontainers.image.created=${{ steps.prep.outputs.created }}
-          org.opencontainers.image.revision=${{ github.sha }}
+  build-and-publish:
+    name: Build and Publish
+    uses: cmu-sei/Crucible-Github-Actions/.github/workflows/[email protected]
+    with:
+      imageName: cmusei/blueprint-api
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}

Blueprint.Api.Client/Blueprint.Api.Client.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="6.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 

Blueprint.Api.Client/README.md

@@ -1,6 +1,6 @@
 # How to create the nuget package for Blueprint.Api.Client
 1. cd ../Blueprint.Api
-2. swagger tofile --output ../Blueprint.Api.Client/swagger.json bin/Debug/net6.0/Blueprint.Api.dll v1
+2. swagger tofile --output ../Blueprint.Api.Client/swagger.json bin/Debug/net8.0/Blueprint.Api.dll v1
 3. cd ../Blueprint.Api.Client
 4. npm install
 5. ./node_modules/.bin/nswag run /runtime:Net60

Blueprint.Api.Data/Blueprint.Api.Data.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <ProjectGuid>{FA9D19BE-32D2-405D-A3A3-0A9061BC0DE5}</ProjectGuid>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.8" />
   </ItemGroup>
 
-</Project>
+</Project>

Blueprint.Api.Data/BlueprintContext.cs

@@ -17,11 +17,10 @@ namespace Blueprint.Api.Data
     public class BlueprintContext : DbContext
     {
         public List<Entry> Entries { get; set; } = new List<Entry>();
-        private DbContextOptions<BlueprintContext> _options;
+        // Needed for EventInterceptor
+        public IServiceProvider ServiceProvider;
 
-        public BlueprintContext(DbContextOptions<BlueprintContext> options) : base(options) {
-            _options = options;
-        }
+        public BlueprintContext(DbContextOptions<BlueprintContext> options) : base(options) { }
 
         public DbSet<UserEntity> Users { get; set; }
         public DbSet<PermissionEntity> Permissions { get; set; }
@@ -120,4 +119,3 @@ private void SaveEntries()
         }
     }
 }
-

Blueprint.Api.Data/BlueprintContextFactory.cs

@@ -0,0 +1,24 @@
+// Copyright 2024 Carnegie Mellon University. All Rights Reserved.
+// Released under a MIT (SEI)-style license. See LICENSE.md in the project root for license information.
+using System;
+using Microsoft.EntityFrameworkCore;
+namespace Blueprint.Api.Data;
+public class BlueprintContextFactory : IDbContextFactory<BlueprintContext>
+{
+    private readonly IDbContextFactory<BlueprintContext> _pooledFactory;
+    private readonly IServiceProvider _serviceProvider;
+    public BlueprintContextFactory(
+        IDbContextFactory<BlueprintContext> pooledFactory,
+        IServiceProvider serviceProvider)
+    {
+        _pooledFactory = pooledFactory;
+        _serviceProvider = serviceProvider;
+    }
+    public BlueprintContext CreateDbContext()
+    {
+        var context = _pooledFactory.CreateDbContext();
+        // Inject the current scope's ServiceProvider
+        context.ServiceProvider = _serviceProvider;
+        return context;
+    }
+}

Blueprint.Api.Data/Entry.cs

@@ -0,0 +1,49 @@
+// Copyright 2024 Carnegie Mellon University. All Rights Reserved.
+// Released under a MIT (SEI)-style license. See LICENSE.md in the project root for license information.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+namespace Blueprint.Api.Data;
+public class Entry
+{
+    public object Entity { get; set; }
+    public EntityState State { get; set; }
+    public IEnumerable<PropertyEntry> Properties { get; set; }
+    private Dictionary<string, bool> IsPropertyModified { get; set; } = new();
+    public Entry(EntityEntry entry, Entry oldEntry = null)
+    {
+        Entity = entry.Entity;
+        State = entry.State;
+        Properties = entry.Properties;
+        ProcessOldEntry(oldEntry);
+        foreach (var prop in Properties)
+        {
+            IsPropertyModified[prop.Metadata.Name] = prop.IsModified;
+        }
+    }
+    private void ProcessOldEntry(Entry oldEntry)
+    {
+        if (oldEntry == null) return;
+        if (oldEntry.State != EntityState.Unchanged && oldEntry.State != EntityState.Detached)
+        {
+            State = oldEntry.State;
+        }
+        var modifiedProperties = oldEntry.GetModifiedProperties();
+        foreach (var property in Properties)
+        {
+            if (modifiedProperties.Contains(property.Metadata.Name))
+            {
+                property.IsModified = true;
+            }
+        }
+    }
+    public string[] GetModifiedProperties()
+    {
+        return IsPropertyModified
+            .Where(x => x.Value)
+            .Select(x => x.Key)
+            .ToArray();
+    }
+}

Blueprint.Api.Data/Extensions/ModelBuilderExtensions.cs

@@ -45,8 +45,8 @@ public static void AddPostgresUUIDGeneration(this ModelBuilder builder)
                 .GetEntityTypes()
                     .SelectMany(t => t.GetProperties())
                         .Where(p => p.ClrType == typeof(Guid))
-                            .Select(p => builder.Entity(p.DeclaringEntityType.ClrType).Property(p.Name))
-                                .Where(p => p.Metadata.ValueGenerated == Microsoft.EntityFrameworkCore.Metadata.ValueGenerated.OnAdd &&
+                            .Select(p => builder.Entity(p.DeclaringType.ClrType).Property(p.Name))
+                                .Where(p => p.Metadata.ValueGenerated == ValueGenerated.OnAdd &&
                                             p.Metadata.IsPrimaryKey())
             )
             {
@@ -80,4 +80,3 @@ public static void UsePostgresCasing(this ModelBuilder builder)
         }
     }
 }
-

Blueprint.Api.Migrations.PostgreSQL/Blueprint.Api.Migrations.PostgreSQL.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <ProjectGuid>{94A7F5B1-E6D5-465C-B07F-2573ACCD0236}</ProjectGuid>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.8" />
   </ItemGroup>
 
   <ItemGroup>