Merge branch 'release/2.0.0'

* release/2.0.0: Don't run InspectCode on AppVeyor Address GitHub action issues * Update GitHub actions images * Install Pinned .NET SDK Version * Use GitVersion.Tool 5.8.1 (GH-83) Update to Cake Core/Common 2.0 * fixes #83 * Fix build warnings * Remove unsupported target frameworks * Update AppVeyor image to VS2022 * Pin .NET SDK Version
cake-contrib · Dec 14, 2021 · 2078871 · 2078871
2 parents ee89267 + 80c1697
commit 2078871
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 9 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,7 +1,7 @@
 #---------------------------------#
 #  Build Image                    #
 #---------------------------------#
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 #---------------------------------#
 #  Build Script                   #

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-latest, ubuntu-18.04, macos-latest]
+        os: [windows-2022, ubuntu-18.04, macos-latest]
 
     env:
       AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
@@ -47,6 +47,19 @@ jobs:
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
 
+      - name: Install .NET Core SDK 3.1.x
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '3.1.x'
+
+      - name: Install .NET Core SDK 5.0.x
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.x'
+
+      - name: Install .NET Core SDK (global.json)
+        uses: actions/setup-dotnet@v1
+
       - name: Cache Tools
         uses: actions/cache@v2
         with:

diff --git a/Source/Cake.Gitter/Cake.Gitter.csproj b/Source/Cake.Gitter/Cake.Gitter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net50;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -19,27 +19,27 @@
       <Description>Cake AddIn that extends Cake with ability to send messages to Gitter.</Description>
       <PackageLicenseExpression>MIT</PackageLicenseExpression>
       <PackageProjectUrl>https://github.com/cake-contrib/Home</PackageProjectUrl>
-      <PackageTags>cake;script;build;gitter;cake-addin</PackageTags>
+      <PackageTags>cake;script;build;gitter;cake-addin;cake-build;addin</PackageTags>
       <RepositoryUrl>https://github.com/cake-contrib/Cake.Gitter.git</RepositoryUrl>
       <PackageReleaseNotes>https://github.com/cake-contrib/Cake.Gitter/releases/tag/$(Version)</PackageReleaseNotes>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <CodeAnalysisRuleSet>Cake.Gitter.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Common" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Common" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
     <PackageReference Include="Cake.Addin.Analyzer" Version="0.1.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CakeContrib.Guidelines" Version="1.1.1">
+    <PackageReference Include="CakeContrib.Guidelines" Version="1.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/global.json b/global.json
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "6.0.100",
+    "rollForward": "feature",
+    "allowPrerelease": true
+  }
+}
diff --git a/recipe.cake b/recipe.cake
@@ -10,6 +10,7 @@ BuildParameters.SetParameters(context: Context,
                             repositoryName: "Cake.Gitter",
                             appVeyorAccountName: "cakecontrib",
                             shouldRunDupFinder: false,
+                            shouldRunInspectCode:!AppVeyor.IsRunningOnAppVeyor,
                             shouldRunDotNetCorePack: true,
                             preferredBuildProviderType: BuildProviderType.GitHubActions,
                             shouldGenerateDocumentation: false);
@@ -23,4 +24,8 @@ ToolSettings.SetToolSettings(context: Context,
                             testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
                             testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
 
+ToolSettings.SetToolPreprocessorDirectives(
+    reSharperTools: "#tool nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2021.3.1",
+    gitVersionGlobalTool: "#tool dotnet:?package=GitVersion.Tool&version=5.8.1");
+
 Build.RunDotNetCore();