From 225273436ddfa39b5cbb8a8b81c3f288720a8177 Mon Sep 17 00:00:00 2001
From: "J. Daniel Smith" <dan@jdanielsmith.me>
Date: Mon, 17 Jul 2023 22:14:30 -0400
Subject: [PATCH] fix YAML for 'main'

---
 .github/workflows/main.yml | 62 ++++++++++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5151ecc5c..f08b70807 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,6 +11,8 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
+        platform: [x64]
+        configuration: [Release]
     name: ${{ matrix.os }}-CMake
     runs-on: ${{ matrix.os }}
 
@@ -22,29 +24,63 @@ jobs:
         python-version: '3.7'
     - name: configure
       run: |
-        mkdir target-Release
-        cd target-Release
-         cmake -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION="3.7" ..
+        mkdir out
+        cd out
+        cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DPYTHON_VERSION="3.7"
     - name: make
       run: |
-        cd target-Release
-        cmake --build . --config Release -j
-        cmake --build . --config Release --target install
+        cd out
+        cmake --build . --config ${{ matrix.configuration }} -j
+        cmake --build . --config ${{ matrix.configuration }} --target install
     - name: test
       run: |
-        cd target-Release
-        ctest -C Release --output-on-failure
+        cd out
+        ctest -C ${{ matrix.configuration }} --output-on-failure
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
+      with:
+        msbuild-architecture: x64
+    - name: msbuild
+      run: |
+        msbuild nitro.sln /p:configuration=${{ matrix.configuration }}
+
+  build-msbuild-windows:
+    strategy:
+      matrix:
+        os: [windows-latest]
+        platform: [x64]
+        configuration: [Debug] # Debug turns on more compiler warnings
+    name: ${{ matrix.os }}-msbuild
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: configure CODA-OSS
+      run: |
+        mkdir externals\coda-oss\out
+        cd externals\coda-oss\out
+        cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DENABLE_PYTHON=OFF
+    - name: make CODA-OSS
+      run: |
+        cd externals\coda-oss\out
+        cmake --build . --config ${{ matrix.configuration }} -j
+        cmake --build . --config ${{ matrix.configuration }} --target install
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.1
+      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
       with:
         msbuild-architecture: x64
     - name: msbuild
       run: |
-        msbuild nitro.sln /p:configuration=Release
-    #- name: mstest
+        msbuild nitro.sln /p:configuration=${{ matrix.configuration }}
+    #- name: vstest 
+    #  uses: microsoft/vstest-action@v1.0.0 # https://github.com/marketplace/actions/vstest-action
+    #  with:
+    #    platform: ${{ matrix.platform }}
+    #    testAssembly: UnitTest.dll
+    #    searchFolder: D:\a\nitro\nitro\x64\Debug
+    #- name: vstest 
     #  run: |
-        # mstest /testcontainer:${RUNNER_WORKSPACE}\coda-oss\x64\Releast\Test.dll
-        # mstest /testcontainer:${RUNNER_WORKSPACE}\coda-oss\x64\Releast\Test++.dll
+    #    vstest.console D:\a\nitro\nitro\x64\Debug\UnitTest.dll
 
   build-linux-cmake:
     strategy: