Merge pull request #202 from IntelliTect/BenjaminMichaelis-updateBuil…

…dv9.0 Consolidate Build Files
IntelliTect · Dec 21, 2021 · 5a3058b · 5a3058b
2 parents 669cc1f + 2d7912e
commit 5a3058b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 38 deletions.
diff --git a/.github/workflows/Branch v9.0 - Windows.yml b/.github/workflows/Branch v9.0 - Windows.yml
diff --git a/.github/workflows/Branch v9.0 - Linux.yml → .github/workflows/Branch v9.0.yml b/.github/workflows/Branch v9.0 - Linux.yml → .github/workflows/Branch v9.0.yml
@@ -1,4 +1,4 @@
-name: Branch v9.0 - Linux - EssentialCSharp
+name: Branch v9.0 - EssentialCSharp
 
 on:
   push:
@@ -9,10 +9,12 @@ on:
     - cron: 0 6 * * 1
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+  build-and-test:
+    name: build-and-test-(${{matrix.dotnet-version}}) on ${{matrix.os}}
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
         dotnet-version: [ '3.1.x', '5.0.x' ]
     steps:
       - uses: actions/checkout@v2
@@ -30,4 +32,4 @@ jobs:
       - name: Build
         run: dotnet build --no-restore
       - name: Test
-        run: dotnet test --no-build --verbosity normal
+        run: dotnet test --no-build --no-restore --verbosity normal
diff --git a/src/Chapter09.Tests/Listing09.17.UsingFlagsAttribute.cs b/src/Chapter09.Tests/Listing09.17.UsingFlagsAttribute.cs
@@ -9,7 +9,7 @@ public class ProgramTests
         [TestMethod]
         public void Main_FileAttributes_UseFlagsAttribute()
         {
-            string expected = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+            string expected = (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
                 ? @"""ReadOnly | Hidden"" outputs as ""ReadOnly, Hidden""
 ReadOnly, Hidden"
                 : @"""ReadOnly"" outputs as ""ReadOnly""