Migrated Shared Framework to .NET 8 only. Sorry but .NET 6 and 7 supp…

…ort could not stay. Signed-off-by: AraHaan <[email protected]>
Elskom · Dec 26, 2023 · b716168 · b716168
1 parent 61bcf76
commit b716168
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 25 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,7 +12,7 @@
     <PackageProjectUrl>https://github.com/Elskom/Sdk/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Elskom/Sdk/</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Copyright>Copyright (c) 2018-2022</Copyright>
+    <Copyright>Copyright (c) 2018-2023</Copyright>
     <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
     <IsTagBuild Condition="$(GITHUB_REF.StartsWith('refs/tags/'))">true</IsTagBuild>
     <VersionSuffix Condition="'$(IsTagBuild)' == '' AND '$(GITHUB_ACTIONS)' == ''">-dev</VersionSuffix>

diff --git a/Elskom.Sdk.Tasks/TaskHelpers.cs b/Elskom.Sdk.Tasks/TaskHelpers.cs
@@ -15,27 +15,17 @@ internal static class TaskHelpers
             return null;
         }
 
-        var knownFrameworkReference1 = new TaskItem("Elskom.Sdk.App");
-        knownFrameworkReference1.SetMetadata("TargetFramework", "net6.0");
-        knownFrameworkReference1.SetMetadata("RuntimeFrameworkName", "Elskom.Sdk.App");
-        knownFrameworkReference1.SetMetadata("DefaultRuntimeFrameworkVersion", installedRuntimeVersion);
-        knownFrameworkReference1.SetMetadata("LatestRuntimeFrameworkVersion", installedRuntimeVersion);
-        knownFrameworkReference1.SetMetadata("TargetingPackName", "Elskom.Sdk.App.Ref");
-        knownFrameworkReference1.SetMetadata("TargetingPackVersion", installedRuntimeVersion);
-        knownFrameworkReference1.SetMetadata("RuntimePackNamePatterns", "Elskom.Sdk.App.Runtime.**RID**");
-        knownFrameworkReference1.SetMetadata("RuntimePackRuntimeIdentifiers", "win-x86;win-x64;win-arm64;linux-x64;linux-arm;linux-arm64;osx-x64;osx-arm64");
-        knownFrameworkReference1.SetMetadata("IsTrimmable", "true");
-        var knownFrameworkReference2 = new TaskItem("Elskom.Sdk.App");
-        knownFrameworkReference2.SetMetadata("TargetFramework", "net7.0");
-        knownFrameworkReference2.SetMetadata("RuntimeFrameworkName", "Elskom.Sdk.App");
-        knownFrameworkReference2.SetMetadata("DefaultRuntimeFrameworkVersion", installedRuntimeVersion);
-        knownFrameworkReference2.SetMetadata("LatestRuntimeFrameworkVersion", installedRuntimeVersion);
-        knownFrameworkReference2.SetMetadata("TargetingPackName", "Elskom.Sdk.App.Ref");
-        knownFrameworkReference2.SetMetadata("TargetingPackVersion", installedRuntimeVersion);
-        knownFrameworkReference2.SetMetadata("RuntimePackNamePatterns", "Elskom.Sdk.App.Runtime.**RID**");
-        knownFrameworkReference2.SetMetadata("RuntimePackRuntimeIdentifiers", "win-x86;win-x64;win-arm64;linux-x64;linux-arm;linux-arm64;osx-x64;osx-arm64");
-        knownFrameworkReference2.SetMetadata("IsTrimmable", "true");
-        return new[] { knownFrameworkReference1, knownFrameworkReference2 };
+        var knownFrameworkReference = new TaskItem("Elskom.Sdk.App");
+        knownFrameworkReference.SetMetadata("TargetFramework", "net8.0");
+        knownFrameworkReference.SetMetadata("RuntimeFrameworkName", "Elskom.Sdk.App");
+        knownFrameworkReference.SetMetadata("DefaultRuntimeFrameworkVersion", installedRuntimeVersion);
+        knownFrameworkReference.SetMetadata("LatestRuntimeFrameworkVersion", installedRuntimeVersion);
+        knownFrameworkReference.SetMetadata("TargetingPackName", "Elskom.Sdk.App.Ref");
+        knownFrameworkReference.SetMetadata("TargetingPackVersion", installedRuntimeVersion);
+        knownFrameworkReference.SetMetadata("RuntimePackNamePatterns", "Elskom.Sdk.App.Runtime.**RID**");
+        knownFrameworkReference.SetMetadata("RuntimePackRuntimeIdentifiers", "win-x86;win-x64;win-arm64;linux-x64;linux-arm;linux-arm64;osx-x64;osx-arm64");
+        knownFrameworkReference.SetMetadata("IsTrimmable", "true");
+        return new[] { knownFrameworkReference };
     }
 
     internal static ITaskItem[] ReturnItemOrEmpty(bool add, ITaskItem[] items)
@@ -62,7 +52,7 @@ private static string GetInstalledDotNetSdkRuntimePackVersion(string packName)
     private static NuGetVersion ConvertVersionToNuGetVersion(string version)
     {
         _ = NuGetVersion.TryParse(version, out var version2);
-        return version2;
+        return version2!;
     }
 
     private static string GetDotNetSdkRuntimePacksFolder()

diff --git a/Elskom.Sdk/Directory.Build.props b/Elskom.Sdk/Directory.Build.props
@@ -3,8 +3,8 @@
   <Import Project="../Directory.Build.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>6.0.4</Version>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>8.0.0</Version>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <NoPackageAnalysis>true</NoPackageAnalysis>
     <PackageTags>GitBuildInformation;SettingsFile;zlib;BlowFish;Unluac;ZipAssembly;ReleasePackaging;MessageManager;GenericPluginLoader;MiniDump;PluginFramework;PluginUpdateCheck;GitBuildInfo</PackageTags>