OctopusSamples · slewis74 · Sep 17, 2018 · Sep 17, 2018 · Sep 18, 2018 · Sep 18, 2018
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+tools/
 
 # Visual Studio 2015 cache/options directory
 .vs/

diff --git a/README.md b/README.md
@@ -1,2 +1,14 @@
 # Random Quotes
 Fun random quotes web app.  App is built using Microsoft's ASP.NET core framework and it's very simple.
+
+## Build
+
+There is a Cake script for building the Random Quotes application in the root folder.
+
+The Octo .NET Core CLI extension must be installed prior to running the build, using the command line
+
+```shell
+dotnet tool install Octopus.DotNet.Cli --tool-path .\tools\
+```
+
+Running locally will place the resulting Zip package into a folder called `LocalPackages`, as a sibling to the repo's folder.
diff --git a/RandomQuotes/AppSettings.cs b/RandomQuotes/AppSettings.cs
@@ -4,5 +4,13 @@ public class AppSettings
     {
         public string AppVersion { get; set; }
         public string EnvironmentName { get; set; }
+        public string TenantName { get; set; }
+        public QuoteRecord[] CustomQuotes { get; set; }
+    }
+
+    public class QuoteRecord
+    {
+        public string Quote { get; set; }
+        public string Author { get; set; }
     }
 }
diff --git a/RandomQuotes/Startup.cs b/RandomQuotes/Startup.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using RandomQuotes.Models;
 
 namespace RandomQuotes
@@ -53,10 +54,21 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
                 ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
             });
 
-            var quoteFilePath = Path.Combine(Directory.GetCurrentDirectory(), $"wwwroot{Path.DirectorySeparatorChar}data{Path.DirectorySeparatorChar}quotes.txt");
-            Quote.Quotes = File.Exists(quoteFilePath) ? File.ReadAllLines(quoteFilePath).Select(System.Net.WebUtility.HtmlDecode).ToList() : new List<string>();
-            var authorFilePath = Path.Combine(Directory.GetCurrentDirectory(), $"wwwroot{Path.DirectorySeparatorChar}data{Path.DirectorySeparatorChar}authors.txt");
-            Quote.Authors = File.Exists(authorFilePath) ? File.ReadAllLines(authorFilePath).Select(System.Net.WebUtility.HtmlDecode).ToList() : new List<string>();
+            var service = app.ApplicationServices.GetService(typeof(IOptions<AppSettings>));
+            var settings = ((IOptions<AppSettings>)service).Value;
+
+            if (settings.CustomQuotes != null && settings.CustomQuotes.Any())
+            {
+                Quote.Quotes = settings.CustomQuotes.Select(x => x.Quote).ToList();
+                Quote.Authors = settings.CustomQuotes.Select(x => x.Author).ToList();
+            }
+            else
+            {
+                var quoteFilePath = Path.Combine(Directory.GetCurrentDirectory(), $"wwwroot{Path.DirectorySeparatorChar}data{Path.DirectorySeparatorChar}quotes.txt");
+                Quote.Quotes = File.Exists(quoteFilePath) ? File.ReadAllLines(quoteFilePath).Select(System.Net.WebUtility.HtmlDecode).ToList() : new List<string>();
+                var authorFilePath = Path.Combine(Directory.GetCurrentDirectory(), $"wwwroot{Path.DirectorySeparatorChar}data{Path.DirectorySeparatorChar}authors.txt");
+                Quote.Authors = File.Exists(authorFilePath) ? File.ReadAllLines(authorFilePath).Select(System.Net.WebUtility.HtmlDecode).ToList() : new List<string>();
+            }
         }
     }
 }
diff --git a/RandomQuotes/Views/Shared/_Layout.cshtml b/RandomQuotes/Views/Shared/_Layout.cshtml
@@ -1,12 +1,19 @@
 @using Microsoft.Extensions.Options;
 @inject IOptions<AppSettings> Settings
+@{
+    var title = "Random Quotes";
+    if (!string.IsNullOrWhiteSpace(Settings.Value.TenantName))
+    {
+        title += $" - {Settings.Value.TenantName}";
+    }
+}
 
 <!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>@ViewData["Title"] - Random Quotes</title>
+    <title>@title</title>
 
     <environment include="Development">
         <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css"/>
@@ -30,7 +37,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">Random Quotes</a>
+            <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">@title</a>
         </div>
     </div>
 </nav>
@@ -39,7 +46,7 @@
     @RenderBody()
     <hr/>
     <footer>
-        <p>&copy; 2018 - Random Quotes | Version @Settings.Value.AppVersion running in @Settings.Value.EnvironmentName</p>
+        <p>&copy; 2018 - @title | Version @Settings.Value.AppVersion running in @Settings.Value.EnvironmentName</p>
     </footer>
 </div>
 

diff --git a/RandomQuotes/appsettings.json b/RandomQuotes/appsettings.json
@@ -7,6 +7,7 @@
   },
   "AppSettings": {
     "AppVersion": "0.0.0",
-    "EnvironmentName": "DEV"
+    "EnvironmentName": "DEV",
+    "CustomQuotes": []
   }
 }
