Updated to .NET 6 and added package dependency constrains

Geta · Dec 27, 2023 · f8e55b3 · f8e55b3
1 parent e219178
commit f8e55b3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/sandbox/Foundation/src/Foundation/Features/Search/SearchService.cs b/sandbox/Foundation/src/Foundation/Features/Search/SearchService.cs
@@ -521,7 +521,7 @@ private IEnumerable<EntryContentBase> GetManualInclusion(IList<ContentReference>
                     results.Add(item as EntryContentBase);
                 }
             }
-            return results.DistinctBy(e => e.ContentGuid);
+            return ListExtensions.DistinctBy(results, e => e.ContentGuid);
         }
 
         private ProductSearchResults GetSearchResults(IContent currentContent,

diff --git a/sandbox/Foundation/src/Foundation/Foundation.csproj b/sandbox/Foundation/src/Foundation/Foundation.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>net5.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<VersionPrefix>2021.04.1.0</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<PackageVersion Condition=" '$(PackageVersion)' == '' ">$(VersionPrefix)$(VersionSuffix)</PackageVersion>

diff --git a/src/Geta.Optimizely.Categories.Find/Geta.Optimizely.Categories.Find.csproj b/src/Geta.Optimizely.Categories.Find/Geta.Optimizely.Categories.Find.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <PackageId>Geta.Optimizely.Categories.Find</PackageId>
     <Title>Geta Optimizely Categories Find</Title>
@@ -16,17 +16,14 @@
     <PackageTags>Geta Optimizely Categories Find</PackageTags>
     <RepositoryUrl>https://github.com/Geta/geta-optimizely-categories.git</RepositoryUrl>
   </PropertyGroup>
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\images\icon.png" Link="icon.png">
       <PackagePath>\</PackagePath>
       <Pack>true</Pack>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="EPiServer.Find.Cms" Version="14.0.4" />
+    <PackageReference Include="EPiServer.Find.Cms" Version="[14.0.4, 15.0)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Geta.Optimizely.Categories\Geta.Optimizely.Categories.csproj" />

diff --git a/src/Geta.Optimizely.Categories/Geta.Optimizely.Categories.csproj b/src/Geta.Optimizely.Categories/Geta.Optimizely.Categories.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <PackageId>Geta.Optimizely.Categories</PackageId>
     <Title>Geta Optimizely Categories</Title>
@@ -19,14 +19,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
-  <ItemGroup>
-	<PackageReference Include="EPiServer.CMS.AspNetCore" Version="12.0.3" />
-    <PackageReference Include="EPiServer.CMS.AspNetCore.Routing" Version="12.0.3" />
-    <PackageReference Include="EPiServer.CMS.UI.Core" Version="12.0.3" />
-    <PackageReference Include="EPiServer.Framework" Version="12.0.3" />
+	<PackageReference Include="EPiServer.CMS.AspNetCore" Version="[12.0.3, 13.0)" />
+    <PackageReference Include="EPiServer.CMS.AspNetCore.Routing" Version="[12.0.3, 13.0)" />
+    <PackageReference Include="EPiServer.CMS.UI.Core" Version="[12.0.3, 13.0)" />
+    <PackageReference Include="EPiServer.Framework" Version="[12.0.3, 13.0)" />
   </ItemGroup>
 
   <ItemGroup>