Merged Pull Request '#157 version/feature/net-8->version/4.5: FEAT: M…

…ove projects from .Net 6.0 to .Net 8.0' FEAT: Move projects from .Net 6.0 to .Net 8.0
51Degrees · Dec 18, 2024 · 8154fbf · 8154fbf
2 parents 106714d + acd4daf
commit 8154fbf
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 21 deletions.
diff --git a/Examples/CustomFlowElement/1. Simple Flow Element/Examples.CustomFlowElement.csproj b/Examples/CustomFlowElement/1. Simple Flow Element/Examples.CustomFlowElement.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU</Platforms>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/Examples/CustomFlowElement/2. On Premise Engine/Examples.OnPremiseEngine.csproj b/Examples/CustomFlowElement/2. On Premise Engine/Examples.OnPremiseEngine.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU</Platforms>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/...ent/3. Client-side evidence/ClientSideEvidence.MVC/Examples.ClientSideEvidence.MVC.csproj b/...ent/3. Client-side evidence/ClientSideEvidence.MVC/Examples.ClientSideEvidence.MVC.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/Examples/CustomFlowElement/4. Cloud Engine/Examples.CloudEngine.csproj b/Examples/CustomFlowElement/4. Cloud Engine/Examples.CloudEngine.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU</Platforms>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/Examples/ResultCaching/Examples.ResultCaching.csproj b/Examples/ResultCaching/Examples.ResultCaching.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <Platforms>AnyCPU</Platforms>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/Examples/UsageSharing/Examples.UsageSharing.csproj b/Examples/UsageSharing/Examples.UsageSharing.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/Web Integration/FiftyOne.Pipeline.Web.nuspec b/Web Integration/FiftyOne.Pipeline.Web.nuspec
@@ -14,7 +14,7 @@
 		<tags>51degrees,pipeline,aggregate,data service,web</tags>
 		<repository type="git" url="https://github.com/51Degrees/pipeline-dotnet" />
 		<dependencies>
-			<group targetFramework="net6.0">
+			<group targetFramework="net8.0">
 				<dependency id="FiftyOne.Pipeline.Engines.FiftyOne" version="$version$" />
 				<dependency id="FiftyOne.Pipeline.Web.Shared" version="$version$" />
 				<dependency id="FiftyOne.Pipeline.JavaScriptBuilder" version="$version$" />
@@ -38,12 +38,12 @@
 			</group>
 		</dependencies>
         <frameworkAssemblies>
-            <frameworkAssembly assemblyName="Microsoft.AspNetCore.App" targetFramework="net6.0"/>
+            <frameworkAssembly assemblyName="Microsoft.AspNetCore.App" targetFramework="net8.0"/>
         </frameworkAssemblies>
     </metadata>
 	<files>
 		<file src="..\images\51d-logo.png" target="images\" />
-    <file src="FiftyOne.Pipeline.Web\bin\$config$\net6.0\FiftyOne.Pipeline.Web.dll" target="lib\net6.0" />
+    <file src="FiftyOne.Pipeline.Web\bin\$config$\net8.0\FiftyOne.Pipeline.Web.dll" target="lib\net8.0" />
     <file src="FiftyOne.Pipeline.Web\bin\$config$\netcoreapp3.1\FiftyOne.Pipeline.Web.dll" target="lib\netcoreapp3.1" />
 		<file src="FiftyOne.Pipeline.Web.Framework\bin\$config$\FiftyOne.Pipeline.Web.Framework.dll" target="lib\net462" />
 		<file src="FiftyOne.Pipeline.Web.Framework\Web.config.transform" target="content/net462/Web.config.transform" />

diff --git a/Web Integration/FiftyOne.Pipeline.Web/Adapters/ResponseAdapter.cs b/Web Integration/FiftyOne.Pipeline.Web/Adapters/ResponseAdapter.cs
@@ -65,7 +65,7 @@ public void ClearHeaders()
         /// <inheritdoc/>
         public void SetHeader(string name, string value)
         {
-            _response.Headers.Add(name, value);
+            _response.Headers.Append(name, value);
         }
 
         /// <inheritdoc/>

diff --git a/Web Integration/FiftyOne.Pipeline.Web/FiftyOne.Pipeline.Web.csproj b/Web Integration/FiftyOne.Pipeline.Web/FiftyOne.Pipeline.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net8.0</TargetFrameworks>
     <Platforms>AnyCPU</Platforms>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -33,7 +33,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.32" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.36" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
     <!-- If these package references are updated or modified then don't forget to also 
 	     update the dependencies in the nuspec file in the parent directory. -->
     <FrameworkReference Include="Microsoft.AspNetCore.App" />

diff --git a/Web Integration/FiftyOne.Pipeline.Web/Services/SetHeadersService.cs b/Web Integration/FiftyOne.Pipeline.Web/Services/SetHeadersService.cs
@@ -96,14 +96,7 @@ public static void SetHeaders(HttpContext context,
             foreach (var header in flowData.GetFromElement(element)
                 .ResponseHeaderDictionary)
             {
-                if (context.Response.Headers.ContainsKey(header.Key))
-                {
-                    context.Response.Headers.Append(header.Key, header.Value);
-                }
-                else
-                {
-                    context.Response.Headers.Add(header.Key, header.Value);
-                }
+                context.Response.Headers.Append(header.Key, header.Value);
             }
         }
     }

diff --git a/performance-tests/performance-tests.csproj b/performance-tests/performance-tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>performance_tests</RootNamespace>
     <AssemblyName>performance_tests</AssemblyName>
   </PropertyGroup>