Resolved merge conflicts between coreclr and master

thecodejunkie · thecodejunkie · commit 301d1d0ccfb1 · 2016-05-27T14:30:13.000+02:00
diff --git a/build.ps1 b/build.ps1
@@ -5,19 +5,52 @@ function Install-Dotnet
   if(($LASTEXITCODE -ne 0) -Or ((Test-Path Env:\APPVEYOR) -eq $true))
   {
     Write-Host "Dotnet CLI not found - downloading latest version"
-    & { iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1')) }
+
+    # Prepare the dotnet CLI folder
+    $env:DOTNET_INSTALL_DIR="$(Convert-Path "$PSScriptRoot")\.dotnet\win7-x64"
+    if (!(Test-Path $env:DOTNET_INSTALL_DIR))
+    {
+      mkdir $env:DOTNET_INSTALL_DIR | Out-Null
+    }
+
+    # Download the dotnet CLI install script
+    if (!(Test-Path .\dotnet\install.ps1))
+    {
+      Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\.dotnet\dotnet-install.ps1"
+    }
+
+    # Run the dotnet CLI install
+    & .\.dotnet\dotnet-install.ps1
+
+    # Add the dotnet folder path to the process. This gets skipped
+    # by Install-DotNetCli if it's already installed.
+    Remove-PathVariable $env:DOTNET_INSTALL_DIR
+    $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
+
   }
 }
 
