Skip to content

Commit

Permalink
Merge branch 'release/2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalberger committed Aug 9, 2023
2 parents 93203c6 + 6f025c5 commit 6a3a11f
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 28 deletions.
3 changes: 2 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +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 2.1.818 -InstallDir $env:DOTNET_INSTALL_DIR'
- 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:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
- ps: dotnet --info

Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# These owners will be the default owners for everything in the repo and
# will be requested for review when someone opens a pull request.
* @cake-contrib/team-bbt @jokay
* @bbtsoftware/dev-services @pascalberger
24 changes: 18 additions & 6 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,17 @@ jobs:
steps:
- task: UseDotNet@2
inputs:
version: '2.1.x'
displayName: 'Install .NET Core 2.1'
version: '3.1.x'
displayName: 'Install .NET Core 3.1'
# .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'
- powershell: |
$ENV:CAKE_SKIP_GITVERSION=([string]::IsNullOrEmpty($ENV:SYSTEM_PULLREQUEST_PULLREQUESTID) -eq $False).ToString()
.\build.ps1
Expand All @@ -34,13 +38,17 @@ jobs:
steps:
- task: UseDotNet@2
inputs:
version: '2.1.x'
displayName: 'Install .NET Core 2.1'
version: '3.1.x'
displayName: 'Install .NET Core 3.1'
# .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'
- bash: |
./build.sh
displayName: 'Cake Build'
Expand All @@ -50,13 +58,17 @@ jobs:
steps:
- task: UseDotNet@2
inputs:
version: '2.1.x'
displayName: 'Install .NET Core 2.1'
version: '3.1.x'
displayName: 'Install .NET Core 3.1'
# .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'
- bash: |
./build.sh --verbosity diagnostic
displayName: 'Cake Build'
14 changes: 10 additions & 4 deletions nuspec/nuget/Cake.Markdownlint.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,18 @@ 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/1.1.0</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Markdownlint/releases/tag/2.0.0</releaseNotes>
</metadata>
<files>
<file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
<file src="netstandard2.0\Cake.Markdownlint.dll" target="lib\netstandard2.0" />
<file src="netstandard2.0\Cake.Markdownlint.pdb" target="lib\netstandard2.0" />
<file src="netstandard2.0\Cake.Markdownlint.xml" target="lib\netstandard2.0" />
<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" />
</files>
</package>
10 changes: 5 additions & 5 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>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
<Product>Cake.Markdownlint</Product>
<Copyright>Copyright © BBT Software AG and contributors</Copyright>
Expand All @@ -15,10 +15,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Cake.Core" Version="1.0.0" />
<PackageReference Include="Cake.Testing" Version="1.0.0" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<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="Shouldly" Version="4.2.1" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
Expand Down
15 changes: 4 additions & 11 deletions src/Cake.Markdownlint/Cake.Markdownlint.csproj
Original file line number Diff line number Diff line change
@@ -1,33 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.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>
<Copyright>Copyright © BBT Software AG and contributors</Copyright>
</PropertyGroup>

<PropertyGroup>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Cake.Markdownlint.xml</DocumentationFile>
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
<CodeAnalysisRuleSet>..\Cake.Markdownlint.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
<DocumentationFile>bin\Debug\netstandard2.0\Cake.Markdownlint.xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<DocumentationFile>bin\Release\netstandard2.0\Cake.Markdownlint.xml</DocumentationFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Core" Version="1.0.0">
<PackageReference Include="Cake.Core" Version="2.0.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit 6a3a11f

Please sign in to comment.