From 019987a7ed5a8fa63b420c33eca79a01ed5b7b0e Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Mon, 20 Dec 2021 18:02:42 -0800 Subject: [PATCH 1/5] Update and rename Branch v9.0 - Linux.yml to Branch v9.0.yml --- .../{Branch v9.0 - Linux.yml => Branch v9.0.yml} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename .github/workflows/{Branch v9.0 - Linux.yml => Branch v9.0.yml} (69%) diff --git a/.github/workflows/Branch v9.0 - Linux.yml b/.github/workflows/Branch v9.0.yml similarity index 69% rename from .github/workflows/Branch v9.0 - Linux.yml rename to .github/workflows/Branch v9.0.yml index 074e782b9..bc16fb82e 100644 --- a/.github/workflows/Branch v9.0 - Linux.yml +++ b/.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 \ No newline at end of file + run: dotnet test --no-build --no-restore --verbosity normal From 1f75b976c90777c7a148038aab6ff597ed215f9e Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Mon, 20 Dec 2021 18:03:39 -0800 Subject: [PATCH 2/5] Delete Branch v9.0 - Windows.yml --- .github/workflows/Branch v9.0 - Windows.yml | 33 --------------------- 1 file changed, 33 deletions(-) delete mode 100644 .github/workflows/Branch v9.0 - Windows.yml diff --git a/.github/workflows/Branch v9.0 - Windows.yml b/.github/workflows/Branch v9.0 - Windows.yml deleted file mode 100644 index aeb7d4f17..000000000 --- a/.github/workflows/Branch v9.0 - Windows.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Branch v9.0 - Windows - EssentialCSharp - -on: - push: - branches: [ v9.0 ] - pull_request: - branches: [ v9.0 ] - schedule: - - cron: 0 6 * * 1 - -jobs: - build: - runs-on: windows-latest - strategy: - matrix: - dotnet-version: ['3.1.x', '5.0.x' ] - steps: - - uses: actions/checkout@v2 - - name: Setup dotnet SDK ${{ matrix.dotnet-version }} - uses: actions/setup-dotnet@v1 - with: - dotnet-version: ${{ matrix.dotnet }} - - name: Get Build Information - run: | - pwd - dotnet --info - dotnet --version - - name: Restore dependencies - run: dotnet restore - - name: Build - run: dotnet build --no-restore - - name: Test - run: dotnet test --no-build --verbosity normal \ No newline at end of file From fb49eaf3962e543a3fd1873f123edb5bb12cb5de Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Mon, 20 Dec 2021 18:06:56 -0800 Subject: [PATCH 3/5] Update Branch v9.0.yml --- .github/workflows/Branch v9.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Branch v9.0.yml b/.github/workflows/Branch v9.0.yml index bc16fb82e..1fdbdf060 100644 --- a/.github/workflows/Branch v9.0.yml +++ b/.github/workflows/Branch v9.0.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] + os: [ubuntu-latest, windows-latest] dotnet-version: [ '3.1.x', '5.0.x' ] steps: - uses: actions/checkout@v2 From 35eb861a3eb21b91ed097f45e7de38cb6a32fc1a Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Mon, 20 Dec 2021 20:21:08 -0800 Subject: [PATCH 4/5] Fix for mac --- src/Chapter09.Tests/Listing09.17.UsingFlagsAttribute.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Chapter09.Tests/Listing09.17.UsingFlagsAttribute.cs b/src/Chapter09.Tests/Listing09.17.UsingFlagsAttribute.cs index d60f3007a..4176842e6 100644 --- 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"" From 2d7912ed016b7f71e81d8bb27d4429adbfb3553a Mon Sep 17 00:00:00 2001 From: Benjamin Michaelis Date: Mon, 20 Dec 2021 20:24:13 -0800 Subject: [PATCH 5/5] Use mac-os as well --- .github/workflows/Branch v9.0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Branch v9.0.yml b/.github/workflows/Branch v9.0.yml index 1fdbdf060..bc16fb82e 100644 --- a/.github/workflows/Branch v9.0.yml +++ b/.github/workflows/Branch v9.0.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macOS-latest] dotnet-version: [ '3.1.x', '5.0.x' ] steps: - uses: actions/checkout@v2