Merge branch 'release/1.1.0'

.github/dependabot.yml

@@ -6,3 +6,8 @@ updates:
     interval: daily
   open-pull-requests-limit: 10
   target-branch: develop
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "daily"
+  target-branch: "develop"

.github/workflows/build.yml

@@ -13,18 +13,21 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ ubuntu-18.04, windows-2019, macos-10.15 ]
 
     steps:
-      - uses: actions/[email protected]
-        with:
-          fetch-depth: 0
-          ref: ${{ github.event.ref }}
+      - name: Checkout the repository 
+        uses: actions/checkout@v2
+
+      - name: Fetch all tags and branches
+        run: git fetch --prune --unshallow
+
       - name: Cache Tools
         uses: actions/cache@v2
         with:
           path: tools
           key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
+
       - name: Build project
         uses: cake-build/cake-action@v1
         with:
@@ -33,18 +36,17 @@ jobs:
           verbosity: Diagnostic
           cake-version: 0.38.5
           cake-bootstrap: true
-      # currently, Cake.Recipe does not upload artifacts when run on gh-actions
-      - name: Upload Issues
+
+      - name: Upload Issues-Report
         uses: actions/upload-artifact@v2
         with:
           if-no-files-found: warn
-          name: ${{ matrix.os }} Issues
-          path: |
-            BuildArtifacts/report.html
-            BuildArtifacts/**/coverlet/*.xml
+          name: ${{ matrix.os }} issues
+          path: BuildArtifacts/report.html
+
       - name: Upload Packages
         uses: actions/upload-artifact@v2
-        if: matrix.os == 'windows-latest'
+        if: runner.os == 'Windows'
         with:
           if-no-files-found: warn
           name: package

.github/workflows/codeql-analysis.yml

@@ -17,7 +17,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     strategy:
       fail-fast: false
@@ -34,11 +34,6 @@ jobs:
       with:
         fetch-depth: 0
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
     - name: Cache Tools
       uses: actions/cache@v2
       with:
@@ -59,6 +54,7 @@ jobs:
       uses: cake-build/cake-action@v1
       with:
         script-path: recipe.cake
+        target: DotNetCore-Build
         verbosity: Diagnostic
         cake-version: 0.38.5
         cake-bootstrap: true

.github/workflows/dependabot-cake.yml

@@ -0,0 +1,13 @@
+name: Run dependabot for cake
+on:
+  workflow_dispatch:
+  schedule:
+    # run everyday at 6
+    - cron:  '0 6 * * *'
+
+jobs:
+  dependabot-cake:
+    runs-on: ubuntu-latest # linux, because this is a docker-action
+    steps:
+      - name: check/update cake dependencies
+        uses: nils-org/dependabot-cake-action@v1

.github/workflows/publishDocs.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: checkout
-      uses: actions/[email protected].3 #https://github.com/actions/checkout
+      uses: actions/[email protected].4 #https://github.com/actions/checkout
       with:
         fetch-depth: 0 # GitVersion is somewhat irritated when fetch-depth is "1"....
         ref: ${{ github.event.ref }}

.github/workflows/sonarcloud-analysis.yml

@@ -2,43 +2,60 @@ name: "SonarCloud"
 
 on:
   push:
-    branches: [develop]
-  pull_request:
-    branches: [develop]
+    branches: [develop, main]
   workflow_dispatch:
 
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v2.3.4
       with:
         fetch-depth: 0
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
-    - name: Cache Tools
+    - name: Cache Cake-Tools
       uses: actions/cache@v2
       with:
         path: tools
         key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
 
-    - name: Build project
-      uses: cake-build/cake-action@v1
+    - 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: Get Java 11
+      uses: actions/setup-java@v2
       with:
-        script-path: recipe.cake
-        verbosity: Diagnostic
-        cake-version: 0.38.5
-        cake-bootstrap: true
+        java-version: "11"
+        java-package: jre
 
-    - name: SonarCloud Scan
-      uses: SonarSource/sonarcloud-github-action@master
+    - name: Build and analyze
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      shell: powershell
+      run: |
+        .\.sonar\scanner\dotnet-sonarscanner begin /k:"nils-org_Quartz.LightCore" /o:"nils-org" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
+        .\build.ps1 --target=DotNetCore-Build
+        .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"

.gitignore

@@ -8,3 +8,4 @@ dist/
 /config.wyam.*
 tools/
 /BuildArtifacts
+.history/

recipe.cake

@@ -1,4 +1,4 @@
-#load nuget:?package=Cake.Recipe&version=2.0.1
+#load nuget:?package=Cake.Recipe&version=2.2.1
 
 Environment.SetVariableNames();
 

src/Quartz.LightCore.Tests/Quartz.LightCore.Tests.csproj

@@ -24,13 +24,13 @@
     <ProjectReference Include="..\Quartz.LightCore\Quartz.LightCore.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="LightCore" Version="1.5.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="Quartz" Version="3.2.0" />
+    <PackageReference Include="Quartz" Version="3.3.1" />
   </ItemGroup>
 </Project>

src/Quartz.LightCore/Quartz.LightCore.csproj

@@ -38,7 +38,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="LightCore" Version="1.5.1" />
-    <PackageReference Include="Quartz" Version="3.2.0" />
+    <PackageReference Include="Quartz" Version="3.3.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>