From e65d92c12c623f02a3547a4cf85b61d24370949e Mon Sep 17 00:00:00 2001 From: Jeddunk Date: Mon, 25 Dec 2023 13:34:46 +0100 Subject: [PATCH 1/2] Update to .NET 8; Update SteamStorefrontAPI --- GoldbergGUI.Core/GoldbergGUI.Core.csproj | 6 +++--- GoldbergGUI.WPF/GoldbergGUI.WPF.csproj | 4 ++-- SteamStorefrontAPI | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GoldbergGUI.Core/GoldbergGUI.Core.csproj b/GoldbergGUI.Core/GoldbergGUI.Core.csproj index 865a61b..f6ebfb7 100644 --- a/GoldbergGUI.Core/GoldbergGUI.Core.csproj +++ b/GoldbergGUI.Core/GoldbergGUI.Core.csproj @@ -1,8 +1,8 @@  - netcoreapp3.1 - 0.2.0 + net8.0 + 0.3.0 Jeddunk AnyCPU;x86;x64 @@ -11,7 +11,7 @@ - + diff --git a/GoldbergGUI.WPF/GoldbergGUI.WPF.csproj b/GoldbergGUI.WPF/GoldbergGUI.WPF.csproj index d0e7dcb..6e1a7aa 100644 --- a/GoldbergGUI.WPF/GoldbergGUI.WPF.csproj +++ b/GoldbergGUI.WPF/GoldbergGUI.WPF.csproj @@ -2,9 +2,9 @@ WinExe - netcoreapp3.1 + net8.0-windows true - 0.2.0 + 0.3.0 Jeddunk AnyCPU;x86;x64 diff --git a/SteamStorefrontAPI b/SteamStorefrontAPI index 2b984cd..c1fc8a5 160000 --- a/SteamStorefrontAPI +++ b/SteamStorefrontAPI @@ -1 +1 @@ -Subproject commit 2b984cd5a11802e6106e0e1202b90fe5da7735fb +Subproject commit c1fc8a5d6f4852c9430a66f7bc3c57c7076d2a39 From 1839ec226a89dc0365a43140eb9dc89c58d6fcc7 Mon Sep 17 00:00:00 2001 From: Jeddunk Date: Mon, 25 Dec 2023 21:49:37 +0100 Subject: [PATCH 2/2] Update to latest SteamStorefrontAPI --- GoldbergGUI.Core/GoldbergGUI.Core.csproj | 48 +++++++++++------------- GoldbergGUI.sln | 14 ------- SteamStorefrontAPI | 1 - 3 files changed, 22 insertions(+), 41 deletions(-) delete mode 160000 SteamStorefrontAPI diff --git a/GoldbergGUI.Core/GoldbergGUI.Core.csproj b/GoldbergGUI.Core/GoldbergGUI.Core.csproj index f6ebfb7..72f32a9 100644 --- a/GoldbergGUI.Core/GoldbergGUI.Core.csproj +++ b/GoldbergGUI.Core/GoldbergGUI.Core.csproj @@ -1,32 +1,28 @@  - - net8.0 - 0.3.0 - Jeddunk - AnyCPU;x86;x64 - + + net8.0 + 0.3.0 + Jeddunk + AnyCPU;x86;x64 + - - - - - - - - + + + + + + + + - - - - - - - ..\..\..\..\..\..\Windows\Microsoft.NET\assembly\GAC_32\PresentationCore\v4.0_4.0.0.0__31bf3856ad364e35\PresentationCore.dll - - - ..\..\..\..\..\..\Windows\Microsoft.NET\assembly\GAC_MSIL\PresentationFramework\v4.0_4.0.0.0__31bf3856ad364e35\PresentationFramework.dll - - + + + ..\..\..\..\..\..\Windows\Microsoft.NET\assembly\GAC_32\PresentationCore\v4.0_4.0.0.0__31bf3856ad364e35\PresentationCore.dll + + + ..\..\..\..\..\..\Windows\Microsoft.NET\assembly\GAC_MSIL\PresentationFramework\v4.0_4.0.0.0__31bf3856ad364e35\PresentationFramework.dll + + diff --git a/GoldbergGUI.sln b/GoldbergGUI.sln index 913cbee..91e54f5 100644 --- a/GoldbergGUI.sln +++ b/GoldbergGUI.sln @@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GoldbergGUI.Core", "Goldber EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GoldbergGUI.WPF", "GoldbergGUI.WPF\GoldbergGUI.WPF.csproj", "{84ED15D3-725C-43B1-B8C7-51759CAABBAA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamStorefrontAPI", "SteamStorefrontAPI\SteamStorefrontAPI\SteamStorefrontAPI.csproj", "{42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E7DA860-D7FD-4090-B7EC-6DA3974DC845}" ProjectSection(SolutionItems) = preProject COPYING = COPYING @@ -49,18 +47,6 @@ Global {84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|x64.Build.0 = Release|Any CPU {84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|x86.ActiveCfg = Release|x86 {84ED15D3-725C-43B1-B8C7-51759CAABBAA}.Release|x86.Build.0 = Release|x86 - {42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}.Debug|x64.ActiveCfg = Debug|Any CPU - {42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}.Debug|x64.Build.0 = Debug|Any CPU - {42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}.Debug|x86.ActiveCfg = Debug|Any CPU - {42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}.Debug|x86.Build.0 = Debug|Any CPU - {42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}.Release|Any CPU.Build.0 = Release|Any CPU - {42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}.Release|x64.ActiveCfg = Release|Any CPU - {42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}.Release|x64.Build.0 = Release|Any CPU - {42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}.Release|x86.ActiveCfg = Release|Any CPU - {42D17FA4-C45C-4CC1-BA9C-80B3FA1C006D}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SteamStorefrontAPI b/SteamStorefrontAPI deleted file mode 160000 index c1fc8a5..0000000 --- a/SteamStorefrontAPI +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c1fc8a5d6f4852c9430a66f7bc3c57c7076d2a39