Added support for .Net 9

.github/workflows/build.yml

@@ -34,10 +34,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup .Net 8.0.*
+      - name: Setup .Net 8.0.403
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.*
+          dotnet-version: 8.0.403
+      - name: Setup .Net 9.0.100-rc.2.24474.11
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.100-rc.2.24474.11
       - name: 'Cache: .nuke/temp, ~/.nuget/packages'
         uses: actions/cache@v4
         with:

.github/workflows/pr.yml

@@ -29,10 +29,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup .Net 8.0.*
+      - name: Setup .Net 8.0.403
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.*
+          dotnet-version: 8.0.403
+      - name: Setup .Net 9.0.100-rc.2.24474.11
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.100-rc.2.24474.11
       - name: 'Cache: .nuke/temp, ~/.nuget/packages'
         uses: actions/cache@v4
         with:

.github/workflows/publish-docs.yml

@@ -31,10 +31,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup .Net 8.0.*
+      - name: Setup .Net 8.0.403
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.*
+          dotnet-version: 8.0.403
+      - name: Setup .Net 9.0.100-rc.2.24474.11
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.100-rc.2.24474.11
       - name: 'Cache: .nuke/temp, ~/.nuget/packages'
         uses: actions/cache@v4
         with:

.github/workflows/release.yml

@@ -34,10 +34,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup .Net 8.0.*
+      - name: Setup .Net 8.0.403
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.*
+          dotnet-version: 8.0.403
+      - name: Setup .Net 9.0.100-rc.2.24474.11
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.100-rc.2.24474.11
       - name: 'Cache: .nuke/temp, ~/.nuget/packages'
         uses: actions/cache@v4
         with:

.github/workflows/tag-version.yml

@@ -32,10 +32,14 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.TAG_VERSION_TOKEN }}
-      - name: Setup .Net 8.0.*
+      - name: Setup .Net 8.0.403
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.*
+          dotnet-version: 8.0.403
+      - name: Setup .Net 9.0.100-rc.2.24474.11
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.100-rc.2.24474.11
       - name: 'Cache: .nuke/temp, ~/.nuget/packages'
         uses: actions/cache@v4
         with:

build/Build.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<Nullable>disable</Nullable>
 		<RootNamespace></RootNamespace>
 		<NoWarn>CS0649;CS0169</NoWarn>
@@ -19,6 +19,9 @@
 		<!-- Fix for https://security.snyk.io/vuln/SNYK-DOTNET-SYSTEMFORMATSASN1-7443633 - begin -->
 		<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
 		<!-- Fix for https://security.snyk.io/vuln/SNYK-DOTNET-SYSTEMFORMATSASN1-7443633 - end -->
+		<!-- Fix for "System.PlatformNotSupportedException: BinaryFormatter serialization and deserialization have been removed" - begin -->
+		<PackageReference Include="System.Runtime.Serialization.Formatters" Version="9.0.0-rc.2.24473.5" />
+		<!-- Fix for "System.PlatformNotSupportedException: BinaryFormatter serialization and deserialization have been removed" - end -->
 	</ItemGroup>
 
 	<ItemGroup>

build/DryGen/GithubActions/BaseGitHubActionsAttribute.cs

