Merge pull request #83 from nils-a/release/0.5.0

Release/0.5.0
nils-org · Sep 11, 2023 · eec965c · eec965c
2 parents 0e9ad2e + 08f5113
commit eec965c
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 43 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,10 +1,28 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [ "github>nils-a/renovate-config" ],
-  "packageRules": [
-    {
-      "matchPackageNames": ["cake.tool", "Spectre.Console", "SimpleInjector"],
-      "enabled": false
-    }
-  ]
-}
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [ "github>nils-org/renovate-config:minimal" ],
+    "packageRules": [
+      {
+        "matchPackageNames": [
+          "cake.tool",
+          "SimpleInjector"
+        ],
+        "matchUpdateTypes": ["minor", "patch"],
+        "enabled": false
+      },
+      {
+        "matchPackageNames": [
+          "SimpleInjector"
+        ],
+        "matchUpdateTypes": ["major"],
+        "labels": ["Breaking Change"]
+      },
+      {
+        "matchPackagePatterns": [
+          "^Spectre\\.Console\\..*"
+        ],
+        "matchUpdateTypes": ["major", "minor"],
+        "labels": ["Breaking Change"]
+      }
+    ]
+  }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ windows-2019, ubuntu-18.04, macos-11 ]
+        os: [ windows-2022, ubuntu-22.04, macos-12 ]
     env:
       COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
       GITHUB_PAT: ${{ secrets.GH_TOKEN }}
@@ -38,43 +38,44 @@ jobs:
       #WYAM_ACCESS_TOKEN: ${{ secrets.WYAM_ACCESS_TOKEN }}
       #WYAM_DEPLOY_BRANCH: "gh-pages"
       #WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }}
-      
+
     steps:
-      - name: Checkout the repository 
-        uses: actions/checkout@v3
+      - name: Checkout the repository
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
-      - uses: actions/setup-dotnet@v3.0.3
+      - uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
         with:
           # codecov needs 2.1
           dotnet-version: |
             2.1
             3.1
             5.0
             6.0
+            7.0
       - name: Cache Tools
-        uses: actions/cache@v3
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3
         with:
           path: tools
           key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
       - name: Build project
-        uses: cake-build/cake-action@v1
+        uses: cake-build/cake-action@a6eb054329257c9e70a6c6bf01747ad6e1d9d52b # v1
         with:
           script-path: recipe.cake
           target: CI
           cake-version: 1.3.0
       - name: Upload Issues
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
         with:
           if-no-files-found: warn
           name: ${{ matrix.os }} Issues
           path: |
             BuildArtifacts/report.html
             BuildArtifacts/**/coverlet/*.xml
       - name: Upload Packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
         if: runner.os == 'Windows'
         with:
           if-no-files-found: warn
           name: package
-          path: BuildArtifacts/Packages/**/*
+          path: BuildArtifacts/Packages/**/*
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
@@ -30,41 +30,42 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
       with:
         fetch-depth: 0
 
-    - uses: actions/setup-dotnet@v3.0.3
+    - uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
       with:
         # codecov needs 2.1
         dotnet-version: |
           2.1
           3.1
           5.0
           6.0
+          7.0
 
     - name: Cache Tools
-      uses: actions/cache@v3
+      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3
       with:
         path: tools
         key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
+        # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     - name: Build project
-      uses: cake-build/cake-action@v1
+      uses: cake-build/cake-action@a6eb054329257c9e70a6c6bf01747ad6e1d9d52b # v1
       with:
         script-path: recipe.cake
         target: DotNetCore-Build
         cake-version: 1.3.0
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
     "sdk": {
         "allowPrerelease": true,
-        "version": "6.0.402",
+        "version": "7.0.400",
         "rollForward": "latestFeature"
     }
-}
+}
diff --git a/recipe.cake b/recipe.cake
@@ -1,4 +1,4 @@
-#load nuget:?package=Cake.Recipe&version=3.0.1
+#load nuget:?package=Cake.Recipe&version=3.1.1
 
 var standardNotificationMessage = "Version {0} of {1} has just been released, it will be available here https://www.nuget.org/packages/{1}, once package indexing is complete.";
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+    <PropertyGroup>
+        <LangVersion>latest</LangVersion>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+</Project>
diff --git a/...le.Registrars.SimpleInjector.Tests/Spectre.Console.Registrars.SimpleInjector.Tests.csproj b/...le.Registrars.SimpleInjector.Tests/Spectre.Console.Registrars.SimpleInjector.Tests.csproj
@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.msbuild" Version="3.2.0">
+        <PackageReference Include="coverlet.msbuild" Version="6.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-        <PackageReference Include="Moq" Version="4.18.2" />
-        <PackageReference Include="Shouldly" Version="4.1.0" />
+        <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="Moq" Version="4.20.69" />
+        <PackageReference Include="Shouldly" Version="4.2.1" />
         <PackageReference Include="SimpleInjector" Version="5.4.1" />
-        <PackageReference Include="Spectre.Console.Cli" Version="0.45.0" />
-        <PackageReference Include="Spectre.Console.Testing" Version="0.45.0" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.analyzers" Version="1.0.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
+        <PackageReference Include="Spectre.Console.Testing" Version="0.47.0" />
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="xunit.analyzers" Version="1.2.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/src/Spectre.Console.Registrars.SimpleInjector.sln b/src/Spectre.Console.Registrars.SimpleInjector.sln
@@ -7,6 +7,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spectre.Console.Registrars.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spectre.Console.Registrars.SimpleInjector.Tests", "Spectre.Console.Registrars.SimpleInjector.Tests\Spectre.Console.Registrars.SimpleInjector.Tests.csproj", "{A9545423-59A6-43C7-BC0B-A2F775E5AD0F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFolder", "SolutionFolder", "{9297320E-891C-415B-AEEC-946F1EACC60F}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/...pectre.Console.Registrars.SimpleInjector/Spectre.Console.Registrars.SimpleInjector.csproj b/...pectre.Console.Registrars.SimpleInjector/Spectre.Console.Registrars.SimpleInjector.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net7.0;net6.0</TargetFrameworks>
     <RootNamespace>Spectre.Console</RootNamespace>
   </PropertyGroup>
 
@@ -34,7 +34,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="SimpleInjector" Version="5.0.0" PrivateAssets="all" />
-    <PackageReference Include="Spectre.Console.Cli" Version="0.45.0" PrivateAssets="all" />
+    <PackageReference Include="Spectre.Console.Cli" Version="0.47.0" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>