Merge pull request #33 from allegro/feature/package-bump-identifiers

Unpin version of Meziantou.Framework and Microsoft.CodeAnalysis
allegro · Jan 26, 2024 · 30a3e39 · 30a3e39
2 parents 174e09c + 28ca909
commit 30a3e39
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 7 deletions.
diff --git a/global.json b/global.json
@@ -1,9 +1,9 @@
 {
     "sdk": {
-        "version": "6.0.405",
+        "version": "8.0.100",
         "rollForward": "latestFeature"
     },
     "msbuild-sdks": {
-        "Allegro.DotnetSdk": "1.2.2"
+        "Allegro.DotnetSdk": "2.1.0"
     }
 }
diff --git a/...ro.Extensions.Identifiers.Abstractions/Allegro.Extensions.Identifiers.Abstractions.csproj b/...ro.Extensions.Identifiers.Abstractions/Allegro.Extensions.Identifiers.Abstractions.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <Import Project="..\..\Package.Build.props" />
   <ItemGroup>
-    <PackageReference Include="Meziantou.Framework.StronglyTypedId" Version="[1.0.28]" />
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="[4.3.1]"/>
+    <PackageReference Include="Meziantou.Framework.StronglyTypedId" Version="2.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.8.0" />
   </ItemGroup>
 </Project>
diff --git a/...llegro.Extensions.Identifiers.AspNetCore/Allegro.Extensions.Identifiers.AspNetCore.csproj b/...llegro.Extensions.Identifiers.AspNetCore/Allegro.Extensions.Identifiers.AspNetCore.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <Import Project="..\..\Package.Build.props" />
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Allegro.Extensions.Identifiers.Abstractions\Allegro.Extensions.Identifiers.Abstractions.csproj" />

diff --git a/...rs/Allegro.Extensions.Identifiers.AspNetCore/Swagger/StronglyTypedIdsSwaggerExtensions.cs b/...rs/Allegro.Extensions.Identifiers.AspNetCore/Swagger/StronglyTypedIdsSwaggerExtensions.cs
@@ -19,6 +19,7 @@ public static IServiceCollection AddStronglyTypedIds(this IServiceCollection ser
         services.Configure<SwaggerGenOptions>(options =>
         {
             var types = AppDomain.CurrentDomain.GetAssemblies()
+                .Where(a => a.FullName?.StartsWith("Microsoft", StringComparison.Ordinal) != true)
                 .SelectMany(x => x.GetTypes())
                 .Where(x => IsAssignableToGenericType(x, typeof(IStronglyTypedId<>)) && !x.IsInterface && !x.IsAbstract)
                 .ToList();

diff --git a/...dentifiers/Allegro.Extensions.Identifiers.Demo/Allegro.Extensions.Identifiers.Demo.csproj b/...dentifiers/Allegro.Extensions.Identifiers.Demo/Allegro.Extensions.Identifiers.Demo.csproj
@@ -4,7 +4,7 @@
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Allegro.Extensions.Identifiers.Abstractions\Allegro.Extensions.Identifiers.Abstractions.csproj" />

diff --git a/...Allegro.Extensions.Identifiers/Allegro.Extensions.Identifiers.Demo/Identifiers/OrderId.cs b/...Allegro.Extensions.Identifiers/Allegro.Extensions.Identifiers.Demo/Identifiers/OrderId.cs
@@ -2,6 +2,7 @@
 #pragma warning disable 1591
 
 using Allegro.Extensions.Identifiers.Abstractions;
+using Meziantou.Framework.Annotations;
 
 namespace Allegro.Extensions.Identifiers.Demo.Identifiers;
 

diff --git a/...legro.Extensions.Identifiers/Allegro.Extensions.Identifiers.Demo/Identifiers/PaymentId.cs b/...legro.Extensions.Identifiers/Allegro.Extensions.Identifiers.Demo/Identifiers/PaymentId.cs
@@ -1,6 +1,7 @@
 // Copyright (c) PlaceholderCompany. All rights reserved.
 
 using Allegro.Extensions.Identifiers.Abstractions;
+using Meziantou.Framework.Annotations;
 
 namespace Allegro.Extensions.Identifiers.Demo.Identifiers;
 

diff --git a/src/Allegro.Extensions.Identifiers/Allegro.Extensions.Identifiers.Demo/Identifiers/UserId.cs b/src/Allegro.Extensions.Identifiers/Allegro.Extensions.Identifiers.Demo/Identifiers/UserId.cs
@@ -1,6 +1,7 @@
 // Copyright (c) PlaceholderCompany. All rights reserved.
 
 using Allegro.Extensions.Identifiers.Abstractions;
+using Meziantou.Framework.Annotations;
 
 namespace Allegro.Extensions.Identifiers.Demo.Identifiers;
 

diff --git a/src/Allegro.Extensions.Identifiers/CHANGELOG.md b/src/Allegro.Extensions.Identifiers/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.0] - 2024-01-26
+* Updated to version 2.1.0 of Meziantou.Framework.StronglyTypedId and Microsoft.CodeAnalysis to 4.8.0
+* Fixed AddStronglyTypedIds failing becouse of https://github.com/dotnet/SqlClient/issues/1930
+### Fix
+
+* Updated to version 1.0.34 of Meziantou.Framework.StronglyTypedId and Microsoft.CodeAnalysis to 4.7.0
+
 ## [1.2.0] - 2023-01-03
 
 ### Fix

diff --git a/src/Allegro.Extensions.Identifiers/version.xml b/src/Allegro.Extensions.Identifiers/version.xml
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.2.0</VersionPrefix>
+    <VersionPrefix>1.3.0</VersionPrefix>
   </PropertyGroup>
 </Project>