From 0a324db1ff51d2d2bc149850b214df9c6fe0b491 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 20 Oct 2018 17:14:12 -0700 Subject: [PATCH 001/230] Use specific version for Cake.Git. Future versions may not be compatible with the pinned version of Cake. --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index da95bf3..2d5eb7c 100644 --- a/build.cake +++ b/build.cake @@ -1,4 +1,4 @@ -#addin "Cake.Git" +#addin nuget:?package=Cake.Git&version=0.19.0 #addin nuget:?package=Cake.XmlDocMarkdown&version=1.4.1 using System.Text.RegularExpressions; From 70f042abdb914eb42cbf2c73ccde685428117c62 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 20 Oct 2018 17:16:39 -0700 Subject: [PATCH 002/230] Encourage use of package tags. --- src/ProjectName/ProjectName.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ProjectName/ProjectName.csproj b/src/ProjectName/ProjectName.csproj index 3528d66..e4b3bf5 100644 --- a/src/ProjectName/ProjectName.csproj +++ b/src/ProjectName/ProjectName.csproj @@ -4,6 +4,7 @@ 0.1.0 netstandard1.4;netstandard2.0;net461 + From 65b04dedb26b16c7a2cdc9aef542a6275b278cdb Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 20 Oct 2018 10:13:21 -0700 Subject: [PATCH 003/230] Make sure we actually use the specified Cake version. --- build.ps1 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/build.ps1 b/build.ps1 index 67d3f25..e2339d6 100644 --- a/build.ps1 +++ b/build.ps1 @@ -19,13 +19,11 @@ New-Item -Path $CakeDirPath -Type Directory -ErrorAction SilentlyContinue | Out- # create packages.config $PackagesConfigPath = Join-Path $CakeDirPath "packages.config" -If (!(Test-Path $PackagesConfigPath)) { - [System.IO.File]::WriteAllLines($PackagesConfigPath, @( - "", - "", - "`t", - "")) -} +[System.IO.File]::WriteAllLines($PackagesConfigPath, @( + "", + "", + "`t", + "")) # download nuget.exe if not in path and not already downloaded $NuGetExe = Get-Command "nuget.exe" -ErrorAction SilentlyContinue @@ -41,14 +39,14 @@ Else { # use NuGet to download Cake Push-Location $CakeDirPath -Invoke-Expression "&`"$NuGetExePath`" install -ExcludeVersion -OutputDirectory ." +Invoke-Expression "&`"$NuGetExePath`" install -OutputDirectory ." If ($LASTEXITCODE -ne 0) { Throw "An error occurred while restoring NuGet tools." } Pop-Location # run Cake with specified arguments -$CakeExePath = Join-Path $CakeDirPath "Cake/Cake.exe" +$CakeExePath = Join-Path $CakeDirPath "Cake.0.30.0/Cake.exe" $ExtraArgs = "" if ($Target) { $ExtraArgs += "--target=$Target" } Invoke-Expression "& `"$CakeExePath`" --paths_tools=cake --experimental $ExtraArgs $ScriptArgs" From e675099a61572389fcb3a874ba80031a728eb44c Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 20 Oct 2018 10:15:53 -0700 Subject: [PATCH 004/230] Store Cake version in a variable. --- build.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.ps1 b/build.ps1 index e2339d6..3c18af5 100644 --- a/build.ps1 +++ b/build.ps1 @@ -13,6 +13,8 @@ Param( [string[]]$ScriptArgs ) +$CakeVersion = "0.30.0" + # create cake directory $CakeDirPath = Join-Path $PSScriptRoot "cake" New-Item -Path $CakeDirPath -Type Directory -ErrorAction SilentlyContinue | Out-Null @@ -22,7 +24,7 @@ $PackagesConfigPath = Join-Path $CakeDirPath "packages.config" [System.IO.File]::WriteAllLines($PackagesConfigPath, @( "", "", - "`t", + "`t", "")) # download nuget.exe if not in path and not already downloaded @@ -46,7 +48,7 @@ If ($LASTEXITCODE -ne 0) { Pop-Location # run Cake with specified arguments -$CakeExePath = Join-Path $CakeDirPath "Cake.0.30.0/Cake.exe" +$CakeExePath = Join-Path $CakeDirPath "Cake.$CakeVersion/Cake.exe" $ExtraArgs = "" if ($Target) { $ExtraArgs += "--target=$Target" } Invoke-Expression "& `"$CakeExePath`" --paths_tools=cake --experimental $ExtraArgs $ScriptArgs" From a3ad9bb43c4c6c6f6f5dcfcc87246d343dde358c Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 20 Oct 2018 10:52:03 -0700 Subject: [PATCH 005/230] Modern C# no longer needs experimental Cake. --- build.ps1 | 2 +- build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.ps1 b/build.ps1 index 3c18af5..3991aa2 100644 --- a/build.ps1 +++ b/build.ps1 @@ -51,5 +51,5 @@ Pop-Location $CakeExePath = Join-Path $CakeDirPath "Cake.$CakeVersion/Cake.exe" $ExtraArgs = "" if ($Target) { $ExtraArgs += "--target=$Target" } -Invoke-Expression "& `"$CakeExePath`" --paths_tools=cake --experimental $ExtraArgs $ScriptArgs" +Invoke-Expression "& `"$CakeExePath`" --paths_tools=cake $ExtraArgs $ScriptArgs" Exit $LASTEXITCODE diff --git a/build.sh b/build.sh index 52d3ce0..eaba6e3 100755 --- a/build.sh +++ b/build.sh @@ -60,4 +60,4 @@ fi export MONO_ROOT=$(dirname $(which mono))/../ # Start Cake -exec mono "$CAKE_EXE" build.cake --paths_tools=cake --experimental ${SCRIPT_ARGUMENTS[@]} +exec mono "$CAKE_EXE" build.cake --paths_tools=cake ${SCRIPT_ARGUMENTS[@]} From 51975ff27d0ac19b969de70d8b50a2fc3ea0beba Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 20 Oct 2018 16:19:27 -0700 Subject: [PATCH 006/230] Only download Cake if necessary. --- build.ps1 | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/build.ps1 b/build.ps1 index 3991aa2..2452551 100644 --- a/build.ps1 +++ b/build.ps1 @@ -19,14 +19,6 @@ $CakeVersion = "0.30.0" $CakeDirPath = Join-Path $PSScriptRoot "cake" New-Item -Path $CakeDirPath -Type Directory -ErrorAction SilentlyContinue | Out-Null -# create packages.config -$PackagesConfigPath = Join-Path $CakeDirPath "packages.config" -[System.IO.File]::WriteAllLines($PackagesConfigPath, @( - "", - "", - "`t", - "")) - # download nuget.exe if not in path and not already downloaded $NuGetExe = Get-Command "nuget.exe" -ErrorAction SilentlyContinue If ($NuGetExe -ne $null) { @@ -39,16 +31,27 @@ Else { } } -# use NuGet to download Cake -Push-Location $CakeDirPath -Invoke-Expression "&`"$NuGetExePath`" install -OutputDirectory ." -If ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet tools." +# download Cake if necessary +$CakeExePath = Join-Path $CakeDirPath "Cake.$CakeVersion/Cake.exe" +If (!(Test-Path $CakeExePath)) { + # create packages.config + $PackagesConfigPath = Join-Path $CakeDirPath "packages.config" + [System.IO.File]::WriteAllLines($PackagesConfigPath, @( + "", + "", + "`t", + "")) + + # use NuGet to download Cake + Push-Location $CakeDirPath + Invoke-Expression "&`"$NuGetExePath`" install -OutputDirectory ." + If ($LASTEXITCODE -ne 0) { + Throw "An error occurred while restoring NuGet tools." + } + Pop-Location } -Pop-Location # run Cake with specified arguments -$CakeExePath = Join-Path $CakeDirPath "Cake.$CakeVersion/Cake.exe" $ExtraArgs = "" if ($Target) { $ExtraArgs += "--target=$Target" } Invoke-Expression "& `"$CakeExePath`" --paths_tools=cake $ExtraArgs $ScriptArgs" From c8e0faf3fb17e5511865574e96511f7048dccb00 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 20 Oct 2018 17:19:20 -0700 Subject: [PATCH 007/230] Move buildbot display name and email into variables. --- build.cake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.cake b/build.cake index 2d5eb7c..ade7db0 100644 --- a/build.cake +++ b/build.cake @@ -17,6 +17,8 @@ var docsSourceUri = "https://github.com/Faithlife/RepoName/tree/master/src"; var nugetSource = "https://api.nuget.org/v3/index.json"; var buildBotUserName = "faithlifebuildbot"; var buildBotPassword = EnvironmentVariable("BUILD_BOT_PASSWORD"); +var buildBotDisplayName = "Faithlife Build Bot"; +var buildBotEmail = "faithlifebuildbot@users.noreply.github.com"; Task("Clean") .Does(() => @@ -66,7 +68,7 @@ Task("UpdateDocs") { Information("Committing all documentation changes."); GitAddAll(docsDirectory); - GitCommit(docsDirectory, "Faithlife Build Bot", "faithlifebuildbot@users.noreply.github.com", "Automatic documentation update."); + GitCommit(docsDirectory, buildBotDisplayName, buildBotEmail, "Automatic documentation update."); Information("Pushing updated documentation to GitHub."); GitPush(docsDirectory, buildBotUserName, buildBotPassword, branchName); } From 15e6ff9753293958a3ec02b43fd597203be8a415 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 20 Oct 2018 17:24:35 -0700 Subject: [PATCH 008/230] Remove unused method from script. --- build.cake | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/build.cake b/build.cake index ade7db0..efb3391 100644 --- a/build.cake +++ b/build.cake @@ -141,16 +141,4 @@ Task("NuGetPublish") Task("Default") .IsDependentOn("Test"); -void ExecuteProcess(string exePath, string arguments) -{ - if (IsRunningOnUnix()) - { - arguments = exePath + " " + arguments; - exePath = "mono"; - } - int exitCode = StartProcess(exePath, arguments); - if (exitCode != 0) - throw new InvalidOperationException($"{exePath} failed with exit code {exitCode}."); -} - RunTarget(target); From e01194809a833c83edf0913cba4231bd98d766d2 Mon Sep 17 00:00:00 2001 From: Bradley Grainger Date: Thu, 27 Dec 2018 15:20:58 -0800 Subject: [PATCH 009/230] Use element. See https://github.com/NuGet/Home/wiki/Packaging-License-within-the-nupkg#project-properties. --- src/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 8042c44..77f4f40 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -10,7 +10,7 @@ portable True RepoName - https://raw.githubusercontent.com/Faithlife/$(RepositoryName)/master/LICENSE + MIT https://github.com/Faithlife/$(RepositoryName) https://github.com/Faithlife/$(RepositoryName)/blob/master/VersionHistory.md#released https://github.com/Faithlife/$(RepositoryName).git From edc1a964e3807c8255cb884c4091b45e23b42a99 Mon Sep 17 00:00:00 2001 From: Bradley Grainger Date: Thu, 27 Dec 2018 15:25:00 -0800 Subject: [PATCH 010/230] Allow source projects to not be NuGet packed. --- build.cake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.cake b/build.cake index efb3391..0c316ce 100644 --- a/build.cake +++ b/build.cake @@ -13,6 +13,7 @@ var solutionFileName = "ProjectName.sln"; var docsProjects = new[] { "ProjectName" }; var docsRepoUri = "https://github.com/Faithlife/RepoName.git"; var docsSourceUri = "https://github.com/Faithlife/RepoName/tree/master/src"; +var nugetIgnore = new string[0]; var nugetSource = "https://api.nuget.org/v3/index.json"; var buildBotUserName = "faithlifebuildbot"; @@ -94,7 +95,7 @@ Task("NuGetPackage") { if (string.IsNullOrEmpty(versionSuffix) && !string.IsNullOrEmpty(trigger)) versionSuffix = Regex.Match(trigger, @"^v[^\.]+\.[^\.]+\.[^\.]+-(.+)").Groups[1].ToString(); - foreach (var projectPath in GetFiles("src/**/*.csproj").Select(x => x.FullPath)) + foreach (var projectPath in GetFiles("src/**/*.csproj").Where(x => !nugetIgnore.Contains(x.GetFilenameWithoutExtension().ToString())).Select(x => x.FullPath)) DotNetCorePack(projectPath, new DotNetCorePackSettings { Configuration = configuration, NoBuild = true, NoRestore = true, OutputDirectory = "release", VersionSuffix = versionSuffix }); }); From 9a49dd254b203e1198470ae02d08c32d941afe5a Mon Sep 17 00:00:00 2001 From: Bradley Grainger Date: Sat, 29 Dec 2018 07:32:39 -0800 Subject: [PATCH 011/230] Add Faithlife.Analyzers to template. --- src/Directory.Build.props | 1 + tests/ProjectName.Tests/ProjectName.Tests.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 77f4f40..fe5a98e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,6 +22,7 @@ + diff --git a/tests/ProjectName.Tests/ProjectName.Tests.csproj b/tests/ProjectName.Tests/ProjectName.Tests.csproj index d5f7767..80480b9 100644 --- a/tests/ProjectName.Tests/ProjectName.Tests.csproj +++ b/tests/ProjectName.Tests/ProjectName.Tests.csproj @@ -6,6 +6,7 @@ + From c4e6ddb6c7fbe58488ee70018863cd0d679780e7 Mon Sep 17 00:00:00 2001 From: Bradley Grainger Date: Sat, 29 Dec 2018 08:16:43 -0800 Subject: [PATCH 012/230] Update FaithlifeAnalyzers to 1.0.1. --- src/Directory.Build.props | 2 +- tests/ProjectName.Tests/ProjectName.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index fe5a98e..edf8c45 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,7 +22,7 @@ - + diff --git a/tests/ProjectName.Tests/ProjectName.Tests.csproj b/tests/ProjectName.Tests/ProjectName.Tests.csproj index 80480b9..9398221 100644 --- a/tests/ProjectName.Tests/ProjectName.Tests.csproj +++ b/tests/ProjectName.Tests/ProjectName.Tests.csproj @@ -6,7 +6,7 @@ - + From f45a953d49f532d5376cc676459015ff0dd106ce Mon Sep 17 00:00:00 2001 From: Bradley Grainger Date: Sat, 29 Dec 2018 09:55:07 -0800 Subject: [PATCH 013/230] Update FaithlifeAnalyzers to 1.0.2. --- src/Directory.Build.props | 2 +- tests/ProjectName.Tests/ProjectName.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index edf8c45..b25e95e 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,7 +22,7 @@ - + diff --git a/tests/ProjectName.Tests/ProjectName.Tests.csproj b/tests/ProjectName.Tests/ProjectName.Tests.csproj index 9398221..560804e 100644 --- a/tests/ProjectName.Tests/ProjectName.Tests.csproj +++ b/tests/ProjectName.Tests/ProjectName.Tests.csproj @@ -6,7 +6,7 @@ - + From f0a567c71e66fc0324707d29ed0d3c85a72cc01d Mon Sep 17 00:00:00 2001 From: Dave Dunkin Date: Sat, 2 Mar 2019 09:27:13 -0700 Subject: [PATCH 014/230] Update Faithlife.Analyzers to 1.0.5. --- src/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b25e95e..1372324 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,7 +22,7 @@ - + From 58a5581403142353fb099a25199f29644cc42285 Mon Sep 17 00:00:00 2001 From: Dave Dunkin Date: Sat, 2 Mar 2019 09:34:01 -0700 Subject: [PATCH 015/230] Update tests Faithlife.Analyzers to 1.0.5. --- tests/ProjectName.Tests/ProjectName.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ProjectName.Tests/ProjectName.Tests.csproj b/tests/ProjectName.Tests/ProjectName.Tests.csproj index 560804e..4e51306 100644 --- a/tests/ProjectName.Tests/ProjectName.Tests.csproj +++ b/tests/ProjectName.Tests/ProjectName.Tests.csproj @@ -6,7 +6,7 @@ - + From 01ab97234eb3bf6e6ee2a5d4b15b40efa54c01f5 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 07:11:12 -0700 Subject: [PATCH 016/230] Ignore ReSharper caches. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9985523..0a5f925 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ Thumbs.db *.ncrunchproject *.ncrunchsolution nCrunchTemp* +_ReSharper* From 23c5dc58308ee6609c60f4d3834773792ec1d717 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 07:11:34 -0700 Subject: [PATCH 017/230] Don't ignore unused output folders. --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0a5f925..68a047f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,8 @@ # ignore output folders bin/ -build/ cake/ obj/ -ipch/ release/ -tools/ # ignore user-specific options/cache files .vs/ From 439a4d5dfc5c1b3f8769909903078ed026c6ed93 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 07:12:16 -0700 Subject: [PATCH 018/230] Inprove contributing links. --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 59aac5d..2c98d4e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,8 +2,8 @@ ## Prerequisites -* Install [Visual Studio 2017](https://www.visualstudio.com/downloads/) or [Visual Studio Code](https://code.visualstudio.com/) with the [editorconfig extension](https://github.com/editorconfig/editorconfig-vscode). -* Install [.NET Core 2.0](https://www.microsoft.com/net/core). +* Install [Visual Studio 2017](https://visualstudio.microsoft.com/downloads/) or [Visual Studio Code](https://code.visualstudio.com/) with the [editorconfig extension](https://github.com/editorconfig/editorconfig-vscode). +* Install [.NET Core 2.x](https://dotnet.microsoft.com/download). ## Guidelines From b47732f6474cb8c31f8da9731933623dd0d1787e Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 07:13:23 -0700 Subject: [PATCH 019/230] dotnet test works on solutions. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2c98d4e..ea44781 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,4 +15,4 @@ * Clone the repository: `git clone https://github.com/Faithlife/RepoName.git` * `cd RepoName` -* `dotnet test tests/ProjectName.Tests` +* `dotnet test` From bac483da3676be015cfb937046f28e5ffc87bca7 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 07:13:53 -0700 Subject: [PATCH 020/230] Remove unnecessary comment. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ea44781..89fe936 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,6 +13,6 @@ ## How to Build -* Clone the repository: `git clone https://github.com/Faithlife/RepoName.git` +* `git clone https://github.com/Faithlife/RepoName.git` * `cd RepoName` * `dotnet test` From 977637c8e7bf0440a9984a4106b484b9031bafb2 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 07:14:14 -0700 Subject: [PATCH 021/230] Update license date. --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 1264693..f5fa8b6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright 2018 Faithlife Corporation +Copyright 2019 Faithlife Corporation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From ba21c66e316808c7c922fe9eb0342a2c93511652 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 07:14:52 -0700 Subject: [PATCH 022/230] Tweak version history instructions. --- VersionHistory.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/VersionHistory.md b/VersionHistory.md index ce33c33..d3f8498 100644 --- a/VersionHistory.md +++ b/VersionHistory.md @@ -2,10 +2,9 @@ ## Pending -Add changes here when they're committed to the `master` branch. Move them to "Released" once the version number -is updated in preparation for publishing an updated NuGet package. +Describe changes here when they're committed to the `master` branch. Move them to **Released** when the project version number is updated in preparation for publishing an updated NuGet package. -Prefix the description of the change with `[major]`, `[minor]` or `[patch]` in accordance with [SemVer](http://semver.org). +Prefix the description of the change with `[major]`, `[minor]` or `[patch]` in accordance with [Semantic Versioning](https://semver.org/). ## Released From 928c3cbef896d97a9fc3ca286fe057c75ca0bc31 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 07:16:15 -0700 Subject: [PATCH 023/230] Use the repository name for the solution. --- CONTRIBUTING.md | 2 +- ProjectName.sln => RepoName.sln | 0 build.cake | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename ProjectName.sln => RepoName.sln (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 89fe936..c4bec4e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# Contributing to ProjectName +# Contributing to RepoName ## Prerequisites diff --git a/ProjectName.sln b/RepoName.sln similarity index 100% rename from ProjectName.sln rename to RepoName.sln diff --git a/build.cake b/build.cake index 0c316ce..6ac6f40 100644 --- a/build.cake +++ b/build.cake @@ -9,7 +9,7 @@ var nugetApiKey = Argument("nugetApiKey", ""); var trigger = Argument("trigger", ""); var versionSuffix = Argument("versionSuffix", ""); -var solutionFileName = "ProjectName.sln"; +var solutionFileName = "RepoName.sln"; var docsProjects = new[] { "ProjectName" }; var docsRepoUri = "https://github.com/Faithlife/RepoName.git"; var docsSourceUri = "https://github.com/Faithlife/RepoName/tree/master/src"; From 4260388212201034c7ce0ddedc8bf3edeb6810d4 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 07:16:48 -0700 Subject: [PATCH 024/230] Make the documentation link more prominent. --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 5a2d5b0..bd66744 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,11 @@ # ProjectName -Description - -## Build Status +Documentation: https://faithlife.github.io/RepoName/ Ubuntu | Windows | NuGet --- | --- | --- [![Travis CI](https://img.shields.io/travis/Faithlife/RepoName/master.svg)](https://travis-ci.org/Faithlife/RepoName) | [![AppVeyor](https://img.shields.io/appveyor/ci/Faithlife/reponame/master.svg)](https://ci.appveyor.com/project/Faithlife/reponame) | [![NuGet](https://img.shields.io/nuget/v/ProjectName.svg)](https://www.nuget.org/packages/ProjectName) -## Documentation - -* https://faithlife.github.io/RepoName/ * License: [MIT](LICENSE) * [Version History](VersionHistory.md) * [Contributing Guidelines](CONTRIBUTING.md) From c6047f5f20a7825c8bd8b672b8583215e951e436 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 09:13:17 -0700 Subject: [PATCH 025/230] Add missing solution file. --- RepoName.sln | 1 + 1 file changed, 1 insertion(+) diff --git a/RepoName.sln b/RepoName.sln index d5ec480..2756a14 100644 --- a/RepoName.sln +++ b/RepoName.sln @@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution appveyor.yml = appveyor.yml build.cake = build.cake build.ps1 = build.ps1 + build.sh = build.sh CONTRIBUTING.md = CONTRIBUTING.md LICENSE = LICENSE README.md = README.md From b1bbb7402367ba5166dd5a6b749c122ba712e353 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Thu, 21 Mar 2019 20:00:41 -0700 Subject: [PATCH 026/230] Tests should use latest compiler, etc. --- tests/Directory.Build.props | 8 ++++++++ tests/ProjectName.Tests/ProjectName.Tests.csproj | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 tests/Directory.Build.props diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props new file mode 100644 index 0000000..ce28edb --- /dev/null +++ b/tests/Directory.Build.props @@ -0,0 +1,8 @@ + + + + latest + true + + + diff --git a/tests/ProjectName.Tests/ProjectName.Tests.csproj b/tests/ProjectName.Tests/ProjectName.Tests.csproj index 4e51306..4eeecb9 100644 --- a/tests/ProjectName.Tests/ProjectName.Tests.csproj +++ b/tests/ProjectName.Tests/ProjectName.Tests.csproj @@ -2,7 +2,6 @@ netcoreapp2.0 - latest From fe470e541b68fb455fbfbdec928d731434de3bd3 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 14:45:15 -0700 Subject: [PATCH 027/230] Only build netstandard2.0. --- build.cake | 2 +- src/Directory.Build.props | 2 -- src/ProjectName/ProjectName.csproj | 6 +----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/build.cake b/build.cake index 6ac6f40..8dba605 100644 --- a/build.cake +++ b/build.cake @@ -61,7 +61,7 @@ Task("UpdateDocs") Information($"Updating documentation at {docsDirectory}."); foreach (var docsProject in docsProjects) { - XmlDocMarkdownGenerate(File($"src/{docsProject}/bin/{configuration}/net461/{docsProject}.dll").ToString(), $"{docsDirectory}{System.IO.Path.DirectorySeparatorChar}", + XmlDocMarkdownGenerate(File($"src/{docsProject}/bin/{configuration}/netstandard2.0/{docsProject}.dll").ToString(), $"{docsDirectory}{System.IO.Path.DirectorySeparatorChar}", new XmlDocMarkdownSettings { SourceCodePath = $"{docsSourceUri}/{docsProject}", NewLine = "\n", ShouldClean = true }); } diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 1372324..feaf9e2 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,8 +1,6 @@ - $(MONO_ROOT)/lib/mono/4.6.1-api/ - $(MONO_ROOT)/lib/mono/4.7-api/ latest true true diff --git a/src/ProjectName/ProjectName.csproj b/src/ProjectName/ProjectName.csproj index e4b3bf5..77d2580 100644 --- a/src/ProjectName/ProjectName.csproj +++ b/src/ProjectName/ProjectName.csproj @@ -2,7 +2,7 @@ 0.1.0 - netstandard1.4;netstandard2.0;net461 + netstandard2.0 @@ -10,8 +10,4 @@ - - - - From 20b2e92e1c30203af9dc0fdcda2fe17420e204d4 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Thu, 21 Mar 2019 19:55:09 -0700 Subject: [PATCH 028/230] All tests should use analyzers. --- tests/Directory.Build.props | 4 ++++ tests/ProjectName.Tests/ProjectName.Tests.csproj | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index ce28edb..eef45ab 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -5,4 +5,8 @@ true + + + + diff --git a/tests/ProjectName.Tests/ProjectName.Tests.csproj b/tests/ProjectName.Tests/ProjectName.Tests.csproj index 4eeecb9..9cf8cc6 100644 --- a/tests/ProjectName.Tests/ProjectName.Tests.csproj +++ b/tests/ProjectName.Tests/ProjectName.Tests.csproj @@ -5,7 +5,6 @@ - From 3aab139dc96bfe42e37ca52ab41a3af97cf5f368 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 09:36:56 -0700 Subject: [PATCH 029/230] Faithlife.Analyzers are PrivateAssets. --- src/Directory.Build.props | 2 +- tests/Directory.Build.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index feaf9e2..2b3cb4d 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -20,7 +20,7 @@ - + diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index eef45ab..8318cef 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -6,7 +6,7 @@ - + From 190191360006c6a40f24e9274e4760bc0b547f31 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 16 Mar 2019 14:42:06 -0700 Subject: [PATCH 030/230] Add Directory.Build.props to Solution Items. --- RepoName.sln | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/RepoName.sln b/RepoName.sln index 2756a14..f6a622f 100644 --- a/RepoName.sln +++ b/RepoName.sln @@ -22,6 +22,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution VersionHistory.md = VersionHistory.md EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{54F18B7A-A267-4D4C-928F-16F46BC2A9FA}" + ProjectSection(SolutionItems) = preProject + src\Directory.Build.props = src\Directory.Build.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A2FB7FB9-0779-4E9A-87A7-455C1DC2F0B8}" + ProjectSection(SolutionItems) = preProject + tests\Directory.Build.props = tests\Directory.Build.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -40,6 +50,10 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {A2FB7FB9-0779-4E9A-87A7-455C1DC2F0B8} = {028A6C6D-8F8F-4A91-A063-45FFCF892109} + {54F18B7A-A267-4D4C-928F-16F46BC2A9FA} = {028A6C6D-8F8F-4A91-A063-45FFCF892109} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6D621D28-8AB2-41C2-AA99-AE2225542E17} EndGlobalSection From c55655451ccfa0389a6ef505e55cba33be5eb079 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sun, 17 Mar 2019 09:42:31 -0700 Subject: [PATCH 031/230] Commit docs changes after publishing to NuGet. --- build.cake | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/build.cake b/build.cake index 8dba605..a43b2f1 100644 --- a/build.cake +++ b/build.cake @@ -21,6 +21,9 @@ var buildBotPassword = EnvironmentVariable("BUILD_BOT_PASSWORD"); var buildBotDisplayName = "Faithlife Build Bot"; var buildBotEmail = "faithlifebuildbot@users.noreply.github.com"; +var docsBranchName = "gh-pages"; +DirectoryPath docsDirectory = null; + Task("Clean") .Does(() => { @@ -54,9 +57,8 @@ Task("UpdateDocs") .IsDependentOn("Build") .Does(() => { - var branchName = "gh-pages"; - var docsDirectory = new DirectoryPath(branchName); - GitClone(docsRepoUri, docsDirectory, new GitCloneSettings { BranchName = branchName }); + docsDirectory = new DirectoryPath(docsBranchName); + GitClone(docsRepoUri, docsDirectory, new GitCloneSettings { BranchName = docsBranchName }); Information($"Updating documentation at {docsDirectory}."); foreach (var docsProject in docsProjects) @@ -64,19 +66,6 @@ Task("UpdateDocs") XmlDocMarkdownGenerate(File($"src/{docsProject}/bin/{configuration}/netstandard2.0/{docsProject}.dll").ToString(), $"{docsDirectory}{System.IO.Path.DirectorySeparatorChar}", new XmlDocMarkdownSettings { SourceCodePath = $"{docsSourceUri}/{docsProject}", NewLine = "\n", ShouldClean = true }); } - - if (GitHasUncommitedChanges(docsDirectory)) - { - Information("Committing all documentation changes."); - GitAddAll(docsDirectory); - GitCommit(docsDirectory, buildBotDisplayName, buildBotEmail, "Automatic documentation update."); - Information("Pushing updated documentation to GitHub."); - GitPush(docsDirectory, buildBotUserName, buildBotPassword, branchName); - } - else - { - Information("No documentation changes detected."); - } }); Task("Test") @@ -132,6 +121,14 @@ Task("NuGetPublish") var pushSettings = new NuGetPushSettings { ApiKey = nugetApiKey, Source = nugetSource }; foreach (var nupkgPath in nupkgPaths) NuGetPush(nupkgPath, pushSettings); + + if (docsDirectory != null && GitHasUncommitedChanges(docsDirectory)) + { + Information("Pushing updated documentation to GitHub."); + GitAddAll(docsDirectory); + GitCommit(docsDirectory, buildBotDisplayName, buildBotEmail, $"Automatic documentation update for {version}."); + GitPush(docsDirectory, buildBotUserName, buildBotPassword, docsBranchName); + } } else { From ca6aad109673c96c9ca4db9474abd9f19d6e448a Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Thu, 21 Mar 2019 21:04:15 -0700 Subject: [PATCH 032/230] Use Faithlife.Build. --- .gitignore | 4 - .travis.yml | 2 +- RepoName.sln | 11 +- appveyor.yml | 2 +- build.cake | 142 ------------------ build.cmd | 1 + build.ps1 | 58 ------- build.sh | 63 +------- src/Directory.Build.props | 3 +- src/ProjectName/ProjectName.csproj | 3 - .../ProjectName.Tests.csproj | 6 +- tools/Build/Build.cs | 19 +++ tools/Build/Build.csproj | 17 +++ 13 files changed, 53 insertions(+), 278 deletions(-) delete mode 100644 build.cake create mode 100644 build.cmd delete mode 100644 build.ps1 create mode 100644 tools/Build/Build.cs create mode 100644 tools/Build/Build.csproj diff --git a/.gitignore b/.gitignore index 68a047f..7ac760f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ # ignore output folders bin/ -cake/ obj/ release/ @@ -9,9 +8,6 @@ release/ Thumbs.db *.cache *.user -*.opensdf -*.sdf -*.suo *.userprefs *.ncrunchproject *.ncrunchsolution diff --git a/.travis.yml b/.travis.yml index 9d08722..8857690 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,4 @@ dist: trusty sudo: false script: -- ./build.sh --target=NuGetPackageTest +- ./build.sh package diff --git a/RepoName.sln b/RepoName.sln index f6a622f..8ebe219 100644 --- a/RepoName.sln +++ b/RepoName.sln @@ -13,8 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .gitignore = .gitignore .travis.yml = .travis.yml appveyor.yml = appveyor.yml - build.cake = build.cake - build.ps1 = build.ps1 + build.cmd = build.cmd build.sh = build.sh CONTRIBUTING.md = CONTRIBUTING.md LICENSE = LICENSE @@ -32,6 +31,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A2FB7FB9 tests\Directory.Build.props = tests\Directory.Build.props EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "tools\Build\Build.csproj", "{CBD807B4-F49F-4DD1-BC9A-359E90EA913F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -46,13 +47,17 @@ Global {DF559AD1-5287-43B1-AB47-61B6F342B0FE}.Debug|Any CPU.Build.0 = Debug|Any CPU {DF559AD1-5287-43B1-AB47-61B6F342B0FE}.Release|Any CPU.ActiveCfg = Release|Any CPU {DF559AD1-5287-43B1-AB47-61B6F342B0FE}.Release|Any CPU.Build.0 = Release|Any CPU + {CBD807B4-F49F-4DD1-BC9A-359E90EA913F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CBD807B4-F49F-4DD1-BC9A-359E90EA913F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CBD807B4-F49F-4DD1-BC9A-359E90EA913F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CBD807B4-F49F-4DD1-BC9A-359E90EA913F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {A2FB7FB9-0779-4E9A-87A7-455C1DC2F0B8} = {028A6C6D-8F8F-4A91-A063-45FFCF892109} {54F18B7A-A267-4D4C-928F-16F46BC2A9FA} = {028A6C6D-8F8F-4A91-A063-45FFCF892109} + {A2FB7FB9-0779-4E9A-87A7-455C1DC2F0B8} = {028A6C6D-8F8F-4A91-A063-45FFCF892109} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6D621D28-8AB2-41C2-AA99-AE2225542E17} diff --git a/appveyor.yml b/appveyor.yml index d5677db..0d3b0f2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ environment: BUILD_BOT_PASSWORD: secure: wJ9JVS5hSAp9ItYlHKxTPg== build_script: -- ps: .\build.ps1 --target=NuGetPublish """--trigger=$env:APPVEYOR_REPO_TAG_NAME""" "--nugetApiKey=$env:NUGETAPIKEY" +- cmd: .\build.cmd publish "--trigger=%APPVEYOR_REPO_TAG_NAME%" "--branch=%APPVEYOR_REPO_BRANCH%" "--nuget-api-key=%NUGETAPIKEY%" test: off artifacts: - path: 'release\*.nupkg' diff --git a/build.cake b/build.cake deleted file mode 100644 index a43b2f1..0000000 --- a/build.cake +++ /dev/null @@ -1,142 +0,0 @@ -#addin nuget:?package=Cake.Git&version=0.19.0 -#addin nuget:?package=Cake.XmlDocMarkdown&version=1.4.1 - -using System.Text.RegularExpressions; - -var target = Argument("target", "Default"); -var configuration = Argument("configuration", "Release"); -var nugetApiKey = Argument("nugetApiKey", ""); -var trigger = Argument("trigger", ""); -var versionSuffix = Argument("versionSuffix", ""); - -var solutionFileName = "RepoName.sln"; -var docsProjects = new[] { "ProjectName" }; -var docsRepoUri = "https://github.com/Faithlife/RepoName.git"; -var docsSourceUri = "https://github.com/Faithlife/RepoName/tree/master/src"; -var nugetIgnore = new string[0]; - -var nugetSource = "https://api.nuget.org/v3/index.json"; -var buildBotUserName = "faithlifebuildbot"; -var buildBotPassword = EnvironmentVariable("BUILD_BOT_PASSWORD"); -var buildBotDisplayName = "Faithlife Build Bot"; -var buildBotEmail = "faithlifebuildbot@users.noreply.github.com"; - -var docsBranchName = "gh-pages"; -DirectoryPath docsDirectory = null; - -Task("Clean") - .Does(() => - { - CleanDirectories("src/**/bin"); - CleanDirectories("src/**/obj"); - CleanDirectories("tests/**/bin"); - CleanDirectories("tests/**/obj"); - CleanDirectories("release"); - }); - -Task("Restore") - .Does(() => - { - DotNetCoreRestore(solutionFileName); - }); - -Task("Build") - .IsDependentOn("Restore") - .Does(() => - { - DotNetCoreBuild(solutionFileName, new DotNetCoreBuildSettings { Configuration = configuration, NoRestore = true, ArgumentCustomization = args => args.Append("--verbosity normal") }); - }); - -Task("Rebuild") - .IsDependentOn("Clean") - .IsDependentOn("Build"); - -Task("UpdateDocs") - .WithCriteria(!string.IsNullOrEmpty(buildBotPassword)) - .WithCriteria(EnvironmentVariable("APPVEYOR_REPO_BRANCH") == "master") - .IsDependentOn("Build") - .Does(() => - { - docsDirectory = new DirectoryPath(docsBranchName); - GitClone(docsRepoUri, docsDirectory, new GitCloneSettings { BranchName = docsBranchName }); - - Information($"Updating documentation at {docsDirectory}."); - foreach (var docsProject in docsProjects) - { - XmlDocMarkdownGenerate(File($"src/{docsProject}/bin/{configuration}/netstandard2.0/{docsProject}.dll").ToString(), $"{docsDirectory}{System.IO.Path.DirectorySeparatorChar}", - new XmlDocMarkdownSettings { SourceCodePath = $"{docsSourceUri}/{docsProject}", NewLine = "\n", ShouldClean = true }); - } - }); - -Task("Test") - .IsDependentOn("Build") - .Does(() => - { - foreach (var projectPath in GetFiles("tests/**/*.csproj").Select(x => x.FullPath)) - DotNetCoreTest(projectPath, new DotNetCoreTestSettings { Configuration = configuration, NoBuild = true, NoRestore = true }); - }); - -Task("NuGetPackage") - .IsDependentOn("Rebuild") - .IsDependentOn("Test") - .IsDependentOn("UpdateDocs") - .Does(() => - { - if (string.IsNullOrEmpty(versionSuffix) && !string.IsNullOrEmpty(trigger)) - versionSuffix = Regex.Match(trigger, @"^v[^\.]+\.[^\.]+\.[^\.]+-(.+)").Groups[1].ToString(); - foreach (var projectPath in GetFiles("src/**/*.csproj").Where(x => !nugetIgnore.Contains(x.GetFilenameWithoutExtension().ToString())).Select(x => x.FullPath)) - DotNetCorePack(projectPath, new DotNetCorePackSettings { Configuration = configuration, NoBuild = true, NoRestore = true, OutputDirectory = "release", VersionSuffix = versionSuffix }); - }); - -Task("NuGetPackageTest") - .IsDependentOn("NuGetPackage") - .Does(() => - { - var firstProject = GetFiles("src/**/*.csproj").First().FullPath; - foreach (var nupkg in GetFiles("release/**/*.nupkg").Select(x => x.FullPath)) - DotNetCoreTool(firstProject, "sourcelink", $"test {nupkg}"); - }); - -Task("NuGetPublish") - .IsDependentOn("NuGetPackageTest") - .Does(() => - { - var nupkgPaths = GetFiles("release/*.nupkg").Select(x => x.FullPath).ToList(); - - string version = null; - foreach (var nupkgPath in nupkgPaths) - { - string nupkgVersion = Regex.Match(nupkgPath, @"\.([^\.]+\.[^\.]+\.[^\.]+)\.nupkg$").Groups[1].ToString(); - if (version == null) - version = nupkgVersion; - else if (version != nupkgVersion) - throw new InvalidOperationException($"Mismatched package versions '{version}' and '{nupkgVersion}'."); - } - - if (!string.IsNullOrEmpty(nugetApiKey) && (trigger == null || Regex.IsMatch(trigger, "^v[0-9]"))) - { - if (trigger != null && trigger != $"v{version}") - throw new InvalidOperationException($"Trigger '{trigger}' doesn't match package version '{version}'."); - - var pushSettings = new NuGetPushSettings { ApiKey = nugetApiKey, Source = nugetSource }; - foreach (var nupkgPath in nupkgPaths) - NuGetPush(nupkgPath, pushSettings); - - if (docsDirectory != null && GitHasUncommitedChanges(docsDirectory)) - { - Information("Pushing updated documentation to GitHub."); - GitAddAll(docsDirectory); - GitCommit(docsDirectory, buildBotDisplayName, buildBotEmail, $"Automatic documentation update for {version}."); - GitPush(docsDirectory, buildBotUserName, buildBotPassword, docsBranchName); - } - } - else - { - Information("To publish this package, push this git tag: v" + version); - } - }); - -Task("Default") - .IsDependentOn("Test"); - -RunTarget(target); diff --git a/build.cmd b/build.cmd new file mode 100644 index 0000000..fae63e9 --- /dev/null +++ b/build.cmd @@ -0,0 +1 @@ +@dotnet run --project %~dp0\tools\Build\Build.csproj -- %* diff --git a/build.ps1 b/build.ps1 deleted file mode 100644 index 2452551..0000000 --- a/build.ps1 +++ /dev/null @@ -1,58 +0,0 @@ -<# -.SYNOPSIS -This is a Powershell script to bootstrap a Cake build. - -.PARAMETER Target -The build script target to run. -#> - -[CmdletBinding()] -Param( - [string]$Target, - [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] - [string[]]$ScriptArgs -) - -$CakeVersion = "0.30.0" - -# create cake directory -$CakeDirPath = Join-Path $PSScriptRoot "cake" -New-Item -Path $CakeDirPath -Type Directory -ErrorAction SilentlyContinue | Out-Null - -# download nuget.exe if not in path and not already downloaded -$NuGetExe = Get-Command "nuget.exe" -ErrorAction SilentlyContinue -If ($NuGetExe -ne $null) { - $NuGetExePath = $NuGetExe.Path -} -Else { - $NuGetExePath = Join-Path $CakeDirPath "nuget.exe" - If (!(Test-Path $NuGetExePath)) { - Invoke-WebRequest -Uri http://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile $NuGetExePath - } -} - -# download Cake if necessary -$CakeExePath = Join-Path $CakeDirPath "Cake.$CakeVersion/Cake.exe" -If (!(Test-Path $CakeExePath)) { - # create packages.config - $PackagesConfigPath = Join-Path $CakeDirPath "packages.config" - [System.IO.File]::WriteAllLines($PackagesConfigPath, @( - "", - "", - "`t", - "")) - - # use NuGet to download Cake - Push-Location $CakeDirPath - Invoke-Expression "&`"$NuGetExePath`" install -OutputDirectory ." - If ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet tools." - } - Pop-Location -} - -# run Cake with specified arguments -$ExtraArgs = "" -if ($Target) { $ExtraArgs += "--target=$Target" } -Invoke-Expression "& `"$CakeExePath`" --paths_tools=cake $ExtraArgs $ScriptArgs" -Exit $LASTEXITCODE diff --git a/build.sh b/build.sh index eaba6e3..044c20b 100755 --- a/build.sh +++ b/build.sh @@ -1,63 +1,4 @@ #!/usr/bin/env bash -########################################################################## -# This is the Cake bootstrapper script for Linux and OS X. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## - -# Define directories. +set -euo pipefail SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -TOOLS_DIR=$SCRIPT_DIR/cake -NUGET_EXE=$TOOLS_DIR/nuget.exe -NUGET_URL=https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -CAKE_VERSION=0.30.0 -CAKE_EXE=$TOOLS_DIR/Cake.$CAKE_VERSION/Cake.exe - -# Define default arguments. -SCRIPT_ARGUMENTS=$@ - -# Make sure the tools folder exist. -if [ ! -d "$TOOLS_DIR" ]; then - mkdir "$TOOLS_DIR" -fi - -########################################################################### -# INSTALL NUGET -########################################################################### - -# Download NuGet if it does not exist. -if [ ! -f "$NUGET_EXE" ]; then - echo "Downloading NuGet..." - curl -Lsfo "$NUGET_EXE" $NUGET_URL - if [ $? -ne 0 ]; then - echo "An error occurred while downloading nuget.exe." - exit 1 - fi -fi - -########################################################################### -# INSTALL CAKE -########################################################################### - -if [ ! -f "$CAKE_EXE" ]; then - mono "$NUGET_EXE" install Cake -Version $CAKE_VERSION -OutputDirectory "$TOOLS_DIR" - if [ $? -ne 0 ]; then - echo "An error occurred while installing Cake." - exit 1 - fi -fi - -# Make sure that Cake has been installed. -if [ ! -f "$CAKE_EXE" ]; then - echo "Could not find Cake.exe at '$CAKE_EXE'." - exit 1 -fi - -########################################################################### -# RUN BUILD SCRIPT -########################################################################### - -export MONO_ROOT=$(dirname $(which mono))/../ - -# Start Cake -exec mono "$CAKE_EXE" build.cake --paths_tools=cake ${SCRIPT_ARGUMENTS[@]} +dotnet run --project "$SCRIPT_DIR/tools/Build/Build.csproj" -- "$@" diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 2b3cb4d..b716849 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -21,8 +21,7 @@ - - + diff --git a/src/ProjectName/ProjectName.csproj b/src/ProjectName/ProjectName.csproj index 77d2580..9b48a1c 100644 --- a/src/ProjectName/ProjectName.csproj +++ b/src/ProjectName/ProjectName.csproj @@ -7,7 +7,4 @@ - - - diff --git a/tests/ProjectName.Tests/ProjectName.Tests.csproj b/tests/ProjectName.Tests/ProjectName.Tests.csproj index 9cf8cc6..24c475c 100644 --- a/tests/ProjectName.Tests/ProjectName.Tests.csproj +++ b/tests/ProjectName.Tests/ProjectName.Tests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/tools/Build/Build.cs b/tools/Build/Build.cs new file mode 100644 index 0000000..c5f212a --- /dev/null +++ b/tools/Build/Build.cs @@ -0,0 +1,19 @@ +using System; +using Faithlife.Build; + +internal static class Build +{ + public static int Main(string[] args) => BuildRunner.Execute(args, build => + { + build.AddDotNetTargets( + new DotNetBuildSettings + { + DocsSettings = new DotNetDocsSettings + { + GitLogin = new GitLoginInfo("faithlifebuildbot", Environment.GetEnvironmentVariable("BUILD_BOT_PASSWORD") ?? ""), + GitAuthor = new GitAuthorInfo("Faithlife Build Bot", "faithlifebuildbot@users.noreply.github.com"), + SourceCodeUrl = "https://github.com/Faithlife/RepoName/tree/master/src", + }, + }); + }); +} diff --git a/tools/Build/Build.csproj b/tools/Build/Build.csproj new file mode 100644 index 0000000..dab5d56 --- /dev/null +++ b/tools/Build/Build.csproj @@ -0,0 +1,17 @@ + + + + Exe + netcoreapp2.0 + latest + + true + false + false + + + + + + + From 24134031acfe84d6fafb3feb697ba17ebb60dc57 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Fri, 22 Mar 2019 07:59:21 -0700 Subject: [PATCH 033/230] Move docs from gh-pages. --- docs/README.md | 1 + docs/_layouts/page.html | 60 +++++++++++++ docs/assets/github.png | Bin 0 -> 2541 bytes docs/assets/page.css | 185 ++++++++++++++++++++++++++++++++++++++++ docs/index.md | 11 +++ 5 files changed, 257 insertions(+) create mode 100644 docs/README.md create mode 100644 docs/_layouts/page.html create mode 100644 docs/assets/github.png create mode 100644 docs/assets/page.css create mode 100644 docs/index.md diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..38d2360 --- /dev/null +++ b/docs/README.md @@ -0,0 +1 @@ +### https://faithlife.github.io/RepoName/ diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html new file mode 100644 index 0000000..94d84a1 --- /dev/null +++ b/docs/_layouts/page.html @@ -0,0 +1,60 @@ + + + + + + + {{ page.title | strip_html }} + + + + + + +
+
+
+ {{ content }} +
+
+ +
+
+
+ + + + + + + diff --git a/docs/assets/github.png b/docs/assets/github.png new file mode 100644 index 0000000000000000000000000000000000000000..bdd7cf4be4dbb997d1091e98a5fc0661d635ab8f GIT binary patch literal 2541 zcmeH|`9IT-1IOQP&21ZV3&Y%O3C)#l47*${l2y)+9FgM_xr%C%@{wZ+GwDJ(QW0T& zT#ekzaz-KfR0@;u>HA-NfB3u}kJsz<`}6U7JYHAGL}w|GG6(0#Nd0Mw7{*mX|=;c-4mPuXX zySGM8jxB$Uew&o6&&X;Hek|rXo#UmuAR6J`z@B@Gi!#gj%b#FszAyC7pJbwUN#8|> z#;T^c7sn~#WnkY!>7JLC>aP^mygo{L=jgGXhk|@Mpq20spQ#Kg}kYBOX$x^BB4n#rDb9XTCY*(DvYz+Gta|+R0nFTL4U5npfDBj{iaYS zufP`P%fH0+@vExS$*Krcrqxh$`M6;@B_aXz6fato8Q8<>5~Q(}zOMfFZja(FTFh zfoEgg=&i`x6p2}=a_EZY<@`ZS1;;L4t3StSar#NmWh15|UN|^mWJ$G33b#z2*Q{#A zvyx~QB-YS{9?;HN1+}8}e%boz@*9>ixP6Rc7pK_?;T)^cAJp@E3(XaGf`Z(##|ax; z`|-1vm3V#7!FR;Jge8MVbYSMSV%Y`B!EWIq!qA$s)ZpHRu6axb%KUWet~vuP#v%ij zf*%7&!wb17OHW3s5GG4EyGg;+Yk4RJER}T_ZKz8PVjvbo8n9A5r848Z`$xJoDh-O zpKZN$AQ5#*fgu2}8fU{Z^#V4BI`3M{dH6mL6I6Gf#2DV`32iia32>EthFrC2_TlyX z7}eTW_EaK|q--Tu`9$hbXJ$4<*`*9(j#1IRl%Pp^7wJb-apKF`^;gdY6)NcR?kWE2 zBU&jketi~?*un7R$Geg2m-g@f#;-6#{VtNJ;h2NFbwU^TC&LB;w_mw9WSeKmac>NLyqj;6i8% z?h=owxD;6MNQRowIQLL5EMCay>TvNpDR6js+Y1%ot2n_`@UiTpN^L2##4MZn4-Wp{ zCH%rriUqu74EX9s=;)U8^<%@-_`)+H$!Y}#T}8K=#B}}cZHh-ngMB5xG|6<}z_HuL zoL}~4tLNhElh+N_o7%hlIQO|S9cYcX6yfsR?7VGu$#|@q<#ez~ThjjKbenA8Rg@dh zT^PYv>SbjgFA?t;hy#^OWiQ?vp63s4Ta|r` zcds%eF&T@r#llAJQ31C*FD>@in?F5fxnl(Uuc|Njw+L1Z3;THJ)2Z>};*(kDTTZOp zJ{i24t0|)w%Hl^Xm>mgd+mS3WtX~va&M7OP%>!~PCpymI_eZ+8nv~f z(d6?t^`n+i>5+}bT!n&W(Drn?6PT-S7z1t_2X(vdRhmqC)6t_5-q77xwYBes>js@G zru(B(bI!>)m!(O36S9jsF*EZ%`felJ?HNn_pPe0zNcNcLSDn#--s)5vsUsU=v);2) zkyDB;Do5(Mqb&mZ-@eq?>6N`nLVB;-w=jtl%MYT>C?G# .active > a, +.navbar-inverse .navbar-nav > .active > a:hover, +.navbar-inverse .navbar-nav > .active > a:focus, +.navbar-inverse .navbar-nav > .open > a, +.navbar-inverse .navbar-nav > .open > a:hover, +.navbar-inverse .navbar-nav > .open > a:focus, +.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, +.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, +.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { + background-color: #429b1c; +} + +.large { + font-size: 125%; +} + +.github-logo { + height: 24px; +} + +.page-container { + margin-top: 21px; + margin-bottom: 21px; +} + +.content-column { + padding-left: 45px; +} + +h1, .h1, h2, .h2, h3, .h3 { + margin-top: 0; + padding-top: 21px; +} + +h4, .h4, h5, .h5, h6, .h6 { + margin-top: 14px; + margin-bottom: 7px; +} + +a, a:focus, a:hover, .btn-link, .btn-link:hover, .btn-link:focus { + color: #429b1c; +} + +.navbar-inverse .navbar-nav > li > a:hover, +.navbar-inverse .navbar-nav > li > a:focus, +.navbar-inverse .navbar-brand:hover, +.navbar-inverse .navbar-brand:focus { + color: #c1f992; +} + +a.anchorjs-link:active, a.anchorjs-link:hover { + text-decoration: none; +} + +nav.affix[data-toggle='toc'] { + margin-top: -60px; +} + +#toc { + width: 190px; +} + +pre { + color: inherit; +} + +code { + color: inherit; + background-color: #ecf0f1; +} + +@media (max-width: 767px) { + #toc { + display: none; + } +} + +@media (max-width: 479px) { + .content-column { + padding-left: 15px; + } + + .anchorjs-link { + display: none; + } +} + +/* apply .table, .table-striped, and .table-hover from Flatly to all tables */ +@media print { + table { + border-collapse: collapse !important; + } + table td, + table th { + background-color: #fff !important; + } +} +table { + width: 100%; + max-width: 100%; + margin-bottom: 21px; +} +table > thead > tr > th, +table > tbody > tr > th, +table > tfoot > tr > th, +table > thead > tr > td, +table > tbody > tr > td, +table > tfoot > tr > td { + padding: 8px; + line-height: 1.42857143; + vertical-align: top; + border-top: 1px solid #ecf0f1; +} +table > thead > tr > th { + vertical-align: bottom; + border-bottom: 2px solid #ecf0f1; +} +table > caption + thead > tr:first-child > th, +table > colgroup + thead > tr:first-child > th, +table > thead:first-child > tr:first-child > th, +table > caption + thead > tr:first-child > td, +table > colgroup + thead > tr:first-child > td, +table > thead:first-child > tr:first-child > td { + border-top: 0; +} +table > tbody + tbody { + border-top: 2px solid #ecf0f1; +} +table table { + background-color: #ffffff; +} +table > tbody > tr:nth-of-type(odd) { + background-color: #f9f9f9; +} +table > tbody > tr:hover { + background-color: #ecf0f1; +} + +/* undo underlined links in tables */ +table a:not(.btn), .table a:not(.btn) { + text-decoration: none; +} + +.highlight .hll { background-color: #ffffcc } +.highlight .c { color: #008000 } /* Comment */ +.highlight .err { border: 1px solid #FF0000 } /* Error */ +.highlight .k { color: #0000ff } /* Keyword */ +.highlight .cm { color: #008000 } /* Comment.Multiline */ +.highlight .cp { color: #0000ff } /* Comment.Preproc */ +.highlight .c1 { color: #008000 } /* Comment.Single */ +.highlight .cs { color: #008000 } /* Comment.Special */ +.highlight .ge { font-style: italic } /* Generic.Emph */ +.highlight .gh { font-weight: bold } /* Generic.Heading */ +.highlight .gp { font-weight: bold } /* Generic.Prompt */ +.highlight .gs { font-weight: bold } /* Generic.Strong */ +.highlight .gu { font-weight: bold } /* Generic.Subheading */ +.highlight .kc { color: #0000ff } /* Keyword.Constant */ +.highlight .kd { color: #0000ff } /* Keyword.Declaration */ +.highlight .kn { color: #0000ff } /* Keyword.Namespace */ +.highlight .kp { color: #0000ff } /* Keyword.Pseudo */ +.highlight .kr { color: #0000ff } /* Keyword.Reserved */ +.highlight .kt { color: #2b91af } /* Keyword.Type */ +.highlight .s { color: #a31515 } /* Literal.String */ +.highlight .nc { color: #2b91af } /* Name.Class */ +.highlight .ow { color: #0000ff } /* Operator.Word */ +.highlight .sb { color: #a31515 } /* Literal.String.Backtick */ +.highlight .sc { color: #a31515 } /* Literal.String.Char */ +.highlight .sd { color: #a31515 } /* Literal.String.Doc */ +.highlight .s2 { color: #a31515 } /* Literal.String.Double */ +.highlight .se { color: #a31515 } /* Literal.String.Escape */ +.highlight .sh { color: #a31515 } /* Literal.String.Heredoc */ +.highlight .si { color: #a31515 } /* Literal.String.Interpol */ +.highlight .sx { color: #a31515 } /* Literal.String.Other */ +.highlight .sr { color: #a31515 } /* Literal.String.Regex */ +.highlight .s1 { color: #a31515 } /* Literal.String.Single */ +.highlight .ss { color: #a31515 } /* Literal.String.Symbol */ diff --git a/docs/index.md b/docs/index.md new file mode 100644 index 0000000..96b7fcf --- /dev/null +++ b/docs/index.md @@ -0,0 +1,11 @@ +# ProjectName + +**ProjectName** description + +## Installation + +Install **ProjectName** using NuGet. [![NuGet](https://img.shields.io/nuget/v/ProjectName.svg)](https://www.nuget.org/packages/ProjectName) + +## Documentation + +* [Reference Documentation](ProjectName.md) From 69d632f25f8631682c3a53ce16b1d0651b2406f7 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Fri, 22 Mar 2019 08:17:59 -0700 Subject: [PATCH 034/230] Upgrade dotnet used by Travis. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8857690..384cf96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: csharp mono: latest -dotnet: 2.1.401 +dotnet: 2.2.104 dist: trusty sudo: false From 65a27c20c4378f266e994bc22c1d1909d31c10fd Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Fri, 22 Mar 2019 08:48:21 -0700 Subject: [PATCH 035/230] Use Appveyor instead of Travis for Linux builds. --- .travis.yml | 8 -------- appveyor.yml | 5 ++++- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 384cf96..0000000 --- a/.travis.yml +++ /dev/null @@ -1,8 +0,0 @@ -language: csharp -mono: latest -dotnet: 2.2.104 -dist: trusty -sudo: false - -script: -- ./build.sh package diff --git a/appveyor.yml b/appveyor.yml index 0d3b0f2..44f6d1f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,7 @@ version: '{build}' -image: Visual Studio 2017 +image: +- Visual Studio 2017 +- Ubuntu environment: NUGETAPIKEY: secure: Ev6JfzK7FYZzsR4ALWtJs95U98Pa9FxgMxECDA0LGNidWwULyKoQIKYQwMVZ1s0U @@ -7,6 +9,7 @@ environment: secure: wJ9JVS5hSAp9ItYlHKxTPg== build_script: - cmd: .\build.cmd publish "--trigger=%APPVEYOR_REPO_TAG_NAME%" "--branch=%APPVEYOR_REPO_BRANCH%" "--nuget-api-key=%NUGETAPIKEY%" +- sh: ./build.sh package test: off artifacts: - path: 'release\*.nupkg' From 047a4a8aa1bcda0a9a67013c4ec85b4d21118a40 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Fri, 22 Mar 2019 08:52:08 -0700 Subject: [PATCH 036/230] Fix README links. --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index bd66744..8c1306f 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,7 @@ Documentation: https://faithlife.github.io/RepoName/ -Ubuntu | Windows | NuGet ---- | --- | --- -[![Travis CI](https://img.shields.io/travis/Faithlife/RepoName/master.svg)](https://travis-ci.org/Faithlife/RepoName) | [![AppVeyor](https://img.shields.io/appveyor/ci/Faithlife/reponame/master.svg)](https://ci.appveyor.com/project/Faithlife/reponame) | [![NuGet](https://img.shields.io/nuget/v/ProjectName.svg)](https://www.nuget.org/packages/ProjectName) +[![AppVeyor](https://img.shields.io/appveyor/ci/Faithlife/reponame/master.svg)](https://ci.appveyor.com/project/Faithlife/reponame) [![NuGet](https://img.shields.io/nuget/v/ProjectName.svg)](https://www.nuget.org/packages/ProjectName) * License: [MIT](LICENSE) * [Version History](VersionHistory.md) From 084e09e193db16da07f4870168364ee8bb5ae426 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Fri, 22 Mar 2019 20:58:15 -0700 Subject: [PATCH 037/230] Fix "Edit This Page" link. --- docs/_layouts/page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html index 94d84a1..51b933c 100644 --- a/docs/_layouts/page.html +++ b/docs/_layouts/page.html @@ -31,7 +31,7 @@ From 255344ad32becd73c1fede558f6c2110d08c14ba Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Fri, 22 Mar 2019 21:06:49 -0700 Subject: [PATCH 038/230] Remove travis from solution items. --- RepoName.sln | 1 - 1 file changed, 1 deletion(-) diff --git a/RepoName.sln b/RepoName.sln index 8ebe219..3f332ee 100644 --- a/RepoName.sln +++ b/RepoName.sln @@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig .gitattributes = .gitattributes .gitignore = .gitignore - .travis.yml = .travis.yml appveyor.yml = appveyor.yml build.cmd = build.cmd build.sh = build.sh From 4a42e11ac49592b93de1303aaa481cf845462207 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 23 Mar 2019 09:04:15 -0700 Subject: [PATCH 039/230] Update Faithlife.Build. --- tools/Build/Build.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Build/Build.csproj b/tools/Build/Build.csproj index dab5d56..dda9be9 100644 --- a/tools/Build/Build.csproj +++ b/tools/Build/Build.csproj @@ -11,7 +11,7 @@ - + From e7c5378934d80429be819b0ea0016597f1b82cac Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Mon, 25 Mar 2019 12:22:11 -0700 Subject: [PATCH 040/230] Be explicit about IsPackable and IsTestProject. --- RepoName.sln | 6 ++++++ src/Directory.Build.props | 2 ++ tests/Directory.Build.props | 2 ++ tools/Build/Build.csproj | 4 ---- tools/Directory.Build.props | 14 ++++++++++++++ 5 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 tools/Directory.Build.props diff --git a/RepoName.sln b/RepoName.sln index 3f332ee..0f52a23 100644 --- a/RepoName.sln +++ b/RepoName.sln @@ -32,6 +32,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A2FB7FB9 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "tools\Build\Build.csproj", "{CBD807B4-F49F-4DD1-BC9A-359E90EA913F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{8412402D-21B9-4DF8-BF74-3506AA41D5CD}" + ProjectSection(SolutionItems) = preProject + tools\Directory.Build.props = tools\Directory.Build.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -57,6 +62,7 @@ Global GlobalSection(NestedProjects) = preSolution {54F18B7A-A267-4D4C-928F-16F46BC2A9FA} = {028A6C6D-8F8F-4A91-A063-45FFCF892109} {A2FB7FB9-0779-4E9A-87A7-455C1DC2F0B8} = {028A6C6D-8F8F-4A91-A063-45FFCF892109} + {8412402D-21B9-4DF8-BF74-3506AA41D5CD} = {028A6C6D-8F8F-4A91-A063-45FFCF892109} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6D621D28-8AB2-41C2-AA99-AE2225542E17} diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b716849..3e42ac5 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -17,6 +17,8 @@ true true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + true + false diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 8318cef..0b30846 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -3,6 +3,8 @@ latest true + false + false diff --git a/tools/Build/Build.csproj b/tools/Build/Build.csproj index dda9be9..111fc6a 100644 --- a/tools/Build/Build.csproj +++ b/tools/Build/Build.csproj @@ -3,11 +3,7 @@ Exe netcoreapp2.0 - latest - true - false - false diff --git a/tools/Directory.Build.props b/tools/Directory.Build.props new file mode 100644 index 0000000..0b30846 --- /dev/null +++ b/tools/Directory.Build.props @@ -0,0 +1,14 @@ + + + + latest + true + false + false + + + + + + + From 73028e525f5cfdf18311c5dbaee09c6f66789e7a Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Mon, 25 Mar 2019 20:56:16 -0700 Subject: [PATCH 041/230] Set MONO_ROOT in build.sh. --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 044c20b..c21a031 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash set -euo pipefail +export MONO_ROOT=$(dirname $(which mono))/../ SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) dotnet run --project "$SCRIPT_DIR/tools/Build/Build.csproj" -- "$@" From 829174df03b2dcc44003a582e6d7abe6adfaf960 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Tue, 26 Mar 2019 22:09:37 -0700 Subject: [PATCH 042/230] Add documentation home page to solution. --- RepoName.sln | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RepoName.sln b/RepoName.sln index 0f52a23..5aa7f0c 100644 --- a/RepoName.sln +++ b/RepoName.sln @@ -37,6 +37,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{8412402D tools\Directory.Build.props = tools\Directory.Build.props EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{478AD8C7-F5B6-45C5-B487-9E2D65BF9118}" + ProjectSection(SolutionItems) = preProject + docs\index.md = docs\index.md + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -63,6 +68,7 @@ Global {54F18B7A-A267-4D4C-928F-16F46BC2A9FA} = {028A6C6D-8F8F-4A91-A063-45FFCF892109} {A2FB7FB9-0779-4E9A-87A7-455C1DC2F0B8} = {028A6C6D-8F8F-4A91-A063-45FFCF892109} {8412402D-21B9-4DF8-BF74-3506AA41D5CD} = {028A6C6D-8F8F-4A91-A063-45FFCF892109} + {478AD8C7-F5B6-45C5-B487-9E2D65BF9118} = {028A6C6D-8F8F-4A91-A063-45FFCF892109} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6D621D28-8AB2-41C2-AA99-AE2225542E17} From 714a61f2ae98b803b12cdd340911e81ee035b0ea Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Tue, 26 Mar 2019 22:09:54 -0700 Subject: [PATCH 043/230] Simplify documentation home page. --- docs/index.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/docs/index.md b/docs/index.md index 96b7fcf..8a98153 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,11 +1,7 @@ # ProjectName -**ProjectName** description +[![NuGet](https://img.shields.io/nuget/v/ProjectName.svg)](https://www.nuget.org/packages/ProjectName) -## Installation +## Usage -Install **ProjectName** using NuGet. [![NuGet](https://img.shields.io/nuget/v/ProjectName.svg)](https://www.nuget.org/packages/ProjectName) - -## Documentation - -* [Reference Documentation](ProjectName.md) +See the [reference documentation](ProjectName.md). From 36d8ed12549c9c169335cdad7c8b770ce14acd7d Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Tue, 26 Mar 2019 22:10:25 -0700 Subject: [PATCH 044/230] Oxford comma, baby. --- VersionHistory.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VersionHistory.md b/VersionHistory.md index d3f8498..83934d4 100644 --- a/VersionHistory.md +++ b/VersionHistory.md @@ -4,7 +4,7 @@ Describe changes here when they're committed to the `master` branch. Move them to **Released** when the project version number is updated in preparation for publishing an updated NuGet package. -Prefix the description of the change with `[major]`, `[minor]` or `[patch]` in accordance with [Semantic Versioning](https://semver.org/). +Prefix the description of the change with `[major]`, `[minor]`, or `[patch]` in accordance with [Semantic Versioning](https://semver.org/). ## Released From 1aee5b65c854ef98f5d40caff77ed0c90c9971c8 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Tue, 26 Mar 2019 22:10:52 -0700 Subject: [PATCH 045/230] Upgrade Faithlife.Build. --- tools/Build/Build.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Build/Build.csproj b/tools/Build/Build.csproj index 111fc6a..59d5dde 100644 --- a/tools/Build/Build.csproj +++ b/tools/Build/Build.csproj @@ -1,4 +1,4 @@ - + Exe @@ -7,7 +7,7 @@ - + From ba255b7056b4f4d76ec7d32a3375bb44ea700ff9 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Tue, 26 Mar 2019 22:11:04 -0700 Subject: [PATCH 046/230] Set default build target to build. --- tools/Build/Build.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/Build/Build.cs b/tools/Build/Build.cs index c5f212a..f498286 100644 --- a/tools/Build/Build.cs +++ b/tools/Build/Build.cs @@ -15,5 +15,8 @@ public static int Main(string[] args) => BuildRunner.Execute(args, build => SourceCodeUrl = "https://github.com/Faithlife/RepoName/tree/master/src", }, }); + + build.Target("default") + .DependsOn("build"); }); } From 8b2fc820879006d5d61848c327ee92d9b76f8782 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Tue, 26 Mar 2019 22:20:09 -0700 Subject: [PATCH 047/230] Start with a better-than-nothing package description. --- src/ProjectName/ProjectName.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectName/ProjectName.csproj b/src/ProjectName/ProjectName.csproj index 9b48a1c..c183f24 100644 --- a/src/ProjectName/ProjectName.csproj +++ b/src/ProjectName/ProjectName.csproj @@ -3,7 +3,7 @@ 0.1.0 netstandard2.0 - + ProjectName class library. From a2c5ef905a41c3d45b996a9b0c66e727829edf5d Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Wed, 27 Mar 2019 06:50:22 -0700 Subject: [PATCH 048/230] Simplify README. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 8c1306f..7ba90ec 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ # ProjectName -Documentation: https://faithlife.github.io/RepoName/ - [![AppVeyor](https://img.shields.io/appveyor/ci/Faithlife/reponame/master.svg)](https://ci.appveyor.com/project/Faithlife/reponame) [![NuGet](https://img.shields.io/nuget/v/ProjectName.svg)](https://www.nuget.org/packages/ProjectName) +* Documentation: https://faithlife.github.io/RepoName/ * License: [MIT](LICENSE) * [Version History](VersionHistory.md) * [Contributing Guidelines](CONTRIBUTING.md) From 72202aaab5d751c3312675d4e922a4993da63950 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Wed, 27 Mar 2019 12:11:55 -0700 Subject: [PATCH 049/230] Add Faithlife logo. --- docs/_layouts/page.html | 3 +++ docs/assets/faithlife.png | Bin 0 -> 1811 bytes docs/assets/page.css | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 docs/assets/faithlife.png diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html index 51b933c..0a5c828 100644 --- a/docs/_layouts/page.html +++ b/docs/_layouts/page.html @@ -25,6 +25,9 @@ +
    +
    • +
  • diff --git a/docs/assets/faithlife.png b/docs/assets/faithlife.png new file mode 100644 index 0000000000000000000000000000000000000000..c6cb03ccfc54502ab4c93926e32cbf50f5b0e0de GIT binary patch literal 1811 zcmV+u2kiKXP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGqBme*wBmtWh#uNYm2B=9yK~#9!?VStJ zr8p3Ue+fuH0uqpb1SB9K4v>HZBt!xdkbs2DK2kgEi~5<){ch-cPSw75XJ+~6?vqX@ ze5I8B`c3jD0Ty6Mfc-s_CZ)9c1uVc@`b|Co3+|G#1lS+kDg9IwU|(>%lqJAEP1WHS zumH!DCBVMxt^hl%yN3Y#Pt5}CH8o#o7hn&r`9cEhpj#!t{@}Lh`|1SPY4m3G0_-$; zvnBy{8ogPw0Q+#x4%Wf~Jf>fe06%O>;}_KV11xiO)+oSE({tAHRlNjwP1kyOPg;QY zWK$==H7}3ss<`1Hz#X*xN(pdCWfXh^7U116U;)k=d;=EX=m4+)J1|=U z?5A}pz(dONAH`~PIE`ZUqF43G_&pT=XPAN_HVLN19EWid(eFa7<4`99quBPr8r|>C&$5dW}=>}R({U-q4fjS4&W55_ffcfa< zQ+1QujD%*lfPsfNnFkFR^^XFaQ(RL?o3J;H3NhNA1~}#DY%5uJwp1B0Xk-B!-uml} z?_A?pZM^B?4HpG?yr_lbQpDa|;5Q`#54c=cD&|yqGFP~k%ANJW0xqA<4tu)eA;ay= zv39^Q@ggC2FJ3(wWU@%e{2Dn5aNUrD0Q-j=1sD^5EyH<> zQGoqI?mYqC5-xte3#!La`@!!~1YUjt#$~@Nv-1ErB(LIc+6w~A%RE${UG-xD59zZM zU-*pr+D|roih|Xv@Y{t3rO#AbI1qMv!~gu|jfNWIRk3gsFYf`Il_8EfjksDW88jBG z#Uls!da-`wk7cxwlin(K)lDHs-M%kHUqAdQ1Am2<2V{p}_>#=^z#Rm5N$=BO0E|Yl zvAZ?lfGcQZ91p7R!I-979B>7Vj0FSCNAY^?##z8!dXEOCMDS6Zvtm8xgYz3o>UdzU zd%xfGxc+ZQz%j8}ivZ>|+yoqI0UQ#msmM4gujK~dgSus>#yZ?RbTi|)F_<^pxPh;= z0IsbLAKc4T{|)ciWCjB8@~$R+dX}cbcWWmK@Q@hI51-te3jz)RU_4DvmyLn?6-(ZX z4*nzzbfC01R zVE#H90dF+`4sQV5c?W#)Tw4Gz^MOZ0=77Y1`j(rE2BNt5GL6?z_=_(a2N;NA2ghWZ z!gp=09AF@d4P&P@Xe|jhD*%AeEAN{JpJp6xKD)(wAdUa(ie3FT>Q#-}i$-o%Er-t{ z83mP^t^S6g+UzNx1>BL#j0$_x>y0hfJH~WE0Oto9@^5|qZ8-hCP|#6FAZwsA(K#ir z>AqSD@KE7gQ~!i}wDQ@l!}g*BDH?XK?L(q?yolJ*xWX7wz_7WQZWxw#MeguFnQqDd z-0sL}z#!zc;#+=>Y%1H6H(3jJ^#Tu=f2a-LY^mL}0f5012cteMfC09z>wv!Q>;Uct z99^mE!;S5S-F({tfUEkL@@&~xb#NjA0Bm*GfZ=dZk5~G1p~-x)O9sFI@)wQ+fbDg8 z=cAZkAMy%cbn?jq}D+sz-|*E(Msci$k%_8?VE@ z6ygE11}qycb5n*_Je3&NfX@bOhS!YepF1W-`?%)r zw!;))!v_BJCGmjaHYaax1Q>6O2r>?sugiiA0tO~V1Q`H~*JVNG0rM?RLFNIY=F0$C zfSsAIQGoqJo&}f}?XVXC<|W7iTzuPc6kuBXTDcQo-;kpK`-j{Luy4qd0Q-g<1lTKN z0rn4Bfc-=61=ug-L(3#dfF%Kz1XwB$Siiab?FV4Wl6ZdtzPbPa002ovPDHLkV1l4M BPu~Cl literal 0 HcmV?d00001 diff --git a/docs/assets/page.css b/docs/assets/page.css index f53166e..7642415 100644 --- a/docs/assets/page.css +++ b/docs/assets/page.css @@ -27,6 +27,11 @@ body { height: 24px; } +.faithlife-logo { + height: 28px; + margin: -2px; +} + .page-container { margin-top: 21px; margin-bottom: 21px; From 1ee4d51f08a1abb101202f3ba017b3ad225dd6b2 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sun, 31 Mar 2019 22:28:56 -0700 Subject: [PATCH 050/230] Update Faithlife.Build. --- tools/Build/Build.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Build/Build.csproj b/tools/Build/Build.csproj index 59d5dde..a551762 100644 --- a/tools/Build/Build.csproj +++ b/tools/Build/Build.csproj @@ -7,7 +7,7 @@ - + From 2227f6b72b83caed6bf793f25723ad1883d10394 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 6 Apr 2019 16:28:57 -0700 Subject: [PATCH 051/230] Support docker-compose for preview. --- docs/.gitignore | 5 +++++ docs/_config.yml | 3 +++ docs/docker-compose.yml | 12 ++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 docs/.gitignore create mode 100644 docs/_config.yml create mode 100644 docs/docker-compose.yml diff --git a/docs/.gitignore b/docs/.gitignore new file mode 100644 index 0000000..5986f88 --- /dev/null +++ b/docs/.gitignore @@ -0,0 +1,5 @@ +_drafts/ +_site/ + +Thumbs.db +.jekyll-metadata diff --git a/docs/_config.yml b/docs/_config.yml new file mode 100644 index 0000000..df075c9 --- /dev/null +++ b/docs/_config.yml @@ -0,0 +1,3 @@ +exclude: + - docker-compose.yml + - README.md diff --git a/docs/docker-compose.yml b/docs/docker-compose.yml new file mode 100644 index 0000000..7c54131 --- /dev/null +++ b/docs/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3' + +services: + jekyll: + image: jekyll/jekyll:pages + container_name: reponame + command: jekyll serve --force_polling --livereload + ports: + - 4000:4000 + - 35729:35729 + volumes: + - ./:/srv/jekyll From 57b3b62da86395863b823e30245bb03842c455d0 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 6 Apr 2019 16:29:23 -0700 Subject: [PATCH 052/230] Fix Faithlife logo URL. --- docs/_layouts/page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html index 0a5c828..a403caf 100644 --- a/docs/_layouts/page.html +++ b/docs/_layouts/page.html @@ -26,7 +26,7 @@
  • Reference
    -
    • +
  • From 9834d3c2115ec71c7b940001df701a8964309f64 Mon Sep 17 00:00:00 2001 From: Ed Ball Date: Sat, 6 Apr 2019 16:29:39 -0700 Subject: [PATCH 053/230] Rename class to navbar-logo. --- docs/_layouts/page.html | 2 +- docs/assets/page.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html index a403caf..d10a9a2 100644 --- a/docs/_layouts/page.html +++ b/docs/_layouts/page.html @@ -30,7 +30,7 @@
  • - +