Resolve merge conflicts + cleanup csproj

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: Handlebars-Net/Handlebars.Net # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/ci.yml

@@ -1,156 +1,156 @@
-name: CI
-
-on:
- push:
- branches: [ master ]
-
-jobs:
- build:
- name: Build
- runs-on: windows-latest
- steps:
- - uses: actions/checkout@master
- - name: Setup dotnet
- uses: actions/setup-dotnet@v1
- with:
- dotnet-version: |
- 2.1.x
- 3.1.x
- 5.0.x
- 6.0.x
- - name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
- working-directory: ./source
- run: dotnet clean -c Release && dotnet nuget locals all --clear
- - name: Build
- working-directory: ./source
- run: dotnet build -c Release
-
- test:
- name: Tests on ${{ matrix.os }}
- needs: [build]
- runs-on: ${{ matrix.os }}
- strategy:
- matrix:
- os: [ macos-latest, ubuntu-latest, windows-latest ]
- steps:
- - uses: actions/checkout@master
- - name: Setup dotnet
- uses: actions/setup-dotnet@v1
- with:
- dotnet-version: |
- 2.1.x
- 3.1.x
- 5.0.x
- 6.0.x
- - name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
- working-directory: ./source
- run: dotnet clean -c Release && dotnet nuget locals all --clear
- - name: Test
- working-directory: ./source
- run: dotnet test --logger:trx --logger:GitHubActions
-
- sonar-ci:
- name: SonarCloud
- runs-on: windows-latest
- steps:
- - uses: actions/checkout@v2
- with:
- fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- - name: Setup dotnet
- uses: actions/setup-dotnet@v1
- with:
- dotnet-version: |
- 2.1.x
- 3.1.x
- 5.0.x
- 6.0.x
- - uses: actions/setup-java@v1
- with:
- java-version: '13' # The JDK version to make available on the path.
- - name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
- working-directory: ./source
- run: dotnet clean -c Release && dotnet nuget locals all --clear
- - name: Cache SonarCloud packages
- uses: actions/cache@v1
- with:
- path: ~\sonar\cache
- key: ${{ runner.os }}-sonar
- restore-keys: ${{ runner.os }}-sonar
- - name: Cache SonarCloud scanner
- id: cache-sonar-scanner
- uses: actions/cache@v1
- with:
- path: .\.sonar\scanner
- key: ${{ runner.os }}-sonar-scanner
- restore-keys: ${{ runner.os }}-sonar-scanner
- - name: Install SonarCloud scanner
- if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
- shell: powershell
- run: |
- New-Item -Path .\.sonar\scanner -ItemType Directory
- dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
- - name: Run tests
- run: dotnet test source/Handlebars.sln --logger:trx --collect:"XPlat Code Coverage" --settings source/Handlebars.Test/coverlet.runsettings
- - name: Build and analyze
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
- SONAR_TOKEN: 22a5e1c1df52b7200ac14fc139ed1dfbe53dda4d
- shell: powershell
- run: |
- .\.sonar\scanner\dotnet-sonarscanner begin /k:"Handlebars-Net_Handlebars.Net" /o:"handlebars-net" /d:sonar.login="${{ env.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="**/*.opencover.xml" /d:sonar.cs.vstest.reportsPaths="**/*.trx" /d:sonar.coverage.exclusions="**/*.md;source/Handlebars.Benchmark/**/*.*" /d:sonar.cpd.exclusions="source/Handlebars/Iterators/**/*.*"
- dotnet build source/Handlebars.sln -c Release
- .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ env.SONAR_TOKEN }}"
-
- benchmark:
- name: Run Benchmark.Net
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - name: Setup dotnet
- uses: actions/setup-dotnet@v1
- with:
- dotnet-version: |
- 2.1.x
- 3.1.x
- 5.0.x
- 6.0.x
- - name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
- working-directory: ./source
- run: dotnet clean -c Release && dotnet nuget locals all --clear
- - name: Run benchmark
- working-directory: ./source/Handlebars.Benchmark
- run: dotnet run -c Release -f net6 --exporters json --filter '*' -m --join
- - name: Get benchmark file name
- id: benchmarkfilename
- working-directory: ./source/Handlebars.Benchmark/BenchmarkDotNet.Artifacts/results
- run: |
- filePath=$(find . -type f -name 'BenchmarkRun-joined-*-report-full-compressed.json' | rev | cut -d '/' -f1 | rev)
- echo $filePath
- echo "::set-output name=file::$filePath"
- - name: Store benchmark result
- uses: Happypig375/github-action-benchmark@v1.8.2
- with:
- name: Benchmark.Net Benchmark
- tool: 'benchmarkdotnet'
- output-file-path: source/Handlebars.Benchmark/BenchmarkDotNet.Artifacts/results/${{ steps.benchmarkfilename.outputs.file }}
- github-token: ${{ secrets.GITHUB_TOKEN }}
- auto-push: true
- # Show alert with commit comment on detecting possible performance regression
- alert-threshold: '200%'
- comment-on-alert: true
- fail-on-alert: false
- alert-comment-cc-users: '@zjklee'
- - name: Upload Artifacts
- uses: actions/upload-artifact@v2
- with:
- name: Benchmark
- path: source/Handlebars.Benchmark/BenchmarkDotNet.Artifacts/results/
-
- update_release_draft:
- name: Release Drafter
- runs-on: ubuntu-latest
- needs: [build, test, sonar-ci]
- steps:
- - uses: release-drafter/release-drafter@v5
- env:
+name: CI
+
+on:
+ push:
+ branches: [ master ]
+
+jobs:
+ build:
+ name: Build
+ runs-on: windows-2019
+ steps:
+ - uses: actions/checkout@master
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: |
+ 2.1.x
+ 3.1.x
+ 5.0.x
+ 6.0.x
+ - name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
+ working-directory: ./source
+ run: dotnet clean -c Release && dotnet nuget locals all --clear
+ - name: Build
+ working-directory: ./source
+ run: dotnet build -c Release
+
+ test:
+ name: Tests on ${{ matrix.os }}
+ needs: [build]
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [ macos-latest, ubuntu-latest, windows-2019 ]
+ steps:
+ - uses: actions/checkout@master
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: |
+ 2.1.x
+ 3.1.x
+ 5.0.x
+ 6.0.x
+ - name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
+ working-directory: ./source
+ run: dotnet clean -c Release && dotnet nuget locals all --clear
+ - name: Test
+ working-directory: ./source
+ run: dotnet test --logger:trx --logger:GitHubActions
+
+ sonar-ci:
+ name: SonarCloud
+ runs-on: windows-2019
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: |
+ 2.1.x
+ 3.1.x
+ 5.0.x
+ 6.0.x
+ - uses: actions/setup-java@v4
+ with:
+ java-version: '17' # The JDK version to make available on the path.
+ - name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
+ working-directory: ./source
+ run: dotnet clean -c Release && dotnet nuget locals all --clear
+ - name: Cache SonarCloud packages
+ uses: actions/cache@v1
+ with:
+ path: ~\sonar\cache
+ key: ${{ runner.os }}-sonar
+ restore-keys: ${{ runner.os }}-sonar
+ - name: Cache SonarCloud scanner
+ id: cache-sonar-scanner
+ uses: actions/cache@v1
+ with:
+ path: .\.sonar\scanner
+ key: ${{ runner.os }}-sonar-scanner
+ restore-keys: ${{ runner.os }}-sonar-scanner
+ - name: Install SonarCloud scanner
+ if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
+ shell: powershell
+ run: |
+ New-Item -Path .\.sonar\scanner -ItemType Directory
+ dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+ - name: Run tests
+ run: dotnet test source/Handlebars.sln --logger:trx --collect:"XPlat Code Coverage" --settings source/Handlebars.Test/coverlet.runsettings
+ - name: Build and analyze
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
+ SONAR_TOKEN: 22a5e1c1df52b7200ac14fc139ed1dfbe53dda4d
+ shell: powershell
+ run: |
+ .\.sonar\scanner\dotnet-sonarscanner begin /k:"Handlebars-Net_Handlebars.Net" /o:"handlebars-net" /d:sonar.login="${{ env.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="**/*.opencover.xml" /d:sonar.cs.vstest.reportsPaths="**/*.trx" /d:sonar.coverage.exclusions="**/*.md;source/Handlebars.Benchmark/**/*.*" /d:sonar.cpd.exclusions="source/Handlebars/Iterators/**/*.*"
+ dotnet build source/Handlebars.sln -c Release
+ .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ env.SONAR_TOKEN }}"
+
+ benchmark:
+ name: Run Benchmark.Net
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Setup dotnet
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: |
+ 2.1.x
+ 3.1.x
+ 5.0.x
+ 6.0.x
+ - name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
+ working-directory: ./source
+ run: dotnet clean -c Release && dotnet nuget locals all --clear
+ - name: Run benchmark
+ working-directory: ./source/Handlebars.Benchmark
+ run: dotnet run -c Release -f net6 --exporters json --filter '*' -m --join
+ - name: Get benchmark file name
+ id: benchmarkfilename
+ working-directory: ./source/Handlebars.Benchmark/BenchmarkDotNet.Artifacts/results
+ run: |
+ filePath=$(find . -type f -name 'BenchmarkRun-joined-*-report-full-compressed.json' | rev | cut -d '/' -f1 | rev)
+ echo $filePath
+ echo "::set-output name=file::$filePath"
+ - name: Store benchmark result
+ uses: Happypig375/github-action-benchmark@v1.8.2
+ with:
+ name: Benchmark.Net Benchmark
+ tool: 'benchmarkdotnet'
+ output-file-path: source/Handlebars.Benchmark/BenchmarkDotNet.Artifacts/results/${{ steps.benchmarkfilename.outputs.file }}
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ auto-push: true
+ # Show alert with commit comment on detecting possible performance regression
+ alert-threshold: '200%'
+ comment-on-alert: true
+ fail-on-alert: false
+ alert-comment-cc-users: '@zjklee'
+ - name: Upload Artifacts
+ uses: actions/upload-artifact@v2
+ with:
+ name: Benchmark
+ path: source/Handlebars.Benchmark/BenchmarkDotNet.Artifacts/results/
+
+ update_release_draft:
+ name: Release Drafter
+ runs-on: ubuntu-latest
+ needs: [build, test, sonar-ci]
+ steps:
+ - uses: release-drafter/release-drafter@v5
+ env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pull_request.yml

