Fixing id parameter type

eQuantic · Sep 24, 2023 · 9432a85 · 9432a85
1 parent 5c7de38
commit 9432a85
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 19 deletions.
diff --git a/src/eQuantic.Core.Api.Crud/Extensions/WepApplicationExtensions.cs b/src/eQuantic.Core.Api.Crud/Extensions/WepApplicationExtensions.cs
@@ -218,10 +218,10 @@ private static string GetPattern<TEntity>(bool withId = false, Type? referenceTy
         var pattern = $"/{prefix}";
         if (referenceType != null)
         {
-            pattern = $"/{referenceType.Name.Pluralize().Camelize()}/{{referenceId:int}}{pattern}";
+            pattern = $"/{referenceType.Name.Pluralize().Camelize()}/{{referenceId}}{pattern}";
         }
 
-        if (withId) pattern = $"{pattern}/{{id:int}}";
+        if (withId) pattern = $"{pattern}/{{id}}";
         return pattern;
     }
 

diff --git a/src/eQuantic.Core.Api.Crud/eQuantic.Core.Api.Crud.csproj b/src/eQuantic.Core.Api.Crud/eQuantic.Core.Api.Crud.csproj
@@ -6,10 +6,10 @@
         <Authors>eQuantic Systems</Authors>
         <RootNamespace>eQuantic.Core.Api.Crud</RootNamespace>
         <AssemblyTitle>eQuantic.Core.Api.Crud</AssemblyTitle>
-        <AssemblyVersion>1.1.0.0</AssemblyVersion>
-        <FileVersion>1.1.0.0</FileVersion>
-        <Version>1.1.0.0</Version>
-        <TargetFramework>net7.0</TargetFramework>
+        <AssemblyVersion>1.1.1.0</AssemblyVersion>
+        <FileVersion>1.1.1.0</FileVersion>
+        <Version>1.1.1.0</Version>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 
         <PackageId>eQuantic.Core.Api.Crud</PackageId>
         <PackageTags>eQuantic;Core;API;CRUD;Library</PackageTags>
@@ -35,9 +35,12 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
-    <ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.10" />
     </ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0-rc.1.23421.29" />
+    </ItemGroup>
 
     <ItemGroup>
         <None Include="Icon.png" Pack="true" PackagePath="Icon.png" />

diff --git a/src/eQuantic.Core.Api/eQuantic.Core.Api.csproj b/src/eQuantic.Core.Api/eQuantic.Core.Api.csproj
@@ -6,10 +6,10 @@
         <Authors>eQuantic Systems</Authors>
         <RootNamespace>eQuantic.Core.Api</RootNamespace>
         <AssemblyTitle>eQuantic.Core.Api</AssemblyTitle>
-        <AssemblyVersion>1.1.0.0</AssemblyVersion>
-        <FileVersion>1.1.0.0</FileVersion>
-        <Version>1.1.0.0</Version>
-        <TargetFramework>net7.0</TargetFramework>
+        <AssemblyVersion>1.1.1.0</AssemblyVersion>
+        <FileVersion>1.1.1.0</FileVersion>
+        <Version>1.1.1.0</Version>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 
         <PackageId>eQuantic.Core.Api</PackageId>
         <PackageTags>eQuantic;Core;API;Library</PackageTags>

diff --git a/src/eQuantic.Core.Application.Crud/eQuantic.Core.Application.Crud.csproj b/src/eQuantic.Core.Application.Crud/eQuantic.Core.Application.Crud.csproj
@@ -6,10 +6,10 @@
         <Authors>eQuantic Systems</Authors>
         <RootNamespace>eQuantic.Core.Application.Crud</RootNamespace>
         <AssemblyTitle>eQuantic.Core.Application.Crud</AssemblyTitle>
-        <AssemblyVersion>1.1.0.0</AssemblyVersion>
-        <FileVersion>1.1.0.0</FileVersion>
-        <Version>1.1.0.0</Version>
-        <TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
+        <AssemblyVersion>1.1.1.0</AssemblyVersion>
+        <FileVersion>1.1.1.0</FileVersion>
+        <Version>1.1.1.0</Version>
+        <TargetFrameworks>netstandard2.1;net7.0;net8.0</TargetFrameworks>
 
         <PackageId>eQuantic.Core.Application.Crud</PackageId>
         <PackageTags>eQuantic;Core;Application;CRUD;Library</PackageTags>

diff --git a/src/eQuantic.Core.Application/eQuantic.Core.Application.csproj b/src/eQuantic.Core.Application/eQuantic.Core.Application.csproj
@@ -6,10 +6,10 @@
         <Authors>eQuantic Systems</Authors>
         <RootNamespace>eQuantic.Core.Application</RootNamespace>
         <AssemblyTitle>eQuantic.Core.Application</AssemblyTitle>
-        <AssemblyVersion>1.1.0.0</AssemblyVersion>
-        <FileVersion>1.1.0.0</FileVersion>
-        <Version>1.1.0.0</Version>
-        <TargetFrameworks>netstandard2.1;net7.0</TargetFrameworks>
+        <AssemblyVersion>1.1.1.0</AssemblyVersion>
+        <FileVersion>1.1.1.0</FileVersion>
+        <Version>1.1.1.0</Version>
+        <TargetFrameworks>netstandard2.1;net7.0;net8.0</TargetFrameworks>
 
         <PackageId>eQuantic.Core.Application</PackageId>
         <PackageTags>eQuantic;Core;Application;Library</PackageTags>
@@ -46,6 +46,10 @@
     <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
         <PackageReference Include="Lamar" Version="12.0.0" />
     </ItemGroup>
+
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+        <PackageReference Include="Lamar" Version="12.0.0" />
+    </ItemGroup>
 
     <ItemGroup>
         <None Include="Icon.png" Pack="true" PackagePath="Icon.png" />