Skip to content

Commit

Permalink
Merge branch 'release/3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalberger committed Aug 12, 2023
2 parents 6a3a11f + acca1af commit 5a84cfd
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.426 -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.413 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 7.0.400 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
- ps: dotnet --info

Expand Down
24 changes: 12 additions & 12 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -27,6 +23,10 @@ jobs:
inputs:
version: '6.x'
displayName: 'Install .NET 6'
- task: UseDotNet@2
inputs:
version: '7.x'
displayName: 'Install .NET 7'
- powershell: |
$ENV:CAKE_SKIP_GITVERSION=([string]::IsNullOrEmpty($ENV:SYSTEM_PULLREQUEST_PULLREQUESTID) -eq $False).ToString()
.\build.ps1
Expand All @@ -36,10 +36,6 @@ jobs:
pool:
vmImage: 'macOS-11'
steps:
- task: UseDotNet@2
inputs:
version: '3.1.x'
displayName: 'Install .NET Core 3.1'
# .NET 5 required for GitVersion
- task: UseDotNet@2
inputs:
Expand All @@ -49,17 +45,17 @@ jobs:
inputs:
version: '6.x'
displayName: 'Install .NET 6'
- task: UseDotNet@2
inputs:
version: '7.x'
displayName: 'Install .NET 7'
- bash: |
./build.sh
displayName: 'Cake Build'
- job: Ubuntu
pool:
vmImage: 'ubuntu-20.04'
steps:
- task: UseDotNet@2
inputs:
version: '3.1.x'
displayName: 'Install .NET Core 3.1'
# .NET 5 required for GitVersion
- task: UseDotNet@2
inputs:
Expand All @@ -69,6 +65,10 @@ jobs:
inputs:
version: '6.x'
displayName: 'Install .NET 6'
- task: UseDotNet@2
inputs:
version: '7.x'
displayName: 'Install .NET 7'
- bash: |
./build.sh --verbosity diagnostic
displayName: 'Cake Build'
3 changes: 0 additions & 3 deletions cake.config

This file was deleted.

11 changes: 4 additions & 7 deletions nuspec/nuget/Cake.Markdownlint.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,15 @@ This addin for Cake allows you to lint Markdown files using markdownlint.
<repository type="git" url="https://github.com/cake-contrib/Cake.Markdownlint.git"/>
<copyright>Copyright © BBT Software AG and contributors</copyright>
<tags>cake cake-addin linting markdown markdownlint</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Markdownlint/releases/tag/2.0.0</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Markdownlint/releases/tag/3.0.0</releaseNotes>
</metadata>
<files>
<file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
<file src="netcoreapp3.1\Cake.Markdownlint.dll" target="lib\netcoreapp3.1" />
<file src="netcoreapp3.1\Cake.Markdownlint.pdb" target="lib\netcoreapp3.1" />
<file src="netcoreapp3.1\Cake.Markdownlint.xml" target="lib\netcoreapp3.1" />
<file src="net5.0\Cake.Markdownlint.dll" target="lib\net5.0" />
<file src="net5.0\Cake.Markdownlint.pdb" target="lib\net5.0" />
<file src="net5.0\Cake.Markdownlint.xml" target="lib\net5.0" />
<file src="net6.0\Cake.Markdownlint.dll" target="lib\net6.0" />
<file src="net6.0\Cake.Markdownlint.pdb" target="lib\net6.0" />
<file src="net6.0\Cake.Markdownlint.xml" target="lib\net6.0" />
<file src="net7.0\Cake.Markdownlint.dll" target="lib\net7.0" />
<file src="net7.0\Cake.Markdownlint.pdb" target="lib\net7.0" />
<file src="net7.0\Cake.Markdownlint.xml" target="lib\net7.0" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/Cake.Markdownlint.Tests/Cake.Markdownlint.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<Product>Cake.Markdownlint</Product>
<Copyright>Copyright © BBT Software AG and contributors</Copyright>
Expand All @@ -16,8 +16,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
<PackageReference Include="Cake.Core" Version="2.0.0" />
<PackageReference Include="Cake.Testing" Version="2.0.0" />
<PackageReference Include="Cake.Core" 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" />
<PackageReference Include="xunit" Version="2.5.0" />
Expand Down
4 changes: 2 additions & 2 deletions src/Cake.Markdownlint/Cake.Markdownlint.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Description>Addin for the Cake build automation system for running linting on Markdown files</Description>
<Authors>BBT Software AG</Authors>
<Company>BBT Software AG</Company>
Expand All @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Core" Version="2.0.0">
<PackageReference Include="Cake.Core" Version="3.0.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3">
Expand Down
1 change: 0 additions & 1 deletion src/Cake.Markdownlint/NodeJs/MarkdownlintNodeJsRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ protected override void ProcessExitCode(int exitCode)
{
// Don't throw an exit code.
// We handle behavior ourselves in the post action.
return;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
/// </summary>
public class MarkdownlintNodeJsRunnerSettings : ToolSettings
{
private FilePath file;
private DirectoryPath directory;
private readonly FilePath file;
private readonly DirectoryPath directory;

/// <summary>
/// Initializes a new instance of the <see cref="MarkdownlintNodeJsRunnerSettings"/> class.
Expand Down

0 comments on commit 5a84cfd

Please sign in to comment.