update build

.editorconfig

@@ -11,7 +11,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 # XML Configuration Files
-[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct,refactorlog}]
+[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct,refactorlog,runsettings}]
 indent_size = 2
 
 # JSON Files

.github/workflows/dotnet.yml

@@ -1,9 +1,10 @@
-name: Build Project
+name: Build
 
 env:
-  BUILD_PATH: "${{github.workspace}}/packages"
-  BUILD_VERSION: "5.0.${{github.run_number}}"
-  BUILD_INFORMATION: "5.0.${{github.run_number}}+Branch.${{github.ref_name}}.Sha.${{github.sha}}"
+  DOTNET_NOLOGO: true
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  BUILD_PATH: '${{github.workspace}}/artifacts'
+  COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
 
 on:
   push:
@@ -22,48 +23,82 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 7.0.x
-
-      - name: Restore Dependencies
-        run: dotnet restore
-
-      - name: Build Project
-        run: 'dotnet build --configuration Release --no-restore -p:Version="${{env.BUILD_VERSION}}" -p:InformationalVersion="${{env.BUILD_INFORMATION}}"'
-
-      - name: Run Tests
-        run: 'dotnet test --configuration Release --no-build --no-restore --collect:"XPlat Code Coverage"'
-
-      - name: Create Packages
-        run: 'dotnet pack --configuration Release --include-symbols --include-source --no-build --no-restore -p:Version="${{env.BUILD_VERSION}}" --output "${{env.BUILD_PATH}}"'
-
-      - name: Upload Package Artifact
-        if: success()
-        uses: actions/upload-artifact@v3
-        with:
-          name: Packages
-          path: "${{env.BUILD_PATH}}"
-
-      - name: Publish Packages
-        if: success() && github.event_name != 'pull_request'
-        run: |
-          dotnet nuget add source --username pwelter34 --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/loresoft/index.json"
-          for package in $(find -name "*.nupkg"); do
-            echo "${0##*/}": Pushing $package...
-            dotnet nuget push $package --source "github" --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
-          done
-
-      - name: Publish Release Packages
-        if: success() && startsWith(github.ref, 'refs/tags/v')
-        run: |
-          for package in $(find -name "*.nupkg"); do
-            echo "${0##*/}": Pushing $package...
-            dotnet nuget push $package --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_KEY }} --skip-duplicate
-          done
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v3
+      with:
+          dotnet-version: | 
+                6.0.x
+                7.0.x
+
+    - name: Restore Dependencies
+      run: dotnet restore
+
+    - name: Build Solution
+      run: dotnet build --no-restore --configuration Release
+
+    - name: Run Test
+      run: dotnet test --configuration Release --collect:"XPlat Code Coverage" --settings coverlet.runsettings
+
+    - name: Generate Coverage 
+      uses: danielpalme/ReportGenerator-GitHub-Action@5.1.23
+      with:
+        reports: '${{github.workspace}}/test/*/TestResults/*/coverage.info'
+        targetdir: ${{env.BUILD_PATH}}
+        reporttypes: lcov
+
+    - name: Report Coverage
+      if: success()
+      uses: coverallsapp/github-action@v2
+      with:
+          file: artifacts/lcov.info
+          format: lcov
+
+    - name: Create Packages
+      if: success() && github.event_name != 'pull_request'
+      run: dotnet pack --configuration Release --include-symbols --include-source --no-build --no-restore --output "${{env.BUILD_PATH}}"
+
+    - name: Upload Packages
+      if: success() && github.event_name != 'pull_request'
+      uses: actions/upload-artifact@v3
+      with:
+        name: packages
+        path: '${{env.BUILD_PATH}}'
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    if: success() && github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
+
+    steps:
+    - name: Download Artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: packages
+
+    - name: Publish Packages GitHub
+      run: |
+        for package in $(find -name "*.nupkg"); do
+          echo "${0##*/}": Pushing $package...
+          dotnet nuget push $package --source https://nuget.pkg.github.com/loresoft/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
+        done
+
+    - name: Publish Packages feedz
+      run: |
+        for package in $(find -name "*.nupkg"); do
+          echo "${0##*/}": Pushing $package...
+          dotnet nuget push $package --source https://f.feedz.io/loresoft/open/nuget/index.json --api-key ${{ secrets.FEEDDZ_KEY }} --skip-duplicate
+        done
+
+    - name: Publish Packages Nuget
+      if: startsWith(github.ref, 'refs/tags/v')
+      run: |
+        for package in $(find -name "*.nupkg"); do
+          echo "${0##*/}": Pushing $package...
+          dotnet nuget push $package --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_KEY }} --skip-duplicate
+        done
+

coverlet.runsettings

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="XPlat code coverage">
+        <Configuration>
+          <Format>lcov</Format>
+          <ExcludeByAttribute>Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute,TestSDKAutoGeneratedCode</ExcludeByAttribute>
+          <SkipAutoProps>true</SkipAutoProps>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>

src/Directory.Build.props

@@ -1,7 +1,6 @@
 <Project>
 
   <PropertyGroup Label="Package">
-    <Product>EntityChange</Product>
     <Description>Library to compare two entity object graphs detecting changes</Description>
     <Copyright>Copyright © $([System.DateTime]::Now.ToString(yyyy)) LoreSoft</Copyright>
     <Authors>LoreSoft</Authors>
@@ -31,11 +30,12 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>5.0.0</Version>
+    <MinVerTagPrefix>v</MinVerTagPrefix>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

test/EntityChange.Tests/EntityChange.Tests.csproj

@@ -10,14 +10,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="FluentAssertions" Version="6.11.0" />
+    <PackageReference Include="xunit" Version="2.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>