Merge branch 'release/3.0.0'

cake-contrib · Jul 16, 2023 · 3440996 · 3440996
2 parents a778685 + 11a1118
commit 3440996
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 36 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -4,12 +4,21 @@
 image: Visual Studio 2022
 
 #---------------------------------#
-#  Build Script                   #
+#  Install .NET                   #
 #---------------------------------#
 install:
-  # Update to latest NuGet version since we require 5.3.0 for embedded icon
-  - ps: nuget update -self
+  - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
+  - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
+  - ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.408 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.405 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 7.0.102 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
+  - ps: dotnet --info
 
+#---------------------------------#
+#  Build Script                   #
+#---------------------------------#
 build_script:
   - ps: .\build.ps1 --target=CI
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -15,6 +15,19 @@ jobs:
   pool:
     vmImage: 'windows-2022'
   steps:
+  # .NET 5 required for GitVersion
+  - task: UseDotNet@2
+    inputs:
+      version: '5.x'
+    displayName: 'Install .NET 5'
+  - task: UseDotNet@2
+    inputs:
+      version: '6.x'
+    displayName: 'Install .NET 6'
+  - task: UseDotNet@2
+    inputs:
+      version: '7.x'
+    displayName: 'Install .NET 7'
   - powershell: ./build.ps1
     displayName: 'Build'
   - publish: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
@@ -30,6 +43,10 @@ jobs:
   - download: current
     artifact: NuGet Package
     displayName: 'Download build artifact'
+  - task: UseDotNet@2
+    inputs:
+      version: '6.x'
+    displayName: 'Install .NET 6'
   - task: CopyFiles@2
     inputs:
       sourceFolder: $(Pipeline.Workspace)/NuGet Package
@@ -51,6 +68,10 @@ jobs:
   - download: current
     artifact: NuGet Package
     displayName: 'Download build artifact'
+  - task: UseDotNet@2
+    inputs:
+      version: '6.x'
+    displayName: 'Install .NET 6'
   - task: CopyFiles@2
     inputs:
       sourceFolder: $(Pipeline.Workspace)/NuGet Package
@@ -72,6 +93,10 @@ jobs:
   - download: current
     artifact: NuGet Package
     displayName: 'Download build artifact'
+  - task: UseDotNet@2
+    inputs:
+      version: '6.x'
+    displayName: 'Install .NET 6'
   - task: CopyFiles@2
     inputs:
       sourceFolder: $(Pipeline.Workspace)/NuGet Package
@@ -93,6 +118,10 @@ jobs:
   - download: current
     artifact: NuGet Package
     displayName: 'Download build artifact'
+  - task: UseDotNet@2
+    inputs:
+      version: '6.x'
+    displayName: 'Install .NET 6'
   - task: CopyFiles@2
     inputs:
       sourceFolder: $(Pipeline.Workspace)/NuGet Package
@@ -104,16 +133,20 @@ jobs:
   - publish: $(Build.SourcesDirectory)/BuildArtifacts/TestResults/Integration
     artifact: Integration Tests macOS 12 (.NET Core tool)
     displayName: 'Publish generated reports as build artifact'
-# Integration Tests Ubuntu 18.04 (.NET Core tool)
-- job: Test_Ubuntu_18_04_DotNetCoreTool
-  displayName: Integration Tests Ubuntu 18.04 (.NET Core tool)
+# Integration Tests Ubuntu 20.04 (.NET Core tool)
+- job: Test_Ubuntu_20_04_DotNetCoreTool
+  displayName: Integration Tests Ubuntu 20.04 (.NET Core tool)
   dependsOn: Build
   pool:
-    vmImage: 'ubuntu-18.04'
+    vmImage: 'ubuntu-20.04'
   steps:
   - download: current
     artifact: NuGet Package
     displayName: 'Download build artifact'
+  - task: UseDotNet@2
+    inputs:
+      version: '6.x'
+    displayName: 'Install .NET 6'
   - task: CopyFiles@2
     inputs:
       sourceFolder: $(Pipeline.Workspace)/NuGet Package
@@ -123,18 +156,22 @@ jobs:
     workingDirectory: ./tests/script-runner/
     displayName: 'Run integration tests'
   - publish: $(Build.SourcesDirectory)/BuildArtifacts/TestResults/Integration
-    artifact: Integration Tests Ubuntu 18.04 (.NET Core tool)
+    artifact: Integration Tests Ubuntu 20.04 (.NET Core tool)
     displayName: 'Publish generated reports as build artifact'
-# Integration Tests Ubuntu 20.04 (.NET Core tool)
-- job: Test_Ubuntu_20_04_DotNetCoreTool
-  displayName: Integration Tests Ubuntu 20.04 (.NET Core tool)
+# Integration Tests Ubuntu 22.04 (.NET Core tool)
+- job: Test_Ubuntu_22_04_DotNetCoreTool
+  displayName: Integration Tests Ubuntu 22.04 (.NET Core tool)
   dependsOn: Build
   pool:
-    vmImage: 'ubuntu-20.04'
+    vmImage: 'ubuntu-22.04'
   steps:
   - download: current
     artifact: NuGet Package
     displayName: 'Download build artifact'