@@ -17,7 +17,7 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC
     {
         var job = base.GetJobs(image, relevantTargets);
         var newSteps = new List<GitHubActionsStep>(job.Steps);
-        foreach (var version in new[] { "8.0.*" })
+        foreach (var version in new[] {"9.0.100-rc.2.24474.11", "8.0.403" })
         {
             newSteps.Insert(1, new SetupDotNetStep(version));
         }

docs/templates/releasenotes/yyyy-MM-dd-v-x.y.z.md → docs/templates/releasenotes/2024-11-03-v-2.0.0-prerelease0002.md

@@ -4,6 +4,7 @@
 
 ### Improvements in this version
 ## Prerelease 2
+- Added support for .Net 9 
 - Added support for generating many to many associations in `mermaid-class-diagram-from-csharp`.
 - Added support for generating many to many relations in `mermaid-er-diagram-from-csharp`.
 - Added support for `include-exception-stacktrace` in `verbs-from-options-file`.

global.json

@@ -1,6 +1,6 @@
 {
 	"sdk": {
-		"version": "8.0.403",
+		"version": "9.0.100-rc.2.24474.11",
 		"rollForward": "feature"
 	}
 }

src/DryGen.CSharpFromJsonSchema/DryGen.CSharpFromJsonSchema.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>

src/DryGen.CodeCompiler/DryGen.CodeCompiler.csproj

@@ -1,11 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.final" />
+		<!-- Fix for "error NU1903: Warning As Error: Package 'System.Net.Http' 4.3.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-7jgj-8wvc-jh57 " begin -->
+		<PackageReference Include="System.Net.Http" Version="4.3.4" />
+		<!-- Fix for "error NU1903: Warning As Error: Package 'System.Net.Http' 4.3.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-7jgj-8wvc-jh57 " end -->
+		<!-- Fix for "error NU1903: Warning As Error: Package 'System.Text.RegularExpressions' 4.3.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-cmhx-cq75-c4mj " begin -->
+		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+		<!-- Fix for "error NU1903: Warning As Error: Package 'System.Text.RegularExpressions' 4.3.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-cmhx-cq75-c4mj " end -->
 	</ItemGroup>
 
 	<ItemGroup>

src/DryGen.Core/DryGen.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 </Project>

src/DryGen.MermaidFromCSharp/DryGen.MermaidFromCSharp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>

src/DryGen.MermaidFromDotnetDepsJson/DryGen.MermaidFromDotnetDepsJson.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>

src/DryGen.MermaidFromEfCore/DryGen.MermaidFromEfCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>

src/DryGen.MermaidFromJsonSchema/DryGen.MermaidFromJsonSchema.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<ItemGroup>

src/DryGen.Templates/DryGen.Templates.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<PackageType>Template</PackageType>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 		<PackageId>dry-gen.templates</PackageId>
 		<Title>DryGen Templates</Title>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -30,16 +30,16 @@
 	-->
 	<Target Name="BuildTemplates" BeforeTargets="Build">
 		<Message Text="Building template DryGen.Templates.JsonSchema" Importance="High" />
-		<Exec Command="dotnet build ./templates/DryGen.Templates.JsonSchema/  --configuration $(Configuration)" />
+		<Exec Command="dotnet build ./templates/DryGen.Templates.JsonSchema/  --configuration $(Configuration) --framework net9.0" Condition="'$(TargetFramework)' == 'net9.0'"/>
 		<Message Text="Building template DryGen.Templates.Mermaid" Importance="High" />
-		<Exec Command="dotnet build ./templates/DryGen.Templates.Mermaid/  --configuration $(Configuration)" />
+		<Exec Command="dotnet build ./templates/DryGen.Templates.Mermaid/  --configuration $(Configuration) --framework net9.0" Condition="'$(TargetFramework)' == 'net9.0'"/>
 	</Target>
 
 	<Target Name="CleanTemplates" AfterTargets="Clean">
 		<Message Text="Cleaning template DryGen.Templates.JsonSchema" Importance="High" />
-		<Exec Command="dotnet clean ./templates/DryGen.Templates.JsonSchema/  --configuration $(Configuration)" />
+		<Exec Command="dotnet clean ./templates/DryGen.Templates.JsonSchema/  --configuration $(Configuration) --framework net9.0" Condition="'$(TargetFramework)' == 'net9.0'"/>
 		<Message Text="Cleaning template DryGen.Templates.Mermaid" Importance="High" />
-		<Exec Command="dotnet clean ./templates/DryGen.Templates.Mermaid/  --configuration $(Configuration)" />
+		<Exec Command="dotnet clean ./templates/DryGen.Templates.Mermaid/  --configuration $(Configuration) --framework net9.0" Condition="'$(TargetFramework)' == 'net9.0'"/>
 	</Target>
 
 </Project>

src/DryGen.Templates/templates/DryGen.Templates.JsonSchema/.template.config/template.json

@@ -6,8 +6,27 @@
   "name": "dry-gen: Generate C# code from json schema before build",
   "shortName": "dry-gen.jsonschema",
   "sourceName": "DryGen.Templates.JsonSchema",
+  "preferNameDirectory": true,
   "tags": {
     "language": "C#",
     "type": "project"
-  }
+  },
+	"symbols": {
+		"framework": {
+			"type": "parameter",
+			"datatype": "choice",
+			"defaultValue": "net9.0",
+			"choices": [
+				{
+					"choice": "net8.0",
+					"description": "Target .Net 8"
+				},
+				{
+					"choice": "net9.0",
+					"description": "Target .Net 9"
+				}
+			],
+			"replaces": "net8.0;net9.0"
+		}
+	}
 }

