From 9ee3e4b82452f9b20d57def6140d1cc8f0abe2d4 Mon Sep 17 00:00:00 2001 From: SaileshBK Date: Sat, 23 Dec 2023 22:52:35 -0600 Subject: [PATCH 1/4] fix(upgrade): Upgrade to .NET 8 --- .../UnitystationLauncher.Tests.csproj | 66 +++++++++---------- UnitystationLauncher.sln | 23 ++++--- .../UnitystationLauncher.csproj | 11 ++-- 3 files changed, 51 insertions(+), 49 deletions(-) diff --git a/UnitystationLauncher.Tests/UnitystationLauncher.Tests.csproj b/UnitystationLauncher.Tests/UnitystationLauncher.Tests.csproj index 9ae04cb4..a21024ef 100644 --- a/UnitystationLauncher.Tests/UnitystationLauncher.Tests.csproj +++ b/UnitystationLauncher.Tests/UnitystationLauncher.Tests.csproj @@ -1,37 +1,31 @@ - - - net7.0 - enable - - false - false - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - - - - - + + net8.0 + enable + false + false + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + \ No newline at end of file diff --git a/UnitystationLauncher.sln b/UnitystationLauncher.sln index b50bb455..75cc64fc 100644 --- a/UnitystationLauncher.sln +++ b/UnitystationLauncher.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29418.71 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34330.188 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitystationLauncher", "UnitystationLauncher\UnitystationLauncher.csproj", "{B7F5B4B3-BD06-46DF-AD15-634B00004CDB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitystationLauncher", "UnitystationLauncher\UnitystationLauncher.csproj", "{B7F5B4B3-BD06-46DF-AD15-634B00004CDB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitystationLauncher.Tests", "UnitystationLauncher.Tests\UnitystationLauncher.Tests.csproj", "{FC971561-155A-4B54-9977-203EA22663CB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitystationLauncher.Tests", "UnitystationLauncher.Tests\UnitystationLauncher.Tests.csproj", "{FC971561-155A-4B54-9977-203EA22663CB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,11 +13,12 @@ Global Debug|x64 = Debug|x64 Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 + ReleaseOSX|Any CPU = ReleaseOSX|Any CPU + ReleaseOSX|x64 = ReleaseOSX|x64 ReleasePOSIX64|Any CPU = ReleasePOSIX64|Any CPU ReleasePOSIX64|x64 = ReleasePOSIX64|x64 ReleaseWIN64|Any CPU = ReleaseWIN64|Any CPU ReleaseWIN64|x64 = ReleaseWIN64|x64 - ReleaseOSX|x64 = ReleaseOSX|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -28,6 +29,10 @@ Global {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.Release|Any CPU.Build.0 = Release|Any CPU {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.Release|x64.ActiveCfg = Release|x64 {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.Release|x64.Build.0 = Release|x64 + {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.ReleaseOSX|Any CPU.ActiveCfg = ReleaseOSX|x64 + {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.ReleaseOSX|Any CPU.Build.0 = ReleaseOSX|x64 + {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.ReleaseOSX|x64.ActiveCfg = ReleaseOSX|x64 + {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.ReleaseOSX|x64.Build.0 = ReleaseOSX|x64 {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.ReleasePOSIX64|Any CPU.ActiveCfg = ReleasePOSIX64|Any CPU {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.ReleasePOSIX64|Any CPU.Build.0 = ReleasePOSIX64|Any CPU {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.ReleasePOSIX64|x64.ActiveCfg = ReleasePOSIX64|x64 @@ -36,8 +41,6 @@ Global {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.ReleaseWIN64|Any CPU.Build.0 = ReleaseWIN64|Any CPU {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.ReleaseWIN64|x64.ActiveCfg = ReleaseWIN64|x64 {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.ReleaseWIN64|x64.Build.0 = ReleaseWIN64|x64 - {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.ReleaseOSX|x64.ActiveCfg = ReleaseOSX|x64 - {B7F5B4B3-BD06-46DF-AD15-634B00004CDB}.ReleaseOSX|x64.Build.0 = ReleaseOSX|x64 {FC971561-155A-4B54-9977-203EA22663CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FC971561-155A-4B54-9977-203EA22663CB}.Debug|Any CPU.Build.0 = Debug|Any CPU {FC971561-155A-4B54-9977-203EA22663CB}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -46,6 +49,10 @@ Global {FC971561-155A-4B54-9977-203EA22663CB}.Release|Any CPU.Build.0 = Release|Any CPU {FC971561-155A-4B54-9977-203EA22663CB}.Release|x64.ActiveCfg = Release|Any CPU {FC971561-155A-4B54-9977-203EA22663CB}.Release|x64.Build.0 = Release|Any CPU + {FC971561-155A-4B54-9977-203EA22663CB}.ReleaseOSX|Any CPU.ActiveCfg = Release|Any CPU + {FC971561-155A-4B54-9977-203EA22663CB}.ReleaseOSX|Any CPU.Build.0 = Release|Any CPU + {FC971561-155A-4B54-9977-203EA22663CB}.ReleaseOSX|x64.ActiveCfg = Debug|Any CPU + {FC971561-155A-4B54-9977-203EA22663CB}.ReleaseOSX|x64.Build.0 = Debug|Any CPU {FC971561-155A-4B54-9977-203EA22663CB}.ReleasePOSIX64|Any CPU.ActiveCfg = Debug|Any CPU {FC971561-155A-4B54-9977-203EA22663CB}.ReleasePOSIX64|Any CPU.Build.0 = Debug|Any CPU {FC971561-155A-4B54-9977-203EA22663CB}.ReleasePOSIX64|x64.ActiveCfg = Debug|Any CPU @@ -54,8 +61,6 @@ Global {FC971561-155A-4B54-9977-203EA22663CB}.ReleaseWIN64|Any CPU.Build.0 = Debug|Any CPU {FC971561-155A-4B54-9977-203EA22663CB}.ReleaseWIN64|x64.ActiveCfg = Debug|Any CPU {FC971561-155A-4B54-9977-203EA22663CB}.ReleaseWIN64|x64.Build.0 = Debug|Any CPU - {FC971561-155A-4B54-9977-203EA22663CB}.ReleaseOSX|x64.ActiveCfg = Debug|Any CPU - {FC971561-155A-4B54-9977-203EA22663CB}.ReleaseOSX|x64.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UnitystationLauncher/UnitystationLauncher.csproj b/UnitystationLauncher/UnitystationLauncher.csproj index ca65b505..b8d81c23 100644 --- a/UnitystationLauncher/UnitystationLauncher.csproj +++ b/UnitystationLauncher/UnitystationLauncher.csproj @@ -1,7 +1,7 @@ WinExe - net7.0 + net8.0 latest enable enable @@ -24,14 +24,16 @@ False Error - StationHub + StationHub + org.unitystation.hub 1.0.0 1.0.0 APPL ???? StationHub - ian.icns + ian.icns + NSApplication true @@ -109,6 +111,7 @@ + @@ -118,4 +121,4 @@ InBuiltData - + \ No newline at end of file From aa42542c48cfc81820f599d8a1a300394041242e Mon Sep 17 00:00:00 2001 From: SaileshBK Date: Sat, 23 Dec 2023 23:25:56 -0600 Subject: [PATCH 2/4] fix(update): Update dotnetcore.yml --- .github/workflows/dotnetcore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index ee63068c..eeee09f8 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -9,7 +9,7 @@ on: - "*" env: - DOTNET_VERSION: '7.0.x' + DOTNET_VERSION: '8.0.x' jobs: test: From dbdac796d5ec221ca10a59af0076569cb5274a7f Mon Sep 17 00:00:00 2001 From: SaileshBK Date: Sun, 24 Dec 2023 15:34:14 -0600 Subject: [PATCH 3/4] chore(upgrade): Resolved comments --- .github/workflows/dotnetcore.yml | 2 +- UnitystationLauncher.sln | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index eeee09f8..c1b0eb90 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -115,4 +115,4 @@ jobs: # Build - name: Test Flatpak Build run: | - dotnet publish --framework net7.0 --runtime linux-x64 --configuration Release --self-contained true /p:DefineConstants="FLATPAK" /p:DisableBeauty=true + dotnet publish --framework net8.0 --runtime linux-x64 --configuration Release --self-contained true /p:DefineConstants="FLATPAK" /p:DisableBeauty=true diff --git a/UnitystationLauncher.sln b/UnitystationLauncher.sln index 75cc64fc..ee6d2124 100644 --- a/UnitystationLauncher.sln +++ b/UnitystationLauncher.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.8.34330.188 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitystationLauncher", "UnitystationLauncher\UnitystationLauncher.csproj", "{B7F5B4B3-BD06-46DF-AD15-634B00004CDB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitystationLauncher", "UnitystationLauncher\UnitystationLauncher.csproj", "{B7F5B4B3-BD06-46DF-AD15-634B00004CDB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitystationLauncher.Tests", "UnitystationLauncher.Tests\UnitystationLauncher.Tests.csproj", "{FC971561-155A-4B54-9977-203EA22663CB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitystationLauncher.Tests", "UnitystationLauncher.Tests\UnitystationLauncher.Tests.csproj", "{FC971561-155A-4B54-9977-203EA22663CB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From 17a2f010864370b40befae6b46af39e962cad51c Mon Sep 17 00:00:00 2001 From: SaileshBK Date: Fri, 16 Feb 2024 22:48:22 -0600 Subject: [PATCH 4/4] chore(upgrade): Removed redundant line --- UnitystationLauncher/UnitystationLauncher.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/UnitystationLauncher/UnitystationLauncher.csproj b/UnitystationLauncher/UnitystationLauncher.csproj index b8d81c23..f387acf3 100644 --- a/UnitystationLauncher/UnitystationLauncher.csproj +++ b/UnitystationLauncher/UnitystationLauncher.csproj @@ -111,7 +111,6 @@ -