Merge branch 'release/4.5.0'

Author: wwwlicious

.appveyor.yml

@@ -0,0 +1,33 @@
+#---------------------------------#
+#  Build Script                   #
+#---------------------------------#
+build_script:
+  - ps: .\build.ps1 -Target AppVeyor --settings_skipverification=true
+
+
+# Tests
+test: off
+
+#---------------------------------#
+#        Branches to build        #
+#---------------------------------#
+branches:
+  # Whitelist
+  only:
+    - develop
+    - master
+    - /release/.*/
+    - /hotfix/.*/
+
+#---------------------------------#
+#  Build Cache                    #
+#---------------------------------#
+cache:
+- src\packages -> src\**\packages.config
+
+#---------------------------------#
+#    environment configuration    #
+#---------------------------------#
+
+# Build worker image (VM template)
+image: Visual Studio 2017

.gitignore

@@ -23,6 +23,7 @@ bld/
 
 # Visual Studio 2015 cache/options directory
 .vs/
+.idea/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 

build.cake

@@ -1,95 +1,228 @@
-#addin "MagicChunks"
+#tool "nuget:?package=xunit.runner.console&version=2.3.1"
+#tool "nuget:?package=GitVersion.CommandLine&version=3.6.5"
+#tool "nuget:?package=gitreleasemanager&version=0.7.1"
+#tool "nuget:?package=gitlink&version=2.4.0"
+#addin "nuget:?package=Cake.Incubator&version=3.1.0"
 
-var target						  = Argument("target", "Default");
-var configuration				  = Argument<string>("configuration", "Release");
+///////////////////////////////////////////////////////////////////////////////
+// ARGUMENTS
+///////////////////////////////////////////////////////////////////////////////
+var envBuildNumber = EnvironmentVariable<int>("APPVEYOR_BUILD_NUMBER", 0);
+var gitHubUserName = EnvironmentVariable("GITHUB_USERNAME");
+var gitHubPassword = EnvironmentVariable("GITHUB_PASSWORD");
+var nugetSourceUrl = EnvironmentVariable("NUGET_SOURCE");
+var nugetApiKey = EnvironmentVariable("NUGET_API_KEY");
+
+var target = Argument("target", "Default");
+var configuration = Argument("configuration", "Release");
+var buildNumber = Argument<int>("buildNumber", envBuildNumber);
 
 ///////////////////////////////////////////////////////////////////////////////
-// GLOBAL VARIABLES
+// VARIABLES
 ///////////////////////////////////////////////////////////////////////////////
-var isLocalBuild				  = !AppVeyor.IsRunningOnAppVeyor;
-var projects					  = new []
-{
-	"./src/IdentityServer4.Contrib.ServiceStack/IdentityServer4.Contrib.ServiceStack.csproj",
-	"./src/ServiceStack.Authentication.IdentityServer/ServiceStack.Authentication.IdentityServer.csproj"
-};
-var sourcePath					  = Directory("./src");
-var buildArtifacts				  = Directory("./Artifacts");
 
-var nugetSources                  = new [] { "https://api.nuget.org/v3/index.json" };
+// folders
+var artifactsDir        = Directory("./artifacts");
+var nugetPackageDir     = artifactsDir + Directory("nuget-packages");
+var srcDir              = Directory("./src");
+var rootPath            = MakeAbsolute(Directory("./"));
+var releaseNotesPath = rootPath.CombineWithFilePath("CHANGELOG.md");
 
