Merge branch 'master' of https://github.com/MartinKuschnik/WmiLight

MartinKuschnik · Mar 19, 2024 · dfb9d60 · dfb9d60
2 parents 2ae7f3d + 8b78798
commit dfb9d60
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -36,9 +36,6 @@ jobs:
            echo "${{ secrets.PRIVATE_KEY }}" > WmiLight\private_key.base64
            certutil -decode WmiLight\private_key.base64 WmiLight\private_key.snk
            rm WmiLight\private_key.base64 -v
-           
-    - name: Build .Net Lib
-      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} WmiLight\WmiLight.csproj
       
     - name: Cleanup Private Key
       run: rm WmiLight\private_key.snk -v
@@ -58,6 +55,29 @@ jobs:
     - name: Build Native static Lib (x86, NoOp) 
       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
       run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:ConfigurationType=StaticLibrary /p:WholeProgramOptimization=false /p:Platform=x86 WmiLight.Native\WmiLight.Native.vcxproj
+
+    - name: Restore NuGet Package for Unit Tests
+      run: msbuild WmiLight.UnitTests\WmiLight.UnitTests.csproj -t:restore -p:RestorePackagesConfig=true
+
+    - name: Build Unit Tests (x64)
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=x64 WmiLight.UnitTests\WmiLight.UnitTests.csproj
+
+    - name: Build Unit Tests (x86)
+      run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform=x86 WmiLight.UnitTests\WmiLight.UnitTests.csproj
+
+    - name: Run Unit Tests (x64)
+      uses: MartinKuschnik/vstest-action-with-space-support@v1.0.1
+      with:
+        testAssembly: '*UnitTests*.dll'
+        searchFolder: '**\*'
+        platform: x64
+
+    - name: Run Unit Tests (x86)
+      uses: MartinKuschnik/vstest-action-with-space-support@v1.0.1
+      with:
+        testAssembly: '*UnitTests*.dll'
+        searchFolder: '**\*'
+        platform: x86
 
     - name: Pack with dotnet
       run: dotnet pack WmiLight\WmiLight.csproj --configuration ${{env.BUILD_CONFIGURATION}} --output nuget-packages --no-build      

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+ <PropertyGroup>
+    <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
+ </PropertyGroup>
+</Project>