src/DryGen.Templates/templates/DryGen.Templates.JsonSchema/DryGen.Templates.JsonSchema.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>disable</Nullable>
 	</PropertyGroup>

src/DryGen.Templates/templates/DryGen.Templates.Mermaid/.template.config/template.json

@@ -1,13 +1,32 @@
 {
-  "$schema": "http://json.schemastore.org/template",
-  "author": "Eirik Bjornset",
-  "classifications": [ "dry-gen", "mermaid" ],
-  "identity": "DryGen.Mermaid",
-  "name": "dry-gen: Generate Mermaid diagrams after build",
-  "shortName": "dry-gen.mermaid",
-  "sourceName": "DryGen.Templates.Mermaid",
-  "tags": {
-    "language": "C#",
-    "type": "project"
-  }
-}
+	"$schema": "http://json.schemastore.org/template",
+	"author": "Eirik Bjornset",
+	"classifications": ["dry-gen", "mermaid"],
+	"identity": "DryGen.Mermaid",
+	"name": "dry-gen: Generate Mermaid diagrams after build",
+	"shortName": "dry-gen.mermaid",
+	"sourceName": "DryGen.Templates.Mermaid",
+  "preferNameDirectory": true,
+	"tags": {
+		"language": "C#",
+		"type": "project"
+	},
+	"symbols": {
+		"framework": {
+			"type": "parameter",
+			"datatype": "choice",
+			"defaultValue": "net9.0",
+			"choices": [
+				{
+					"choice": "net8.0",
+					"description": "Target .Net 8"
+				},
+				{
+					"choice": "net9.0",
+					"description": "Target .Net 9"
+				}
+			],
+			"replaces": "net8.0;net9.0"
+		}
+	}
+}

src/DryGen.Templates/templates/DryGen.Templates.Mermaid/DryGen.Templates.Mermaid.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>disable</Nullable>
 		<!--
@@ -18,14 +18,20 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.*,9.0)" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[8.*,9.0)">
 			<!--
 			dry-gen needs the InMemory database to be able to introspect the datamodel in the DbContexts.
 			The InMemory database is normally not used at runtime, so it can be referenced as private assets.
 			-->
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.*,9.0)" Condition="'$(TargetFramework)' == 'net8.0'" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[8.*,9.0)" Condition="'$(TargetFramework)' == 'net8.0'" >
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[9.0.0-rc.*,10.0)" Condition="'$(TargetFramework)' == 'net9.0'" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[9.0.0-rc.*,10.0)" Condition="'$(TargetFramework)' == 'net9.0'" >
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+
+		<PackageReference Include="FluentAssertions" Version="6.12.1" />
 	</ItemGroup>
 
 	<ItemGroup>

src/DryGen/DryGen.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 		<ImplicitUsings>false</ImplicitUsings>
 		<PackAsTool>true</PackAsTool>
 		<ToolCommandName>dry-gen</ToolCommandName>

src/develop/DryGen.DevUtils/DryGen.DevUtils.csproj

@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 		<Packable>false</Packable>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[8.*,9.0)" Condition="'$(TargetFramework)' == 'net8.0'" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[8.*,9.0)" Condition="'$(TargetFramework)' == 'net8.0'" />
-		<PackageReference Include="FluentAssertions" Version="6.12.1" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[9.0.0-rc.*,10.0)" Condition="'$(TargetFramework)' == 'net9.0'" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="[9.0.0-rc.*,10.0)" Condition="'$(TargetFramework)' == 'net9.0'" />		<PackageReference Include="FluentAssertions" Version="6.12.1" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
 		<PackageReference Include="Reqnroll.xUnit" Version="2.1.1" />
 		<!-- Fix for https://security.snyk.io/vuln/SNYK-DOTNET-SYSTEMTEXTJSON-8168848 - begin -->

src/develop/DryGen.Docs/DryGen.Docs.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 		<Nullable>disable</Nullable>
 	</PropertyGroup>