Skip to content
This repository has been archived by the owner on Apr 11, 2024. It is now read-only.

Commit

Permalink
Merge branch 'release/4.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalberger committed Dec 23, 2023
2 parents 17bbdc4 + a9c8f9c commit 6136089
Show file tree
Hide file tree
Showing 12 changed files with 52 additions and 56 deletions.
5 changes: 3 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ install:
- 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:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.417 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 7.0.404 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.100 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
- ps: dotnet --info

Expand Down
21 changes: 0 additions & 21 deletions .github/dependabot.yml

This file was deleted.

6 changes: 6 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"github>cake-contrib/renovate-presets:cake-issues"
]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"dotnet.defaultSolution": "src\\Cake.Issues.Terraform.sln"
}
4 changes: 4 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,9 @@ jobs:
inputs:
version: '7.x'
displayName: 'Install .NET 7'
- task: UseDotNet@2
inputs:
version: '8.x'
displayName: 'Install .NET 8'
- powershell: ./build.ps1
displayName: 'Cake Build'
7 changes: 7 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sdk": {
"allowPrerelease": true,
"version": "8.0.100",
"rollForward": "latestFeature"
}
}
5 changes: 4 additions & 1 deletion nuspec/nuget/Cake.Issues.Terraform.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ 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.Terraform.git"/>
<copyright>Copyright © Pascal Berger</copyright>
<tags>cake cake-addin cake-issues cake-issueprovider linting terraform</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues.Terraform/releases/tag/3.0.0</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues.Terraform/releases/tag/4.0.0</releaseNotes>
</metadata>
<files>
<file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
Expand All @@ -34,5 +34,8 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
<file src="net7.0/Cake.Issues.Terraform.dll" target="lib\net7.0" />
<file src="net7.0/Cake.Issues.Terraform.pdb" target="lib\net7.0" />
<file src="net7.0/Cake.Issues.Terraform.xml" target="lib\net7.0" />
<file src="net8.0/Cake.Issues.Terraform.dll" target="lib\net8.0" />
<file src="net8.0/Cake.Issues.Terraform.pdb" target="lib\net8.0" />
<file src="net8.0/Cake.Issues.Terraform.xml" target="lib\net8.0" />
</files>
</package>
2 changes: 1 addition & 1 deletion recipe.cake
Original file line number Diff line number Diff line change
@@ -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.1.1

//*************************************************************************************************
// Settings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,25 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Cake.Issues.Testing">
<Version>3.0.0</Version>
<Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="Cake.Testing">
<Version>3.0.0</Version>
<Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="Shouldly">
<Version>4.1.0</Version>
<Version>4.2.1</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.6.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit">
<Version>2.4.2</Version>
<Version>2.6.3</Version>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio">
<Version>2.4.5</Version>
<Version>2.5.5</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions src/Cake.Issues.Terraform/Cake.Issues.Terraform.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<Description>Terraform support for the Cake.Issues Addin for Cake Build Automation System</Description>
<Authors>Pascal Berger</Authors>
<Product>Cake.Issues</Product>
Expand All @@ -24,12 +24,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Cake.Core">
<Version>3.0.0</Version>
<Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="Cake.Issues">
<Version>3.0.0</Version>
<Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
30 changes: 9 additions & 21 deletions src/Cake.Issues.Terraform/TerraformIssuesProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,11 @@
/// <summary>
/// Provider for warnings reported by Terraform.
/// </summary>
internal class TerraformIssuesProvider : BaseConfigurableIssueProvider<TerraformIssuesSettings>
/// <param name="log">The Cake log context.</param>
/// <param name="issueProviderSettings">Settings for the issue provider.</param>
internal class TerraformIssuesProvider(ICakeLog log, TerraformIssuesSettings issueProviderSettings)
: BaseConfigurableIssueProvider<TerraformIssuesSettings>(log, issueProviderSettings)
{
/// <summary>
/// Initializes a new instance of the <see cref="TerraformIssuesProvider"/> class.
/// </summary>
/// <param name="log">The Cake log context.</param>
/// <param name="issueProviderSettings">Settings for the issue provider.</param>
public TerraformIssuesProvider(ICakeLog log, TerraformIssuesSettings issueProviderSettings)
: base(log, issueProviderSettings)
{
}

/// <summary>
/// Gets the name of the Terraform issue provider.
/// This name can be used to identify issues based on the <see cref="IIssue.ProviderType"/> property.
Expand Down Expand Up @@ -109,17 +102,12 @@ private static string GetRule(string summary, string detail)
/// <returns>Priority.</returns>
private static IssuePriority GetPriority(string severity)
{
switch (severity.ToLower())
return severity.ToLowerInvariant() switch
{
case "error":
return IssuePriority.Error;

case "warning":
return IssuePriority.Warning;

default:
return IssuePriority.Undefined;
}
"error" => IssuePriority.Error,
"warning" => IssuePriority.Warning,
_ => IssuePriority.Undefined,
};
}

/// <summary>
Expand Down
5 changes: 5 additions & 0 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
</PropertyGroup>
</Project>

0 comments on commit 6136089

Please sign in to comment.