From 987fe6410adbcaa394290dc81e0dbf03018d5ec4 Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Wed, 30 Oct 2024 16:18:14 -0400 Subject: [PATCH 1/4] Fix build script --- .github/workflows/build-and-test.yaml | 2 +- .../max/Code/max/Compiling/Configuration/Compiler/VC.hpp | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 26d0675..cfd5d02 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -26,7 +26,7 @@ jobs: uses: microsoft/setup-msbuild@v1.0.2 - name: Update NuGet packages - uses: nuget update + run: nuget update - name: Build working-directory: ${{env.GITHUB_WORKSPACE}} diff --git a/Dependencies/max/Code/max/Compiling/Configuration/Compiler/VC.hpp b/Dependencies/max/Code/max/Compiling/Configuration/Compiler/VC.hpp index 13e2931..b771f3b 100644 --- a/Dependencies/max/Code/max/Compiling/Configuration/Compiler/VC.hpp +++ b/Dependencies/max/Code/max/Compiling/Configuration/Compiler/VC.hpp @@ -11,10 +11,14 @@ #define MAX_COMPILER_MESSAGE( Message ) __pragma( message( Message ) ) -#if _MSC_VER > 1938 +#if _MSC_VER > 1939 MAX_COMPILER_MESSAGE( "Compiling with a newer version of MSVC than max recognizes. Using last known version." ); +#elif _MSC_VER >= 1939 + // MSVC++ (Visual Studio 2022 / version 17.9) + #define MAX_COMPILER_VERSION_MAJOR 17 + #define MAX_COMPILER_VERSION_MINOR 9 #elif _MSC_VER >= 1938 - // MCVC++ (Visual Studio 2022 / version 17.8) + // MSVC++ (Visual Studio 2022 / version 17.8) #define MAX_COMPILER_VERSION_MAJOR 17 #define MAX_COMPILER_VERSION_MINOR 8 #elif _MSC_VER >= 1937 From 340adb9d60f30e7da4f9d97b2ea6268f02fb7077 Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Wed, 30 Oct 2024 16:20:37 -0400 Subject: [PATCH 2/4] Fix packages.config path --- .github/workflows/build-and-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index cfd5d02..243e27e 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -26,7 +26,7 @@ jobs: uses: microsoft/setup-msbuild@v1.0.2 - name: Update NuGet packages - run: nuget update + run: nuget update .\Projects\VisualStudio\maxGUI\packages.config - name: Build working-directory: ${{env.GITHUB_WORKSPACE}} From f3cf3f11626e5df00b3a10153395237d14666d63 Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Wed, 30 Oct 2024 16:23:15 -0400 Subject: [PATCH 3/4] Use solution file instead of packages.config --- .github/workflows/build-and-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 243e27e..be420f3 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -26,7 +26,7 @@ jobs: uses: microsoft/setup-msbuild@v1.0.2 - name: Update NuGet packages - run: nuget update .\Projects\VisualStudio\maxGUI\packages.config + run: nuget update .\Projects\VisualStudio\maxGUI.sln - name: Build working-directory: ${{env.GITHUB_WORKSPACE}} From 0a5831a7f360fcf9d00e5093110710653e562153 Mon Sep 17 00:00:00 2001 From: Chris Blume Date: Wed, 30 Oct 2024 16:26:57 -0400 Subject: [PATCH 4/4] Use nuget restore instead of nuget update --- .github/workflows/build-and-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index be420f3..a00cf55 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -26,7 +26,7 @@ jobs: uses: microsoft/setup-msbuild@v1.0.2 - name: Update NuGet packages - run: nuget update .\Projects\VisualStudio\maxGUI.sln + run: nuget restore .\Projects\VisualStudio\maxGUI.sln - name: Build working-directory: ${{env.GITHUB_WORKSPACE}}