build: NuGet packages for legacy MSVC builds

This may be useful for testing and troubleshooting.

Author: trungnt2910

.github/workflows/build.yml

@@ -130,8 +130,8 @@ jobs:
           name: monika_clang_${{ matrix.configuration }}_${{ matrix.platform }}
           path: out/${{ matrix.configuration }}
 
-  pack-clang:
-    needs: build-clang
+  pack:
+    needs: [build-msvc, build-clang]
     runs-on: windows-latest
     permissions:
       packages: write  # Pushing to GitHub Packages
@@ -144,20 +144,30 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Download Build Artifacts
+      - name: Download Build Artifacts (Clang)
         uses: actions/download-artifact@v8
         with:
           pattern: monika_clang_${{ matrix.configuration }}_*
           path: out/${{ matrix.configuration }}
           merge-multiple: true
 
+      - name: Download Build Artifacts (MSVC)
+        uses: actions/download-artifact@v8
+        with:
+          pattern: monika_clang_${{ matrix.configuration }}_*
+          path: out/${{ matrix.configuration }}/msvc
+          merge-multiple: true
+
       - name: Setup NuGet
         uses: nuget/setup-nuget@v3
 
       - name: NuGet Pack
         run: |
           nuget pack out/${{ matrix.configuration }}/monika.nuspec -NonInteractive
           nuget pack out/${{ matrix.configuration }}/monika.SDK.nuspec -NonInteractive
+
+          nuget pack out/${{ matrix.configuration }}/monika.MSVC.nuspec -NonInteractive
+          nuget pack out/${{ matrix.configuration }}/monika.SDK.MSVC.nuspec -NonInteractive
         shell: cmd
 
       - name: Upload NuGet Artifacts

packaging/nuget/CMakeLists.txt

@@ -59,6 +59,18 @@ monika_add_processed_xml(
     "${CMAKE_CURRENT_BINARY_DIR}/monika.nuspec"
     FLAGS
         "-DMONIKA_NUGET_PACKAGE_ID=monika${MONIKA_NUGET_PACKAGE_SUFFIX}"
+        "-DMONIKA_NUGET_BIN_SRC_PATH=\".\\bin\\**\""
+        "-DMONIKA_NUGET_PDB_SRC_PATH=\".\\Debug\\**\""
+)
+
+monika_add_processed_xml(
+    MonikaNuGetMsvcXml
+    "${CMAKE_CURRENT_SOURCE_DIR}/monika.nuspec"
+    "${CMAKE_CURRENT_BINARY_DIR}/monika.MSVC.nuspec"
+    FLAGS
+        "-DMONIKA_NUGET_PACKAGE_ID=monika.MSVC${MONIKA_NUGET_PACKAGE_SUFFIX}"
+        "-DMONIKA_NUGET_BIN_SRC_PATH=\".\\msvc\\bin\\**\""
+        "-DMONIKA_NUGET_PDB_SRC_PATH=\".\\msvc\\Debug\\**\""
 )
 
 set(MONIKA_NUGET_TARGETS_PATH "build/native/monika.SDK${MONIKA_NUGET_PACKAGE_SUFFIX}.targets")
@@ -70,6 +82,19 @@ monika_add_processed_xml(
     FLAGS
         "-DMONIKA_NUGET_PACKAGE_ID=monika.SDK${MONIKA_NUGET_PACKAGE_SUFFIX}"
         "-DMONIKA_NUGET_TARGETS_PATH=\"${MONIKA_NUGET_TARGETS_PATH}\""
+        "-DMONIKA_NUGET_INC_SRC_PATH=\".\\Include\\**\""
+        "-DMONIKA_NUGET_LIB_SRC_PATH=\".\\Lib\\**\""
+)
+
+monika_add_processed_xml(
+    MonikaNuGetSdkMsvcXml
+    "${CMAKE_CURRENT_SOURCE_DIR}/monika.SDK.nuspec"
+    "${CMAKE_CURRENT_BINARY_DIR}/monika.SDK.MSVC.nuspec"
+    FLAGS
+        "-DMONIKA_NUGET_PACKAGE_ID=monika.SDK.MSVC${MONIKA_NUGET_PACKAGE_SUFFIX}"
+        "-DMONIKA_NUGET_TARGETS_PATH=\"${MONIKA_NUGET_TARGETS_PATH}\""
+        "-DMONIKA_NUGET_INC_SRC_PATH=\".\\msvc\\Include\\**\""
+        "-DMONIKA_NUGET_LIB_SRC_PATH=\".\\msvc\\Lib\\**\""
 )
 
 configure_file(
@@ -87,6 +112,12 @@ if(MONIKA_NUGET_SHOULD_INSTALL)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/monika.SDK.nuspec"
         DESTINATION "${CMAKE_INSTALL_PREFIX}"
     )
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/monika.MSVC.nuspec"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}"
+    )
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/monika.SDK.MSVC.nuspec"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}"
+    )
     install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/DotnetToolSettings.xml"
         DESTINATION "tools/any/win-${MONIKA_NUGET_ARCH}"
     )

packaging/nuget/monika.SDK.nuspec

@@ -22,7 +22,7 @@
     <!-- Visual Studio C++ build support. -->
     <file src="..\..\packaging\nuget\monika.targets" target=MONIKA_NUGET_TARGETS_PATH />
 
-    <file src=".\Include\**" target="c/Include/" />
-    <file src=".\Lib\**" target="c/Lib/" />
+    <file src=MONIKA_NUGET_INC_SRC_PATH target="c/Include/" />
+    <file src=MONIKA_NUGET_LIB_SRC_PATH target="c/Lib/" />
   </files>
 </package>

packaging/nuget/monika.nuspec

@@ -27,7 +27,7 @@
 
     <!-- Move all SDK files to c\ to avoid conflicts. -->
     <!-- This matches what the Windows C++ SDK NuGet package is doing. -->
-    <file src=".\bin\**" target="c/bin/" />
-    <file src=".\Debug\**" target="c/Debug/" />
+    <file src=MONIKA_NUGET_BIN_SRC_PATH target="c/bin/" />
+    <file src=MONIKA_NUGET_PDB_SRC_PATH target="c/Debug/" />
   </files>
 </package>