+  - task: UseDotNet@2
+    inputs:
+      version: '6.x'
+    displayName: 'Install .NET 6'
   - task: CopyFiles@2
     inputs:
       sourceFolder: $(Pipeline.Workspace)/NuGet Package
@@ -144,5 +181,5 @@ jobs:
     workingDirectory: ./tests/script-runner/
     displayName: 'Run integration tests'
   - publish: $(Build.SourcesDirectory)/BuildArtifacts/TestResults/Integration
-    artifact: Integration Tests Ubuntu 20.04 (.NET Core tool)
-    displayName: 'Publish generated reports as build artifact'
+    artifact: Integration Tests Ubuntu 22.04 (.NET Core tool)
+    displayName: 'Publish generated reports as build artifact'
diff --git a/nuspec/nuget/Cake.Issues.GitRepository.nuspec b/nuspec/nuget/Cake.Issues.GitRepository.nuspec
@@ -24,18 +24,15 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.GitRepository.git"/>
     <copyright>Copyright © Pascal Berger</copyright>
     <tags>cake cake-addin cake-issues cake-issueprovider code-analysis linting git</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.GitRepository/releases/tag/2.0.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.GitRepository/releases/tag/3.0.0</releaseNotes>
   </metadata>
   <files>
     <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
-    <file src="netcoreapp3.1/Cake.Issues.GitRepository.dll" target="lib\netcoreapp3.1" />
-    <file src="netcoreapp3.1/Cake.Issues.GitRepository.pdb" target="lib\netcoreapp3.1" />
-    <file src="netcoreapp3.1/Cake.Issues.GitRepository.xml" target="lib\netcoreapp3.1" />
-    <file src="net5.0/Cake.Issues.GitRepository.dll" target="lib\net5.0" />
-    <file src="net5.0/Cake.Issues.GitRepository.pdb" target="lib\net5.0" />
-    <file src="net5.0/Cake.Issues.GitRepository.xml" target="lib\net5.0" />
     <file src="net6.0/Cake.Issues.GitRepository.dll" target="lib\net6.0" />
     <file src="net6.0/Cake.Issues.GitRepository.pdb" target="lib\net6.0" />
     <file src="net6.0/Cake.Issues.GitRepository.xml" target="lib\net6.0" />
+    <file src="net7.0/Cake.Issues.GitRepository.dll" target="lib\net7.0" />
+    <file src="net7.0/Cake.Issues.GitRepository.pdb" target="lib\net7.0" />
+    <file src="net7.0/Cake.Issues.GitRepository.xml" target="lib\net7.0" />
   </files>
 </package>
diff --git a/recipe.cake b/recipe.cake
@@ -1,4 +1,4 @@
-#load nuget:https://pkgs.dev.azure.com/cake-contrib/Home/_packaging/addins/nuget/v3/index.json?package=Cake.Recipe&version=3.0.0-beta0001-0007&prerelease
+#load nuget:?package=Cake.Recipe&version=3.0.0
 
 //*************************************************************************************************
 // Settings
@@ -15,6 +15,7 @@ BuildParameters.SetParameters(
     repositoryName: "Cake.Issues.GitRepository",
     appVeyorAccountName: "cakecontrib",
     shouldRunCoveralls: false, // Disabled because it's currently failing
+    shouldPostToGitter: false, // Disabled because it's currently failing
     shouldGenerateDocumentation: false,
     integrationTestScriptPath: "./tests/integration/tests.cake");
 

diff --git a/src/Cake.Issues.GitRepository.Tests/Cake.Issues.GitRepository.Tests.csproj b/src/Cake.Issues.GitRepository.Tests/Cake.Issues.GitRepository.Tests.csproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Description>Tests for the Cake.Issues.GitRepository addin</Description>
     <Authors>Pascal Berger</Authors>
@@ -23,25 +23,25 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Cake.Issues">
-      <Version>2.0.0</Version>
+      <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="Cake.Issues.Testing">
-      <Version>2.0.0</Version>
+      <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="Cake.Testing">
-      <Version>2.0.0</Version>
+      <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="Shouldly">
-      <Version>4.0.3</Version>
+      <Version>4.1.0</Version>
     </PackageReference>
     <PackageReference Include="StyleCop.Analyzers">
       <Version>1.1.118</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageReference Include="xunit">
-      <Version>2.4.1</Version>
+      <Version>2.4.2</Version>
     </PackageReference>
     <PackageReference Include="xunit.runner.visualstudio">
       <Version>2.4.5</Version>

diff --git a/src/Cake.Issues.GitRepository/Cake.Issues.GitRepository.csproj b/src/Cake.Issues.GitRepository/Cake.Issues.GitRepository.csproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <Description>Git repository linting support for the Cake.Issues addin for Cake Build Automation System</Description>
     <Authors>Pascal Berger</Authors>
     <Product>Cake.Issues</Product>
@@ -28,12 +28,12 @@
 
   <ItemGroup>
     <PackageReference Include="Cake.Core">
-      <Version>2.0.0</Version>
+      <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="Cake.Issues">
-      <Version>2.0.0</Version>
+      <Version>3.0.0</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/tests/script-runner/.config/dotnet-tools.json b/tests/script-runner/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
     "isRoot": true,
     "tools": {
       "cake.tool": {
-        "version": "2.0.0",
+        "version": "3.0.0",
         "commands": [
           "dotnet-cake"
         ]