Merge pull request #219 from nils-a/release/3.0.0

Release/3.0.0

.appveyor.yml

@@ -17,12 +17,14 @@ test: off
 build: off
 
 environment:
-  JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+  JAVA_HOME: C:\Program Files\Java\jdk11
   #PUBLISH_TOKEN: token to JB-Marketplace for publishing
 
 
 build_script:
-  - ps: .\build.ps1 --target=CI
+  - ps: |
+      $env:Path="$env:JAVA_HOME\bin;$env:Path"
+      .\build.ps1 --target=CI
 
 cache:
   - "tools -> recipe.cake"

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout the requested branch
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.4.0
 
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
@@ -37,24 +37,24 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: '8'
+          java-version: '11'
 
       # Cache Gradle Wrapper
       - name: Setup Gradle Wrapper Cache
-        uses: actions/[email protected].6
+        uses: actions/[email protected].7
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
 
       # Cache Cake tools
       - name: Cache Tools
-        uses: actions/[email protected].6
+        uses: actions/[email protected].7
         with:
           path: tools
           key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
 
       - name: Build project
-        uses: cake-build/cake-action@v1.3.0
+        uses: cake-build/cake-action@v1.4.0
         with:
           script-path: recipe.cake
           target: CI

docs/input/docs/integrations/editors/rider/index.cshtml

@@ -24,7 +24,7 @@ RedirectFrom: docs/editors/rider
 
 <div class="alert alert-info">
     <p>
-        The <a href="https://plugins.jetbrains.com/plugin/15729-cake-rider" target="_blank">Cake plugin for Rider</a> supports Rider version 2020.2 and newer.
+        The <a href="https://plugins.jetbrains.com/plugin/15729-cake-rider" target="_blank">Cake plugin for Rider</a> supports Rider version 2021.2 and newer.
     </p>
 </div>
 

docs/input/docs/integrations/editors/rider/run-configurations.md

@@ -29,7 +29,7 @@ In order to use the run configurations you must have Cake installed on your mach
         </p>
         <pre><code class="language-cmd hljs">dotnet tool install --global Cake.Tool</code></pre>
         <p>
-            This is the default setup in Cake for Rider.
+            This is the default setup in Cake for Rider. Alternatively it is also possible to use a project local installation of the Cake .NET Tool.
         </p>
     </div>
     <div id="frosting" class="tab-pane fade">
@@ -112,6 +112,14 @@ in the [Cake Tasks window](#running-builds-directly).
 ### Runner settings
 
 Allows to define the runner to use.
+
+The first option, *Use 'dotnet cake' instead of executable*, will use `dotnet cake` as the runner.
+The `dotnet` executable must be in available in the path and the Cake .NET Tool must either be globally installed to the machine
+or locally installed to the project. If this option is set, all other options on the settings page are ignored.
+
+Alternatively, when *Use 'dotnet cake' instead of executable* is not set,
+a path to the Cake executable (either `dotnet-cake.exe`, or `cake.exe`) has to be supplied:
+
 Different runners for different operating systems can be set by defining a regular expression which is matched against the system property `os.name`.
 
 The Cake runner settings are able to process environment variables: Use a specific variable like `${VARIABLE}` and the environment variable will be expanded when the runner is called.
@@ -146,8 +154,10 @@ An editor for run configurations is available:
 
 * *Ensure .NET Tool (Global)*:
   Ensures the Cake .NET tool is installed globally before running Cake.
-
-![Run Actions](/assets/img/cake-rider/docs/beforeRunAction-ensureTool.png){.img-responsive}
+* *Restore .NET Tools*:
+  Restores the .NET tools, effectively calling `dotnet tool restore` before running the build.
+
+![Run Actions](/assets/img/cake-rider/docs/beforeRunActions.png){.img-responsive}
 
 ## Running builds directly
 

src/dotnet/cake-rider/Templates/BoolTemplateProviders.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
-using JetBrains.ReSharper.Host.Features.ProjectModel.ProjectTemplates.DotNetExtensions;
-using JetBrains.ReSharper.Host.Features.ProjectModel.ProjectTemplates.DotNetTemplates;
+using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetExtensions;
+using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetTemplates;
 using JetBrains.Rider.Model;
 
 namespace net.cakebuild.Templates

src/dotnet/cake-rider/Templates/ParameterProvider.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using JetBrains.Application;
-using JetBrains.ReSharper.Host.Features.ProjectModel.ProjectTemplates.DotNetExtensions;
+using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetExtensions;
 
 namespace net.cakebuild.Templates
 {

src/dotnet/cake-rider/Templates/TextTemplateProviders.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
-using JetBrains.ReSharper.Host.Features.ProjectModel.ProjectTemplates.DotNetExtensions;
-using JetBrains.ReSharper.Host.Features.ProjectModel.ProjectTemplates.DotNetTemplates;
+using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetExtensions;
+using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetTemplates;
 using JetBrains.Rider.Model;
 
 namespace net.cakebuild.Templates

src/dotnet/cake-rider/cake-rider.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net461</TargetFramework>
+        <TargetFramework>net472</TargetFramework>
         <AssemblyName>cake-rider</AssemblyName>
         <RootNamespace>net.cakebuild</RootNamespace>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -11,7 +11,7 @@
 
     <PropertyGroup>
         <!-- will be injected by gradle at build -->
-        <SdkVersion Condition="'$(SdkVersion)' == ''">2020.1.1</SdkVersion>
+        <SdkVersion Condition="'$(SdkVersion)' == ''">2021.2.1</SdkVersion>
     </PropertyGroup>
 
     <ItemGroup>