From 19291c1234c5e62a11fc7844c96579e2b67e9f48 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Fri, 17 Jan 2020 00:40:31 +1100
Subject: [PATCH] Delete bak file and undo bad gitignore changes

---
 .github/workflows/build-and-test.yml.bak | 116 -----------------------
 .gitignore                               |   4 +-
 2 files changed, 1 insertion(+), 119 deletions(-)
 delete mode 100644 .github/workflows/build-and-test.yml.bak

diff --git a/.github/workflows/build-and-test.yml.bak b/.github/workflows/build-and-test.yml.bak
deleted file mode 100644
index 7d7d2ad26b..0000000000
--- a/.github/workflows/build-and-test.yml.bak
+++ /dev/null
@@ -1,116 +0,0 @@
-name: Build
-
-on:
-    push:
-        branches:
-            - master
-        tags:
-            - "v*"
-    pull_request:
-        branches:
-            - master
-
-jobs:
-    Coverage:
-        runs-on: windows-latest
-        needs: [Build]
-        steps:
-            - uses: actions/checkout@v1
-
-            - name: Install nuget
-              uses: NuGet/setup-nuget@v1
-
-            - name: Enable long file paths
-              run: git config --global core.longpaths true
-
-            - name: Update submodules
-              run: git submodule -q update --init --recursive
-
-            - name: Generate Test Coverage
-              shell: pwsh
-              run: ./tests/CodeCoverage/CodeCoverage.ps1
-              env:
-                  CI: True
-
-            - name: Update codecov
-              uses: iansu/codecov-action-node@v1.0.0
-              with:
-                  token: ${{secrets.CODECOV_TOKEN}}
-                  file: "ImageSharp.Coverage.xml"
-                  flags: unittests
-
-    Build:
-        strategy:
-            matrix:
-                opts:
-                    - os: ubuntu-latest
-                      framework: netcoreapp2.1
-                      is32Bit: False
-                      doCoverage: False
-                    - os: windows-latest
-                      framework: netcoreapp2.1
-                      is32Bit: False
-                      doCoverage: True
-                    - os: windows-latest
-                      framework: net472
-                      is32Bit: False
-                      doCoverage: False
-                    - os: windows-latest
-                      framework: net472
-                      is32Bit: True
-                      doCoverage: False
-
-        runs-on: ${{ matrix.opts.os }}
-
-        steps:
-            - uses: actions/checkout@v1
-
-            - name: install nuget
-              uses: NuGet/setup-nuget@v1
-
-            - name: Enable long file paths
-              run: |
-                  git config --global core.autocrlf false
-                  git config --global core.longpaths true
-
-            - name: Update submodules
-              run: git submodule -q update --init
-
-            - name: Build
-              shell: pwsh
-              run: |
-                  $DebugPreference = "Continue"
-                  ./build.ps1 "${{matrix.opts.framework}}"
-
-            - name: Test
-              shell: pwsh
-              run: ./run-tests.ps1 "${{ matrix.opts.os }}" "${{matrix.opts.framework}}" "${{matrix.opts.is32Bit}}" "${{matrix.opts.doCoverage}}"
-              env:
-                  CI: True
-
-    Publish:
-        runs-on: windows-latest
-        needs: [Build]
-        if: github.event_name == 'push'
-        steps:
-            - uses: actions/checkout@v1
-
-            - name: install nuget
-              uses: NuGet/setup-nuget@v1
-
-            - name: Enable long file paths
-              run: git config --global core.longpaths true
-
-            - name: Update submodules
-              run: git submodule -q update --init --recursive
-
-            - name: Build
-              shell: pwsh
-              run: |
-                  $DebugPreference = "Continue"
-                  ./build.ps1
-
-            - name: Publish to nightly feed -myget
-              if: success()
-              run: nuget.exe push .\artifacts\*.nupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v2/package
-        # TODO: if github.ref starts with 'refs/tags' then it was tag push and we can optionally push out package to nuget.org
diff --git a/.gitignore b/.gitignore
index 4007b1faba..8fcb5ef405 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,7 +137,7 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings 
+# TODO: Comment the next line if you want to checkin your web deploy settings
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
@@ -221,5 +221,3 @@ artifacts/
 # Tests
 **/Images/ActualOutput
 **/Images/ReferenceOutput
-/tests/CodeCoverage/opencover.zip
-/tests/CodeCoverage/OpenCover.4.6.519