Merge pull request #31 from altasoft/upgrade-to-NET10

Upgrade to net10

Author: temonk

.github/workflows/build_nuget_dont_publish.yml

@@ -14,9 +14,9 @@ jobs:
       uses: actions/setup-dotnet@v1
       with: 
         dotnet-version: |
+          10.0.x
           9.0.x
           8.0.x
-          7.0.x
 
     - name: Extract version from tag
       run: echo "VERSION=$(echo ${GITHUB_REF#refs/tags/v})" >> $GITHUB_ENV

.github/workflows/dotnet.yml

@@ -26,9 +26,9 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
+          10.0.x
           9.0.x
           8.0.x
-          7.0.x
 
     - name: Restore dependencies
       run: dotnet restore

.github/workflows/publish_nuget.yml

@@ -15,9 +15,9 @@ jobs:
       uses: actions/setup-dotnet@v1
       with: 
         dotnet-version: |
+          10.0.x
           9.0.x
           8.0.x
-          7.0.x
 
     - name: Extract version from tag
       run: echo "VERSION=$(echo ${GITHUB_REF#refs/tags/v})" >> $GITHUB_ENV
@@ -36,3 +36,7 @@ jobs:
 
     - name: Publish
       run: dotnet nuget push "nupkg/*.nupkg" -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
+
+    - name: Publish Symbols
+      run: dotnet nuget push "nupkg/*.snupkg" -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
+

AltaSoft.DomainPrimitives.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11217.181
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AltaSoft.DomainPrimitives.XmlDataTypes", "src\AltaSoft.DomainPrimitives.XmlDataTypes\AltaSoft.DomainPrimitives.XmlDataTypes.csproj", "{E5F41084-26EF-4BA5-A4F9-74105F550CB9}"
 EndProject
@@ -12,6 +12,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BF9447CC-2D00-495A-A8C3-D4890EADB01B}"
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 		LICENSE.txt = LICENSE.txt
 		README.md = README.md
 	EndProjectSection
@@ -33,6 +34,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AltaSoft.DomainPrimitives.S
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AltaSoft.DomainPrimitives.UnitTests", "tests\AltaSoft.DomainPrimitives.UnitTests\AltaSoft.DomainPrimitives.UnitTests.csproj", "{253F7819-7F69-9B49-8257-65A17B56DF55}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AltaSoft.DomainPrimitives.OpenApiExtensions", "src\AltaSoft.DomainPrimitives.OpenApiExtensions\AltaSoft.DomainPrimitives.OpenApiExtensions.csproj", "{4705B432-D0D1-123B-3566-797F9C9323A7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +70,10 @@ Global
 		{253F7819-7F69-9B49-8257-65A17B56DF55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{253F7819-7F69-9B49-8257-65A17B56DF55}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{253F7819-7F69-9B49-8257-65A17B56DF55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4705B432-D0D1-123B-3566-797F9C9323A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4705B432-D0D1-123B-3566-797F9C9323A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4705B432-D0D1-123B-3566-797F9C9323A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4705B432-D0D1-123B-3566-797F9C9323A7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Directory.Build.props

@@ -1,31 +1,46 @@
 <Project>
   <PropertyGroup>
+	<DefaultTargetFrameworks>net8.0;net9.0;net10.0</DefaultTargetFrameworks>
 	<OutputType>Library</OutputType>
 	<Nullable>enable</Nullable>
 	<LangVersion>Latest</LangVersion>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>
+	<AnalysisLevel>latest</AnalysisLevel>
 
 	<Authors>ALTA Software llc.</Authors>
 	<Product>Domain Primitives</Product>
 	<Company>ALTA Software llc.</Company>
 	<Copyright>Copyright © 2024 ALTA Software llc.</Copyright>
-	<Version>6.0.4</Version>
+	<Version>7.0.0</Version>
   </PropertyGroup>
 
+
   <PropertyGroup>
 	<PackageReadmeFile>README.md</PackageReadmeFile>
 	<ProjectUrl>https://github.com/altasoft/DomainPrimitives</ProjectUrl>
+
+	<PublishRepositoryUrl>true</PublishRepositoryUrl>
 	<RepositoryUrl>https://github.com/altasoft/DomainPrimitives</RepositoryUrl>
 	<RepositoryType>git</RepositoryType>
 	<PackageLicenseExpression>MIT</PackageLicenseExpression>
-	<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	<PackageProjectUrl>https://github.com/altasoft/DomainPrimitives</PackageProjectUrl>
-	<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+	<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
 	<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-	<EnableNETAnalyzers>True</EnableNETAnalyzers>
+	<EnableNETAnalyzers>true</EnableNETAnalyzers>
+
 	<PackageTags>ddd;domain;entity;dotnet-core;value-object;strongly-typed;</PackageTags>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TF_BUILD)' == 'True' ">
+	<DebugType>embedded</DebugType>
+	<EmbedUntrackedSources>true</EmbedUntrackedSources>
+	<EmbedAllSources>false</EmbedAllSources>
+	<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+	<Deterministic>true</Deterministic>
+  </PropertyGroup>
+
+
   <ItemGroup>
 	<None Include="..\..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>

Directory.Packages.props

@@ -0,0 +1,33 @@
+<Project>
+  <PropertyGroup>
+	<!-- Enable Central Package Management -->
+	<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+	<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
+	<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
+	<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.1.0" />
+	<PackageVersion Include="Microsoft.OpenApi" Version="1.3.1" />
+	<PackageVersion Include="System.Collections.Frozen" Version="7.0.0" />
+	<PackageVersion Include="Scalar.AspNetCore" Version="2.11.0" />
+	<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+	<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
+	<PackageVersion Include="Verify.Xunit" Version="31.9.3" />
+	<PackageVersion Include="xunit" Version="2.9.3" />
+	<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+	<PackageVersion Include="coverlet.collector" Version="6.0.4" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+	<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.22" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+	<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.11" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+	<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" />
+  </ItemGroup>
+
+</Project>

Examples/AltaSoft.DomainPrimitives.Demo.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.8.34330.188
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11217.181
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AltaSoft.DomainPrimitives.Demo", "AltaSoft.DomainPrimitives.Demo\AltaSoft.DomainPrimitives.Demo.csproj", "{193DA3B4-7F2C-4EED-A7AF-9F69964B7B27}"
 EndProject
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AltaSoft.DomainPrimitives",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AltaSoft.DomainPrimitives.SwaggerExtensions", "..\src\AltaSoft.DomainPrimitives.SwaggerExtensions\AltaSoft.DomainPrimitives.SwaggerExtensions.csproj", "{CAEE1818-F333-DF43-89BA-DEC9BD64E279}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AltaSoft.DomainPrimitives.OpenApiExtensions", "..\src\AltaSoft.DomainPrimitives.OpenApiExtensions\AltaSoft.DomainPrimitives.OpenApiExtensions.csproj", "{069E8303-00AA-16AD-9DE1-FCD188DA59B1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
 		{CAEE1818-F333-DF43-89BA-DEC9BD64E279}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CAEE1818-F333-DF43-89BA-DEC9BD64E279}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CAEE1818-F333-DF43-89BA-DEC9BD64E279}.Release|Any CPU.Build.0 = Release|Any CPU