diff --git a/build.cake b/build.cake
@@ -0,0 +1,118 @@
+#tool "nuget:?package=GitVersion.CommandLine&prerelease"
+
+using Path = System.IO.Path;
+using IO = System.IO;
+using Cake.Common.Tools;
+
+var target = Argument("target", "Default");
+var configuration = Argument("configuration", "Release");
+var octopusServer = Argument("octopusServer", "");
+var octopusApikey = Argument("octopusApiKey", "");
+
+var isLocalBuild = string.IsNullOrWhiteSpace(octopusServer);
+
+var packageId = "RandomQuotes";
+
+var publishDir = "./publish";
+var artifactsDir = "./artifacts";
+var localPackagesDir = "../LocalPackages";
+
+var gitVersionInfo = GitVersion(new GitVersionSettings {
+    OutputType = GitVersionOutput.Json
+});
+
+var nugetVersion = gitVersionInfo.NuGetVersion;
+
+Setup(context =>
+{
+    if(BuildSystem.IsRunningOnTeamCity)
+        BuildSystem.TeamCity.SetBuildNumber(gitVersionInfo.NuGetVersion);
+
+    Information("Building v{0}", nugetVersion);
+});
+
+Teardown(context =>
+{
+    Information("Finished running tasks.");
+});
+
+Task("__Default")
+    .IsDependentOn("__Clean")
+    .IsDependentOn("__Restore")
+    .IsDependentOn("__Build")
+    .IsDependentOn("__Publish")
+    .IsDependentOn("__Pack")
+    .IsDependentOn("__Push");
+
+Task("__Clean")
+    .Does(() =>
+{
+    CleanDirectory(artifactsDir);
+    CleanDirectory(publishDir);
+    CleanDirectories("./**/bin");
+    CleanDirectories("./**/obj");
+});
+
+Task("__Restore")
+    .Does(() => DotNetCoreRestore(".", new DotNetCoreRestoreSettings
+    {
+        ArgumentCustomization = args => args.Append($"/p:Version={nugetVersion}")
+    })
+);
+
+Task("__Build")
+    .Does(() =>
+{
+    DotNetCoreBuild(".", new DotNetCoreBuildSettings
+    {
+        Configuration = configuration,
+        ArgumentCustomization = args => args.Append($"/p:Version={nugetVersion}")
+    });
+});
+
+Task("__Publish")
+    .Does(() =>
+{
+    DotNetCorePublish(".", new DotNetCorePublishSettings
+    {
+        Framework = "netcoreapp2.0",
+        Configuration = configuration,
+        OutputDirectory = publishDir,
+        ArgumentCustomization = args => args.Append($"--no-build")
+    });
+});
+
+Task("__Pack")
+    .Does(() => {
+
+    OctoPack(packageId, new OctopusPackSettings {
+        BasePath = publishDir,
+        Format = OctopusPackFormat.Zip,
+        Version = nugetVersion,
+        OutFolder = artifactsDir,
+        ToolPath = IsRunningOnUnix() ? Context.Tools.Resolve("dotnet-octo") : Context.Tools.Resolve("dotnet-octo.exe")
+    });    
+});
+
+Task("__Push")
+    .Does(() => {
+
+    var packageFile = $"{artifactsDir}\\{packageId}.{nugetVersion}.zip";
+
+    if (!isLocalBuild)
+    {
+        OctoPush(octopusServer, octopusApikey, packageFile, new OctopusPushSettings {
+            ToolPath = IsRunningOnUnix() ? Context.Tools.Resolve("dotnet-octo") : Context.Tools.Resolve("dotnet-octo.exe")
+        });
+    }
+    else
+    {
+        CreateDirectory(localPackagesDir);
+        CopyFileToDirectory(packageFile, localPackagesDir);
+    }
+});
+
+Task("Default")
+    .IsDependentOn("__Default");
+
+RunTarget(target);
diff --git a/build.cmd b/build.cmd
@@ -0,0 +1,24 @@
+@ECHO OFF
+REM see http://joshua.poehls.me/powershell-batch-file-wrapper/
+
+SET SCRIPTNAME=%~d0%~p0%~n0.ps1
+SET ARGS=%*
+IF [%ARGS%] NEQ [] GOTO ESCAPE_ARGS
+
+:POWERSHELL
+PowerShell.exe -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Unrestricted -Command "& { $ErrorActionPreference = 'Stop'; & '%SCRIPTNAME%' @args; EXIT $LASTEXITCODE }" %ARGS%
+EXIT /B %ERRORLEVEL%
+
+:ESCAPE_ARGS
+SET ARGS=%ARGS:"=\"%
+SET ARGS=%ARGS:`=``%
+SET ARGS=%ARGS:'=`'%
+SET ARGS=%ARGS:$=`$%
+SET ARGS=%ARGS:{=`}%
+SET ARGS=%ARGS:}=`}%
+SET ARGS=%ARGS:(=`(%
+SET ARGS=%ARGS:)=`)%
+SET ARGS=%ARGS:,=`,%
+SET ARGS=%ARGS:^%=%
+
+GOTO POWERSHELL
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ bld/ @@
     [Bb]in/
     [Oo]bj/
     [Ll]og/
+    tools/
     # Visual Studio 2015 cache/options directory
     .vs/
@@ Expand Down @@