@@ -7,7 +7,7 @@ on:
 jobs:
  build:
  name: Build 
- runs-on: windows-latest
+ runs-on: windows-2019
  steps:
  - uses: actions/checkout@master
  - name: Setup dotnet
@@ -30,7 +30,7 @@ jobs:
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
- os: [ macos-latest, ubuntu-latest, windows-latest ]
+ os: [ macos-latest, ubuntu-latest, windows-2019 ]
  steps:
  - uses: actions/checkout@master
  - name: Setup dotnet
@@ -50,7 +50,7 @@ jobs:
 
  sonar-pr:
  name: SonarCloud
- runs-on: windows-latest
+ runs-on: windows-2019
  steps:
  - uses: actions/checkout@v2 
  with:
@@ -65,7 +65,7 @@ jobs:
  6.0.x
  - uses: actions/setup-java@v1
  with:
- java-version: '13' # The JDK version to make available on the path.
+ java-version: '17' # The JDK version to make available on the path.
  - name: Clean package cache as a temporary workaround for https://github.com/actions/setup-dotnet/issues/155
  working-directory: ./source
  run: dotnet clean -c Release && dotnet nuget locals all --clear

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 jobs:
  publish:
  name: Publish
- runs-on: windows-latest
+ runs-on: windows-2019
  steps:
  - uses: actions/checkout@v2