Merge pull request tmenier#152 from tmenier/dev

Flurl.Http 1.1.1

Build/nuspec/Flurl.Http.nuspec

@@ -2,7 +2,7 @@
 <package >
 	<metadata>
 		<id>Flurl.Http</id>
-		<version>1.1.1-pre</version>
+		<version>1.1.1</version>
 		<title>Flurl.Http</title>
 		<authors>Todd Menier</authors>
 		<projectUrl>http://tmenier.github.io/Flurl</projectUrl>

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:

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",

src/Flurl.Shared/Url.cs

@@ -327,8 +327,9 @@ public class Url
 		/// <summary>
 		/// Converts this Url object to its string representation.
 		/// </summary>
+		/// <param name="encodeSpaceAsPlus">Indicates whether to encode spaces with the "+" character instead of "%20"</param>
 		/// <returns></returns>
-		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);