diff --git a/appveyor.yml b/.appveyor.yml
similarity index 100%
rename from appveyor.yml
rename to .appveyor.yml
diff --git a/BasicMiddleware.sln b/BasicMiddleware.sln
index 2fbc9f4838..b3f0434ba6 100644
--- a/BasicMiddleware.sln
+++ b/BasicMiddleware.sln
@@ -1,12 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26127.3
+VisualStudioVersion = 15.0.26817.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOverrides", "src\Microsoft.AspNetCore.HttpOverrides\Microsoft.AspNetCore.HttpOverrides.csproj", "{517308C3-B477-4B01-B461-CAB9C10B6928}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A5076D28-FA7E-4606-9410-FEDD0D603527}"
+ ProjectSection(SolutionItems) = preProject
+ src\Directory.Build.props = src\Directory.Build.props
+ EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8437B0F3-3894-4828-A945-A9187F37631D}"
+ ProjectSection(SolutionItems) = preProject
+ test\Directory.Build.props = test\Directory.Build.props
+ EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOverrides.Tests", "test\Microsoft.AspNetCore.HttpOverrides.Tests\Microsoft.AspNetCore.HttpOverrides.Tests.csproj", "{D6341B92-3416-4F11-8DF4-CB274296175F}"
EndProject
@@ -32,6 +38,25 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Respon
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ResponseCompressionSample", "samples\ResponseCompressionSample\ResponseCompressionSample.csproj", "{B2A3CE38-51B2-4486-982C-98C380AF140E}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{59A9B64C-E9BE-409E-89A2-58D72E2918F5}"
+ ProjectSection(SolutionItems) = preProject
+ .appveyor.yml = .appveyor.yml
+ .gitattributes = .gitattributes
+ .gitignore = .gitignore
+ .travis.yml = .travis.yml
+ build.cmd = build.cmd
+ build.ps1 = build.ps1
+ build.sh = build.sh
+ CONTRIBUTING.md = CONTRIBUTING.md
+ Directory.Build.props = Directory.Build.props
+ Directory.Build.targets = Directory.Build.targets
+ LICENSE.txt = LICENSE.txt
+ NuGet.config = NuGet.config
+ NuGetPackageVerifier.json = NuGetPackageVerifier.json
+ README.md = README.md
+ version.xml = version.xml
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -104,4 +129,7 @@ Global
{3360A5D1-70C0-49EE-9051-04A6A6B836DC} = {8437B0F3-3894-4828-A945-A9187F37631D}
{B2A3CE38-51B2-4486-982C-98C380AF140E} = {9587FE9F-5A17-42C4-8021-E87F59CECB98}
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {4518E9CE-3680-4E05-9259-B64EA7807158}
+ EndGlobalSection
EndGlobal
diff --git a/build/common.props b/Directory.Build.props
similarity index 61%
rename from build/common.props
rename to Directory.Build.props
index f3bb8ac834..ffb3cd28ae 100644
--- a/build/common.props
+++ b/Directory.Build.props
@@ -1,20 +1,16 @@
-
-
+
+
Microsoft ASP.NET Core
https://github.com/aspnet/BasicMiddleware
git
- $(MSBuildThisFileDirectory)Key.snk
+ $(MSBuildThisFileDirectory)build\Key.snk
true
true
$(VersionSuffix)-$(BuildNumber)
true
-
-
-
-
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 0000000000..8c119d5413
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,2 @@
+
+
diff --git a/build/dependencies.props b/build/dependencies.props
index 3945007fb2..8f3cbae099 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -6,7 +6,8 @@
2.0.0-*
2.0.0-*
2.0.0-*
- 15.3.0-*
- 2.3.0-beta2-*
+ 15.3.0
+ 2.3.0-beta4-build3742
+ 0.6.1
diff --git a/samples/HttpOverridesSample/HttpOverridesSample.csproj b/samples/HttpOverridesSample/HttpOverridesSample.csproj
index 9c8dc4616a..c975c27d60 100644
--- a/samples/HttpOverridesSample/HttpOverridesSample.csproj
+++ b/samples/HttpOverridesSample/HttpOverridesSample.csproj
@@ -1,7 +1,5 @@
-
-
net461;netcoreapp2.0
netcoreapp2.0
diff --git a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj b/samples/ResponseBufferingSample/ResponseBufferingSample.csproj
index f0aa4a439a..14545ef8ae 100644
--- a/samples/ResponseBufferingSample/ResponseBufferingSample.csproj
+++ b/samples/ResponseBufferingSample/ResponseBufferingSample.csproj
@@ -1,7 +1,5 @@
-
-
net461;netcoreapp2.0
netcoreapp2.0
diff --git a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj b/samples/ResponseCompressionSample/ResponseCompressionSample.csproj
index a5792ad3e8..ed18dc8e09 100644
--- a/samples/ResponseCompressionSample/ResponseCompressionSample.csproj
+++ b/samples/ResponseCompressionSample/ResponseCompressionSample.csproj
@@ -1,7 +1,5 @@
-
-
net461;netcoreapp2.0
netcoreapp2.0
diff --git a/samples/RewriteSample/RewriteSample.csproj b/samples/RewriteSample/RewriteSample.csproj
index f9c78e7131..d53d958c42 100644
--- a/samples/RewriteSample/RewriteSample.csproj
+++ b/samples/RewriteSample/RewriteSample.csproj
@@ -1,7 +1,5 @@
-
-
net461;netcoreapp2.0
netcoreapp2.0
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 0000000000..e150035ea9
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj
index a3d42c869d..34282135bd 100644
--- a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj
+++ b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.csproj
@@ -1,7 +1,5 @@
-
-
0.4.0
ASP.NET Core middleware for buffering response bodies.
diff --git a/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj
index 7b8ae08a7c..914d51a16e 100644
--- a/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj
+++ b/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.csproj
@@ -1,7 +1,5 @@
-
-
ASP.NET Core basic middleware for supporting HTTP method overrides. Includes:
* X-Forwarded-* headers to forward headers from a proxy.
diff --git a/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj b/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj
index 78c240a0ec..2b574db3d6 100644
--- a/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj
+++ b/src/Microsoft.AspNetCore.ResponseCompression/Microsoft.AspNetCore.ResponseCompression.csproj
@@ -1,7 +1,5 @@
-
-
ASP.NET Core middleware for HTTP Response compression.
net461;netstandard2.0
diff --git a/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj b/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj
index 87f5d80c07..2fd7e40f48 100644
--- a/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj
+++ b/src/Microsoft.AspNetCore.Rewrite/Microsoft.AspNetCore.Rewrite.csproj
@@ -1,7 +1,5 @@
-
-
ASP.NET Core basic middleware for rewriting URLs. Includes:
* Support for custom URL rewrite rules
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
new file mode 100644
index 0000000000..531ce09c1d
--- /dev/null
+++ b/test/Directory.Build.props
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj b/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj
index 2f816560e1..b1938055cc 100644
--- a/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj
+++ b/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.csproj
@@ -1,7 +1,5 @@
-
-
netcoreapp2.0;net461
netcoreapp2.0
@@ -11,11 +9,4 @@
-
-
-
-
-
-
-
diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/ForwardedHeadersMiddlewareTest.cs b/test/Microsoft.AspNetCore.HttpOverrides.Tests/ForwardedHeadersMiddlewareTest.cs
index a346712a8c..216cc608a1 100644
--- a/test/Microsoft.AspNetCore.HttpOverrides.Tests/ForwardedHeadersMiddlewareTest.cs
+++ b/test/Microsoft.AspNetCore.HttpOverrides.Tests/ForwardedHeadersMiddlewareTest.cs
@@ -483,8 +483,8 @@ namespace Microsoft.AspNetCore.HttpOverrides
var options = new ForwardedHeadersOptions();
Assert.True(options.ForwardedHeaders == ForwardedHeaders.None);
Assert.Equal(1, options.ForwardLimit);
- Assert.Equal(1, options.KnownNetworks.Count());
- Assert.Equal(1, options.KnownProxies.Count());
+ Assert.Single(options.KnownNetworks);
+ Assert.Single(options.KnownProxies);
}
[Fact]
diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj b/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj
index 66d615c52a..213f7edb49 100644
--- a/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj
+++ b/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.csproj
@@ -1,7 +1,5 @@
-
-
netcoreapp2.0;net461
netcoreapp2.0
@@ -12,11 +10,7 @@
-
-
-
-
diff --git a/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj b/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj
index 06e467442b..3c95d83443 100644
--- a/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj
+++ b/test/Microsoft.AspNetCore.ResponseCompression.Tests/Microsoft.AspNetCore.ResponseCompression.Tests.csproj
@@ -1,7 +1,5 @@
-
-
netcoreapp2.0;net461
netcoreapp2.0
@@ -17,12 +15,8 @@
-
-
-
-
diff --git a/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj b/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj
index fcf17701e3..ebefe2dd1e 100644
--- a/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj
+++ b/test/Microsoft.AspNetCore.Rewrite.Tests/Microsoft.AspNetCore.Rewrite.Tests.csproj
@@ -1,7 +1,5 @@
-
-
netcoreapp2.0;net461
netcoreapp2.0
@@ -11,12 +9,4 @@
-
-
-
-
-
-
-
-