From 6af3d066bcb7b69230f12aff606849e89ce11725 Mon Sep 17 00:00:00 2001 From: AraHaan Date: Mon, 25 Dec 2023 19:15:36 -0500 Subject: [PATCH] Migrated Shared Framework to .NET 8 only. Sorry but .NET 6 and 7 support could not stay. Signed-off-by: AraHaan --- .github/workflows/dotnetcore-build.yml | 3 +++ .github/workflows/dotnetcore-publish.yml | 3 +++ .github/workflows/dotnetcore.yml | 3 +++ Directory.Build.props | 2 +- Elskom.Sdk.Tasks/TaskHelpers.cs | 34 +++++++++--------------- Elskom.Sdk/Directory.Build.props | 4 +-- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/.github/workflows/dotnetcore-build.yml b/.github/workflows/dotnetcore-build.yml index 2cdd191..12aa54a 100644 --- a/.github/workflows/dotnetcore-build.yml +++ b/.github/workflows/dotnetcore-build.yml @@ -18,6 +18,9 @@ jobs: - name: Install latest .NET SDK uses: Elskom/setup-latest-dotnet@main + with: + SDK_VERSION: '8.0.100' + RUNTIME_VERSIONS: '' - name: Restore, Build, and pack uses: Elskom/build-dotnet@main diff --git a/.github/workflows/dotnetcore-publish.yml b/.github/workflows/dotnetcore-publish.yml index 3e73c85..c26f3a5 100644 --- a/.github/workflows/dotnetcore-publish.yml +++ b/.github/workflows/dotnetcore-publish.yml @@ -19,6 +19,9 @@ jobs: - name: Install latest .NET SDK uses: Elskom/setup-latest-dotnet@main + with: + SDK_VERSION: '8.0.100' + RUNTIME_VERSIONS: '' - name: Restore, Build, and pack uses: Elskom/build-dotnet@main diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 2df82f9..3c11b6c 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -15,6 +15,9 @@ jobs: - name: Install latest .NET SDK uses: Elskom/setup-latest-dotnet@main + with: + SDK_VERSION: '8.0.100' + RUNTIME_VERSIONS: '' - name: Restore, Build, and pack uses: Elskom/build-dotnet@main diff --git a/Directory.Build.props b/Directory.Build.props index ec44fbc..ea84dba 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -12,7 +12,7 @@ https://github.com/Elskom/Sdk/ https://github.com/Elskom/Sdk/ git - Copyright (c) 2018-2022 + Copyright (c) 2018-2023 true true -dev diff --git a/Elskom.Sdk.Tasks/TaskHelpers.cs b/Elskom.Sdk.Tasks/TaskHelpers.cs index 4ca5b13..60cdf5e 100644 --- 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 index caace48..6db1ab0 100644 --- a/Elskom.Sdk/Directory.Build.props +++ b/Elskom.Sdk/Directory.Build.props @@ -3,8 +3,8 @@ - net6.0 - 6.0.4 + net8.0 + 8.0.0 false true GitBuildInformation;SettingsFile;zlib;BlowFish;Unluac;ZipAssembly;ReleasePackaging;MessageManager;GenericPluginLoader;MiniDump;PluginFramework;PluginUpdateCheck;GitBuildInfo