From 689be0cdc9a7e0cbb8438b681c51c42006471336 Mon Sep 17 00:00:00 2001 From: Florian Rappl Date: Tue, 14 May 2019 00:36:59 +0200 Subject: [PATCH 1/2] Improved build process, prepare for 0.13 --- build.cake | 34 ++++++++++++++++++---------------- src/Directory.Build.props | 2 +- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/build.cake b/build.cake index bf405d4..35c7c78 100644 --- a/build.cake +++ b/build.cake @@ -50,8 +50,9 @@ Task("Restore-Packages") .IsDependentOn("Clean") .Does(() => { - NuGetRestore("./src/AngleSharp.Io.sln", new NuGetRestoreSettings { - ToolPath = "tools/nuget.exe" + NuGetRestore("./src/AngleSharp.Io.sln", new NuGetRestoreSettings + { + ToolPath = "tools/nuget.exe", }); }); @@ -59,8 +60,10 @@ Task("Build") .IsDependentOn("Restore-Packages") .Does(() => { - DotNetCoreBuild("./src/AngleSharp.Io.sln", new DotNetCoreBuildSettings() { - Configuration = configuration + ReplaceRegexInFiles("./src/Directory.Build.props", "(?<=)(.+?)(?=)", version); + DotNetCoreBuild("./src/AngleSharp.Io.sln", new DotNetCoreBuildSettings + { + Configuration = configuration, }); }); @@ -70,7 +73,7 @@ Task("Run-Unit-Tests") { var settings = new DotNetCoreTestSettings { - Configuration = configuration + Configuration = configuration, }; if (isRunningOnAppVeyor) @@ -96,7 +99,7 @@ Task("Copy-Files") CopyFiles(new FilePath[] { buildDir + Directory(framework) + File("AngleSharp.Io.dll"), - buildDir + Directory(framework) + File("AngleSharp.Io.xml") + buildDir + Directory(framework) + File("AngleSharp.Io.xml"), }, target); CopyFiles(new FilePath[] { "src/AngleSharp.Io.nuspec" }, nugetRoot); @@ -107,12 +110,8 @@ Task("Create-Package") .Does(() => { var nugetExe = GetFiles("./tools/**/nuget.exe").FirstOrDefault() - ?? (isRunningOnAppVeyor ? GetFiles("C:\\Tools\\NuGet3\\nuget.exe").FirstOrDefault() : null); - - if (nugetExe == null) - { - throw new InvalidOperationException("Could not find nuget.exe."); - } + ?? (isRunningOnAppVeyor ? GetFiles("C:\\Tools\\NuGet3\\nuget.exe").FirstOrDefault() : null) + ?? throw new InvalidOperationException("Could not find nuget.exe."); var nuspec = nugetRoot + File("AngleSharp.Io.nuspec"); @@ -121,7 +120,10 @@ Task("Create-Package") Version = version, OutputDirectory = nugetRoot, Symbols = false, - Properties = new Dictionary { { "Configuration", configuration } } + Properties = new Dictionary + { + { "Configuration", configuration }, + }, }); }); @@ -142,7 +144,7 @@ Task("Publish-Package") NuGetPush(nupkg, new NuGetPushSettings { Source = "https://nuget.org/api/v2/package", - ApiKey = apiKey + ApiKey = apiKey, }); } }); @@ -161,7 +163,7 @@ Task("Publish-Release") var github = new GitHubClient(new ProductHeaderValue("AngleSharpCakeBuild")) { - Credentials = new Credentials(githubToken) + Credentials = new Credentials(githubToken), }; var newRelease = github.Repository.Release; @@ -170,7 +172,7 @@ Task("Publish-Release") Name = version, Body = String.Join(Environment.NewLine, releaseNotes.Notes), Prerelease = false, - TargetCommitish = "master" + TargetCommitish = "master", }).Wait(); }); diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 7802e36..c7c9fbc 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,6 +2,6 @@ Providers additional requesters and IO helpers for AngleSharp. AngleSharp.Io - 0.10.1 + 0.13.0 \ No newline at end of file From 2d5600fd7c6fb4b0d1b152cd002b2c56cf14d658 Mon Sep 17 00:00:00 2001 From: Florian Rappl Date: Wed, 15 May 2019 01:02:27 +0200 Subject: [PATCH 2/2] Binary version fix --- CHANGELOG.md | 6 ++++++ src/AngleSharp.Io.nuspec | 2 +- src/AngleSharp.Io/AngleSharp.Io.csproj | 2 +- src/Directory.Build.props | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e78cfa..c043c37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 0.12.1 + +Released on Wednesday, May 15 2019. + +- Binary version fix + # 0.12.0 Released on Thursday, May 2 2019. diff --git a/src/AngleSharp.Io.nuspec b/src/AngleSharp.Io.nuspec index f9dc608..32a1ac6 100644 --- a/src/AngleSharp.Io.nuspec +++ b/src/AngleSharp.Io.nuspec @@ -14,7 +14,7 @@ Copyright 2016-2019, AngleSharp html html5 css css3 dom requester http https io filesystem storage httpclient cache - + diff --git a/src/AngleSharp.Io/AngleSharp.Io.csproj b/src/AngleSharp.Io/AngleSharp.Io.csproj index 8376934..ff858bc 100644 --- a/src/AngleSharp.Io/AngleSharp.Io.csproj +++ b/src/AngleSharp.Io/AngleSharp.Io.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index c7c9fbc..faea1d9 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,6 +2,6 @@ Providers additional requesters and IO helpers for AngleSharp. AngleSharp.Io - 0.13.0 + 0.12.1 \ No newline at end of file