Update minor files.

Elskom · Jun 15, 2021 · f333221 · f333221
1 parent 11c29ce
commit f333221
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 50 deletions.
diff --git a/.github/workflows/codacy-analysis.yml b/.github/workflows/codacy-analysis.yml
@@ -29,13 +29,12 @@ jobs:
           dotnet-version: '6.0.x'
           include-prerelease: true
 
-      - name: Restore
-        run: dotnet restore
-        shell: bash
-
-      - name: Test
-        run: dotnet test --configuration Release --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=./coverage.codacy.opencover.xml
-        shell: bash
+      - name: Restore, Build, test, and pack
+        uses: Elskom/build-dotnet@main
+        with:
+          SOLUTION_FILE_PATH: GitBuildInfo.SourceGenerator.sln
+          TEST: true
+          PACK: false
 
       - name: Run codacy-coverage-reporter
         uses: codacy/codacy-coverage-reporter-action@master

diff --git a/.github/workflows/dotnetcore-build.yml b/.github/workflows/dotnetcore-build.yml
@@ -19,16 +19,8 @@ jobs:
         dotnet-version: '6.0.x'
         include-prerelease: true
 
-    - name: Restore
-      run: dotnet restore
-      shell: bash
-
-    - name: Build with dotnet
-      run: |
-        dotnet build --configuration Release --no-restore
-        dotnet pack --configuration Release --no-build --no-restore
-      shell: bash
-
-    - name: Test
-      run: dotnet test --configuration Release --no-build --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=./coverage.codacy.opencover.xml
-      shell: bash
+    - name: Restore, Build, test, and pack
+      uses: Elskom/build-dotnet@main
+      with:
+        SOLUTION_FILE_PATH: GitBuildInfo.SourceGenerator.sln
+        TEST: true
diff --git a/.github/workflows/dotnetcore-publish.yml b/.github/workflows/dotnetcore-publish.yml
@@ -20,28 +20,21 @@ jobs:
         dotnet-version: '6.0.x'
         include-prerelease: true
 
-    - name: Restore
-      run: dotnet restore
-      shell: bash
-
-    - name: Build with dotnet
-      run: |
-        dotnet build --configuration Release --no-restore
-        dotnet pack --configuration Release --no-build --no-restore
-      shell: bash
-
-    - name: Test
-      run: dotnet test --configuration Release --no-build --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=./coverage.codacy.opencover.xml
-      shell: bash
+    - name: Restore, Build, test, and pack
+      uses: Elskom/build-dotnet@main
+      with:
+        SOLUTION_FILE_PATH: GitBuildInfo.SourceGenerator.sln
+        TEST: true
 
     - name: Publish Release
       id: publish_nuget
-      uses: brandedoutcast/publish-nuget@master
+      uses: Elskom/publish-nuget@main
       with:
         # Filepath of the project to be packaged, relative to root of repository
-        PROJECT_FILE_PATH: src/GitBuildInfo.SourceGenerator.csproj
+        PROJECT_FILE_PATH: '**/*.csproj'
+        # Path to store all generated nuget packages, relative to root of repository
+        PACKAGE_PATH: artifacts/
         # Flag to toggle git tagging, enabled by default
         TAG_COMMIT: false
         # API key to authenticate with NuGet server
         NUGET_KEY: ${{ secrets.NUGET_API_KEY }}
-        INCLUDE_SYMBOLS: false
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -17,16 +17,8 @@ jobs:
         dotnet-version: '6.0.x'
         include-prerelease: true
 
-    - name: Restore
-      run: dotnet restore
-      shell: bash
-
-    - name: Build with dotnet
-      run: |
-        dotnet build --configuration Release --no-restore
-        dotnet pack --configuration Release --no-build --no-restore
-      shell: bash
-
-    - name: Test
-      run: dotnet test --configuration Release --no-build --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=./coverage.codacy.opencover.xml
-      shell: bash
+    - name: Restore, Build, test, and pack
+      uses: Elskom/build-dotnet@main
+      with:
+        SOLUTION_FILE_PATH: GitBuildInfo.SourceGenerator.sln
+        TEST: true
diff --git a/README.md b/README.md
@@ -3,4 +3,8 @@ Source Generator for dumping the git branch information, commit hash, and if the
 
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/d13da68cd3784f1486af29432e75e707)](https://www.codacy.com/gh/Elskom/GitBuildInfo.SourceGenerator/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Elskom/GitBuildInfo.SourceGenerator&amp;utm_campaign=Badge_Grade)
 [![Codacy Coverage Badge](https://app.codacy.com/project/badge/Coverage/d13da68cd3784f1486af29432e75e707)](https://www.codacy.com/gh/Elskom/GitBuildInfo.SourceGenerator/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Elskom/GitBuildInfo.SourceGenerator&amp;utm_campaign=Badge_Coverage)
-[![NuGet Badge](https://buildstats.info/nuget/GitBuildInfo.SourceGenerator?includePreReleases=true)](https://www.nuget.org/packages/GitBuildInfo.SourceGenerator/)
+
+| Package | Version |
+|:-------:|:-------:|
+| GitBuildInfo.SourceGenerator | [![NuGet Badge](https://buildstats.info/nuget/GitBuildInfo.SourceGenerator?includePreReleases=true)](https://www.nuget.org/packages/GitBuildInfo.SourceGenerator/) |
+| Elskom.GitInformation | [![NuGet Badge](https://buildstats.info/nuget/Elskom.GitInformation?includePreReleases=true)](https://www.nuget.org/packages/Elskom.GitInformation/) |
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -4,6 +4,9 @@
     <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
+    <CollectCoverage>true</CollectCoverage>
+    <CoverletOutputFormat>opencover</CoverletOutputFormat>
+    <CoverletOutput>$(MSBuildThisFileDirectory)coverage.codacy.opencover.xml</CoverletOutput>
   </PropertyGroup>
 
 </Project>