Skip to content

Commit

Permalink
Merge branch 'release/2.0.0' into master
Browse files Browse the repository at this point in the history
* release/2.0.0: (340 commits)
  (GH-697) Update JetBrains.ReSharper.CommandLineTools reference from 2020.2.3 to 2020.2.4
  Add rule URL resolver for CakeContrib-Guidelines
  Update Cake.Issues.Recipe to 0.4.3
  (GH-691) Update JetBrains.ReSharper.CommandLineTools reference from 2020.2.2 to 2020.2.3
  Revert "(GH-673) Use .Net Global Tool for ReSharper Tools"
  (GH-616) Create unique version number
  Update Cake.Issues.Recipe to 0.4.2
  (GH-687) using RepositoryName insteadof repositoryName to make use of the default-value for RepositoryName.
  (GH-612) Add docs for upgrading to 2.0.0
  (GH-673) Use .Net Global Tool for ReSharper Tools
  Update Cake.Issues.Recipe to 0.4.1
  (GH-684) parameter ShouldDocumentSourceFiles is no longer dependent on ShouldGenerateDocumentation.
  (GH-677) Updated documentation to reflect the changes of the default of webLinkRoot
  (GH-680) Documentation of GH-680 as a known-issue.
  (GH-677) set default for WebLinkRoot as RepositoryName instead of title.
  (GH-675) Update Cake.Transifex reference from 0.9.0 to 0.9.1
  (maint) Switch to latest version of Kudu
  (GH-674) Update github action workflow with cake-action
  (GH-674) update bootstrappers to run use .NET Core global tool
  (maint) Correct line endings for shell scripts
  ...
  • Loading branch information
gep13 committed Oct 5, 2020
2 parents 42fa2c6 + 9e96d79 commit 87e2506
Show file tree
Hide file tree
Showing 129 changed files with 6,200 additions and 1,964 deletions.
13 changes: 11 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
image: Visual Studio 2019

#---------------------------------#
# Build Script #
#---------------------------------#
build_script:
- ps: .\build.ps1 -Target AppVeyor
- ps: .\build.ps1 --target=CI

# Tests
test: off
Expand All @@ -22,4 +24,11 @@ branches:
# Build Cache #
#---------------------------------#
cache:
- Tools -> build.ps1
- 'tools -> build.ps1, Cake.Recipe/Content/addins.cake, Cake.Recipe/Content/tools.cake'

#---------------------------------#
# Environment Variables #
#---------------------------------#

environment:
MYGET_SOURCE:
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"cake.tool": {
"version": "0.38.4",
"commands": [
"dotnet-cake"
]
}
}
}
30 changes: 30 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
; This file is for unifying the coding style for different editors and IDEs.
; More information at http://EditorConfig.org

root = true

[*]
end_of_line = CRLF

[*.ps1]
indent_style = space
indent_size = 4

[*.sh]
# Shell scripts requires that line endings are LF
end_of_line = lf

[*.cs]
indent_style = space
indent_size = 4

[*.cake]
indent_style = space
indent_size = 4

[*.js]
indent_style = tab
indent_size = 2

[*.sh]
end_of_line = lf
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
# Custom for Visual Studio
*.cs diff=csharp

# Shellscripts on Unix is required to use LF line endings
*.sh text eol=lf

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Build

on:
push:
branches-ignore:
- "dependabot/**" # Will still build PRs, but not the branches themself
pull_request:

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]

steps:
- uses: actions/[email protected]
- name: Fetch all branches and tags
run: git fetch --unshallow --prune
- name: Tools caching
uses: actions/cache@v2
with:
path: tools
key: ${{ matrix.os }}-tools-${{ hashFiles('recipe.cake') }}
- name: Creating includes.cake file
run: |
Get-ChildItem "./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
with:
script-path: recipe.cake
target: CI
cake-version: 0.38.4
cake-bootstrap: true
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,7 @@ BuildArtifacts/
*.temp.nuspec
tests/integration/repos/
Cake.Recipe/Content/version.cake

