Skip to content

Commit

Permalink
Merge branch 'release/3.0.0'
Browse files Browse the repository at this point in the history
* release/3.0.0: (59 commits)
  (#803) Remove usage of MyGet feed
  (build) Update to Cake 1.3.0
  (#723) Use alias for getting Arguments
  (#762) Update Cake and Cake.Issues.Recipe
  (#854) modified resolution of nuget
  (#854) modified resolution of RequireToolNotRegistered
  (GH-857) Update Cake.Coveralls reference from 1.0.1 to 1.1.0
  (GH-859) Update Cake.Gitter reference from 1.0.2 to 1.1.0
  (#862) bumped JetBrains.ReSharper.CommandLineTools
  (#873) Remove usage of DupFinder
  (#845) specified the full versions of GitHub actions
  Bump actions/checkout from 2.3.4 to 2.4.0
  Bump cake-build/cake-action from 1.3.0 to 1.4.0
  Bump gittools/actions from 0.9.9 to 0.9.11
  Bump actions/cache from 2.1.5 to 2.1.7
  (maint) FIx spelling mistake
  Bump actions/cache from 2.1.4 to 2.1.5
  Bump cake-build/cake-action from 1 to 1.3.0
  (GH-849) Update Cake.Wyam reference from 2.2.10 to 2.2.12
  (#847) Bump CakeContrib.Guidelines to v1.1.1 to update NuGet package icon
  ...
  • Loading branch information
gep13 committed Aug 8, 2022
2 parents 51fc445 + 7a70da1 commit 724eb7e
Show file tree
Hide file tree
Showing 62 changed files with 289 additions and 265 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ branches:
# Build Cache #
#---------------------------------#
cache:
- 'tools -> build.ps1, Cake.Recipe/Content/addins.cake, Cake.Recipe/Content/tools.cake'
- 'tools -> build.ps1, Source/Cake.Recipe/Content/addins.cake, Source/Cake.Recipe/Content/tools.cake'

#---------------------------------#
# Environment Variables #
Expand Down
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "0.38.4",
"version": "1.3.0",
"commands": [
"dotnet-cake"
]
Expand Down
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
14 changes: 7 additions & 7 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
os: [windows-latest, ubuntu-18.04, macos-latest]

steps:
- uses: actions/checkout@v2.3.2
- uses: actions/checkout@v2.4.0
- name: Fetch all branches and tags
run: git fetch --unshallow --prune
- name: Tools caching
uses: actions/cache@v2
uses: actions/cache@v2.1.7
with:
path: tools
key: ${{ matrix.os }}-tools-${{ hashFiles('recipe.cake') }}
key: ${{ matrix.os }}-tools-${{ hashFiles('recipe.cake', 'Source/Cake.Recipe/Content/addins.cake', 'Source/Cake.Recipe/Content/tools.cake', 'Source/Cake.Recipe/Content/modules.cake') }}
- name: Creating includes.cake file
run: |
Get-ChildItem "./Cake.Recipe/Content/*.cake" -Exclude "version.cake" | % {
Get-ChildItem "./Source/Cake.Recipe/Content/*.cake" -Exclude "version.cake" | % {
"#load `"local:?path=$($_.FullName -replace '\\','/')`""
} | Out-File "./includes.cake"
shell: pwsh
- name: Build Cake.Recipe
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@v1.4.0
with:
script-path: recipe.cake
target: CI
cake-version: 0.38.4
cake-version: 1.3.0
cake-bootstrap: true
18 changes: 9 additions & 9 deletions .github/workflows/release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@ jobs:
draft-stable:
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
runs-on: ubuntu-latest
runs-on: ubuntu-18.04

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
- name: Cache Tools
uses: actions/[email protected].4
uses: actions/[email protected].7
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake', 'Source/Cake.Recipe/Content/addins.cake', 'Source/Cake.Recipe/Content/tools.cake', 'Source/Cake.Recipe/Content/modules.cake') }}
- name: Set up git version
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
uses: gittools/actions/gitversion/[email protected].9
uses: gittools/actions/gitversion/[email protected].11
with:
versionSpec: "5.x"
- name: Run git version
if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
id: gitversion
uses: gittools/actions/gitversion/[email protected].9
uses: gittools/actions/gitversion/[email protected].11
- name: Create release branch ${{ github.event.inputs.version }}
if: ${{ steps.gitversion.outputs.majorMinorPatch }}
run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }}
Expand All @@ -39,15 +39,15 @@ jobs:
github_token: ${{ secrets.GH_TOKEN }}
- name: Creating includes.cake file
run: |
Get-ChildItem "./Cake.Recipe/Content/*.cake" -Exclude "version.cake" | % {
Get-ChildItem "./Source/Cake.Recipe/Content/*.cake" -Exclude "version.cake" | % {
"#load `"local:?path=$($_.FullName -replace '\\','/')`""
} | Out-File "./includes.cake"
shell: pwsh
- name: Drafting Release Notes
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@v1.4.0
with:
script-path: recipe.cake
target: releasenotes
verbosity: Diagnostic
cake-version: 0.38.5
cake-version: 1.1.0
cake-bootstrap: true
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ tools/
BuildArtifacts/
*.temp.nuspec
tests/integration/repos/
Cake.Recipe/Content/version.cake
Source/Cake.Recipe/Content/version.cake
includes.cake

# Wyam related
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"request": "launch",
"program": "${workspaceRoot}/tools/Cake.CoreCLR/Cake.dll",
"args": [
"${workspaceRoot}/build.cake",
"${workspaceRoot}/recipe.cake",
"--debug",
"--verbosity=diagnostic"
],
Expand Down
24 changes: 0 additions & 24 deletions Cake.Recipe/Cake.Recipe.nuspec

This file was deleted.

65 changes: 0 additions & 65 deletions Cake.Recipe/Content/analyzing.cake

This file was deleted.

1 change: 0 additions & 1 deletion Cake.Recipe/Content/modules.cake

This file was deleted.

34 changes: 34 additions & 0 deletions Source/Cake.Recipe.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0
MinimumVisualStudioVersion = 15.0.26124.0
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Recipe", "Cake.Recipe\Cake.Recipe.csproj", "{137DB654-11F3-4634-A2BE-FC5E02967FEA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{137DB654-11F3-4634-A2BE-FC5E02967FEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{137DB654-11F3-4634-A2BE-FC5E02967FEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{137DB654-11F3-4634-A2BE-FC5E02967FEA}.Debug|x64.ActiveCfg = Debug|Any CPU
{137DB654-11F3-4634-A2BE-FC5E02967FEA}.Debug|x64.Build.0 = Debug|Any CPU
{137DB654-11F3-4634-A2BE-FC5E02967FEA}.Debug|x86.ActiveCfg = Debug|Any CPU
{137DB654-11F3-4634-A2BE-FC5E02967FEA}.Debug|x86.Build.0 = Debug|Any CPU
{137DB654-11F3-4634-A2BE-FC5E02967FEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{137DB654-11F3-4634-A2BE-FC5E02967FEA}.Release|Any CPU.Build.0 = Release|Any CPU
{137DB654-11F3-4634-A2BE-FC5E02967FEA}.Release|x64.ActiveCfg = Release|Any CPU
{137DB654-11F3-4634-A2BE-FC5E02967FEA}.Release|x64.Build.0 = Release|Any CPU
{137DB654-11F3-4634-A2BE-FC5E02967FEA}.Release|x86.ActiveCfg = Release|Any CPU
{137DB654-11F3-4634-A2BE-FC5E02967FEA}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
43 changes: 43 additions & 0 deletions Source/Cake.Recipe/Cake.Recipe.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup>
<StartYear>2016</StartYear>
<EndYear>$([System.DateTime]::Today.Year)</EndYear>
<FullYear Condition="'$(StartYear)'=='$(EndYear)'">$(StartYear)</FullYear>
<FullYear Condition="'$(StartYear)'!='$(EndYear)'">$(StartYear)-$(EndYear)</FullYear>

<!-- Properties related to packaging -->
<Authors>gep13</Authors>
<Copyright>Copyright (c) Cake Contributions $(FullYear)</Copyright>
<Description>
This NuGet package contains a set of re-usable scripts that can be added to your build using the load preprocessor directive. As a result, it is possible to use the same set of build scripts across multiple projects, without having to duplicate the scripts. All that is required is a small recipe build script, which sets the project specific information. More information can be found about this project on the documentation page here:

https://cake-contrib.github.io/Cake.Recipe/docs/

NOTE: Currently, Cake.Recipe itself is built using 0.38.4, and as a result, there is an expectation that that any project that is built using Cake.Recipe should also use 0.38.4 of Cake. Using a newer version of Cake may work, but there is no guarantee that it will.
</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/cake-contrib/Cake.Recipe/</PackageProjectUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/cake-contrib/Cake.Recipe.git</RepositoryUrl>
<PackageTags>Cake;Build;Automation;Recipe;cake-recipe;cake-build;script</PackageTags>
<PackageReleaseNotes>https://github.com/cake-contrib/Cake.Recipe/releases/tag/$(Version)</PackageReleaseNotes>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CakeContrib.Guidelines" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<None Include="Content/*" PackagePath="/content" Pack="true" />
</ItemGroup>

</Project>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
// ADDINS
///////////////////////////////////////////////////////////////////////////////

#addin nuget:?package=Cake.Codecov&version=0.9.1
#addin nuget:?package=Cake.Coveralls&version=0.10.2
#addin nuget:?package=Cake.Coverlet&version=2.5.1
#addin nuget:?package=Cake.Codecov&version=1.0.1
#addin nuget:?package=Cake.Coveralls&version=1.1.0
#addin nuget:?package=Cake.Coverlet&version=2.5.4
#addin nuget:?package=Portable.BouncyCastle&version=1.8.5
#addin nuget:?package=MimeKit&version=2.9.1
#addin nuget:?package=MailKit&version=2.8.0
#addin nuget:?package=MimeTypesMap&version=1.0.8
#addin nuget:?package=Cake.Email.Common&version=0.4.2
#addin nuget:?package=Cake.Email&version=0.10.0
#addin nuget:?package=Cake.Figlet&version=1.3.1
#addin nuget:?package=Cake.Gitter&version=0.11.1
#addin nuget:?package=Cake.Incubator&version=5.1.0
#addin nuget:?package=Cake.Kudu&version=0.11.0
#addin nuget:?package=Cake.MicrosoftTeams&version=0.9.0
#addin nuget:?package=Cake.Slack&version=0.13.0
#addin nuget:?package=Cake.Transifex&version=0.9.1
#addin nuget:?package=Cake.Twitter&version=0.10.1
#addin nuget:?package=Cake.Wyam&version=2.2.9
#addin nuget:?package=Cake.Email&version=1.0.2
#addin nuget:?package=Cake.Figlet&version=2.0.1
#addin nuget:?package=Cake.Gitter&version=1.1.0
#addin nuget:?package=Cake.Incubator&version=6.0.0
#addin nuget:?package=Cake.Kudu&version=1.0.1
#addin nuget:?package=Cake.MicrosoftTeams&version=1.0.1
#addin nuget:?package=Cake.Slack&version=1.0.1
#addin nuget:?package=Cake.Transifex&version=1.0.1
#addin nuget:?package=Cake.Twitter&version=1.0.0
#addin nuget:?package=Cake.Wyam&version=2.2.12

#load nuget:?package=Cake.Issues.Recipe&version=0.4.3
#load nuget:?package=Cake.Issues.Recipe&version=1.3.2

Action<string, IDictionary<string, string>> RequireAddin = (code, envVars) => {
var script = MakeAbsolute(File(string.Format("./{0}.cake", Guid.NewGuid())));
Expand Down
29 changes: 29 additions & 0 deletions Source/Cake.Recipe/Content/analyzing.cake
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
///////////////////////////////////////////////////////////////////////////////
// TASK DEFINITIONS
///////////////////////////////////////////////////////////////////////////////
BuildParameters.Tasks.InspectCodeTask = Task("InspectCode")
.WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping due to not running on Windows")
.WithCriteria(() => BuildParameters.ShouldRunInspectCode, "Skipping because InspectCode has been disabled")
.Does<BuildData>(data => RequireTool(ToolSettings.ReSharperTools, () => {
var inspectCodeLogFilePath = BuildParameters.Paths.Directories.InspectCodeTestResults.CombineWithFilePath("inspectcode.xml");
var settings = new InspectCodeSettings() {
SolutionWideAnalysis = true,
OutputFile = inspectCodeLogFilePath,
ArgumentCustomization = x => x.Append("--no-build")
};
if (FileExists(BuildParameters.SourceDirectoryPath.CombineWithFilePath(BuildParameters.ResharperSettingsFileName)))
{
settings.Profile = BuildParameters.SourceDirectoryPath.CombineWithFilePath(BuildParameters.ResharperSettingsFileName);
}
InspectCode(BuildParameters.SolutionFilePath, settings);
// Pass path to InspectCode log file to Cake.Issues.Recipe
IssuesParameters.InputFiles.AddInspectCodeLogFile(inspectCodeLogFilePath);
})
);

BuildParameters.Tasks.AnalyzeTask = Task("Analyze")
.IsDependentOn("InspectCode");
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

BuildParameters.Tasks.ClearAppVeyorCacheTask = Task("Clear-AppVeyor-Cache")
.Does(() =>
RequireAddin(@"#addin nuget:?package=Cake.AppVeyor&version=4.0.0&loaddependencies=true
RequireAddin(@"#addin nuget:?package=Cake.AppVeyor&version=5.0.1&loaddependencies=true
AppVeyorClearCache(new AppVeyorSettings() { ApiToken = EnvironmentVariable(""TEMP_APPVEYOR_TOKEN"") },
EnvironmentVariable(""TEMP_APPVEYOR_ACCOUNT_NAME""),
EnvironmentVariable(""TEMP_APPVEYOR_PROJECT_SLUG""));
Expand Down
File renamed without changes.
Loading

0 comments on commit 724eb7e

Please sign in to comment.