+function Remove-PathVariable
+{
+  [cmdletbinding()]
+  param([string] $VariableToRemove)
+  $path = [Environment]::GetEnvironmentVariable("PATH", "User")
+  $newItems = $path.Split(';') | Where-Object { $_.ToString() -inotlike $VariableToRemove }
+  [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "User")
+  $path = [Environment]::GetEnvironmentVariable("PATH", "Process")
+  $newItems = $path.Split(';') | Where-Object { $_.ToString() -inotlike $VariableToRemove }
+  [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "Process")
+}
+
 function Restore-Packages
 {
     param([string] $DirectoryName)
-    & dotnet restore -v Error ("""" + $DirectoryName + """")
+    & dotnet restore -v Warning ("""" + $DirectoryName + """")
 }
 
 function Test-Projects
 {
-    & dotnet test;
+    & dotnet test -c Release;
     if($LASTEXITCODE -ne 0)
     {
       exit 3
diff --git a/samples/Nancy.Demo.Hosting.Kestrel/HomeModule.cs b/samples/Nancy.Demo.Hosting.Kestrel/HomeModule.cs
@@ -6,9 +6,9 @@ public class HomeModule : NancyModule
     {
         public HomeModule()
         {
-            Get["/"] = (o, token) => Task.FromResult<dynamic>("Hello from Nancy running on CoreCLR");
+            Get("/", (args, ct) => Task.FromResult("Hello from Nancy running on CoreCLR"));
 
-            Get["/conneg/{name}"] = (parameters, token) => Task.FromResult<dynamic>(new Person() { Name = parameters.name });
+            Get("/conneg/{name}", (args, token) => Task.FromResult(new Person() { Name = args.name }));
         }
     }
 }
diff --git a/src/Nancy/project.json b/src/Nancy/project.json
@@ -16,6 +16,7 @@
 
     "buildOptions": {
         "embed": [
+            "ErrorHandling/Resources/**/*.*",
             "Diagnostics/Resources/**/*.*",
             "Diagnostics/Views/**/*.*"
         ]
diff --git a/test/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.xproj b/test/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.Authentication.Forms.Tests/Nancy.Authentication.Forms.Tests.xproj b/test/Nancy.Authentication.Forms.Tests/Nancy.Authentication.Forms.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.Embedded.Tests/Nancy.Embedded.Tests.xproj b/test/Nancy.Embedded.Tests/Nancy.Embedded.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.Encryption.MachineKey.Tests/Nancy.Encryption.MachineKey.Tests.xproj b/test/Nancy.Encryption.MachineKey.Tests/Nancy.Encryption.MachineKey.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.Hosting.Aspnet.Tests/Nancy.Hosting.Aspnet.Tests.xproj b/test/Nancy.Hosting.Aspnet.Tests/Nancy.Hosting.Aspnet.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.xproj b/test/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.Metadata.Modules.Tests/Nancy.Metadata.Modules.Tests.xproj b/test/Nancy.Metadata.Modules.Tests/Nancy.Metadata.Modules.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.Owin.Tests/AppBuilderExtensionsFixture.cs b/test/Nancy.Owin.Tests/AppBuilderExtensionsFixture.cs
@@ -2,18 +2,12 @@
 {
     using System;
     using System.Collections.Generic;
-    using System.IO;
-    using System.Reflection;
     using System.Security.Cryptography.X509Certificates;
     using System.Text;
     using global::Owin;
-
     using Microsoft.Owin.Testing;
-
     using Nancy.Testing;
-
     using Xunit;
-
     using HttpStatusCode = Nancy.HttpStatusCode;
 
     public class AppBuilderExtensionsFixture
@@ -41,7 +35,6 @@ public void When_host_Nancy_via_IAppBuilder_should_read_X509Certificate2()
             // Given
             var bootstrapper = new ConfigurableBootstrapper(config => config.Module<TestModule>());
 
-
             using (var server = TestServer.Create(app => app.UseNancy(opts =>
             {
                 opts.Bootstrapper = bootstrapper;
@@ -65,38 +58,33 @@ public void When_host_Nancy_via_IAppBuilder_should_read_X509Certificate2()
                             -----END CERTIFICATE-----
                             ";
 
-                byte[] embeddedCert = Encoding.UTF8.GetBytes(cert);
+                var embeddedCert = Encoding.UTF8.GetBytes(cert);
 
                 var env = new Dictionary<string, object>()
                 {
                     { "owin.RequestPath", "/ssl" },
                     { "owin.RequestScheme", "http" },
                     { "owin.RequestHeaders", new Dictionary<string, string[]>() { { "Host", new[] { "localhost" } } } },
                     { "owin.RequestMethod", "GET" },
-                    {"ssl.ClientCertificate", new X509Certificate(embeddedCert) }
+                    { "owin.ResponseHeaders", new Dictionary<string, string[]>() },
+                    { "ssl.ClientCertificate", new X509Certificate(embeddedCert) }
                 };
-                server.Invoke(env);
 
+                var result = server.Invoke(env);
+                result.Wait();
 
                 // Then
                 Assert.Equal(env["owin.ResponseStatusCode"], 200);
             }
         }
 #endif
-
         public class TestModule : NancyModule
         {
             public TestModule()
             {
-                Get["/"] = _ =>
-                {
-                    return HttpStatusCode.OK;
-                };
+                Get("/", args => HttpStatusCode.OK);
 
-                Get("/ssl", args =>
-                {
-                    return this.Request.ClientCertificate != null ? 200 : 500;
-                });
+                Get("/ssl", args => this.Request.ClientCertificate != null ? 200 : 500);
             }
         }
     }
diff --git a/test/Nancy.Owin.Tests/Nancy.Owin.Tests.xproj b/test/Nancy.Owin.Tests/Nancy.Owin.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.Testing.Tests/Nancy.Testing.Tests.xproj b/test/Nancy.Testing.Tests/Nancy.Testing.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.Tests.Functional/Nancy.Tests.Functional.xproj b/test/Nancy.Tests.Functional/Nancy.Tests.Functional.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.Tests/Nancy.Tests.xproj b/test/Nancy.Tests/Nancy.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.Validation.DataAnnotatioins.Tests/Nancy.Validation.DataAnnotatioins.Tests.xproj b/test/Nancy.Validation.DataAnnotatioins.Tests/Nancy.Validation.DataAnnotatioins.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.Validation.FluentValidation.Tests/Nancy.Validation.FluentValidation.Tests.xproj b/test/Nancy.Validation.FluentValidation.Tests/Nancy.Validation.FluentValidation.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.ViewEngines.DotLiquid.Tests/Nancy.ViewEngines.DotLiquid.Tests.xproj b/test/Nancy.ViewEngines.DotLiquid.Tests/Nancy.ViewEngines.DotLiquid.Tests.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -16,5 +16,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/test/Nancy.ViewEngines.Markdown.Tests/Nancy.ViewEngines.Markdown.Tests.xproj b/test/Nancy.ViewEngines.Markdown.Tests/Nancy.ViewEngines.Markdown.Tests.xproj
diff --git a/test/Nancy.ViewEngines.Razor.Tests/Nancy.ViewEngines.Razor.Tests.xproj b/test/Nancy.ViewEngines.Razor.Tests/Nancy.ViewEngines.Razor.Tests.xproj

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ public class HomeModule : NancyModule`
`6`	`6`	`{`
`7`	`7`	`public HomeModule()`
`8`	`8`	`{`
`9`		`- Get["/"] = (o, token) => Task.FromResult<dynamic>("Hello from Nancy running on CoreCLR");`
	`9`	`+ Get("/", (args, ct) => Task.FromResult("Hello from Nancy running on CoreCLR"));`
`10`	`10`
`11`		`- Get["/conneg/{name}"] = (parameters, token) => Task.FromResult<dynamic>(new Person() { Name = parameters.name });`
	`11`	`+ Get("/conneg/{name}", (args, token) => Task.FromResult(new Person() { Name = args.name }));`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`"buildOptions": {`
`18`	`18`	`"embed": [`
	`19`	`+ "ErrorHandling/Resources/*/.*",`
`19`	`20`	`"Diagnostics/Resources/*/.*",`
`20`	`21`	`"Diagnostics/Views/*/.*"`
`21`	`22`	`]`