Merge pull request #3 from thecogworks/feat/upgrades

feat: upgraded to .net v8
thecogworks · Jun 10, 2024 · e1cb1ea · e1cb1ea
2 parents 86ab4c6 + b6856e3
commit e1cb1ea
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 39 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,11 +33,11 @@ jobs:
     steps:
       - name: Checkout reference commit
         if: ${{ github.event_name == 'pull_request' }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Checkout master
         if: ${{ github.event_name != 'pull_request' }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: master
           fetch-depth: 0
@@ -53,13 +53,13 @@ jobs:
         with:
           node-version: '16.13.0'
 
-      - name: Setup .NET 5/6/7
-        uses: actions/setup-dotnet@v3
+      - name: Setup .NET 6/7/8
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            5.0.x
             6.0.x
             7.0.x
+            8.0.x
 
       - name: Configure NuGet
         uses: nuget/setup-nuget@v1
@@ -81,7 +81,7 @@ jobs:
           dotnet publish \
             -o ${{ env.BINARIES_OUTPUT }} \
             -c ${{ env.CONFIG }} \
-            -f net7.0 \
+            -f net8.0 \
             --no-build \
             --no-restore
 

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -14,7 +14,7 @@ jobs:
       CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -41,7 +41,7 @@ jobs:
 
         echo "branch=$branch_check" >> $GITHUB_ENV
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       name: Checkout tag branch
       with:
         fetch-depth: 0

diff --git a/.github/workflows/gitflow.yml b/.github/workflows/gitflow.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: master
           fetch-depth: 0

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -29,11 +29,11 @@ jobs:
     steps:
       - name: Checkout reference commit
         if: ${{ github.event_name == 'pull_request' }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Checkout master
         if: ${{ github.event_name != 'pull_request' }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: master
           fetch-depth: 0
@@ -49,13 +49,13 @@ jobs:
         with:
           node-version: '16.13.0'
 
-      - name: Setup .NET 5/6/7
-        uses: actions/setup-dotnet@v3
+      - name: Setup .NET 6/7/8
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            5.0.x
             6.0.x
             7.0.x
+            8.0.x
 
       - name: Configure NuGet
         uses: nuget/setup-nuget@v1
@@ -94,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout commit
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - uses: actions/download-artifact@v1
         with:

diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout master
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: master
           fetch-depth: 0

diff --git a/.github/workflows/release-nuget.yml b/.github/workflows/release-nuget.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout master
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: master
           fetch-depth: 0

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,9 +14,9 @@
     <!-- Project Setup -->
 
     <PropertyGroup>
-        <TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
         <LangVersion>latest</LangVersion>
-        <NoWarn>1591;1701;1702;8032;NU1701;AD0001;CA1041;CS0311;CS5001</NoWarn>
+        <NoWarn>1591;1701;1702;8032;NU1701;NU1902;AD0001;CA1041;CS0311;CS5001</NoWarn>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <Deterministic>true</Deterministic>
         <BuildInParallel>false</BuildInParallel>
@@ -31,6 +31,11 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>disable</ImplicitUsings>
+    </PropertyGroup>
+
     <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
         <Nullable>enable</Nullable>
         <ImplicitUsings>disable</ImplicitUsings>
@@ -54,7 +59,7 @@
     </PropertyGroup>
 
     <!-- Source Link -->
-    <ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
     </ItemGroup>
 

diff --git a/src/Cogworks.AzureSearch.IoC.Umbraco/Cogworks.AzureSearch.IoC.Umbraco.csproj b/src/Cogworks.AzureSearch.IoC.Umbraco/Cogworks.AzureSearch.IoC.Umbraco.csproj
@@ -3,8 +3,8 @@
         <ContentTargetFolders>.</ContentTargetFolders>
         <PackageId>Cogworks.AzureSearch.IoC.Umbraco</PackageId>
         <Title>Cogworks.AzureSearch.IoC.Umbraco</Title>
-        <Description>An Umbraco extension to Cogworks.AzureSearch.</Description>
-        <Product>An Umbraco 9, 10, 11 extension to Cogworks.AzureSearch</Product>
+        <Description>An Umbraco 10+ extension to Cogworks.AzureSearch.</Description>
+        <Product>An Umbraco 10+ extension to Cogworks.AzureSearch</Product>
         <PackageTags>Azure Search Umbraco container IoC</PackageTags>
         <Version></Version>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -15,18 +15,18 @@
         <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     </ItemGroup>
 
+    <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+        <PackageReference Include="Umbraco.Cms.Core" Version="[13.0.0,)" />
+    </ItemGroup>
+
     <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-        <PackageReference Include="Umbraco.Cms.Core" Version="[11.0.0,)" />
+        <PackageReference Include="Umbraco.Cms.Core" Version="[11.0.0,12.99.0)" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
         <PackageReference Include="Umbraco.Cms.Core" Version="[10.0.0, 11.0.0)" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-      <PackageReference Include="Umbraco.Cms.Core" Version="[9.0.0, 10.0.0)" />
-    </ItemGroup>
-
     <ItemGroup>
       <PackageReference Include="Azure.Search.Documents" Version="11.2.0" />
       <PackageReference Include="Cogworks.AzureSearch" Version="1.0.2" />

diff --git a/...works.AzureSearch.IoC.Umbraco.UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests.csproj b/...works.AzureSearch.IoC.Umbraco.UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests.csproj
@@ -4,9 +4,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
-    <NoWarn>1591;1701;1702;8032;NU1701;AD0001;CA1041;CS0311;CS5001</NoWarn>
+    <NoWarn>1591;1701;1702;8032;NU1701;NU1902;AD0001;CA1041;CS0311;CS5001</NoWarn>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Deterministic>true</Deterministic>
     <BuildInParallel>false</BuildInParallel>
@@ -21,6 +21,11 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <Nullable>disable</Nullable>
     <ImplicitUsings>disable</ImplicitUsings>
@@ -35,18 +40,19 @@
     <ProjectReference Include="..\..\..\src\Cogworks.AzureSearch.IoC.Umbraco\Cogworks.AzureSearch.IoC.Umbraco.csproj"/>
   </ItemGroup>
 
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Umbraco.Cms.Core" Version="[13.0.0,)" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Umbraco.Cms.Core" Version="[11.0.0,)"/>
+    <PackageReference Include="Umbraco.Cms.Core" Version="[11.0.0,12.99.0)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="Umbraco.Cms.Core" Version="[10.0.0, 11.0.0)"/>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="Umbraco.Cms.Core" Version="[9.0.0, 10.0.0)"/>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="AutoFixture" Version="4.17.0"/>
     <PackageReference Include="DotLiquid" Version="2.2.595"/>

diff --git a/tests/UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests/UmbracoIocExtensionTests.cs b/tests/UnitTests/Cogworks.AzureSearch.IoC.Umbraco.UnitTests/UmbracoIocExtensionTests.cs
@@ -39,17 +39,17 @@ public class UmbracoIocExtensionTests
         public UmbracoIocExtensionTests()
         {
             _serviceCollection = new ServiceCollection();
-            var dirName = Path.GetDirectoryName(
-                Assembly.GetExecutingAssembly()
-                    .Location
-                    .Replace("bin\\Debug", string.Empty));
 
             var typeLoader =
-#if NET6_0_OR_GREATER || NET7_0
+#if NET6_0_OR_GREATER || NET7_0 || NET8_0
                 new TypeLoader(
                     Substitute.For<ITypeFinder>(),
                     Substitute.For<ILogger<TypeLoader>>());
 #else
+            var dirName = Path.GetDirectoryName(
+                Assembly.GetExecutingAssembly()
+                    .Location
+                    .Replace("bin\\Debug", string.Empty));
                 new TypeLoader(
                     Substitute.For<ITypeFinder>(),
                     new VaryingRuntimeHash(),