Merge branch 'release/4.0.2'

cake-contrib · Apr 11, 2021 · d1b0f88 · d1b0f88
2 parents 49ffaa0 + bd760f0
commit d1b0f88
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -24,16 +24,24 @@ jobs:
       with:
         fetch-depth: 0
 
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
+    - name: Cache Tools
+      uses: actions/cache@v2
+      with:
+        path: tools
+        key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
 
-    - run: ./build.ps1 --target=DotNetCore-Build
-      shell: pwsh
+    - name: Build project
+      uses: cake-build/cake-action@v1
+      with:
+        script-path: recipe.cake
+        target: DotNetCore-Build
+        cake-version: 0.38.5
+        cake-bootstrap: true
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/source/Cake.ExtendedNuGet.Tests/Cake.ExtendedNuGet.Tests.csproj b/source/Cake.ExtendedNuGet.Tests/Cake.ExtendedNuGet.Tests.csproj
@@ -23,7 +23,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="xunit.runner.console" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/source/Cake.ExtendedNuGet/Cake.ExtendedNuGet.csproj b/source/Cake.ExtendedNuGet/Cake.ExtendedNuGet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -11,9 +11,9 @@
     <!-- 
       The target of this addin is NuGet.Packaging/NuGet.Core.
       Since "they" double-target netstandard2.0 and net471
-      the guideline to double-target cake addins to netstandard2.0 and
-      net461 (see https://cake-contrib.github.io/CakeContrib.Guidelines/rules/ccg0007)
-      can be reduced to netstandard2.0.
+      the guideline to target cake addins to net461 
+      (see https://cake-contrib.github.io/CakeContrib.Guidelines/rules/ccg0007)
+      can be ignored.
      -->
     <CakeContribGuidelinesOmitTargetFramework Include="net461" />
   </ItemGroup>
@@ -30,8 +30,6 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/cake-contrib/Cake.ExtendedNuGet.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <PackageIcon>$(CakeContribGuidelinesIconDestinationLocation)</PackageIcon>
-    <PackageIconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png</PackageIconUrl>
   </PropertyGroup>
 
   <ItemGroup>
@@ -41,7 +39,7 @@
     </PackageReference>
     <PackageReference Include="Cake.Common" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="CakeContrib.Guidelines" Version="0.5.0">
+    <PackageReference Include="CakeContrib.Guidelines" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/source/Cake.ExtendedNuGet/icon.png b/source/Cake.ExtendedNuGet/icon.png