Use .NET8 only

GarageGroup · Mar 13, 2024 · 8df6994 · 8df6994
1 parent a451c47
commit 8df6994
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 35 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -15,9 +15,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: |
-            7.0.x
-            8.0.x
+        dotnet-version: 8.0.x
 
      # Add NuGet Sources
 

diff --git a/src/durable-task/Azure.DurableTask/Azure.DurableTask.csproj b/src/durable-task/Azure.DurableTask/Azure.DurableTask.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <InvariantGlobalization>true</InvariantGlobalization>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <RootNamespace>GarageGroup.Infra</RootNamespace>
     <AssemblyName>GarageGroup.Infra.Azure.DurableTask</AssemblyName>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GarageGroup.Infra.Azure.Handler" Version="0.13.0" />
+    <PackageReference Include="GarageGroup.Infra.Azure.Handler" Version="0.14.0" />
     <PackageReference Include="GarageGroup.Infra.Orchestration.Api.Activity.Contract" Version="0.2.0" />
     <PackageReference Include="GarageGroup.Infra.Orchestration.Api.Entity.Contract" Version="0.1.0" />
     <PackageReference Include="GarageGroup.Infra.Orchestration.Api.Instance.Contract" Version="0.2.0" />

diff --git a/src/endpoint/Azure.Endpoint/Azure.Endpoint.csproj b/src/endpoint/Azure.Endpoint/Azure.Endpoint.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <InvariantGlobalization>true</InvariantGlobalization>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <RootNamespace>GarageGroup.Infra</RootNamespace>
     <AssemblyName>GarageGroup.Infra.Azure.Endpoint</AssemblyName>
-    <Version>0.12.0</Version>
+    <Version>0.13.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GarageGroup.Infra.Azure.Swagger" Version="0.7.0" />
+    <PackageReference Include="GarageGroup.Infra.Azure.Swagger" Version="0.8.0" />
     <PackageReference Include="GarageGroup.Infra.Endpoint.Core" Version="0.14.1" />
   </ItemGroup>
 

diff --git a/src/endpoint/Azure.Endpoint/FunctionSwaggerBuilder/Builder.Configure.cs b/src/endpoint/Azure.Endpoint/FunctionSwaggerBuilder/Builder.Configure.cs
@@ -9,7 +9,7 @@ public FunctionSwaggerBuilder Configure(Action<OpenApiDocument> configure)
     {
         ArgumentNullException.ThrowIfNull(configure);
 
-        configure(document);
+        configure.Invoke(document);
         return this;
     }
 }
diff --git a/src/endpoint/Azure.Endpoint/FunctionSwaggerUIHelper/FunctionSwaggerUIHelper.cs b/src/endpoint/Azure.Endpoint/FunctionSwaggerUIHelper/FunctionSwaggerUIHelper.cs
@@ -45,21 +45,13 @@ private static string LoadAndUpdateHtml(this string documentHtml, ZipArchive arc
 
     private static Stream GetZippedResources()
     {
-        var assembly = Assembly.GetAssembly(typeof(SwashBuckleClient));
-        if (assembly is null)
-        {
-            throw new InvalidOperationException($"Assembly for type {typeof(SwashBuckleClient)} was not found");
-        }
+        var assembly = Assembly.GetAssembly(typeof(SwashBuckleClient))
+            ?? throw new InvalidOperationException($"Assembly for type {typeof(SwashBuckleClient)} was not found");
 
         var resourceName = $"{typeof(ISwashBuckleClient).Namespace}.EmbededResources.resources.zip";
-        var resources = assembly.GetManifestResourceStream(resourceName);
 
-        if (resources is null)
-        {
-            throw new InvalidOperationException($"ManifestResource {resourceName} must be not null");
-        }
-
-        return resources;
+        return assembly.GetManifestResourceStream(resourceName)
+            ?? throw new InvalidOperationException($"ManifestResource {resourceName} must be not null");
     }
 
     private static ZipArchiveEntry GetEntryOrThrow(this ZipArchive archive, string entryName)

diff --git a/src/handler/Azure.Handler/Annotations/Function/EventGridFunctionAttribute.cs b/src/handler/Azure.Handler/Annotations/Function/EventGridFunctionAttribute.cs
@@ -3,9 +3,6 @@
 namespace GarageGroup.Infra;
 
 [AttributeUsage(AttributeTargets.Method)]
-public sealed class EventGridFunctionAttribute : HandlerFunctionAttribute
+public sealed class EventGridFunctionAttribute(string name) : HandlerFunctionAttribute(name)
 {
-    public EventGridFunctionAttribute(string name) : base(name)
-    {
-    }
 }
diff --git a/src/handler/Azure.Handler/Azure.Handler.csproj b/src/handler/Azure.Handler/Azure.Handler.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <InvariantGlobalization>true</InvariantGlobalization>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <RootNamespace>GarageGroup.Infra</RootNamespace>
     <AssemblyName>GarageGroup.Infra.Azure.Handler</AssemblyName>
-    <Version>0.13.0</Version>
+    <Version>0.14.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GarageGroup.Infra.Handler.Core" Version="0.5.0" />
+    <PackageReference Include="GarageGroup.Infra.Handler.Core" Version="0.6.0" />
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Core" Version="1.17.0" />
     <PackageReference Include="PrimeFuncPack.Dependency" Version="2.1.0" />

diff --git a/src/hosting/Azure.Hosting/Azure.Hosting.csproj b/src/hosting/Azure.Hosting/Azure.Hosting.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <InvariantGlobalization>true</InvariantGlobalization>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <RootNamespace>GarageGroup.Infra</RootNamespace>
     <AssemblyName>GarageGroup.Infra.Azure.Hosting</AssemblyName>
-    <Version>0.8.0</Version>
+    <Version>0.9.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="GarageGroup.Infra.Azure.TokenCredential" Version="0.1.0" />
-    <PackageReference Include="GarageGroup.Infra.Http.SocketsHandlerProvider" Version="2.5.1" />
+    <PackageReference Include="GarageGroup.Infra.Http.SocketsHandlerProvider" Version="3.0.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" />
-    <PackageReference Include="Microsoft.Azure.AppConfiguration.Functions.Worker" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Azure.AppConfiguration.Functions.Worker" Version="7.1.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.21.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="1.2.0" />
   </ItemGroup>

diff --git a/src/swagger/Azure.Swagger/Azure.Swagger.csproj b/src/swagger/Azure.Swagger/Azure.Swagger.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <InvariantGlobalization>true</InvariantGlobalization>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <RootNamespace>GarageGroup.Infra</RootNamespace>
     <AssemblyName>GarageGroup.Infra.Azure.Swagger</AssemblyName>
-    <Version>0.7.0</Version>
+    <Version>0.8.0</Version>
   </PropertyGroup>
 
   <ItemGroup>