Skip to content

Commit

Permalink
Merge pull request #129 from nils-a/feature/GH-128
Browse files Browse the repository at this point in the history
(#128) bumped Cake to version 2.0.0
  • Loading branch information
nils-a authored Dec 1, 2021
2 parents 4a4e701 + 7a090e0 commit dfa2bc6
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 31 deletions.
23 changes: 0 additions & 23 deletions .appveyor.yml

This file was deleted.

7 changes: 7 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ jobs:
uses: actions/checkout@v2
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- uses: actions/[email protected]
with:
dotnet-version: |
2.1.818
3.1.x
5.0.x
6.0.x
- name: Cache Tools
uses: actions/cache@v2
with:
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ jobs:
with:
fetch-depth: 0

- uses: actions/[email protected]
with:
dotnet-version: |
2.1.818
3.1.x
5.0.x
6.0.x
- name: Cache Tools
uses: actions/cache@v2
with:
Expand Down
4 changes: 3 additions & 1 deletion recipe.cake
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ BuildParameters.SetParameters(
repositoryName: "cake.asciidoctorj",
appVeyorAccountName: "cakecontrib",
shouldRunDotNetCorePack: true,
shouldUseDeterministicBuilds: true);
shouldUseDeterministicBuilds: true,
preferredBuildProviderType: BuildProviderType.GitHubActions,
preferredBuildAgentOperatingSystem: PlatformFamily.Linux);

BuildParameters.PrintParameters(Context);

Expand Down
7 changes: 3 additions & 4 deletions src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)'!='Unix'">$(TargetFrameworks);net461</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<CodeAnalysisRuleSet>..\Cake.AsciiDoctorJ.ruleset</CodeAnalysisRuleSet>

<IsPackable>false</IsPackable>
Expand All @@ -19,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Testing" Version="1.3.0" />
<PackageReference Include="Cake.Testing" Version="2.0.0" />
<PackageReference Include="coverlet.msbuild" Version="3.1.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand All @@ -45,4 +44,4 @@
<ItemGroup>
<ProjectReference Include="../Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj" />
</ItemGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
Expand Down Expand Up @@ -37,8 +37,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="CakeContrib.Guidelines" Version="1.2.0" PrivateAssets="All" />
<PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
<PackageReference Include="CakeContrib.Guidelines" Version="1.3.0" PrivateAssets="All" />
<PackageReference Include="IDisposableAnalyzers" Version="4.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down

0 comments on commit dfa2bc6

Please sign in to comment.