# Cake.Graph related
docs/input/tasks/*
includes.cake

# Wyam related
docs/config.wyam.dll
Expand All @@ -268,4 +266,4 @@ docs/config.wyam.packages.xml

*.orig

.DS_Store
.DS_Store
44 changes: 44 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"cSpell.words": [
"Addin",
"Codecov",
"Datas",
"ENABLESSL",
"Gitter",
"Littles",
"MICROSOFTTEAMS",
"MSIL",
"MYGET",
"PROJECTA",
"Posix",
"Publishedx",
"SMTPHOST",
"Testx",
"Transifex",
"Veyor",
"WEBHOOKURL",
"Wyam",
"Xunit",
"bootstrapper",
"cakecontrib",
"chocolateygui",
"clearcache",
"clickable",
"hotfix",
"msbuild",
"netcoreapp",
"netstandard",
"nuget",
"nunit",
"pdbonly",
"prerelease",
"publishdocs",
"releasenotes",
"resharper",
"typeof",
"vstest",
"wixproj",
"xbuild"
],
"powershell.codeFormatting.addWhitespaceAroundPipe": true
}
38 changes: 38 additions & 0 deletions Cake.Recipe/Content/PackageSourceData.cake
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
public enum FeedType
{
Chocolatey,
NuGet
}

public class PackageSourceData
{
public string Name { get; set; }
public string PushUrl { get; set; }
public FeedType Type { get; set; }
public bool IsRelease { get; set; }
public PackageSourceCredentials Credentials { get; private set; }

public PackageSourceData(ICakeContext context, string name, string pushUrl)
: this(context, name, pushUrl, FeedType.NuGet)
{
}

public PackageSourceData(ICakeContext context, string name, string pushUrl, FeedType feedType)
: this(context, name, pushUrl, feedType, true)
{
}

public PackageSourceData(ICakeContext context, string name, string pushUrl, FeedType feedType, bool isRelease)
{
Name = name;
PushUrl = pushUrl;
Type = feedType;
IsRelease = isRelease;

Credentials = new PackageSourceCredentials(
context.EnvironmentVariable(Name.ToUpperInvariant() + "_API_KEY"),
context.EnvironmentVariable(Name.ToUpperInvariant() + "_USER"),
context.EnvironmentVariable(Name.ToUpperInvariant() + "_PASSWORD")
);
}
}
43 changes: 21 additions & 22 deletions Cake.Recipe/Content/addins.cake
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,26 @@
// ADDINS
///////////////////////////////////////////////////////////////////////////////

#addin nuget:?package=Cake.Codecov&version=0.5.0
#addin nuget:?package=Cake.Coveralls&version=0.9.0
#addin nuget:?package=Cake.Figlet&version=1.2.0
#addin nuget:?package=Cake.Git&version=0.19.0
#addin nuget:?package=Cake.Gitter&version=0.10.0
#addin nuget:?package=Cake.Graph&version=0.6.0
#addin nuget:?package=Cake.Incubator&version=3.1.0
#addin nuget:?package=Cake.Kudu&version=0.8.0
#addin nuget:?package=Cake.MicrosoftTeams&version=0.8.0
#addin nuget:?package=Cake.ReSharperReports&version=0.10.0
#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=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.7.0
#addin nuget:?package=Cake.Twitter&version=0.9.0
#addin nuget:?package=Cake.Wyam&version=2.2.4
#addin nuget:?package=Cake.Issues&version=0.6.2
#addin nuget:?package=Cake.Issues.MsBuild&version=0.6.3
#addin nuget:?package=Cake.Issues.InspectCode&version=0.6.1
#addin nuget:?package=Cake.Issues.Reporting&version=0.6.1
#addin nuget:?package=Cake.Issues.Reporting.Generic&version=0.6.2
// Needed for Cake.Graph
#addin nuget:?package=RazorEngine&version=3.10.0&loaddependencies=true
#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

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

Action<string, IDictionary<string, string>> RequireAddin = (code, envVars) => {
var script = MakeAbsolute(File(string.Format("./{0}.cake", Guid.NewGuid())));
Expand All @@ -31,11 +30,11 @@ Action<string, IDictionary<string, string>> RequireAddin = (code, envVars) => {
System.IO.File.WriteAllText(script.FullPath, code);
var arguments = new Dictionary<string, string>();
if(BuildParameters.CakeConfiguration.GetValue("NuGet_UseInProcessClient") != null) {
if (BuildParameters.CakeConfiguration.GetValue("NuGet_UseInProcessClient") != null) {
arguments.Add("nuget_useinprocessclient", BuildParameters.CakeConfiguration.GetValue("NuGet_UseInProcessClient"));
}
if(BuildParameters.CakeConfiguration.GetValue("Settings_SkipVerification") != null) {
if (BuildParameters.CakeConfiguration.GetValue("Settings_SkipVerification") != null) {
arguments.Add("settings_skipverification", BuildParameters.CakeConfiguration.GetValue("Settings_SkipVerification"));
}
Expand Down
Loading

0 comments on commit 87e2506

Please sign in to comment.