-Task("Build")
-    .IsDependentOn("Clean")
-	.IsDependentOn("Version")
-    .IsDependentOn("Restore")
-    .Does(() =>
+// project specific
+var solutionFile        = srcDir + File("servicestack.auth.identityserver.sln");
+var gitHubRepositoryOwner = "wwwlicious";
+var gitHubRepositoryName = "servicestack-authentication-identityserver";
+
+var isLocalBuild = BuildSystem.IsLocalBuild;
+var isPullRequest = BuildSystem.AppVeyor.Environment.PullRequest.IsPullRequest;
+var isMasterBranch = BuildSystem.AppVeyor.Environment.Repository.Branch.EqualsIgnoreCase("master");
+var isReleaseBranch = BuildSystem.AppVeyor.Environment.Repository.Branch.StartsWithIgnoreCase("release");
+var isHotFixBranch = BuildSystem.AppVeyor.Environment.Repository.Branch.StartsWithIgnoreCase("hotfix");
+var isTagged = BuildSystem.AppVeyor.Environment.Repository.Tag.IsTag && !BuildSystem.AppVeyor.Environment.Repository.Tag.Name.IsNullOrEmpty();
+var publishingError = false;
+
+var shouldPublishNuGet = (!isLocalBuild && !isPullRequest && (isMasterBranch || isReleaseBranch || isHotFixBranch) && isTagged);
+var shouldPublishGitHub = shouldPublishNuGet;
+
+var gitVersionResults   = GitVersion(new GitVersionSettings { UpdateAssemblyInfo = false });
+var semVersion          = $"{gitVersionResults.MajorMinorPatch}.{buildNumber}";
+
+Information("SemverVersion -> {0}", semVersion);
+
+var projects = ParseSolution(solutionFile).GetProjects().Select(x => ParseProject(x.Path, configuration));
+
+///////////////////////////////////////////////////////////////////////////////
+// SETUP / TEARDOWN
+///////////////////////////////////////////////////////////////////////////////
+
+Setup(ctx =>
 {
-	foreach(var project in projects)
-	{
-        var settings = new DotNetCoreBuildSettings 
-        {
-            Configuration = configuration
-        };
-        DotNetCoreBuild(project, settings); 
+    // Executed BEFORE the first task.
+    Information("Running tasks...");
+
+    if(isMasterBranch && (ctx.Log.Verbosity != Verbosity.Diagnostic)) {
+        Information("Increasing verbosity to diagnostic.");
+        ctx.Log.Verbosity = Verbosity.Diagnostic;
     }
 });
 
-Task("Version")
-	.Does(() => 
+Teardown(ctx =>
 {
-	if (AppVeyor.IsRunningOnAppVeyor)
-	{
-		foreach(var project in projects)
-		{
-			string version = XmlPeek(project, "/Project/PropertyGroup/VersionPrefix");
-			version = version.Substring(0, version.LastIndexOf('.')) + "." + AppVeyor.Environment.Build.Number.ToString();
-
-			TransformConfig(project, project, new TransformationCollection {
-				{ "Project/PropertyGroup/VersionPrefix", version }
-			});
-		}
-	}
+   // Executed AFTER the last task.
+   Information("Finished running tasks.");
 });
 
-Task("Restore")
-    .Does(() =>
-{
-    var settings = new DotNetCoreRestoreSettings { Sources = nugetSources };
-    DotNetCoreRestore(Directory("."), settings);
+///////////////////////////////////////////////////////////////////////////////
+// TASKS
+///////////////////////////////////////////////////////////////////////////////
+
+Task("Default")
+.IsDependentOn("Clean")
+.IsDependentOn("Build")
+.IsDependentOn("Test");
+
+Task("Build")
+.Does(() => {
+    Information("Building {0}", solutionFile);
+    var msbuildBinaryLogFile = artifactsDir + new FilePath(solutionFile.Path.GetFilenameWithoutExtension() + ".binlog");
+
+    MSBuild(solutionFile.Path, settings => {
+        settings
+            .SetConfiguration(configuration)
+            .SetMaxCpuCount(0) // use as many cpu's as are available
+            .WithRestore()
+            .WithProperty("TreatresultsAsErrors", "false")
+            .WithProperty("resultsAsErrors", "3884")
+            .WithProperty("CodeContractsRunCodeAnalysis", "true")
+            .WithProperty("RunCodeAnalysis", "false")
+            .WithProperty("Version", semVersion)
+            .WithProperty("PackageVersion", gitVersionResults.MajorMinorPatch)
+            .WithProperty("PackageOutputPath", MakeAbsolute(nugetPackageDir).FullPath)
+            .UseToolVersion(MSBuildToolVersion.VS2017)
+            .SetNodeReuse(false);
+
+            // setup binary logging for solution to artifacts dir
+            settings.ArgumentCustomization = arguments => {
+                arguments.Append($"/bl:{msbuildBinaryLogFile}");
+                return arguments;
+            };
+    });
 });
 
-Task("Pack")
-	.IsDependentOn("Build")
-	.Does(() => 
+Task("Test")
+.Does(() => {
+    Information("Testing for {0}", solutionFile);
+    projects.Where(x => x.IsTestProject()).Each(x => DotNetCoreTest(x.ProjectFilePath.FullPath));
+});
+
+Task("ReleaseNotes")
+.IsDependentOn("Create-Release-Notes");
+
+Task("AppVeyor")
+    .IsDependentOn("Default")
+    .IsDependentOn("Upload-AppVeyor-Artifacts")
+    .IsDependentOn("Publish-Nuget-Packages")
+    .IsDependentOn("Publish-GitHub-Release")
+    .Finally(() =>
 {
-	var settings = new DotNetCorePackSettings
+    if(publishingError)
+    {
+        throw new Exception($"An error occurred during the publishing of {solutionFile.Path}.  All publishing tasks have been attempted.");
+    }
+});
+
+Task("Create-Release-Notes")
+.Does(() => {
+    Information("Creating release notes for {0}", semVersion);
+    gitHubUserName.ThrowIfNull(nameof(gitHubUserName));
+    gitHubPassword.ThrowIfNull(nameof(gitHubPassword));
+    GitReleaseManagerCreate(gitHubUserName, gitHubPassword, gitHubRepositoryOwner, gitHubRepositoryName, new GitReleaseManagerCreateSettings {
+                Milestone         = gitVersionResults.MajorMinorPatch,
+                Name              = gitVersionResults.MajorMinorPatch,
+                Prerelease        = false,
+                TargetCommitish   = "master",
+            });
+});
+
+Task("Export-Release-Notes")
+    .WithCriteria(() => !isLocalBuild)
+    .WithCriteria(() => BuildSystem.IsRunningOnAppVeyor && !isPullRequest)
+    .WithCriteria(() => isMasterBranch || isReleaseBranch || isHotFixBranch)
+    .WithCriteria(() => isTagged)
+.Does(() => {
+    Information("Exporting release notes for {0}", solutionFile);
+    gitHubUserName.ThrowIfNull(nameof(gitHubUserName));
+    gitHubPassword.ThrowIfNull(nameof(gitHubPassword));
+
+    GitReleaseManagerExport(gitHubUserName, gitHubPassword, gitHubRepositoryOwner, gitHubRepositoryName, releaseNotesPath, 
+    new GitReleaseManagerExportSettings {
+        TagName = gitVersionResults.MajorMinorPatch
+    });
+});
+
+Task("Publish-GitHub-Release")
+.IsDependentOn("Export-Release-Notes")
+.WithCriteria(() => shouldPublishGitHub)
+.Does(() => {
+    Information("Publishing github release for {0}", solutionFile);
+    gitHubUserName.ThrowIfNull(nameof(gitHubUserName));
+    gitHubPassword.ThrowIfNull(nameof(gitHubPassword));
+
+    // upload packages as assets
+    foreach(var package in GetFiles(nugetPackageDir.Path + "/*"))
     {
-        Configuration = configuration,
-        OutputDirectory = buildArtifacts,
-    };
-
-	foreach(var project in projects)
-	{
-		DotNetCorePack(Directory(project), settings);
-	}
-
-	if (!isLocalBuild)
-	{
-		var artifacts = GetFiles(buildArtifacts.Path + "/*.nupkg");
-		foreach(var artifact in artifacts)
-		{
-			AppVeyor.UploadArtifact(artifact);
-		}
-	}
+        GitReleaseManagerAddAssets(gitHubUserName, gitHubPassword, gitHubRepositoryOwner, gitHubRepositoryName, gitVersionResults.MajorMinorPatch, package.ToString());
+    }
+
+    // close the release
+    GitReleaseManagerClose(gitHubUserName, gitHubPassword, gitHubRepositoryOwner, gitHubRepositoryName, gitVersionResults.MajorMinorPatch);
 });
 
-Task("Clean")
-    .Does(() =>
-{
-    CleanDirectories(new DirectoryPath[] { buildArtifacts });
+Task("Publish-Nuget-Packages")
+.WithCriteria(() => shouldPublishNuGet)
+.WithCriteria(() => DirectoryExists(nugetPackageDir))
+.Does(() => {
+
+    Information("Publishing NuGet Packages for {0}", solutionFile);
+
+    nugetSourceUrl.ThrowIfNull(nameof(nugetSourceUrl));
+    nugetApiKey.ThrowIfNull(nameof(nugetApiKey));
+    var nupkgFiles = GetFiles(nugetPackageDir.Path + "/**/*.nupkg");
+
+    foreach(var nupkgFile in nupkgFiles)
+    {
+        // Push the package.
+        NuGetPush(nupkgFile, new NuGetPushSettings {
+            Source = nugetSourceUrl,
+            ApiKey = nugetApiKey,
+        });
+    }
 });
 
-Task("Default")
-  .IsDependentOn("Build")
-  .IsDependentOn("Pack");
+
+Task("Upload-AppVeyor-Artifacts")
+.IsDependentOn("Export-Release-Notes")
+.WithCriteria(() => BuildSystem.IsRunningOnAppVeyor)
+.WithCriteria(() => DirectoryExists(nugetPackageDir))
+.Does(() => {
+    Information("Uploading AppVeyor artifacts for {0}", solutionFile);
+    foreach(var package in GetFiles(nugetPackageDir.Path + "/*"))
+    {
+        AppVeyor.UploadArtifact(package);
+    }
+});
+
+Task("Sample")
+.Does(() => {
+    Information("Restoring NuGet Packages for {0}", solutionFile);
+});
+
+Task("Clean")
+.Does(() => {
+   CleanDirectories(new DirectoryPath[] {
+        artifactsDir,
+        nugetPackageDir
+  	});
+});
 
 RunTarget(target);