From ca75e184c9987cc552ec9a9c5c40c4b453385c77 Mon Sep 17 00:00:00 2001 From: Collin Date: Thu, 24 Nov 2016 13:51:17 +0300 Subject: [PATCH 1/3] [edit] appveyor.yml --- appveyor.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a24043b1..d4541f74 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,30 +1,19 @@ version: 1.0.0-{branch}-{build} -os: Visual Studio 2015 - -environment: - matrix: - - CLI_VERSION: 1.0.0-preview2-003131 - -install: - - ps: $url = "https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/$($env:CLI_VERSION)/dotnet-dev-win-x64.$($env:CLI_VERSION.ToLower()).zip" - - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" - - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null - - ps: $tempFile = [System.IO.Path]::GetTempFileName() - - ps: (New-Object System.Net.WebClient).DownloadFile($url, $tempFile) - - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFile, $env:DOTNET_INSTALL_DIR) - - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" - branches: only: - master - dev +image: Visual Studio 2015 + +init: + - dotnet --version + pull_requests: do_not_increment_build_number: true build_script: - - cmd: dotnet --info - cmd: call cmd /C "cd .\build & pack.flurl.cmd & pack.flurl.http.cmd" test_script: From cc1dfcc1bcd746dd3106b7914388257c2f04c790 Mon Sep 17 00:00:00 2001 From: Todd Menier Date: Mon, 28 Nov 2016 08:15:32 -0600 Subject: [PATCH 2/3] typo/comment related + encoding spaces --- src/Flurl.Shared/Url.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Flurl.Shared/Url.cs b/src/Flurl.Shared/Url.cs index 0bb3921d..71a74eb7 100644 --- a/src/Flurl.Shared/Url.cs +++ b/src/Flurl.Shared/Url.cs @@ -327,8 +327,9 @@ public override string ToString() { /// /// Converts this Url object to its string representation. /// + /// Indicates whether to encode spaces with the "+" character instead of "%20" /// - public string ToString(bool encodeStringAsPlus) { + public string ToString(bool encodeSpaceAsPlus) { var sb = new System.Text.StringBuilder(Path); if (Query.Length > 0) sb.Append("?").Append(Query); From 10032cede2ac17c3f75b96b74c7f4219b16b51b0 Mon Sep 17 00:00:00 2001 From: Todd Menier Date: Mon, 28 Nov 2016 08:19:26 -0600 Subject: [PATCH 3/3] stripped -pre from release --- Build/nuspec/Flurl.Http.nuspec | 2 +- src/Flurl.Http/project.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Build/nuspec/Flurl.Http.nuspec b/Build/nuspec/Flurl.Http.nuspec index 20eeb5a3..27b1e01c 100644 --- a/Build/nuspec/Flurl.Http.nuspec +++ b/Build/nuspec/Flurl.Http.nuspec @@ -2,7 +2,7 @@ Flurl.Http - 1.1.1-pre + 1.1.1 Flurl.Http Todd Menier http://tmenier.github.io/Flurl diff --git a/src/Flurl.Http/project.json b/src/Flurl.Http/project.json index 6692a1da..015dbed7 100644 --- a/src/Flurl.Http/project.json +++ b/src/Flurl.Http/project.json @@ -1,6 +1,6 @@ { "title": "Flurl.Http", - "version": "1.1.1-pre", + "version": "1.1.1", "dependencies": { "Flurl": "2.2.1",