+		{069E8303-00AA-16AD-9DE1-FCD188DA59B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{069E8303-00AA-16AD-9DE1-FCD188DA59B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{069E8303-00AA-16AD-9DE1-FCD188DA59B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{069E8303-00AA-16AD-9DE1-FCD188DA59B1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Examples/AltaSoft.DomainPrimitives.Demo/AltaSoft.DomainPrimitives.Demo.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <InvariantGlobalization>true</InvariantGlobalization>
@@ -10,14 +10,14 @@
   </PropertyGroup>
 
 
-  <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
-  </ItemGroup>
-
-
+	<ItemGroup>
+		<PackageReference Include="Scalar.AspNetCore" Version="1.1.1" />
+		<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" />
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+	</ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\AltaSoft.DomainPrimitives.OpenApiExtensions\AltaSoft.DomainPrimitives.OpenApiExtensions.csproj" />
     <ProjectReference Include="..\..\src\AltaSoft.DomainPrimitives.SwaggerExtensions\AltaSoft.DomainPrimitives.SwaggerExtensions.csproj" />
     <ProjectReference Include="..\DomainPrimitivesDemo\DomainPrimitivesDemo.csproj" />
   </ItemGroup>

Examples/AltaSoft.DomainPrimitives.Demo/Customer.cs

@@ -1,5 +1,29 @@
+using System.ComponentModel.DataAnnotations;
 using DomainPrimitivesDemo;
 
 namespace AltaSoft.DomainPrimitives.Demo;
-public sealed record Customer(CustomerId CustomerId, BirthDate BirthDate, CustomerName CustomerName, CustomerAddress CustomerAddress);
+// ReSharper disable InconsistentNaming
+public sealed record Customer(
+
+    [Required] CustomerId A_CustomerId, [Required] Guid A_CustomerIdDotNet,
+    [Required] BirthDate B_BirthDate, [Required] DateOnly B_BirthDateDotNet,
+    [Required] CustomerName C_CustomerName, [Required] string C_CustomerNameDotNet,
+    [Required] PositiveAmount D_Amount, [Required] decimal D_AmountDotnet)
+{
+    public CustomerAddress? CustomerAddress { get; set; } //ignore
+}
+
+public sealed record CustomerNullable(
+    CustomerId? A_CustomerId,
+    Guid? A_CustomerIdDotNet,
+    BirthDate? B_BirthDate,
+    DateOnly? B_BirthDateDotNet,
+    CustomerName? C_CustomerName,
+    string? C_CustomerNameDotNet,
+    PositiveAmount? D_Amount,
+    decimal? D_AmountDotnet);
+
+// ReSharper restore InconsistentNaming
 public sealed record SetCustomerAddress(CustomerId CustomerId, CustomerAddress CustomerAddress);
+public sealed record SetCustomerAddressNullable(CustomerId CustomerId, CustomerAddress? CustomerAddress, PositiveAmount? Amount);
+

Examples/AltaSoft.DomainPrimitives.Demo/CustomerService.cs

@@ -1,5 +1,5 @@
-using DomainPrimitivesDemo;
 using System.Collections.Concurrent;
+using DomainPrimitivesDemo;
 
 namespace AltaSoft.DomainPrimitives.Demo;
 
@@ -14,7 +14,7 @@ public sealed class CustomerService
 
     public Task AddCustomerAsync(Customer customer)
     {
-        if (!_customers.TryAdd(customer.CustomerId, customer))
+        if (!_customers.TryAdd(customer.A_CustomerId, customer))
             throw new BadHttpRequestException("Customer already exists");
 
         return Task.CompletedTask;
@@ -30,4 +30,18 @@ public Task SetCustomerAddressAsync(SetCustomerAddress command)
         _customers[command.CustomerId] = customer;
         return Task.CompletedTask;
     }
+
+    public Task SetCustomerAddressNullableAsync(SetCustomerAddressNullable command)
+    {
+        if (command.CustomerAddress is null)
+            return Task.CompletedTask;
+
+        if (!_customers.TryGetValue(command.CustomerId, out var customer))
+            throw new BadHttpRequestException("Customer already exists");
+
+        customer = customer with { CustomerAddress = command.CustomerAddress };
+
+        _customers[command.CustomerId] = customer;
+        return Task.CompletedTask;
+    }
 }