Skip to content

Commit 6a3a11f

Browse files
committed
Merge branch 'release/2.0.0'
2 parents 93203c6 + 6f025c5 commit 6a3a11f

File tree

6 files changed

+40
-28
lines changed

6 files changed

+40
-28
lines changed

.appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ install:
1010
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
1111
- ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
1212
- ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
13-
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 2.1.818 -InstallDir $env:DOTNET_INSTALL_DIR'
13+
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 3.1.426 -InstallDir $env:DOTNET_INSTALL_DIR'
1414
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.408 -InstallDir $env:DOTNET_INSTALL_DIR'
15+
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.413 -InstallDir $env:DOTNET_INSTALL_DIR'
1516
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
1617
- ps: dotnet --info
1718

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# These owners will be the default owners for everything in the repo and
22
# will be requested for review when someone opens a pull request.
3-
* @cake-contrib/team-bbt @jokay
3+
* @bbtsoftware/dev-services @pascalberger

azure-pipelines.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@ jobs:
1616
steps:
1717
- task: UseDotNet@2
1818
inputs:
19-
version: '2.1.x'
20-
displayName: 'Install .NET Core 2.1'
19+
version: '3.1.x'
20+
displayName: 'Install .NET Core 3.1'
2121
# .NET 5 required for GitVersion
2222
- task: UseDotNet@2
2323
inputs:
2424
version: '5.x'
2525
displayName: 'Install .NET 5'
26+
- task: UseDotNet@2
27+
inputs:
28+
version: '6.x'
29+
displayName: 'Install .NET 6'
2630
- powershell: |
2731
$ENV:CAKE_SKIP_GITVERSION=([string]::IsNullOrEmpty($ENV:SYSTEM_PULLREQUEST_PULLREQUESTID) -eq $False).ToString()
2832
.\build.ps1
@@ -34,13 +38,17 @@ jobs:
3438
steps:
3539
- task: UseDotNet@2
3640
inputs:
37-
version: '2.1.x'
38-
displayName: 'Install .NET Core 2.1'
41+
version: '3.1.x'
42+
displayName: 'Install .NET Core 3.1'
3943
# .NET 5 required for GitVersion
4044
- task: UseDotNet@2
4145
inputs:
4246
version: '5.x'
4347
displayName: 'Install .NET 5'
48+
- task: UseDotNet@2
49+
inputs:
50+
version: '6.x'
51+
displayName: 'Install .NET 6'
4452
- bash: |
4553
./build.sh
4654
displayName: 'Cake Build'
@@ -50,13 +58,17 @@ jobs:
5058
steps:
5159
- task: UseDotNet@2
5260
inputs:
53-
version: '2.1.x'
54-
displayName: 'Install .NET Core 2.1'
61+
version: '3.1.x'
62+
displayName: 'Install .NET Core 3.1'
5563
# .NET 5 required for GitVersion
5664
- task: UseDotNet@2
5765
inputs:
5866
version: '5.x'
5967
displayName: 'Install .NET 5'
68+
- task: UseDotNet@2
69+
inputs:
70+
version: '6.x'
71+
displayName: 'Install .NET 6'
6072
- bash: |
6173
./build.sh --verbosity diagnostic
6274
displayName: 'Cake Build'

nuspec/nuget/Cake.Markdownlint.nuspec

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,18 @@ This addin for Cake allows you to lint Markdown files using markdownlint.
1717
<repository type="git" url="https://github.com/cake-contrib/Cake.Markdownlint.git"/>
1818
<copyright>Copyright © BBT Software AG and contributors</copyright>
1919
<tags>cake cake-addin linting markdown markdownlint</tags>
20-
<releaseNotes>https://github.com/cake-contrib/Cake.Markdownlint/releases/tag/1.1.0</releaseNotes>
20+
<releaseNotes>https://github.com/cake-contrib/Cake.Markdownlint/releases/tag/2.0.0</releaseNotes>
2121
</metadata>
2222
<files>
2323
<file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
24-
<file src="netstandard2.0\Cake.Markdownlint.dll" target="lib\netstandard2.0" />
25-
<file src="netstandard2.0\Cake.Markdownlint.pdb" target="lib\netstandard2.0" />
26-
<file src="netstandard2.0\Cake.Markdownlint.xml" target="lib\netstandard2.0" />
24+
<file src="netcoreapp3.1\Cake.Markdownlint.dll" target="lib\netcoreapp3.1" />
25+
<file src="netcoreapp3.1\Cake.Markdownlint.pdb" target="lib\netcoreapp3.1" />
26+
<file src="netcoreapp3.1\Cake.Markdownlint.xml" target="lib\netcoreapp3.1" />
27+
<file src="net5.0\Cake.Markdownlint.dll" target="lib\net5.0" />
28+
<file src="net5.0\Cake.Markdownlint.pdb" target="lib\net5.0" />
29+
<file src="net5.0\Cake.Markdownlint.xml" target="lib\net5.0" />
30+
<file src="net6.0\Cake.Markdownlint.dll" target="lib\net6.0" />
31+
<file src="net6.0\Cake.Markdownlint.pdb" target="lib\net6.0" />
32+
<file src="net6.0\Cake.Markdownlint.xml" target="lib\net6.0" />
2733
</files>
2834
</package>

src/Cake.Markdownlint.Tests/Cake.Markdownlint.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<Product>Cake.Markdownlint</Product>
77
<Copyright>Copyright © BBT Software AG and contributors</Copyright>
@@ -15,10 +15,10 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
19-
<PackageReference Include="Cake.Core" Version="1.0.0" />
20-
<PackageReference Include="Cake.Testing" Version="1.0.0" />
21-
<PackageReference Include="Shouldly" Version="4.0.3" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
19+
<PackageReference Include="Cake.Core" Version="2.0.0" />
20+
<PackageReference Include="Cake.Testing" Version="2.0.0" />
21+
<PackageReference Include="Shouldly" Version="4.2.1" />
2222
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
2323
<PackageReference Include="xunit" Version="2.5.0" />
2424
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />

src/Cake.Markdownlint/Cake.Markdownlint.csproj

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
55
<Description>Addin for the Cake build automation system for running linting on Markdown files</Description>
66
<Authors>BBT Software AG</Authors>
77
<Company>BBT Software AG</Company>
88
<Copyright>Copyright © BBT Software AG and contributors</Copyright>
99
</PropertyGroup>
1010

1111
<PropertyGroup>
12+
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Cake.Markdownlint.xml</DocumentationFile>
1213
<DebugType>full</DebugType>
1314
<DebugSymbols>true</DebugSymbols>
1415
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
1516
<CodeAnalysisRuleSet>..\Cake.Markdownlint.ruleset</CodeAnalysisRuleSet>
1617
</PropertyGroup>
1718

18-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
19-
<DocumentationFile>bin\Debug\netstandard2.0\Cake.Markdownlint.xml</DocumentationFile>
20-
</PropertyGroup>
21-
22-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
23-
<DocumentationFile>bin\Release\netstandard2.0\Cake.Markdownlint.xml</DocumentationFile>
24-
</PropertyGroup>
25-
2619
<ItemGroup>
27-
<PackageReference Include="Cake.Core" Version="1.0.0">
20+
<PackageReference Include="Cake.Core" Version="2.0.0">
2821
<PrivateAssets>all</PrivateAssets>
2922
</PackageReference>
30-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
23+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3">
3124
<PrivateAssets>all</PrivateAssets>
3225
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3326
</PackageReference>

0 commit comments

Comments
 (0)