From 85c11b4985a56d2b82b1118eb69013e15413d929 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 6 Feb 2024 13:31:08 +0100
Subject: [PATCH] fix build

---
 .github/workflows/ports_windows.yml | 6 ++++--
 ports/windows/msvc/common.props     | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 631e926c0e99f..a01054bccc1c0 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -73,9 +73,11 @@ jobs:
             </ClCompile>
           </ItemDefinitionGroup>
         </Project>
-        '@ | Set-Content ports\windows\msvc\userignore.props
+        '@ | Set-Content ports\windows\msvc\user.props
+    - name: Build micropython.dll
+      run: msbuild ports\windows\micropythoncore.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }} -property:PyVariant=${{ matrix.variant }} 
     - name: Build micropython.exe
-      run: msbuild ports\windows\micropythoncore.vcxproj;ports\windows\micropython.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }} -property:PyVariant=${{ matrix.variant }} 
+      run: msbuild ports\windows\micropython.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }} -property:PyVariant=${{ matrix.variant }} 
     - name: Get micropython.exe path
       id: get_path
       run: |
diff --git a/ports/windows/msvc/common.props b/ports/windows/msvc/common.props
index aa41af1cda99e..4d41d9136a83c 100644
--- a/ports/windows/msvc/common.props
+++ b/ports/windows/msvc/common.props
@@ -42,7 +42,8 @@
     <QstrDependencies Include="$(PyVariantDir)mpconfigvariant.h"/>
   </ItemGroup>
 
-  <!-- Helper for getting resulting executable path since it depends on other properties. -->
+  <!-- Helper for getting resulting executable path since it depends on other properties.
+       Note: recent msbuild versions don't need this, equivalent is msbuild -getProperty:TargetPath. -->
   <Target Name="ShowTargetPath">
     <Message Text="$(TargetPath)" Importance="high"/>
   </Target>