From 732947ed662789e35fc9528ed3eca43e1fcc87d5 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 2 Feb 2017 16:54:59 -0800 Subject: [PATCH] PR feedback. Also, add editorconfig because it is awesome --- .editorconfig | 24 +++++++++++++++++++ IISIntegration.sln | 1 + .../NtlmAuthentationTest.cs | 4 ++-- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..17d90aec31 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,24 @@ +# EditorConfig is awesome:http://EditorConfig.org + +# top-most EditorConfig file +root = true + +[*] +indent_style = space +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.cs] +indent_size = 4 +dotnet_sort_system_directives_first = true:warning + +# Xml files +[*.{csproj,config,props,targets,ruleset,config,resx,xml}] +indent_size = 2 + +[*.{json, yml}] +indent_size = 2 + +[*.{ps1,sh}] +indent_size = 4 diff --git a/IISIntegration.sln b/IISIntegration.sln index 0c3f922ec7..a4067a7366 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -6,6 +6,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04B1EDB6-E96 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EF45656-B25D-40D8-959C-726EAF185E60}" ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig NuGet.Config = NuGet.Config EndProjectSection EndProject diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs index e901d0a0ce..c6c390a74d 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -7,12 +7,12 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; using Xunit.Sdk; using Xunit.Abstractions; -using Microsoft.AspNetCore.Testing; namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests {