From 33d8b10c53c50bb68e824d8e9b943645ca76ec4e Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 16 Apr 2018 17:03:18 -0700 Subject: [PATCH 01/41] Update version number to 2.2.0 --- version.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.props b/version.props index 24f2b00a0a..44985cedb3 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ - 2.1.0 - preview3 + 2.2.0 + preview1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From 6034f7f1bb3df6bf712dd1177d062ed6963852f7 Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Wed, 18 Apr 2018 14:05:46 -0700 Subject: [PATCH 02/41] Use dynamic ports in StaticFileMiddlewareTests (#236) - Replace hardcoded port "12345" with dynamic ports to improve test reliability - Addresses https://github.com/aspnet/Home/issues/3063 - Depends on https://github.com/aspnet/Hosting/pull/1387 --- build/dependencies.props | 2 +- .../StaticFileMiddlewareTests.cs | 27 +++++++++---------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index a5bf83fccd..59932b0a6d 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -9,7 +9,7 @@ 2.1.0-preview3-32233 2.1.0-preview3-32233 2.1.0-preview3-32233 - 0.5.0-preview2-32233 + 0.5.0-a-preview3-build-test-uri-16975 2.1.0-preview3-32233 2.1.0-preview3-32233 2.1.0-preview3-32233 diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs index b2ba4a4f47..470bddff65 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs +++ b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs @@ -13,8 +13,10 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.DependencyInjection; using Xunit; @@ -26,14 +28,13 @@ namespace Microsoft.AspNetCore.StaticFiles [Fact] public async Task ReturnsNotFoundWithoutWwwroot() { - var baseAddress = "http://localhost:12345"; var builder = new WebHostBuilder() .UseKestrel() .Configure(app => app.UseStaticFiles()); - using (var server = builder.Start(baseAddress)) + using (var server = builder.Start(TestUrlHelper.GetTestUrl(ServerType.Kestrel))) { - using (var client = new HttpClient() { BaseAddress = new Uri(baseAddress) }) + using (var client = new HttpClient() { BaseAddress = new Uri(server.GetAddress()) }) { var response = await client.GetAsync("TestDocument.txt"); @@ -45,15 +46,14 @@ namespace Microsoft.AspNetCore.StaticFiles [Fact] public async Task FoundFile_LastModifiedTrimsSeconds() { - var baseAddress = "http://localhost:12345"; var builder = new WebHostBuilder() .UseKestrel() .UseWebRoot(AppContext.BaseDirectory) .Configure(app => app.UseStaticFiles()); - using (var server = builder.Start(baseAddress)) + using (var server = builder.Start(TestUrlHelper.GetTestUrl(ServerType.Kestrel))) { - using (var client = new HttpClient() { BaseAddress = new Uri(baseAddress) }) + using (var client = new HttpClient() { BaseAddress = new Uri(server.GetAddress()) }) { var last = File.GetLastWriteTimeUtc(Path.Combine(AppContext.BaseDirectory, "TestDocument.txt")); var response = await client.GetAsync("TestDocument.txt"); @@ -86,7 +86,6 @@ namespace Microsoft.AspNetCore.StaticFiles private async Task FoundFile_Served(string baseUrl, string baseDir, string requestUrl) { - var baseAddress = "http://localhost:12345"; var builder = new WebHostBuilder() .UseKestrel() .UseWebRoot(Path.Combine(AppContext.BaseDirectory, baseDir)) @@ -95,11 +94,11 @@ namespace Microsoft.AspNetCore.StaticFiles RequestPath = new PathString(baseUrl), })); - using (var server = builder.Start(baseAddress)) + using (var server = builder.Start(TestUrlHelper.GetTestUrl(ServerType.Kestrel))) { var hostingEnvironment = server.Services.GetService(); - using (var client = new HttpClient() { BaseAddress = new Uri(baseAddress) }) + using (var client = new HttpClient() { BaseAddress = new Uri(server.GetAddress()) }) { var fileInfo = hostingEnvironment.WebRootFileProvider.GetFileInfo(Path.GetFileName(requestUrl)); var response = await client.GetAsync(requestUrl); @@ -124,7 +123,6 @@ namespace Microsoft.AspNetCore.StaticFiles [MemberData(nameof(ExistingFiles))] public async Task HeadFile_HeadersButNotBodyServed(string baseUrl, string baseDir, string requestUrl) { - var baseAddress = "http://localhost:12345"; var builder = new WebHostBuilder() .UseKestrel() .UseWebRoot(Path.Combine(AppContext.BaseDirectory, baseDir)) @@ -133,11 +131,11 @@ namespace Microsoft.AspNetCore.StaticFiles RequestPath = new PathString(baseUrl), })); - using (var server = builder.Start(baseAddress)) + using (var server = builder.Start(TestUrlHelper.GetTestUrl(ServerType.Kestrel))) { var hostingEnvironment = server.Services.GetService(); - using (var client = new HttpClient() { BaseAddress = new Uri(baseAddress) }) + using (var client = new HttpClient() { BaseAddress = new Uri(server.GetAddress()) }) { var fileInfo = hostingEnvironment.WebRootFileProvider.GetFileInfo(Path.GetFileName(requestUrl)); var request = new HttpRequestMessage(HttpMethod.Head, requestUrl); @@ -178,7 +176,6 @@ namespace Microsoft.AspNetCore.StaticFiles private void ClientDisconnect_NoWriteExceptionThrown(ServerType serverType) { var interval = TimeSpan.FromSeconds(15); - var baseAddress = "http://localhost:12345"; var requestReceived = new ManualResetEvent(false); var requestCacelled = new ManualResetEvent(false); var responseComplete = new ManualResetEvent(false); @@ -214,10 +211,10 @@ namespace Microsoft.AspNetCore.StaticFiles builder.UseKestrel(); } - using (var server = builder.Start(baseAddress)) + using (var server = builder.Start(TestUrlHelper.GetTestUrl(serverType))) { // We don't use HttpClient here because it's disconnect behavior varies across platforms. - var socket = SendSocketRequestAsync(baseAddress, "/TestDocument1MB.txt"); + var socket = SendSocketRequestAsync(server.GetAddress(), "/TestDocument1MB.txt"); Assert.True(requestReceived.WaitOne(interval), "not received"); socket.LingerState = new LingerOption(true, 0); From e1d1559367f72ec25ddaedcaf6f297995c14e046 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 20 Apr 2018 16:38:59 -0700 Subject: [PATCH 03/41] Fix bad merge from release/2.1 --- build/dependencies.props | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 357b8698ba..7dd2902034 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,25 +1,25 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-rc1-15774 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 0.5.0-preview2-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 + 2.1.0-preview3-17018 + 2.1.0-preview3-32233 + 2.1.0-preview3-32233 + 2.1.0-preview3-32233 + 2.1.0-preview3-32233 + 2.1.0-preview3-32233 + 0.5.0-a-preview3-build-test-uri-16975 + 2.1.0-preview3-32233 + 2.1.0-preview3-32233 + 2.1.0-preview3-32233 + 2.1.0-preview3-32233 + 2.1.0-preview3-32233 + 2.1.0-preview3-32233 + 2.1.0-preview3-32233 + 2.1.0-preview3-32233 2.0.0 - 2.1.0-rc1-26419-02 + 2.1.0-preview3-26413-05 15.6.1 4.7.49 2.0.1 From 9b8a7424a62ee388e645f3fac82ac5ae76fb4753 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 23 Apr 2018 12:28:18 -0700 Subject: [PATCH 04/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 30 +++++++++++++++--------------- korebuild-lock.txt | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 7dd2902034..e3f4fa8fb8 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,21 +3,21 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-preview3-17018 - 2.1.0-preview3-32233 - 2.1.0-preview3-32233 - 2.1.0-preview3-32233 - 2.1.0-preview3-32233 - 2.1.0-preview3-32233 - 0.5.0-a-preview3-build-test-uri-16975 - 2.1.0-preview3-32233 - 2.1.0-preview3-32233 - 2.1.0-preview3-32233 - 2.1.0-preview3-32233 - 2.1.0-preview3-32233 - 2.1.0-preview3-32233 - 2.1.0-preview3-32233 - 2.1.0-preview3-32233 + 2.2.0-preview1-17037 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 0.5.0-preview3-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 2.0.0 2.1.0-preview3-26413-05 15.6.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index b419d767b9..f27a67b442 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview3-17018 -commithash:af264ca131f212b5ba8aafbc5110fc0fc510a2be +version:2.2.0-preview1-17037 +commithash:557055a86cbdc359c97d4fb1c2d23a3dc7ae731e From 100a9433e8cef7480af52a4c8dbc2ef57bf50bb2 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 29 Apr 2018 12:34:22 -0700 Subject: [PATCH 05/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 34 +++++++++++++++++----------------- korebuild-lock.txt | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index e3f4fa8fb8..7d413b8e75 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17037 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 0.5.0-preview3-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 + 2.2.0-preview1-17042 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 0.5.0-preview3-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 2.0.0 - 2.1.0-preview3-26413-05 + 2.2.0-preview1-26424-04 15.6.1 4.7.49 - 2.0.1 + 2.0.3 0.8.0 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index f27a67b442..335e579e06 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17037 -commithash:557055a86cbdc359c97d4fb1c2d23a3dc7ae731e +version:2.2.0-preview1-17042 +commithash:edf0705d014293c260de763543784330514db9a3 From afdb39309506711a60aaf6ac1a3216cf73989b4c Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 6 May 2018 12:33:43 -0700 Subject: [PATCH 06/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 30 +++++++++++++++--------------- korebuild-lock.txt | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 7d413b8e75..faee85f0b9 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,21 +3,21 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17042 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 0.5.0-preview3-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 + 2.2.0-preview1-17047 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 0.6.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 2.0.0 2.2.0-preview1-26424-04 15.6.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 335e579e06..a16d4b9ee4 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17042 -commithash:edf0705d014293c260de763543784330514db9a3 +version:2.2.0-preview1-17047 +commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c From 51c7965e9e1e88f555f35a9acdbd1982b62b44ee Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 7 May 2018 15:16:15 -0700 Subject: [PATCH 07/41] Upgrade to netcoreapp22 --- Directory.Build.targets | 5 ++++- build/dependencies.props | 33 +++++++++++++++++---------------- build/repo.props | 3 ++- korebuild-lock.txt | 4 ++-- test/Directory.Build.props | 6 +++--- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 53b3f6e1da..78626b773e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,7 +1,10 @@ - + $(MicrosoftNETCoreApp20PackageVersion) $(MicrosoftNETCoreApp21PackageVersion) + $(MicrosoftNETCoreApp22PackageVersion) $(NETStandardLibrary20PackageVersion) + + 99.9 diff --git a/build/dependencies.props b/build/dependencies.props index faee85f0b9..d650bd6ba5 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,25 +1,26 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17047 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 0.6.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 + 2.2.0-preview1-17048 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 0.6.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 2.0.0 2.2.0-preview1-26424-04 + 2.2.0-preview1-26502-01 15.6.1 4.7.49 2.0.3 diff --git a/build/repo.props b/build/repo.props index 78b0ce5879..17a98ac7e7 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,4 +1,4 @@ - + @@ -10,5 +10,6 @@ + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a16d4b9ee4..2573a03995 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17047 -commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c +version:2.2.0-preview1-17048 +commithash:de14a0ee5fb48508ee8a29c14280a2928f8dabf8 diff --git a/test/Directory.Build.props b/test/Directory.Build.props index c6e5ecaf30..eb9c44a2b9 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,10 +1,10 @@ - + - netcoreapp2.1 + netcoreapp2.2 $(DeveloperBuildTestTfms) - netcoreapp2.1;netcoreapp2.0 + $(StandardTestTfms);net461 From cc675047ac81dd8a50e8a77620b4c5ff5a794b8b Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 13 May 2018 14:25:51 -0700 Subject: [PATCH 08/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 36 ++++++++++++++++++------------------ korebuild-lock.txt | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index d650bd6ba5..4de7a65322 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,26 +1,26 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17048 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 0.6.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 + 2.2.0-preview1-17051 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 0.6.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 2.0.0 - 2.2.0-preview1-26424-04 - 2.2.0-preview1-26502-01 + 2.1.0-rc1 + 2.2.0-preview1-26509-06 15.6.1 4.7.49 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 2573a03995..89629b454c 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17048 -commithash:de14a0ee5fb48508ee8a29c14280a2928f8dabf8 +version:2.2.0-preview1-17051 +commithash:253c3a480063bc3abaa5cde42f6e27b58457ef9b From 08b20bc4f283ea8c4b3a33eb44696c1b34758120 Mon Sep 17 00:00:00 2001 From: "Chris Ross (ASP.NET)" Date: Mon, 14 May 2018 05:24:04 -0700 Subject: [PATCH 09/41] React to IntegrationTesting changes --- StaticFiles.sln | 17 +++++++++++++++++ build/dependencies.props | 2 +- .../StaticFileMiddlewareTests.cs | 4 ++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/StaticFiles.sln b/StaticFiles.sln index 0e5ab3b48f..d35843bf61 100644 --- a/StaticFiles.sln +++ b/StaticFiles.sln @@ -31,6 +31,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.AspNetCore.RangeH shared\Microsoft.AspNetCore.RangeHelper.Sources\RangeHelper.cs = shared\Microsoft.AspNetCore.RangeHelper.Sources\RangeHelper.cs EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DE015849-E126-4DFA-A754-E1AC3B1E7925}" + ProjectSection(SolutionItems) = preProject + .appveyor.yml = .appveyor.yml + .travis.yml = .travis.yml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D3F67455-9FB9-4354-93EC-B05D755114E9}" + ProjectSection(SolutionItems) = preProject + build\dependencies.props = build\dependencies.props + build\repo.props = build\repo.props + build\sources.props = build\sources.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -106,5 +119,9 @@ Global {FDF0539C-1F62-4B78-91B1-C687886931CA} = {EF02AFE8-7C15-4DDB-8B2C-58A676112A98} {D3D752C4-4CDF-4F18-AC7F-48CB980A69DA} = {EF02AFE8-7C15-4DDB-8B2C-58A676112A98} {DB6A1D14-B8A2-488F-9C4B-422FD45C8853} = {360DC2F8-EEB4-4C69-9784-C686EAD78279} + {D3F67455-9FB9-4354-93EC-B05D755114E9} = {DE015849-E126-4DFA-A754-E1AC3B1E7925} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {AF7F03BE-0DB2-48EF-8185-7698995658A6} EndGlobalSection EndGlobal diff --git a/build/dependencies.props b/build/dependencies.props index 4de7a65322..d65c99da7c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -9,7 +9,7 @@ 2.2.0-preview1-34184 2.2.0-preview1-34184 2.2.0-preview1-34184 - 0.6.0-preview1-34184 + 0.6.0-a-preview1-inttesting-17017 2.2.0-preview1-34184 2.2.0-preview1-34184 2.2.0-preview1-34184 diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs index 470bddff65..f181644069 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs +++ b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs @@ -170,7 +170,7 @@ namespace Microsoft.AspNetCore.StaticFiles [OSSkipCondition(OperatingSystems.MacOSX)] public void ClientDisconnect_WebListener_NoWriteExceptionThrown() { - ClientDisconnect_NoWriteExceptionThrown(ServerType.WebListener); + ClientDisconnect_NoWriteExceptionThrown(ServerType.HttpSys); } private void ClientDisconnect_NoWriteExceptionThrown(ServerType serverType) @@ -202,7 +202,7 @@ namespace Microsoft.AspNetCore.StaticFiles app.UseStaticFiles(); }); - if (serverType == ServerType.WebListener) + if (serverType == ServerType.HttpSys) { builder.UseHttpSys(); } From eade859ed880a67030f78e2549cc78dbb85c52d7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 20 May 2018 19:49:19 +0000 Subject: [PATCH 10/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 30 +++++++++++++++--------------- korebuild-lock.txt | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index d65c99da7c..d3d5477517 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,21 +3,21 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17051 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 0.6.0-a-preview1-inttesting-17017 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 + 2.2.0-preview1-17060 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 0.6.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 2.0.0 2.1.0-rc1 2.2.0-preview1-26509-06 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 89629b454c..cf2fff7def 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17051 -commithash:253c3a480063bc3abaa5cde42f6e27b58457ef9b +version:2.2.0-preview1-17060 +commithash:25b4b134d6f8f7b461928f0d495cfc695ccabb5b From 846874030f1b085dd76c53939687af8afeda0b6f Mon Sep 17 00:00:00 2001 From: "Nate McMaster (automated)" Date: Fri, 25 May 2018 16:17:34 -0700 Subject: [PATCH 11/41] Update bootstrapper scripts (automated commit) [ci skip] --- run.ps1 | 25 +++++++++++++++++++------ run.sh | 33 +++++++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/run.ps1 b/run.ps1 index 27dcf848f8..3b27382468 100644 --- a/run.ps1 +++ b/run.ps1 @@ -26,12 +26,18 @@ The base url where build tools can be downloaded. Overrides the value from the c .PARAMETER Update Updates KoreBuild to the latest version even if a lock file is present. +.PARAMETER Reinstall +Re-installs KoreBuild + .PARAMETER ConfigFile The path to the configuration file that stores values. Defaults to korebuild.json. .PARAMETER ToolsSourceSuffix The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores. +.PARAMETER CI +Sets up CI specific settings and variables. + .PARAMETER Arguments Arguments to be passed to the command @@ -65,8 +71,10 @@ param( [string]$ToolsSource, [Alias('u')] [switch]$Update, - [string]$ConfigFile, + [switch]$Reinstall, [string]$ToolsSourceSuffix, + [string]$ConfigFile = $null, + [switch]$CI, [Parameter(ValueFromRemainingArguments = $true)] [string[]]$Arguments ) @@ -93,6 +101,10 @@ function Get-KoreBuild { $version = $version.TrimStart('version:').Trim() $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version) + if ($Reinstall -and (Test-Path $korebuildPath)) { + Remove-Item -Force -Recurse $korebuildPath + } + if (!(Test-Path $korebuildPath)) { Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version" New-Item -ItemType Directory -Path $korebuildPath | Out-Null @@ -101,9 +113,9 @@ function Get-KoreBuild { try { $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip" Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix - if (Get-Command -Name 'Expand-Archive' -ErrorAction Ignore) { + if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { # Use built-in commands where possible as they are cross-plat compatible - Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath + Microsoft.PowerShell.Archive\Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath } else { # Fallback to old approach for old installations of PowerShell @@ -167,8 +179,9 @@ if (Test-Path $ConfigFile) { } } catch { - Write-Warning "$ConfigFile could not be read. Its settings will be ignored." - Write-Warning $Error[0] + Write-Host -ForegroundColor Red $Error[0] + Write-Error "$ConfigFile contains invalid JSON." + exit 1 } } @@ -188,7 +201,7 @@ $korebuildPath = Get-KoreBuild Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') try { - Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile + Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI Invoke-KoreBuildCommand $Command @Arguments } finally { diff --git a/run.sh b/run.sh index 834961fc3a..02aac15874 100755 --- a/run.sh +++ b/run.sh @@ -14,10 +14,12 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" [ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" verbose=false update=false +reinstall=false repo_path="$DIR" channel='' tools_source='' tools_source_suffix='' +ci=false # # Functions @@ -38,6 +40,8 @@ __usage() { echo " -s|--tools-source|-ToolsSource The base url where build tools can be downloaded. Overrides the value from the config file." echo " --tools-source-suffix|-ToolsSourceSuffix The suffix to append to tools-source. Useful for query strings." echo " -u|--update Update to the latest KoreBuild even if the lock file is present." + echo " --reinstall Reinstall KoreBuild." + echo " --ci Apply CI specific settings and environment variables." echo "" echo "Description:" echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be." @@ -62,6 +66,10 @@ get_korebuild() { version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" + if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then + rm -rf "$korebuild_path" + fi + { if [ ! -d "$korebuild_path" ]; then mkdir -p "$korebuild_path" @@ -175,6 +183,12 @@ while [[ $# -gt 0 ]]; do -u|--update|-Update) update=true ;; + --reinstall|-[Rr]einstall) + reinstall=true + ;; + --ci|-[Cc][Ii]) + ci=true + ;; --verbose|-Verbose) verbose=true ;; @@ -206,17 +220,28 @@ if [ -f "$config_file" ]; then config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" else - __warn "$config_file is invalid JSON. Its settings will be ignored." + _error "$config_file contains invalid JSON." + exit 1 fi elif __machine_has python ; then if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" else - __warn "$config_file is invalid JSON. Its settings will be ignored." + _error "$config_file contains invalid JSON." + exit 1 + fi + elif __machine_has python3 ; then + if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then + config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" + config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" + else + _error "$config_file contains invalid JSON." + exit 1 fi else - __warn 'Missing required command: jq or pyton. Could not parse the JSON file. Its settings will be ignored.' + _error 'Missing required command: jq or python. Could not parse the JSON file.' + exit 1 fi [ ! -z "${config_channel:-}" ] && channel="$config_channel" @@ -227,5 +252,5 @@ fi [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' get_korebuild -set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" +set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci" invoke_korebuild_command "$command" "$@" From a0e090612c83180c23be5bc38081f3c8f253cbef Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 27 May 2018 19:32:15 +0000 Subject: [PATCH 12/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index d3d5477517..744faa9a5c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,24 +3,24 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17060 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 0.6.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 + 2.2.0-preview1-17064 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 0.6.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 2.0.0 2.1.0-rc1 - 2.2.0-preview1-26509-06 + 2.2.0-preview1-26526-03 15.6.1 4.7.49 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index cf2fff7def..3028b66761 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17060 -commithash:25b4b134d6f8f7b461928f0d495cfc695ccabb5b +version:2.2.0-preview1-17064 +commithash:5380a2461b135b261646f31d1c919ab0a7b577a8 From 2972814b22f8c724eed6cf33cc32852db8804385 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 3 Jun 2018 19:31:34 +0000 Subject: [PATCH 13/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 34 +++++++++++++++++----------------- korebuild-lock.txt | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 744faa9a5c..5515738f9c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,24 +3,24 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17064 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 0.6.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 + 2.2.0-preview1-17067 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 0.6.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 2.0.0 - 2.1.0-rc1 - 2.2.0-preview1-26526-03 + 2.1.0 + 2.2.0-preview1-26531-03 15.6.1 4.7.49 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3028b66761..06ba6285b7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17064 -commithash:5380a2461b135b261646f31d1c919ab0a7b577a8 +version:2.2.0-preview1-17067 +commithash:2af0e2e3d02329b4f0290061ab9bd8c7ca1aa26f From 1023468d0ae50cdba00e500bf89a39e24b8166e9 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 5 Jun 2018 22:35:38 -0700 Subject: [PATCH 14/41] Add certificate names for code signing --- Directory.Build.props | 2 ++ korebuild-lock.txt | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 2c2d9cc9d0..6b77a0ded0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,6 +14,8 @@ $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory)build\Key.snk true + Microsoft + MicrosoftNuGet true true diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 06ba6285b7..b679b80427 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17067 -commithash:2af0e2e3d02329b4f0290061ab9bd8c7ca1aa26f +version:2.2.0-preview1-17075 +commithash:d9f07c7f313a0af1d49f003f5424b4dbbdd3e09f From 15b5e62d5a4bee57277eb19be27c24b4c451c794 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 7 Jun 2018 19:50:56 +0000 Subject: [PATCH 15/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 5515738f9c..a02645e9b1 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,24 +3,24 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17067 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 0.6.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 + 2.2.0-preview1-17081 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 0.6.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 2.0.0 2.1.0 - 2.2.0-preview1-26531-03 + 2.2.0-preview1-26606-01 15.6.1 4.7.49 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index b679b80427..deb7e546f0 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17075 -commithash:d9f07c7f313a0af1d49f003f5424b4dbbdd3e09f +version:2.2.0-preview1-17081 +commithash:73f09c256e2a54270951562ecc0ef4a953926c36 From 98949d98b1fbbda70c0d5414865d1d755c2aebbb Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 7 Jun 2018 15:48:33 -0700 Subject: [PATCH 16/41] Adding VSTS file --- .vsts-pipelines/builds/ci-internal.yml | 13 +++++++++++++ .vsts-pipelines/builds/ci-public.yml | 15 +++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 .vsts-pipelines/builds/ci-internal.yml create mode 100644 .vsts-pipelines/builds/ci-public.yml diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml new file mode 100644 index 0000000000..d7ceb76378 --- /dev/null +++ b/.vsts-pipelines/builds/ci-internal.yml @@ -0,0 +1,13 @@ +trigger: +- dev +- release/* + +resources: + repositories: + - repository: buildtools + type: git + name: aspnet-BuildTools + ref: refs/heads/dev + +phases: +- template: .vsts-pipelines/templates/project-ci.yml@buildtools diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml new file mode 100644 index 0000000000..b7f25723f8 --- /dev/null +++ b/.vsts-pipelines/builds/ci-public.yml @@ -0,0 +1,15 @@ +trigger: +- dev +- release/* + +# See https://github.com/aspnet/BuildTools +resources: + repositories: + - repository: buildtools + type: github + endpoint: DotNet-Bot GitHub Connection + name: aspnet/BuildTools + ref: refs/heads/dev + +phases: +- template: .vsts-pipelines/templates/project-ci.yml@buildtools From bbf1f6220479e8d83692ad168f0957a51e58857c Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 13 Jun 2018 11:00:13 -0700 Subject: [PATCH 17/41] Set 2.1 baselines --- src/Microsoft.AspNetCore.StaticFiles/baseline.netcore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.StaticFiles/baseline.netcore.json b/src/Microsoft.AspNetCore.StaticFiles/baseline.netcore.json index fe3705b38b..489e7f3a81 100644 --- a/src/Microsoft.AspNetCore.StaticFiles/baseline.netcore.json +++ b/src/Microsoft.AspNetCore.StaticFiles/baseline.netcore.json @@ -1,5 +1,5 @@ { - "AssemblyIdentity": "Microsoft.AspNetCore.StaticFiles, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", + "AssemblyIdentity": "Microsoft.AspNetCore.StaticFiles, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "Types": [ { "Name": "Microsoft.Extensions.DependencyInjection.DirectoryBrowserServiceExtensions", From cfbf87ccb772ce8cdea292a585ee30bdad1a3101 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 25 Jun 2018 11:32:27 -0700 Subject: [PATCH 18/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index a02645e9b1..77306d2178 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,24 +3,24 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17081 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 0.6.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 + 2.2.0-preview1-17090 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 0.6.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 2.0.0 2.1.0 - 2.2.0-preview1-26606-01 + 2.2.0-preview1-26618-02 15.6.1 4.7.49 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index deb7e546f0..a8109db529 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17081 -commithash:73f09c256e2a54270951562ecc0ef4a953926c36 +version:2.2.0-preview1-17090 +commithash:b19e903e946579cd9482089bce7d917e8bacd765 From 91f4696ae62d6e1cfd284468d228d9adaa924301 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 28 Jun 2018 16:22:07 -0700 Subject: [PATCH 19/41] Update infrastructure for the 2.2 release --- .vsts-pipelines/builds/ci-internal.yml | 4 ++-- .vsts-pipelines/builds/ci-public.yml | 6 +++--- build/repo.props | 1 + korebuild.json | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml index d7ceb76378..dc7b8a3cb9 100644 --- a/.vsts-pipelines/builds/ci-internal.yml +++ b/.vsts-pipelines/builds/ci-internal.yml @@ -1,5 +1,5 @@ trigger: -- dev +- master - release/* resources: @@ -7,7 +7,7 @@ resources: - repository: buildtools type: git name: aspnet-BuildTools - ref: refs/heads/dev + ref: refs/heads/release/2.2 phases: - template: .vsts-pipelines/templates/project-ci.yml@buildtools diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml index b7f25723f8..f5087d9c30 100644 --- a/.vsts-pipelines/builds/ci-public.yml +++ b/.vsts-pipelines/builds/ci-public.yml @@ -1,5 +1,5 @@ trigger: -- dev +- master - release/* # See https://github.com/aspnet/BuildTools @@ -9,7 +9,7 @@ resources: type: github endpoint: DotNet-Bot GitHub Connection name: aspnet/BuildTools - ref: refs/heads/dev - + ref: refs/heads/release/2.2 + phases: - template: .vsts-pipelines/templates/project-ci.yml@buildtools diff --git a/build/repo.props b/build/repo.props index 17a98ac7e7..f1fe24dd27 100644 --- a/build/repo.props +++ b/build/repo.props @@ -4,6 +4,7 @@ Internal.AspNetCore.Universe.Lineup + 2.2.0-* https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json diff --git a/korebuild.json b/korebuild.json index bd5d51a51b..d217d06e3e 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,4 +1,4 @@ { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev" + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json", + "channel": "release/2.2" } From 2df2d2865ffc692f8f946933d1b71d3bb39561b7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 8 Jul 2018 12:31:37 -0700 Subject: [PATCH 20/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 36 ++++++++++++++++++------------------ korebuild-lock.txt | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 77306d2178..98b95d35fc 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,30 +3,30 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17090 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 0.6.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.0.0 - 2.1.0 + 2.2.0-preview1-17099 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 0.6.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.0.7 + 2.1.1 2.2.0-preview1-26618-02 15.6.1 4.7.49 2.0.3 0.8.0 2.3.1 - 2.4.0-beta.1.build3945 + 2.4.0-rc.1.build4038 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a8109db529..27e2e80f9a 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17090 -commithash:b19e903e946579cd9482089bce7d917e8bacd765 +version:2.2.0-preview1-17099 +commithash:263ed1db9866b6b419b1f5d5189a712aa218acb3 From 483c888afb388dc421d8bccddb904894b818e714 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 15 Jul 2018 12:30:50 -0700 Subject: [PATCH 21/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 98b95d35fc..2a620b2acf 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,27 +4,27 @@ 2.2.0-preview1-17099 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 0.6.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.0.7 - 2.1.1 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 0.6.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.0.9 + 2.1.2 2.2.0-preview1-26618-02 15.6.1 4.7.49 2.0.3 - 0.8.0 + 0.9.0 2.3.1 2.4.0-rc.1.build4038 From 5c5795786b674351d59bcc29507d8c8e217f03f2 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 22 Jul 2018 12:30:19 -0700 Subject: [PATCH 22/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 2a620b2acf..e59c9d9500 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,20 +4,20 @@ 2.2.0-preview1-17099 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 0.6.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 0.6.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 2.0.9 2.1.2 2.2.0-preview1-26618-02 From 4dba708d74e7a445ee3818cf1023010699ebfdac Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 29 Jul 2018 12:29:05 -0700 Subject: [PATCH 23/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 35 ++++++++++++++++++----------------- korebuild-lock.txt | 4 ++-- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index e59c9d9500..345c8ba70e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,30 +3,31 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17099 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 0.6.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 + 2.2.0-preview1-17102 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 0.6.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 2.0.9 2.1.2 2.2.0-preview1-26618-02 15.6.1 4.7.49 2.0.3 - 0.9.0 + 0.10.0 2.3.1 - 2.4.0-rc.1.build4038 + 2.4.0 + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 27e2e80f9a..6b8da29e6b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17099 -commithash:263ed1db9866b6b419b1f5d5189a712aa218acb3 +version:2.2.0-preview1-17102 +commithash:e7e2b5a97ca92cfc6acc4def534cb0901a6d1eb9 From 24a8b0bad6d35f65e44555885c7c9e741d7f3240 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 5 Aug 2018 19:30:40 +0000 Subject: [PATCH 24/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 30 +++++++++++++++--------------- korebuild-lock.txt | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 345c8ba70e..70a38e8635 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,21 +3,21 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17102 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 0.6.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 + 2.2.0-preview1-20180731.1 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 0.6.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 2.0.9 2.1.2 2.2.0-preview1-26618-02 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 6b8da29e6b..c7af2292c7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17102 -commithash:e7e2b5a97ca92cfc6acc4def534cb0901a6d1eb9 +version:2.2.0-preview1-20180731.1 +commithash:29fde58465439f4bb9df40830635ed758e063daf From 06342cf54c2664145f18c4b55aff3c2770879a16 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 6 Aug 2018 20:54:01 +0000 Subject: [PATCH 25/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 70a38e8635..5b9caa8153 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,20 +4,20 @@ 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 0.6.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 0.6.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 2.0.9 2.1.2 2.2.0-preview1-26618-02 From ee6c420c5c98f35592b91b6ef0587e461f0ab793 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 12 Aug 2018 19:33:09 +0000 Subject: [PATCH 26/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 30 +++++++++++++++--------------- korebuild-lock.txt | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 5b9caa8153..295d57f761 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,21 +3,21 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 0.6.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-20180807.2 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 0.6.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 2.0.9 2.1.2 2.2.0-preview1-26618-02 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index c7af2292c7..3fbcc80189 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180731.1 -commithash:29fde58465439f4bb9df40830635ed758e063daf +version:2.2.0-preview1-20180807.2 +commithash:11495dbd236104434e08cb1152fcb58cf2a20923 From 48e29a007831c5f39da90d7f8f3ed2219f450417 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 21 Aug 2018 13:33:52 -0700 Subject: [PATCH 27/41] Update package branding for 2.2.0-preview2 --- build/dependencies.props | 2 +- version.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 295d57f761..fb368545ed 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -28,6 +28,6 @@ 2.3.1 2.4.0 - + diff --git a/version.props b/version.props index 44985cedb3..15637ba785 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ 2.2.0 - preview1 + preview2 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From 089ec7711cb6f3c875f527b3e4ac5954a580deb8 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 2 Sep 2018 12:29:36 -0700 Subject: [PATCH 28/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 30 +++++++++++++++--------------- korebuild-lock.txt | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index fb368545ed..481f4651d2 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,21 +3,21 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180807.2 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 0.6.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 + 2.2.0-preview1-20180821.1 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 0.6.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 2.0.9 2.1.2 2.2.0-preview1-26618-02 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3fbcc80189..ad704918df 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180807.2 -commithash:11495dbd236104434e08cb1152fcb58cf2a20923 +version:2.2.0-preview1-20180821.1 +commithash:c8d0cc52cd1abb697be24e288ffd54f8fae8bf17 From 11cd669ce43dfedcb549431bfd22a60d7e0e2e8e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 5 Sep 2018 16:36:32 -0700 Subject: [PATCH 29/41] Update branding to 2.2.0-preview3 --- version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.props b/version.props index 15637ba785..704cac087b 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ 2.2.0 - preview2 + preview3 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From 9e89f798c633c7a98bbd70ee4838e9d9579e8a3b Mon Sep 17 00:00:00 2001 From: John Luo Date: Fri, 7 Sep 2018 14:22:39 -0700 Subject: [PATCH 30/41] Add logging to functional tests --- .../StaticFileMiddlewareTests.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs index f181644069..d1776fd1a4 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs +++ b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs @@ -13,22 +13,23 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.Common; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging.Testing; using Xunit; namespace Microsoft.AspNetCore.StaticFiles { - public class StaticFileMiddlewareTests + public class StaticFileMiddlewareTests : LoggedTest { [Fact] public async Task ReturnsNotFoundWithoutWwwroot() { var builder = new WebHostBuilder() + .ConfigureServices(services => services.AddSingleton(LoggerFactory)) .UseKestrel() .Configure(app => app.UseStaticFiles()); @@ -47,6 +48,7 @@ namespace Microsoft.AspNetCore.StaticFiles public async Task FoundFile_LastModifiedTrimsSeconds() { var builder = new WebHostBuilder() + .ConfigureServices(services => services.AddSingleton(LoggerFactory)) .UseKestrel() .UseWebRoot(AppContext.BaseDirectory) .Configure(app => app.UseStaticFiles()); @@ -87,6 +89,7 @@ namespace Microsoft.AspNetCore.StaticFiles private async Task FoundFile_Served(string baseUrl, string baseDir, string requestUrl) { var builder = new WebHostBuilder() + .ConfigureServices(services => services.AddSingleton(LoggerFactory)) .UseKestrel() .UseWebRoot(Path.Combine(AppContext.BaseDirectory, baseDir)) .Configure(app => app.UseStaticFiles(new StaticFileOptions() @@ -124,6 +127,7 @@ namespace Microsoft.AspNetCore.StaticFiles public async Task HeadFile_HeadersButNotBodyServed(string baseUrl, string baseDir, string requestUrl) { var builder = new WebHostBuilder() + .ConfigureServices(services => services.AddSingleton(LoggerFactory)) .UseKestrel() .UseWebRoot(Path.Combine(AppContext.BaseDirectory, baseDir)) .Configure(app => app.UseStaticFiles(new StaticFileOptions() @@ -181,6 +185,7 @@ namespace Microsoft.AspNetCore.StaticFiles var responseComplete = new ManualResetEvent(false); Exception exception = null; var builder = new WebHostBuilder() + .ConfigureServices(services => services.AddSingleton(LoggerFactory)) .UseWebRoot(Path.Combine(AppContext.BaseDirectory)) .Configure(app => { From e4614bcddaae8b6578b0148aa1f607bdac5c920e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 9 Sep 2018 12:32:19 -0700 Subject: [PATCH 31/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 34 +++++++++++++++++----------------- korebuild-lock.txt | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 481f4651d2..8fdce0e84f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,24 +3,24 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180821.1 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 0.6.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 + 2.2.0-preview1-20180907.8 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 0.6.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 2.0.9 - 2.1.2 - 2.2.0-preview1-26618-02 + 2.1.3 + 2.2.0-preview2-26905-02 15.6.1 4.7.49 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index ad704918df..312f82f9a5 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180821.1 -commithash:c8d0cc52cd1abb697be24e288ffd54f8fae8bf17 +version:2.2.0-preview1-20180907.8 +commithash:078918eb5c1f176ee1da351c584fb4a4d7491aa0 From 7da4635215f0b059d67b04c94ba2b0a8be351e63 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 16 Sep 2018 12:30:48 -0700 Subject: [PATCH 32/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 30 +++++++++++++++--------------- korebuild-lock.txt | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 8fdce0e84f..22df40b5d8 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,21 +3,21 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180907.8 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 0.6.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 + 2.2.0-preview1-20180911.1 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 0.6.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 2.0.9 2.1.3 2.2.0-preview2-26905-02 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 312f82f9a5..7124f37441 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180907.8 -commithash:078918eb5c1f176ee1da351c584fb4a4d7491aa0 +version:2.2.0-preview1-20180911.1 +commithash:ddfecdfc6e8e4859db5a0daea578070b862aac65 From 47e093bb24dd019b9f9a6b6e5794984157396167 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 23 Sep 2018 19:34:16 +0000 Subject: [PATCH 33/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 30 +++++++++++++++--------------- korebuild-lock.txt | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 22df40b5d8..fb9abf0846 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,21 +3,21 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180911.1 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 0.6.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 + 2.2.0-preview1-20180918.1 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 0.6.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 2.0.9 2.1.3 2.2.0-preview2-26905-02 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 7124f37441..649bf2ba0b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180911.1 -commithash:ddfecdfc6e8e4859db5a0daea578070b862aac65 +version:2.2.0-preview1-20180918.1 +commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 From 8dcc01132461361b3689a8a6aaa82409cc98f3bc Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Fri, 28 Sep 2018 13:24:42 +1000 Subject: [PATCH 34/41] spelling, inline outs, redundant braces (#252) --- .../DefaultFilesMiddleware.cs | 3 +-- .../DefaultFilesOptions.cs | 2 +- .../DirectoryBrowserMiddleware.cs | 6 ++--- .../StaticFileContext.cs | 5 ++--- .../StaticFileMiddlewareTests.cs | 22 +++++++++---------- .../CacheHeaderTests.cs | 8 +++---- .../DefaultContentTypeProviderTests.cs | 14 +++++------- .../DefaultFilesMiddlewareTests.cs | 4 ++-- .../StaticFileContextTest.cs | 3 +-- .../StaticFileMiddlewareTests.cs | 4 ++-- 10 files changed, 31 insertions(+), 40 deletions(-) diff --git a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs index a401759b3d..e879bcf886 100644 --- a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs +++ b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs @@ -62,9 +62,8 @@ namespace Microsoft.AspNetCore.StaticFiles /// public Task Invoke(HttpContext context) { - PathString subpath; if (Helpers.IsGetOrHeadMethod(context.Request.Method) - && Helpers.TryMatchPath(context, _matchUrl, forDirectory: true, subpath: out subpath)) + && Helpers.TryMatchPath(context, _matchUrl, forDirectory: true, subpath: out var subpath)) { var dirContents = _fileProvider.GetDirectoryContents(subpath.Value); if (dirContents.Exists) diff --git a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs index 72b577dfcc..646774315d 100644 --- a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs +++ b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Builder : base(sharedOptions) { // Prioritized list - DefaultFileNames = new List() + DefaultFileNames = new List { "default.htm", "default.html", diff --git a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs index 71765d0459..0ac1258c83 100644 --- a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs +++ b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs @@ -79,11 +79,9 @@ namespace Microsoft.AspNetCore.StaticFiles public Task Invoke(HttpContext context) { // Check if the URL matches any expected paths - PathString subpath; - IDirectoryContents contents; if (Helpers.IsGetOrHeadMethod(context.Request.Method) - && Helpers.TryMatchPath(context, _matchUrl, forDirectory: true, subpath: out subpath) - && TryGetDirectoryInfo(subpath, out contents)) + && Helpers.TryMatchPath(context, _matchUrl, forDirectory: true, subpath: out var subpath) + && TryGetDirectoryInfo(subpath, out var contents)) { // If the path matches a directory but does not end in a slash, redirect to add the slash. // This prevents relative links from breaking. diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs index f5024dcb23..501be2d71c 100644 --- a/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs +++ b/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs @@ -282,7 +282,7 @@ namespace Microsoft.AspNetCore.StaticFiles // it is not returned for 304, 412, and 416 _response.ContentLength = _length; } - _options.OnPrepareResponse(new StaticFileResponseContext() + _options.OnPrepareResponse(new StaticFileResponseContext { Context = _context, File = _fileInfo, @@ -360,8 +360,7 @@ namespace Microsoft.AspNetCore.StaticFiles return; } - long start, length; - _responseHeaders.ContentRange = ComputeContentRange(_range, out start, out length); + _responseHeaders.ContentRange = ComputeContentRange(_range, out var start, out var length); _response.ContentLength = length; ApplyResponseHeaders(Constants.Status206PartialContent); diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs index d1776fd1a4..268accc699 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs +++ b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.StaticFiles using (var server = builder.Start(TestUrlHelper.GetTestUrl(ServerType.Kestrel))) { - using (var client = new HttpClient() { BaseAddress = new Uri(server.GetAddress()) }) + using (var client = new HttpClient { BaseAddress = new Uri(server.GetAddress()) }) { var response = await client.GetAsync("TestDocument.txt"); @@ -55,14 +55,14 @@ namespace Microsoft.AspNetCore.StaticFiles using (var server = builder.Start(TestUrlHelper.GetTestUrl(ServerType.Kestrel))) { - using (var client = new HttpClient() { BaseAddress = new Uri(server.GetAddress()) }) + using (var client = new HttpClient { BaseAddress = new Uri(server.GetAddress()) }) { var last = File.GetLastWriteTimeUtc(Path.Combine(AppContext.BaseDirectory, "TestDocument.txt")); var response = await client.GetAsync("TestDocument.txt"); - var trimed = new DateTimeOffset(last.Year, last.Month, last.Day, last.Hour, last.Minute, last.Second, TimeSpan.Zero).ToUniversalTime(); + var trimmed = new DateTimeOffset(last.Year, last.Month, last.Day, last.Hour, last.Minute, last.Second, TimeSpan.Zero).ToUniversalTime(); - Assert.Equal(response.Content.Headers.LastModified.Value, trimed); + Assert.Equal(response.Content.Headers.LastModified.Value, trimmed); } } } @@ -92,7 +92,7 @@ namespace Microsoft.AspNetCore.StaticFiles .ConfigureServices(services => services.AddSingleton(LoggerFactory)) .UseKestrel() .UseWebRoot(Path.Combine(AppContext.BaseDirectory, baseDir)) - .Configure(app => app.UseStaticFiles(new StaticFileOptions() + .Configure(app => app.UseStaticFiles(new StaticFileOptions { RequestPath = new PathString(baseUrl), })); @@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.StaticFiles { var hostingEnvironment = server.Services.GetService(); - using (var client = new HttpClient() { BaseAddress = new Uri(server.GetAddress()) }) + using (var client = new HttpClient { BaseAddress = new Uri(server.GetAddress()) }) { var fileInfo = hostingEnvironment.WebRootFileProvider.GetFileInfo(Path.GetFileName(requestUrl)); var response = await client.GetAsync(requestUrl); @@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.StaticFiles .ConfigureServices(services => services.AddSingleton(LoggerFactory)) .UseKestrel() .UseWebRoot(Path.Combine(AppContext.BaseDirectory, baseDir)) - .Configure(app => app.UseStaticFiles(new StaticFileOptions() + .Configure(app => app.UseStaticFiles(new StaticFileOptions { RequestPath = new PathString(baseUrl), })); @@ -139,7 +139,7 @@ namespace Microsoft.AspNetCore.StaticFiles { var hostingEnvironment = server.Services.GetService(); - using (var client = new HttpClient() { BaseAddress = new Uri(server.GetAddress()) }) + using (var client = new HttpClient { BaseAddress = new Uri(server.GetAddress()) }) { var fileInfo = hostingEnvironment.WebRootFileProvider.GetFileInfo(Path.GetFileName(requestUrl)); var request = new HttpRequestMessage(HttpMethod.Head, requestUrl); @@ -181,7 +181,7 @@ namespace Microsoft.AspNetCore.StaticFiles { var interval = TimeSpan.FromSeconds(15); var requestReceived = new ManualResetEvent(false); - var requestCacelled = new ManualResetEvent(false); + var requestCancelled = new ManualResetEvent(false); var responseComplete = new ManualResetEvent(false); Exception exception = null; var builder = new WebHostBuilder() @@ -194,7 +194,7 @@ namespace Microsoft.AspNetCore.StaticFiles try { requestReceived.Set(); - Assert.True(requestCacelled.WaitOne(interval), "not cancelled"); + Assert.True(requestCancelled.WaitOne(interval), "not cancelled"); Assert.True(context.RequestAborted.WaitHandle.WaitOne(interval), "not aborted"); await next(); } @@ -224,7 +224,7 @@ namespace Microsoft.AspNetCore.StaticFiles socket.LingerState = new LingerOption(true, 0); socket.Dispose(); - requestCacelled.Set(); + requestCancelled.Set(); Assert.True(responseComplete.WaitOne(interval), "not completed"); Assert.Null(exception); diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs index 862346a9d8..7c70ce4551 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs +++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs @@ -69,7 +69,7 @@ namespace Microsoft.AspNetCore.StaticFiles [Theory] [MemberData(nameof(SupportedMethods))] - public async Task IfMatchShouldBeServedForAstrisk(HttpMethod method) + public async Task IfMatchShouldBeServedForAsterisk(HttpMethod method) { TestServer server = StaticFilesTestServer.Create(app => app.UseFileServer()); var req = new HttpRequestMessage(method, "http://localhost/SubFolder/extra.xml"); @@ -230,7 +230,7 @@ namespace Microsoft.AspNetCore.StaticFiles DateTimeOffset lastModified = resp1.Content.Headers.LastModified.Value; DateTimeOffset pastDate = lastModified.AddHours(-1); - DateTimeOffset furtureDate = lastModified.AddHours(1); + DateTimeOffset futureDate = lastModified.AddHours(1); HttpResponseMessage resp2 = await server .CreateRequest("/SubFolder/extra.xml") @@ -247,7 +247,7 @@ namespace Microsoft.AspNetCore.StaticFiles HttpResponseMessage resp4 = await server .CreateRequest("/SubFolder/extra.xml") .AddHeader("If-None-Match", "\"fake\"") - .And(req => req.Headers.IfModifiedSince = furtureDate) + .And(req => req.Headers.IfModifiedSince = futureDate) .SendAsync(method.Method); Assert.Equal(HttpStatusCode.OK, resp2.StatusCode); @@ -322,7 +322,7 @@ namespace Microsoft.AspNetCore.StaticFiles [Theory] [MemberData(nameof(SupportedMethods))] - public async Task SuppportsIfModifiedDateFormats(HttpMethod method) + public async Task SupportsIfModifiedDateFormats(HttpMethod method) { TestServer server = StaticFilesTestServer.Create(app => app.UseFileServer()); HttpResponseMessage res1 = await server diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs index 1095b64350..5df588c802 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs +++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs @@ -16,11 +16,10 @@ namespace Microsoft.AspNetCore.StaticFiles } [Fact] - public void KnownExtensionsReturnTrye() + public void KnownExtensionsReturnType() { var provider = new FileExtensionContentTypeProvider(); - string contentType; - Assert.True(provider.TryGetContentType("known.txt", out contentType)); + Assert.True(provider.TryGetContentType("known.txt", out var contentType)); Assert.Equal("text/plain", contentType); } @@ -36,8 +35,7 @@ namespace Microsoft.AspNetCore.StaticFiles public void DashedExtensionsShouldBeMatched() { var provider = new FileExtensionContentTypeProvider(); - string contentType; - Assert.True(provider.TryGetContentType("known.dvr-ms", out contentType)); + Assert.True(provider.TryGetContentType("known.dvr-ms", out var contentType)); Assert.Equal("video/x-ms-dvr", contentType); } @@ -45,8 +43,7 @@ namespace Microsoft.AspNetCore.StaticFiles public void BothSlashFormatsAreUnderstood() { var provider = new FileExtensionContentTypeProvider(); - string contentType; - Assert.True(provider.TryGetContentType(@"/first/example.txt", out contentType)); + Assert.True(provider.TryGetContentType(@"/first/example.txt", out var contentType)); Assert.Equal("text/plain", contentType); Assert.True(provider.TryGetContentType(@"\second\example.txt", out contentType)); Assert.Equal("text/plain", contentType); @@ -56,8 +53,7 @@ namespace Microsoft.AspNetCore.StaticFiles public void DotsInDirectoryAreIgnored() { var provider = new FileExtensionContentTypeProvider(); - string contentType; - Assert.True(provider.TryGetContentType(@"/first.css/example.txt", out contentType)); + Assert.True(provider.TryGetContentType(@"/first.css/example.txt", out var contentType)); Assert.Equal("text/plain", contentType); Assert.True(provider.TryGetContentType(@"\second.css\example.txt", out contentType)); Assert.Equal("text/plain", contentType); diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs index e50557f277..4601522333 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs +++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs @@ -169,12 +169,12 @@ namespace Microsoft.AspNetCore.StaticFiles private async Task PostDirectory_PassesThrough(string baseUrl, string baseDir, string requestUrl) { - using (var fileProvder = new PhysicalFileProvider(Path.Combine(AppContext.BaseDirectory, baseDir))) + using (var fileProvider = new PhysicalFileProvider(Path.Combine(AppContext.BaseDirectory, baseDir))) { var server = StaticFilesTestServer.Create(app => app.UseDefaultFiles(new DefaultFilesOptions { RequestPath = new PathString(baseUrl), - FileProvider = fileProvder + FileProvider = fileProvider })); var response = await server.CreateRequest(requestUrl).GetAsync(); diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs index a1da44fd38..f4fca87a36 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs +++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs @@ -70,8 +70,7 @@ namespace Microsoft.AspNetCore.StaticFiles public IFileInfo GetFileInfo(string subpath) { - IFileInfo result; - if (_files.TryGetValue(subpath, out result)) + if (_files.TryGetValue(subpath, out var result)) { return result; } diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs index 31c6894d2b..2c5c30df63 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs +++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs @@ -101,9 +101,9 @@ namespace Microsoft.AspNetCore.StaticFiles var response = await server.CreateRequest("TestDocument.txt").GetAsync(); var last = fileInfo.LastModified; - var trimed = new DateTimeOffset(last.Year, last.Month, last.Day, last.Hour, last.Minute, last.Second, last.Offset).ToUniversalTime(); + var trimmed = new DateTimeOffset(last.Year, last.Month, last.Day, last.Hour, last.Minute, last.Second, last.Offset).ToUniversalTime(); - Assert.Equal(response.Content.Headers.LastModified.Value, trimed); + Assert.Equal(response.Content.Headers.LastModified.Value, trimmed); } } From bd8183ab29a5402d6878a00dc057485618917088 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 28 Sep 2018 17:10:41 -0700 Subject: [PATCH 35/41] automated: bulk infrastructure updates. Update bootstrapper scripts and remove unnecessary signing properties --- Directory.Build.props | 3 --- run.ps1 | 6 +++--- run.sh | 10 +++++----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 6b77a0ded0..c46c5e323b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,9 +14,6 @@ $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory)build\Key.snk true - Microsoft - MicrosoftNuGet - true true diff --git a/run.ps1 b/run.ps1 index 3b27382468..34604c7175 100644 --- a/run.ps1 +++ b/run.ps1 @@ -52,8 +52,8 @@ in the file are overridden by command line parameters. Example config file: ```json { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev", + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", + "channel": "master", "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" } ``` @@ -192,7 +192,7 @@ if (!$DotNetHome) { else { Join-Path $PSScriptRoot '.dotnet'} } -if (!$Channel) { $Channel = 'dev' } +if (!$Channel) { $Channel = 'master' } if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } # Execute diff --git a/run.sh b/run.sh index 02aac15874..4c1fed5646 100755 --- a/run.sh +++ b/run.sh @@ -220,7 +220,7 @@ if [ -f "$config_file" ]; then config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" else - _error "$config_file contains invalid JSON." + __error "$config_file contains invalid JSON." exit 1 fi elif __machine_has python ; then @@ -228,7 +228,7 @@ if [ -f "$config_file" ]; then config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" else - _error "$config_file contains invalid JSON." + __error "$config_file contains invalid JSON." exit 1 fi elif __machine_has python3 ; then @@ -236,11 +236,11 @@ if [ -f "$config_file" ]; then config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" else - _error "$config_file contains invalid JSON." + __error "$config_file contains invalid JSON." exit 1 fi else - _error 'Missing required command: jq or python. Could not parse the JSON file.' + __error 'Missing required command: jq or python. Could not parse the JSON file.' exit 1 fi @@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" fi -[ -z "$channel" ] && channel='dev' +[ -z "$channel" ] && channel='master' [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' get_korebuild From 49dc5af93081db4861836198e4ce2d8b94eafae4 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 30 Sep 2018 12:34:19 -0700 Subject: [PATCH 36/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index fb9abf0846..9d10e1f140 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,24 +3,24 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180918.1 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 0.6.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview1-20180928.5 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 0.6.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 2.0.9 2.1.3 - 2.2.0-preview2-26905-02 + 2.2.0-preview3-26927-02 15.6.1 4.7.49 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 649bf2ba0b..26697a21fa 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180918.1 -commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 +version:2.2.0-preview1-20180928.5 +commithash:43faa29f679f47b88689d645b39e6be5e0055d70 From 6e91a8e72e515c0f581f714826ef726a24223c6b Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 7 Oct 2018 19:36:03 +0000 Subject: [PATCH 37/41] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 9d10e1f140..aeb5a7c33c 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,24 +3,24 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180928.5 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 0.6.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 + 2.2.0-preview2-20181004.6 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 0.6.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 2.0.9 2.1.3 - 2.2.0-preview3-26927-02 + 2.2.0-preview3-27001-02 15.6.1 4.7.49 2.0.3 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 26697a21fa..96fe3217ef 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180928.5 -commithash:43faa29f679f47b88689d645b39e6be5e0055d70 +version:2.2.0-preview2-20181004.6 +commithash:c04c4b2f5018632647f96210ab01876661302dac From 7a3a936ba52c29dd680aca035d98008b4d0a30fd Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 16 Oct 2018 12:48:20 -0700 Subject: [PATCH 38/41] Update package branding for 2.2 RTM --- version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.props b/version.props index 704cac087b..4889a26987 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ 2.2.0 - preview3 + rtm $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From a43587290fecff5a1229d8cb7f26603c01c7ab1d Mon Sep 17 00:00:00 2001 From: itminus Date: Wed, 17 Oct 2018 23:07:37 +0800 Subject: [PATCH 39/41] fix : DefaultFilesMiddleware serve with unicode path (#257) --- .../DefaultFilesMiddleware.cs | 2 +- .../DefaultFilesMiddlewareTests.cs | 16 ++++++++++++++-- .../SubFolder/你好/default.html | 11 +++++++++++ .../SubFolder/你好/世界/default.html | 11 +++++++++++ 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/default.html create mode 100644 test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/世界/default.html diff --git a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs index e879bcf886..3c3a1c60b8 100644 --- a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs +++ b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs @@ -72,7 +72,7 @@ namespace Microsoft.AspNetCore.StaticFiles for (int matchIndex = 0; matchIndex < _options.DefaultFileNames.Count; matchIndex++) { string defaultFile = _options.DefaultFileNames[matchIndex]; - var file = _fileProvider.GetFileInfo(subpath + defaultFile); + var file = _fileProvider.GetFileInfo(subpath.Value + defaultFile); // TryMatchPath will make sure subpath always ends with a "/" by adding it if needed. if (file.Exists) { diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs index 4601522333..7df375d2d4 100644 --- a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs +++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.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; @@ -9,6 +9,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.TestHost; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.FileProviders; @@ -75,6 +76,8 @@ namespace Microsoft.AspNetCore.StaticFiles [InlineData("", @".", "/SubFolder/")] [InlineData("", @"./", "/SubFolder/")] [InlineData("", @"./SubFolder", "/")] + [InlineData("", @"./SubFolder", "/你好/")] + [InlineData("", @"./SubFolder", "/你好/世界/")] public async Task FoundDirectoryWithDefaultFile_PathModified_All(string baseUrl, string baseDir, string requestUrl) { await FoundDirectoryWithDefaultFile_PathModified(baseUrl, baseDir, requestUrl); @@ -85,6 +88,8 @@ namespace Microsoft.AspNetCore.StaticFiles [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData("", @".\", "/SubFolder/")] [InlineData("", @".\subFolder", "/")] + [InlineData("", @".\SubFolder", "/你好/")] + [InlineData("", @".\SubFolder", "/你好/世界/")] public async Task FoundDirectoryWithDefaultFile_PathModified_Windows(string baseUrl, string baseDir, string requestUrl) { await FoundDirectoryWithDefaultFile_PathModified(baseUrl, baseDir, requestUrl); @@ -114,6 +119,8 @@ namespace Microsoft.AspNetCore.StaticFiles [InlineData("", @".", "/SubFolder", "")] [InlineData("", @"./", "/SubFolder", "")] [InlineData("", @"./", "/SubFolder", "?a=b")] + [InlineData("", @"./SubFolder", "/你好", "?a=b")] + [InlineData("", @"./SubFolder", "/你好/世界", "?a=b")] public async Task NearMatch_RedirectAddSlash_All(string baseUrl, string baseDir, string requestUrl, string queryString) { await NearMatch_RedirectAddSlash(baseUrl, baseDir, requestUrl, queryString); @@ -124,6 +131,8 @@ namespace Microsoft.AspNetCore.StaticFiles [OSSkipCondition(OperatingSystems.MacOSX)] [InlineData("", @".\", "/SubFolder", "")] [InlineData("", @".\", "/SubFolder", "?a=b")] + [InlineData("", @".\SubFolder", "/你好", "?a=b")] + [InlineData("", @".\SubFolder", "/你好/世界", "?a=b")] public async Task NearMatch_RedirectAddSlash_Windows(string baseUrl, string baseDir, string requestUrl, string queryString) { await NearMatch_RedirectAddSlash(baseUrl, baseDir, requestUrl, queryString); @@ -141,7 +150,10 @@ namespace Microsoft.AspNetCore.StaticFiles var response = await server.CreateRequest(requestUrl + queryString).GetAsync(); Assert.Equal(HttpStatusCode.Moved, response.StatusCode); - Assert.Equal(requestUrl + "/" + queryString, response.Headers.GetValues("Location").FirstOrDefault()); + // the url in the header of `Location: /xxx/xxx` should be encoded + var expectedURL = UriHelper.BuildRelative(baseUrl, requestUrl + "/", new QueryString(queryString), new FragmentString()); + var actualURL = response.Headers.GetValues("Location").FirstOrDefault(); + Assert.Equal(expectedURL, actualURL); Assert.Empty((await response.Content.ReadAsByteArrayAsync())); } } diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/default.html b/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/default.html new file mode 100644 index 0000000000..4740d83682 --- /dev/null +++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/default.html @@ -0,0 +1,11 @@ + + + + + + + + + Hello World + + \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/世界/default.html b/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/世界/default.html new file mode 100644 index 0000000000..4740d83682 --- /dev/null +++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/世界/default.html @@ -0,0 +1,11 @@ + + + + + + + + + Hello World + + \ No newline at end of file From a5fcd9dd8724eb71f0642340f68aeb85b0473374 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Tue, 23 Oct 2018 14:43:47 -0700 Subject: [PATCH 40/41] Add application/wasm #3681 (#259) --- .../FileExtensionContentTypeProvider.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs b/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs index f2e8f1b788..ea5775c73e 100644 --- a/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs +++ b/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs @@ -331,7 +331,8 @@ namespace Microsoft.AspNetCore.StaticFiles { ".vsto", "application/x-ms-vsto" }, { ".vsw", "application/vnd.visio" }, { ".vsx", "application/vnd.visio" }, - { ".vtx", "application/vnd.visio" }, + { ".vtx", "application/vnd.visio" }, + { ".wasm", "application/wasm" }, { ".wav", "audio/wav" }, { ".wax", "audio/x-ms-wax" }, { ".wbmp", "image/vnd.wap.wbmp" }, @@ -456,4 +457,4 @@ namespace Microsoft.AspNetCore.StaticFiles return path.Substring(index); } } -} \ No newline at end of file +} From c391301dce37d741b10a04fed3105093bfa93848 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 21 Nov 2018 10:59:42 -0800 Subject: [PATCH 41/41] Reorganize source code in preparation to move into aspnet/AspNetCore Prior to reorganization, this source code was found in https://github.com/aspnet/StaticFiles/tree/a5fcd9dd8724eb71f0642340f68aeb85b0473374 --- .appveyor.yml | 17 -- .gitattributes | 51 ---- .github/ISSUE_TEMPLATE.md | 3 - .travis.yml | 27 -- .vsts-pipelines/builds/ci-internal.yml | 13 - .vsts-pipelines/builds/ci-public.yml | 15 - CONTRIBUTING.md | 4 - LICENSE.txt | 14 - NuGet.config | 7 - build.cmd | 2 - build.sh | 8 - korebuild-lock.txt | 2 - korebuild.json | 4 - run.cmd | 2 - run.ps1 | 209 -------------- run.sh | 256 ------------------ .gitignore => src/StaticFiles/.gitignore | 0 .../StaticFiles/Directory.Build.props | 0 .../StaticFiles/Directory.Build.targets | 0 .../StaticFiles/NuGetPackageVerifier.json | 0 README.md => src/StaticFiles/README.md | 0 .../StaticFiles/StaticFiles.sln | 0 {build => src/StaticFiles/build}/Key.snk | Bin .../StaticFiles/build}/dependencies.props | 0 {build => src/StaticFiles/build}/repo.props | 0 .../StaticFiles/build}/sources.props | 0 .../Properties/launchSettings.json | 0 .../samples}/StaticFileSample/Startup.cs | 0 .../StaticFileSample/StaticFileSample.csproj | 0 .../StaticFileSample/wwwroot/htmlpage.html | 0 .../RangeHelper.cs | 0 .../src}/Directory.Build.props | 0 .../Constants.cs | 0 .../CustomDictionary.xml | 0 .../DefaultFilesExtensions.cs | 0 .../DefaultFilesMiddleware.cs | 0 .../DefaultFilesOptions.cs | 0 .../DirectoryBrowserExtensions.cs | 0 .../DirectoryBrowserMiddleware.cs | 0 .../DirectoryBrowserOptions.cs | 0 .../DirectoryBrowserServiceExtensions.cs | 0 .../FileExtensionContentTypeProvider.cs | 0 .../FileServerExtensions.cs | 0 .../FileServerOptions.cs | 0 .../Helpers.cs | 0 .../HtmlDirectoryFormatter.cs | 0 .../IContentTypeProvider.cs | 0 .../IDirectoryFormatter.cs | 0 .../Infrastructure/SharedOptions.cs | 0 .../Infrastructure/SharedOptionsBase.cs | 0 .../LoggerExtensions.cs | 0 .../Microsoft.AspNetCore.StaticFiles.csproj | 0 .../Properties/AssemblyInfo.cs | 0 .../Resources.Designer.cs | 0 .../Resources.resx | 0 .../StaticFileContext.cs | 0 .../StaticFileExtensions.cs | 0 .../StaticFileMiddleware.cs | 0 .../StaticFileOptions.cs | 0 .../StaticFileResponseContext.cs | 0 .../baseline.netcore.json | 0 .../StaticFiles/test}/Directory.Build.props | 0 ...AspNetCore.RangeHelper.Sources.Test.csproj | 0 .../RangeHelperTests.cs | 0 ...NetCore.StaticFiles.FunctionalTests.csproj | 0 .../StaticFileMiddlewareTests.cs | 0 .../SubFolder/Empty.txt | 0 .../SubFolder/SingleByte.txt | 0 .../SubFolder/default.html | 0 .../SubFolder/extra.xml | 0 .../SubFolder/ranges.txt | 0 .../TestDocument.txt | 0 .../TestDocument1MB.txt | 0 .../CacheHeaderTests.cs | 0 .../DefaultContentTypeProviderTests.cs | 0 .../DefaultFilesMiddlewareTests.cs | 0 .../DirectoryBrowserMiddlewareTests.cs | 0 ...rosoft.AspNetCore.StaticFiles.Tests.csproj | 0 .../RangeHeaderTests.cs | 0 .../StaticFileContextTest.cs | 0 .../StaticFileMiddlewareTests.cs | 0 .../StaticFilesTestServer.cs | 0 .../SubFolder/Empty.txt | 0 .../SubFolder/SingleByte.txt | 0 .../SubFolder/default.html | 0 .../SubFolder/extra.xml | 0 .../SubFolder/ranges.txt | 0 .../SubFolder/你好/default.html | 0 .../SubFolder/你好/世界/default.html | 0 .../TestDocument.txt | 0 .../StaticFiles/version.props | 0 91 files changed, 634 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .gitattributes delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .travis.yml delete mode 100644 .vsts-pipelines/builds/ci-internal.yml delete mode 100644 .vsts-pipelines/builds/ci-public.yml delete mode 100644 CONTRIBUTING.md delete mode 100644 LICENSE.txt delete mode 100644 NuGet.config delete mode 100644 build.cmd delete mode 100755 build.sh delete mode 100644 korebuild-lock.txt delete mode 100644 korebuild.json delete mode 100644 run.cmd delete mode 100644 run.ps1 delete mode 100755 run.sh rename .gitignore => src/StaticFiles/.gitignore (100%) rename Directory.Build.props => src/StaticFiles/Directory.Build.props (100%) rename Directory.Build.targets => src/StaticFiles/Directory.Build.targets (100%) rename NuGetPackageVerifier.json => src/StaticFiles/NuGetPackageVerifier.json (100%) rename README.md => src/StaticFiles/README.md (100%) rename StaticFiles.sln => src/StaticFiles/StaticFiles.sln (100%) rename {build => src/StaticFiles/build}/Key.snk (100%) rename {build => src/StaticFiles/build}/dependencies.props (100%) rename {build => src/StaticFiles/build}/repo.props (100%) rename {build => src/StaticFiles/build}/sources.props (100%) rename {samples => src/StaticFiles/samples}/StaticFileSample/Properties/launchSettings.json (100%) rename {samples => src/StaticFiles/samples}/StaticFileSample/Startup.cs (100%) rename {samples => src/StaticFiles/samples}/StaticFileSample/StaticFileSample.csproj (100%) rename {samples => src/StaticFiles/samples}/StaticFileSample/wwwroot/htmlpage.html (100%) rename {shared => src/StaticFiles/shared}/Microsoft.AspNetCore.RangeHelper.Sources/RangeHelper.cs (100%) rename src/{ => StaticFiles/src}/Directory.Build.props (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/Constants.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/CustomDictionary.xml (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserServiceExtensions.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/FileServerOptions.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/Helpers.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/Properties/AssemblyInfo.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/Resources.resx (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs (100%) rename src/{ => StaticFiles/src}/Microsoft.AspNetCore.StaticFiles/baseline.netcore.json (100%) rename {test => src/StaticFiles/test}/Directory.Build.props (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.RangeHelper.Sources.Test/RangeHelperTests.cs (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/Empty.txt (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/SingleByte.txt (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/default.html (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/extra.xml (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/ranges.txt (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument.txt (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument1MB.txt (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/Empty.txt (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/SingleByte.txt (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/default.html (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/extra.xml (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/ranges.txt (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/default.html (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/世界/default.html (100%) rename {test => src/StaticFiles/test}/Microsoft.AspNetCore.StaticFiles.Tests/TestDocument.txt (100%) rename version.props => src/StaticFiles/version.props (100%) diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 4eea96ab69..0000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,17 +0,0 @@ -init: -- git config --global core.autocrlf true -branches: - only: - - dev - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ -build_script: -- ps: .\run.ps1 default-build -clone_depth: 1 -environment: - global: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -test: 'off' -deploy: 'off' -os: Visual Studio 2017 diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 97b827b758..0000000000 --- a/.gitattributes +++ /dev/null @@ -1,51 +0,0 @@ -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain - -*.jpg binary -*.png binary -*.gif binary - -*.cs text=auto diff=csharp -*.vb text=auto -*.resx text=auto -*.c text=auto -*.cpp text=auto -*.cxx text=auto -*.h text=auto -*.hxx text=auto -*.py text=auto -*.rb text=auto -*.java text=auto -*.html text=auto -*.htm text=auto -*.css text=auto -*.scss text=auto -*.sass text=auto -*.less text=auto -*.js text=auto -*.lisp text=auto -*.clj text=auto -*.sql text=auto -*.php text=auto -*.lua text=auto -*.m text=auto -*.asm text=auto -*.erl text=auto -*.fs text=auto -*.fsx text=auto -*.hs text=auto - -*.csproj text=auto -*.vbproj text=auto -*.fsproj text=auto -*.dbproj text=auto -*.sln text=auto eol=crlf -*.sh eol=lf diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 101a084f0a..0000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -THIS ISSUE TRACKER IS CLOSED - please log new issues here: https://github.com/aspnet/Home/issues - -For information about this change, see https://github.com/aspnet/Announcements/issues/283 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 64bdbb4441..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -language: csharp -sudo: false -dist: trusty -env: - global: - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -mono: none -os: -- linux -- osx -osx_image: xcode8.2 -addons: - apt: - packages: - - libunwind8 -branches: - only: - - dev - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ -before_install: -- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s - /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib - /usr/local/lib/; fi -script: -- ./build.sh diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml deleted file mode 100644 index dc7b8a3cb9..0000000000 --- a/.vsts-pipelines/builds/ci-internal.yml +++ /dev/null @@ -1,13 +0,0 @@ -trigger: -- master -- release/* - -resources: - repositories: - - repository: buildtools - type: git - name: aspnet-BuildTools - ref: refs/heads/release/2.2 - -phases: -- template: .vsts-pipelines/templates/project-ci.yml@buildtools diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml deleted file mode 100644 index f5087d9c30..0000000000 --- a/.vsts-pipelines/builds/ci-public.yml +++ /dev/null @@ -1,15 +0,0 @@ -trigger: -- master -- release/* - -# See https://github.com/aspnet/BuildTools -resources: - repositories: - - repository: buildtools - type: github - endpoint: DotNet-Bot GitHub Connection - name: aspnet/BuildTools - ref: refs/heads/release/2.2 - -phases: -- template: .vsts-pipelines/templates/project-ci.yml@buildtools diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 64ff041d5c..0000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,4 +0,0 @@ -Contributing -====== - -Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 7b2956ecee..0000000000 --- a/LICENSE.txt +++ /dev/null @@ -1,14 +0,0 @@ -Copyright (c) .NET Foundation and Contributors - -All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed -under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index e32bddfd51..0000000000 --- a/NuGet.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/build.cmd b/build.cmd deleted file mode 100644 index c0050bda12..0000000000 --- a/build.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' default-build %*; exit $LASTEXITCODE" diff --git a/build.sh b/build.sh deleted file mode 100755 index 98a4b22765..0000000000 --- a/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs) -chmod +x "$DIR/run.sh"; sync -"$DIR/run.sh" default-build "$@" diff --git a/korebuild-lock.txt b/korebuild-lock.txt deleted file mode 100644 index 96fe3217ef..0000000000 --- a/korebuild-lock.txt +++ /dev/null @@ -1,2 +0,0 @@ -version:2.2.0-preview2-20181004.6 -commithash:c04c4b2f5018632647f96210ab01876661302dac diff --git a/korebuild.json b/korebuild.json deleted file mode 100644 index d217d06e3e..0000000000 --- a/korebuild.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json", - "channel": "release/2.2" -} diff --git a/run.cmd b/run.cmd deleted file mode 100644 index d52d5c7e68..0000000000 --- a/run.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' %*; exit $LASTEXITCODE" diff --git a/run.ps1 b/run.ps1 deleted file mode 100644 index 34604c7175..0000000000 --- a/run.ps1 +++ /dev/null @@ -1,209 +0,0 @@ -#!/usr/bin/env powershell -#requires -version 4 - -<# -.SYNOPSIS -Executes KoreBuild commands. - -.DESCRIPTION -Downloads korebuild if required. Then executes the KoreBuild command. To see available commands, execute with `-Command help`. - -.PARAMETER Command -The KoreBuild command to run. - -.PARAMETER Path -The folder to build. Defaults to the folder containing this script. - -.PARAMETER Channel -The channel of KoreBuild to download. Overrides the value from the config file. - -.PARAMETER DotNetHome -The directory where .NET Core tools will be stored. - -.PARAMETER ToolsSource -The base url where build tools can be downloaded. Overrides the value from the config file. - -.PARAMETER Update -Updates KoreBuild to the latest version even if a lock file is present. - -.PARAMETER Reinstall -Re-installs KoreBuild - -.PARAMETER ConfigFile -The path to the configuration file that stores values. Defaults to korebuild.json. - -.PARAMETER ToolsSourceSuffix -The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores. - -.PARAMETER CI -Sets up CI specific settings and variables. - -.PARAMETER Arguments -Arguments to be passed to the command - -.NOTES -This function will create a file $PSScriptRoot/korebuild-lock.txt. This lock file can be committed to source, but does not have to be. -When the lockfile is not present, KoreBuild will create one using latest available version from $Channel. - -The $ConfigFile is expected to be an JSON file. It is optional, and the configuration values in it are optional as well. Any options set -in the file are overridden by command line parameters. - -.EXAMPLE -Example config file: -```json -{ - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", - "channel": "master", - "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" -} -``` -#> -[CmdletBinding(PositionalBinding = $false)] -param( - [Parameter(Mandatory = $true, Position = 0)] - [string]$Command, - [string]$Path = $PSScriptRoot, - [Alias('c')] - [string]$Channel, - [Alias('d')] - [string]$DotNetHome, - [Alias('s')] - [string]$ToolsSource, - [Alias('u')] - [switch]$Update, - [switch]$Reinstall, - [string]$ToolsSourceSuffix, - [string]$ConfigFile = $null, - [switch]$CI, - [Parameter(ValueFromRemainingArguments = $true)] - [string[]]$Arguments -) - -Set-StrictMode -Version 2 -$ErrorActionPreference = 'Stop' - -# -# Functions -# - -function Get-KoreBuild { - - $lockFile = Join-Path $Path 'korebuild-lock.txt' - - if (!(Test-Path $lockFile) -or $Update) { - Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile $ToolsSourceSuffix - } - - $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1 - if (!$version) { - Write-Error "Failed to parse version from $lockFile. Expected a line that begins with 'version:'" - } - $version = $version.TrimStart('version:').Trim() - $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version) - - if ($Reinstall -and (Test-Path $korebuildPath)) { - Remove-Item -Force -Recurse $korebuildPath - } - - if (!(Test-Path $korebuildPath)) { - Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version" - New-Item -ItemType Directory -Path $korebuildPath | Out-Null - $remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip" - - try { - $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip" - Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix - if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { - # Use built-in commands where possible as they are cross-plat compatible - Microsoft.PowerShell.Archive\Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath - } - else { - # Fallback to old approach for old installations of PowerShell - Add-Type -AssemblyName System.IO.Compression.FileSystem - [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpfile, $korebuildPath) - } - } - catch { - Remove-Item -Recurse -Force $korebuildPath -ErrorAction Ignore - throw - } - finally { - Remove-Item $tmpfile -ErrorAction Ignore - } - } - - return $korebuildPath -} - -function Join-Paths([string]$path, [string[]]$childPaths) { - $childPaths | ForEach-Object { $path = Join-Path $path $_ } - return $path -} - -function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$RemoteSuffix) { - if ($RemotePath -notlike 'http*') { - Copy-Item $RemotePath $LocalPath - return - } - - $retries = 10 - while ($retries -gt 0) { - $retries -= 1 - try { - Invoke-WebRequest -UseBasicParsing -Uri $($RemotePath + $RemoteSuffix) -OutFile $LocalPath - return - } - catch { - Write-Verbose "Request failed. $retries retries remaining" - } - } - - Write-Error "Download failed: '$RemotePath'." -} - -# -# Main -# - -# Load configuration or set defaults - -$Path = Resolve-Path $Path -if (!$ConfigFile) { $ConfigFile = Join-Path $Path 'korebuild.json' } - -if (Test-Path $ConfigFile) { - try { - $config = Get-Content -Raw -Encoding UTF8 -Path $ConfigFile | ConvertFrom-Json - if ($config) { - if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel } - if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource} - } - } - catch { - Write-Host -ForegroundColor Red $Error[0] - Write-Error "$ConfigFile contains invalid JSON." - exit 1 - } -} - -if (!$DotNetHome) { - $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } ` - elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} ` - elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}` - else { Join-Path $PSScriptRoot '.dotnet'} -} - -if (!$Channel) { $Channel = 'master' } -if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } - -# Execute - -$korebuildPath = Get-KoreBuild -Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') - -try { - Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI - Invoke-KoreBuildCommand $Command @Arguments -} -finally { - Remove-Module 'KoreBuild' -ErrorAction Ignore -} diff --git a/run.sh b/run.sh deleted file mode 100755 index 4c1fed5646..0000000000 --- a/run.sh +++ /dev/null @@ -1,256 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -# -# variables -# - -RESET="\033[0m" -RED="\033[0;31m" -YELLOW="\033[0;33m" -MAGENTA="\033[0;95m" -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" -verbose=false -update=false -reinstall=false -repo_path="$DIR" -channel='' -tools_source='' -tools_source_suffix='' -ci=false - -# -# Functions -# -__usage() { - echo "Usage: $(basename "${BASH_SOURCE[0]}") command [options] [[--] ...]" - echo "" - echo "Arguments:" - echo " command The command to be run." - echo " ... Arguments passed to the command. Variable number of arguments allowed." - echo "" - echo "Options:" - echo " --verbose Show verbose output." - echo " -c|--channel The channel of KoreBuild to download. Overrides the value from the config file.." - echo " --config-file The path to the configuration file that stores values. Defaults to korebuild.json." - echo " -d|--dotnet-home The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet." - echo " --path The directory to build. Defaults to the directory containing the script." - echo " -s|--tools-source|-ToolsSource The base url where build tools can be downloaded. Overrides the value from the config file." - echo " --tools-source-suffix|-ToolsSourceSuffix The suffix to append to tools-source. Useful for query strings." - echo " -u|--update Update to the latest KoreBuild even if the lock file is present." - echo " --reinstall Reinstall KoreBuild." - echo " --ci Apply CI specific settings and environment variables." - echo "" - echo "Description:" - echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be." - echo " When the lockfile is not present, KoreBuild will create one using latest available version from \$channel." - - if [[ "${1:-}" != '--no-exit' ]]; then - exit 2 - fi -} - -get_korebuild() { - local version - local lock_file="$repo_path/korebuild-lock.txt" - if [ ! -f "$lock_file" ] || [ "$update" = true ]; then - __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file" "$tools_source_suffix" - fi - version="$(grep 'version:*' -m 1 "$lock_file")" - if [[ "$version" == '' ]]; then - __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'" - return 1 - fi - version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" - local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" - - if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then - rm -rf "$korebuild_path" - fi - - { - if [ ! -d "$korebuild_path" ]; then - mkdir -p "$korebuild_path" - local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip" - tmpfile="$(mktemp)" - echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}" - if __get_remote_file "$remote_path" "$tmpfile" "$tools_source_suffix"; then - unzip -q -d "$korebuild_path" "$tmpfile" - fi - rm "$tmpfile" || true - fi - - source "$korebuild_path/KoreBuild.sh" - } || { - if [ -d "$korebuild_path" ]; then - echo "Cleaning up after failed installation" - rm -rf "$korebuild_path" || true - fi - return 1 - } -} - -__error() { - echo -e "${RED}error: $*${RESET}" 1>&2 -} - -__warn() { - echo -e "${YELLOW}warning: $*${RESET}" -} - -__machine_has() { - hash "$1" > /dev/null 2>&1 - return $? -} - -__get_remote_file() { - local remote_path=$1 - local local_path=$2 - local remote_path_suffix=$3 - - if [[ "$remote_path" != 'http'* ]]; then - cp "$remote_path" "$local_path" - return 0 - fi - - local failed=false - if __machine_has wget; then - wget --tries 10 --quiet -O "$local_path" "${remote_path}${remote_path_suffix}" || failed=true - else - failed=true - fi - - if [ "$failed" = true ] && __machine_has curl; then - failed=false - curl --retry 10 -sSL -f --create-dirs -o "$local_path" "${remote_path}${remote_path_suffix}" || failed=true - fi - - if [ "$failed" = true ]; then - __error "Download failed: $remote_path" 1>&2 - return 1 - fi -} - -# -# main -# - -command="${1:-}" -shift - -while [[ $# -gt 0 ]]; do - case $1 in - -\?|-h|--help) - __usage --no-exit - exit 0 - ;; - -c|--channel|-Channel) - shift - channel="${1:-}" - [ -z "$channel" ] && __usage - ;; - --config-file|-ConfigFile) - shift - config_file="${1:-}" - [ -z "$config_file" ] && __usage - if [ ! -f "$config_file" ]; then - __error "Invalid value for --config-file. $config_file does not exist." - exit 1 - fi - ;; - -d|--dotnet-home|-DotNetHome) - shift - DOTNET_HOME="${1:-}" - [ -z "$DOTNET_HOME" ] && __usage - ;; - --path|-Path) - shift - repo_path="${1:-}" - [ -z "$repo_path" ] && __usage - ;; - -s|--tools-source|-ToolsSource) - shift - tools_source="${1:-}" - [ -z "$tools_source" ] && __usage - ;; - --tools-source-suffix|-ToolsSourceSuffix) - shift - tools_source_suffix="${1:-}" - [ -z "$tools_source_suffix" ] && __usage - ;; - -u|--update|-Update) - update=true - ;; - --reinstall|-[Rr]einstall) - reinstall=true - ;; - --ci|-[Cc][Ii]) - ci=true - ;; - --verbose|-Verbose) - verbose=true - ;; - --) - shift - break - ;; - *) - break - ;; - esac - shift -done - -if ! __machine_has unzip; then - __error 'Missing required command: unzip' - exit 1 -fi - -if ! __machine_has curl && ! __machine_has wget; then - __error 'Missing required command. Either wget or curl is required.' - exit 1 -fi - -[ -z "${config_file:-}" ] && config_file="$repo_path/korebuild.json" -if [ -f "$config_file" ]; then - if __machine_has jq ; then - if jq '.' "$config_file" >/dev/null ; then - config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" - config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - elif __machine_has python ; then - if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then - config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" - config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - elif __machine_has python3 ; then - if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then - config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" - config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - else - __error 'Missing required command: jq or python. Could not parse the JSON file.' - exit 1 - fi - - [ ! -z "${config_channel:-}" ] && channel="$config_channel" - [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" -fi - -[ -z "$channel" ] && channel='master' -[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' - -get_korebuild -set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci" -invoke_korebuild_command "$command" "$@" diff --git a/.gitignore b/src/StaticFiles/.gitignore similarity index 100% rename from .gitignore rename to src/StaticFiles/.gitignore diff --git a/Directory.Build.props b/src/StaticFiles/Directory.Build.props similarity index 100% rename from Directory.Build.props rename to src/StaticFiles/Directory.Build.props diff --git a/Directory.Build.targets b/src/StaticFiles/Directory.Build.targets similarity index 100% rename from Directory.Build.targets rename to src/StaticFiles/Directory.Build.targets diff --git a/NuGetPackageVerifier.json b/src/StaticFiles/NuGetPackageVerifier.json similarity index 100% rename from NuGetPackageVerifier.json rename to src/StaticFiles/NuGetPackageVerifier.json diff --git a/README.md b/src/StaticFiles/README.md similarity index 100% rename from README.md rename to src/StaticFiles/README.md diff --git a/StaticFiles.sln b/src/StaticFiles/StaticFiles.sln similarity index 100% rename from StaticFiles.sln rename to src/StaticFiles/StaticFiles.sln diff --git a/build/Key.snk b/src/StaticFiles/build/Key.snk similarity index 100% rename from build/Key.snk rename to src/StaticFiles/build/Key.snk diff --git a/build/dependencies.props b/src/StaticFiles/build/dependencies.props similarity index 100% rename from build/dependencies.props rename to src/StaticFiles/build/dependencies.props diff --git a/build/repo.props b/src/StaticFiles/build/repo.props similarity index 100% rename from build/repo.props rename to src/StaticFiles/build/repo.props diff --git a/build/sources.props b/src/StaticFiles/build/sources.props similarity index 100% rename from build/sources.props rename to src/StaticFiles/build/sources.props diff --git a/samples/StaticFileSample/Properties/launchSettings.json b/src/StaticFiles/samples/StaticFileSample/Properties/launchSettings.json similarity index 100% rename from samples/StaticFileSample/Properties/launchSettings.json rename to src/StaticFiles/samples/StaticFileSample/Properties/launchSettings.json diff --git a/samples/StaticFileSample/Startup.cs b/src/StaticFiles/samples/StaticFileSample/Startup.cs similarity index 100% rename from samples/StaticFileSample/Startup.cs rename to src/StaticFiles/samples/StaticFileSample/Startup.cs diff --git a/samples/StaticFileSample/StaticFileSample.csproj b/src/StaticFiles/samples/StaticFileSample/StaticFileSample.csproj similarity index 100% rename from samples/StaticFileSample/StaticFileSample.csproj rename to src/StaticFiles/samples/StaticFileSample/StaticFileSample.csproj diff --git a/samples/StaticFileSample/wwwroot/htmlpage.html b/src/StaticFiles/samples/StaticFileSample/wwwroot/htmlpage.html similarity index 100% rename from samples/StaticFileSample/wwwroot/htmlpage.html rename to src/StaticFiles/samples/StaticFileSample/wwwroot/htmlpage.html diff --git a/shared/Microsoft.AspNetCore.RangeHelper.Sources/RangeHelper.cs b/src/StaticFiles/shared/Microsoft.AspNetCore.RangeHelper.Sources/RangeHelper.cs similarity index 100% rename from shared/Microsoft.AspNetCore.RangeHelper.Sources/RangeHelper.cs rename to src/StaticFiles/shared/Microsoft.AspNetCore.RangeHelper.Sources/RangeHelper.cs diff --git a/src/Directory.Build.props b/src/StaticFiles/src/Directory.Build.props similarity index 100% rename from src/Directory.Build.props rename to src/StaticFiles/src/Directory.Build.props diff --git a/src/Microsoft.AspNetCore.StaticFiles/Constants.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Constants.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/Constants.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Constants.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/CustomDictionary.xml b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/CustomDictionary.xml similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/CustomDictionary.xml rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/CustomDictionary.xml diff --git a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserServiceExtensions.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserServiceExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserServiceExtensions.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserServiceExtensions.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/FileServerOptions.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/FileServerOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/FileServerOptions.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/FileServerOptions.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/Helpers.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Helpers.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/Helpers.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Helpers.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj diff --git a/src/Microsoft.AspNetCore.StaticFiles/Properties/AssemblyInfo.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/Properties/AssemblyInfo.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/Resources.resx b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Resources.resx similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/Resources.resx rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/Resources.resx diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs diff --git a/src/Microsoft.AspNetCore.StaticFiles/baseline.netcore.json b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.StaticFiles/baseline.netcore.json rename to src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/baseline.netcore.json diff --git a/test/Directory.Build.props b/src/StaticFiles/test/Directory.Build.props similarity index 100% rename from test/Directory.Build.props rename to src/StaticFiles/test/Directory.Build.props diff --git a/test/Microsoft.AspNetCore.RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj b/src/StaticFiles/test/Microsoft.AspNetCore.RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj similarity index 100% rename from test/Microsoft.AspNetCore.RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj rename to src/StaticFiles/test/Microsoft.AspNetCore.RangeHelper.Sources.Test/Microsoft.AspNetCore.RangeHelper.Sources.Test.csproj diff --git a/test/Microsoft.AspNetCore.RangeHelper.Sources.Test/RangeHelperTests.cs b/src/StaticFiles/test/Microsoft.AspNetCore.RangeHelper.Sources.Test/RangeHelperTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.RangeHelper.Sources.Test/RangeHelperTests.cs rename to src/StaticFiles/test/Microsoft.AspNetCore.RangeHelper.Sources.Test/RangeHelperTests.cs diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/StaticFileMiddlewareTests.cs diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/Empty.txt b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/Empty.txt similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/Empty.txt rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/Empty.txt diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/SingleByte.txt b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/SingleByte.txt similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/SingleByte.txt rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/SingleByte.txt diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/default.html b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/default.html similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/default.html rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/default.html diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/extra.xml b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/extra.xml similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/extra.xml rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/extra.xml diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/ranges.txt b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/ranges.txt similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/ranges.txt rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/SubFolder/ranges.txt diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument.txt b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument.txt similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument.txt rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument.txt diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument1MB.txt b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument1MB.txt similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument1MB.txt rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/TestDocument1MB.txt diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/Empty.txt b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/Empty.txt similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/Empty.txt rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/Empty.txt diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/SingleByte.txt b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/SingleByte.txt similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/SingleByte.txt rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/SingleByte.txt diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/default.html b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/default.html similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/default.html rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/default.html diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/extra.xml b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/extra.xml similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/extra.xml rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/extra.xml diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/ranges.txt b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/ranges.txt similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/ranges.txt rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/ranges.txt diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/default.html b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/default.html similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/default.html rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/default.html diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/世界/default.html b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/世界/default.html similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/世界/default.html rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/SubFolder/你好/世界/default.html diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/TestDocument.txt b/src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/TestDocument.txt similarity index 100% rename from test/Microsoft.AspNetCore.StaticFiles.Tests/TestDocument.txt rename to src/StaticFiles/test/Microsoft.AspNetCore.StaticFiles.Tests/TestDocument.txt diff --git a/version.props b/src/StaticFiles/version.props similarity index 100% rename from version.props rename to src/StaticFiles/version.props