Merge branch 'release/3.0.0'

cake-contrib · Jul 16, 2023 · 387dd27 · 387dd27
2 parents f0327a0 + 268a36f
commit 387dd27
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 32 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -10,9 +10,9 @@ install:
   - 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 3.1.100 -InstallDir $env:DOTNET_INSTALL_DIR'
   - 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
 

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,14 +8,10 @@ updates:
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: Cake.Core
-    versions:
-    - "(,3.0)"
+    update-types: ["version-update:semver-minor"]
   - dependency-name: Cake.Testing
-    versions:
-    - "(,3.0)"
+    update-types: ["version-update:semver-minor"]
   - dependency-name: Cake.Issues
-    versions:
-    - "> 1.0.0, < 2"
+    update-types: ["version-update:semver-minor"]
   - dependency-name: Cake.Issues.Testing
-    versions:
-    - "> 1.0.0, < 2"
+    update-types: ["version-update:semver-minor"]
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -14,10 +14,6 @@ jobs:
   pool:
     vmImage: 'windows-2022'
   steps:
-  - task: UseDotNet@2
-    inputs:
-      version: '3.1.x'
-    displayName: 'Install .NET Core 3.1'
   # .NET 5 required for GitVersion
   - task: UseDotNet@2
     inputs:
@@ -27,5 +23,9 @@ jobs:
     inputs:
       version: '6.x'
     displayName: 'Install .NET 6'
+  - task: UseDotNet@2
+    inputs:
+      version: '7.x'
+    displayName: 'Install .NET 7'
   - powershell: ./build.ps1
     displayName: 'Cake Build'
diff --git a/nuspec/nuget/Cake.Issues.DocFx.nuspec b/nuspec/nuget/Cake.Issues.DocFx.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.DocFx.git"/>
     <copyright>Copyright © BBT Software AG and contributors</copyright>
     <tags>cake cake-addin cake-issues cake-issueprovider linting docfx</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.DocFx/releases/tag/2.0.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues.DocFx/releases/tag/3.0.0</releaseNotes>
   </metadata>
   <files>
     <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
-    <file src="netcoreapp3.1/Cake.Issues.DocFx.dll" target="lib\netcoreapp3.1" />
-    <file src="netcoreapp3.1/Cake.Issues.DocFx.pdb" target="lib\netcoreapp3.1" />
-    <file src="netcoreapp3.1/Cake.Issues.DocFx.xml" target="lib\netcoreapp3.1" />
-    <file src="net5.0/Cake.Issues.DocFx.dll" target="lib\net5.0" />
-    <file src="net5.0/Cake.Issues.DocFx.pdb" target="lib\net5.0" />
-    <file src="net5.0/Cake.Issues.DocFx.xml" target="lib\net5.0" />
     <file src="net6.0/Cake.Issues.DocFx.dll" target="lib\net6.0" />
     <file src="net6.0/Cake.Issues.DocFx.pdb" target="lib\net6.0" />
     <file src="net6.0/Cake.Issues.DocFx.xml" target="lib\net6.0" />
+    <file src="net7.0/Cake.Issues.DocFx.dll" target="lib\net7.0" />
+    <file src="net7.0/Cake.Issues.DocFx.pdb" target="lib\net7.0" />
+    <file src="net7.0/Cake.Issues.DocFx.xml" target="lib\net7.0" />
   </files>
 </package>
diff --git a/recipe.cake b/recipe.cake
@@ -15,6 +15,7 @@ BuildParameters.SetParameters(
     repositoryName: "Cake.Issues.DocFx",
     appVeyorAccountName: "cakecontrib",
     shouldRunCoveralls: false, // Disabled because it's currently failing
+    shouldPostToGitter: false, // Disabled because it's currently failing
     shouldGenerateDocumentation: false);
 
 BuildParameters.PrintParameters(Context);

diff --git a/src/Cake.Issues.DocFx.Tests/Cake.Issues.DocFx.Tests.csproj b/src/Cake.Issues.DocFx.Tests/Cake.Issues.DocFx.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>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Description>Tests for the Cake.Issues.DocFx addin</Description>
     <Authors>BBT Software AG</Authors>
@@ -34,11 +34,11 @@
     <EmbeddedResource Include="Testfiles\entry-with-line-0.json" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="Cake.Issues" Version="2.0.0" />
-    <PackageReference Include="Cake.Issues.Testing" Version="2.0.0" />
-    <PackageReference Include="Cake.Testing" Version="2.0.0" />
-    <PackageReference Include="Shouldly" Version="4.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Cake.Issues" Version="3.0.0" />
+    <PackageReference Include="Cake.Issues.Testing" Version="3.0.0" />
+    <PackageReference Include="Cake.Testing" Version="3.0.0" />
+    <PackageReference Include="Shouldly" Version="4.2.1" />
     <PackageReference Include="StyleCop.Analyzers">
       <Version>1.1.118</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/src/Cake.Issues.DocFx/Cake.Issues.DocFx.csproj b/src/Cake.Issues.DocFx/Cake.Issues.DocFx.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>DocFx support for the Cake.Issues Addin for Cake Build Automation System</Description>
     <Authors>BBT Software AG</Authors>
     <Company>BBT Software AG</Company>
@@ -25,9 +25,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.0.0" />
-    <PackageReference Include="Cake.Issues" Version="2.0.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+    <PackageReference Include="Cake.Core" Version="3.0.0" />
+    <PackageReference Include="Cake.Issues" Version="3.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>