Update from .NET Framework 4.5 to 4.8

KSP-CKAN · Nov 13, 2023 · ce2262a · ce2262a
1 parent 41317ed
commit ce2262a
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 28 deletions.
diff --git a/AutoUpdate/CKAN-autoupdate.csproj b/AutoUpdate/CKAN-autoupdate.csproj
@@ -16,8 +16,8 @@
     <Prefer32Bit>false</Prefer32Bit>
     <LangVersion>7</LangVersion>
     <ApplicationIcon>..\assets\ckan.ico</ApplicationIcon>
-    <TargetFramework>net45</TargetFramework>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFramework>net48</TargetFramework>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/Cmdline/CKAN-cmdline.csproj b/Cmdline/CKAN-cmdline.csproj
@@ -14,11 +14,11 @@
     <Deterministic>true</Deterministic>
     <Configurations>Debug;Release</Configurations>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>7</LangVersion>
-    <TargetFramework>net45</TargetFramework>
+    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net48</TargetFramework>
     <StartupObject>CKAN.CmdLine.MainClass</StartupObject>
     <ApplicationIcon>..\assets\ckan.ico</ApplicationIcon>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/ConsoleUI/CKAN-ConsoleUI.csproj b/ConsoleUI/CKAN-ConsoleUI.csproj
@@ -14,10 +14,10 @@
     <Deterministic>true</Deterministic>
     <Configurations>Debug;Release</Configurations>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>7</LangVersion>
-    <TargetFramework>net45</TargetFramework>
+    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net48</TargetFramework>
     <ApplicationIcon>..\assets\ckan.ico</ApplicationIcon>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/Core/CKAN-core.csproj b/Core/CKAN-core.csproj
@@ -14,7 +14,7 @@
     <Deterministic>true</Deterministic>
     <Configurations>Debug;Release;Debug_NetCore;Release_NetCore</Configurations>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>7</LangVersion>
+    <LangVersion>7.3</LangVersion>
     <NoWarn>IDE1006</NoWarn>
   </PropertyGroup>
   <Choose>
@@ -25,7 +25,7 @@
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFramework>net45</TargetFramework>
+        <TargetFramework>net48</TargetFramework>
       </PropertyGroup>
     </Otherwise>
   </Choose>
@@ -44,7 +44,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NJsonSchema" Version="10.9.0" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
     <PackageReference Include="ChinhDo.Transactions.FileManager" Version="1.2.0" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />

diff --git a/Core/Extensions/EnumerableExtensions.cs b/Core/Extensions/EnumerableExtensions.cs
@@ -117,7 +117,7 @@ public static TimeSpan Sum(this IEnumerable<TimeSpan> source)
         public static IEnumerable<V> ZipMany<T, U, V>(this IEnumerable<T> seq1, IEnumerable<U> seq2, Func<T, U, IEnumerable<V>> func)
             => seq1.Zip(seq2, func).SelectMany(seqs => seqs);
 
-#if NET45
+#if NETFRAMEWORK
 
         /// <summary>
         /// Eliminate duplicate elements based on the value returned by a callback
@@ -144,7 +144,7 @@ public static IEnumerable<T> TraverseNodes<T>(this T start, Func<T, T> getNext)
             }
         }
 
-#if NET45
+#if NETFRAMEWORK
 
         /// <summary>
         /// Make pairs out of the elements of two sequences
@@ -155,6 +155,10 @@ public static IEnumerable<T> TraverseNodes<T>(this T start, Func<T, T> getNext)
         public static IEnumerable<Tuple<T1, T2>> Zip<T1, T2>(this IEnumerable<T1> seq1, IEnumerable<T2> seq2)
             => seq1.Zip(seq2, (item1, item2) => new Tuple<T1, T2>(item1, item2));
 
+#endif
+
+#if NET45
+
         /// <summary>
         /// Enable a `foreach` over a sequence of tuples
         /// </summary>
@@ -201,6 +205,8 @@ public static void Deconstruct<T1, T2, T3, T4>(this Tuple<T1, T2, T3, T4> tuple,
             item4 = tuple.Item4;
         }
 
+#endif
+
         /// <summary>
         /// Enable a `foreach` over a sequence of key value pairs
         /// </summary>
@@ -213,8 +219,6 @@ public static void Deconstruct<T1, T2>(this KeyValuePair<T1, T2> kvp, out T1 key
             val = kvp.Value;
         }
 
-#endif
-
     }
 
     /// <summary>

diff --git a/GUI/CKAN-GUI.csproj b/GUI/CKAN-GUI.csproj
@@ -14,10 +14,10 @@
     <Deterministic>true</Deterministic>
     <Configurations>Debug;Release</Configurations>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>7</LangVersion>
-    <TargetFramework>net45</TargetFramework>
+    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net48</TargetFramework>
     <ApplicationIcon>..\assets\ckan.ico</ApplicationIcon>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/GUI/Controls/ManageMods.Designer.cs b/GUI/Controls/ManageMods.Designer.cs
diff --git a/Netkan/CKAN-netkan.csproj b/Netkan/CKAN-netkan.csproj
@@ -14,11 +14,11 @@
     <Deterministic>true</Deterministic>
     <Configurations>Debug;Release</Configurations>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>7</LangVersion>
-    <TargetFramework>net45</TargetFramework>
+    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net48</TargetFramework>
     <StartupObject>CKAN.NetKAN.Program</StartupObject>
     <ApplicationIcon>..\assets\ckan.ico</ApplicationIcon>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -15,7 +15,7 @@
     <Deterministic>true</Deterministic>
     <Configurations>Debug;Release;Debug_NetCore;Release_NetCore</Configurations>
     <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>7</LangVersion>
+    <LangVersion>7.3</LangVersion>
     <NoWarn>IDE1006</NoWarn>
   </PropertyGroup>
   <Choose>
@@ -26,7 +26,7 @@
     </When>
     <Otherwise>
       <PropertyGroup>
-        <TargetFramework>net45</TargetFramework>
+        <TargetFramework>net48</TargetFramework>
       </PropertyGroup>
     </Otherwise>
   </Choose>
@@ -51,7 +51,7 @@
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -73,7 +73,7 @@
     <ProjectReference Include="..\Core\CKAN-core.csproj" />
   </ItemGroup>
   <Choose>
-    <When Condition=" '$(TargetFramework)' == 'net45' ">
+    <When Condition=" '$(TargetFramework)' == 'net48' ">
       <ItemGroup>
         <ProjectReference Include="..\Cmdline\CKAN-cmdline.csproj" />
         <ProjectReference Include="..\ConsoleUI\CKAN-ConsoleUI.csproj" />

diff --git a/build.cake b/build.cake
@@ -8,7 +8,7 @@ using System.Text.RegularExpressions;
 using Semver;
 
 var buildNetCore = "net7.0";
-var buildNetFramework = "net45";
+var buildNetFramework = "net48";
 
 var target = Argument<string>("target", "Default");
 var configuration = Argument<string>("configuration", "Debug");