diff --git a/src/StaticFiles/build/dependencies.props b/src/StaticFiles/build/dependencies.props index aeb5a7c33c..54a1135136 100644 --- a/src/StaticFiles/build/dependencies.props +++ b/src/StaticFiles/build/dependencies.props @@ -3,31 +3,31 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 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 + 3.0.0-alpha1-20181011.3 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 0.7.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 + 3.0.0-alpha1-10605 2.0.9 2.1.3 2.2.0-preview3-27001-02 15.6.1 - 4.7.49 + 4.10.0 2.0.3 0.10.0 2.3.1 2.4.0 - + diff --git a/src/StaticFiles/build/repo.props b/src/StaticFiles/build/repo.props index f1fe24dd27..17a98ac7e7 100644 --- a/src/StaticFiles/build/repo.props +++ b/src/StaticFiles/build/repo.props @@ -4,7 +4,6 @@ Internal.AspNetCore.Universe.Lineup - 2.2.0-* https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs index 501be2d71c..6bf8c60f34 100644 --- a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs +++ b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs @@ -282,11 +282,8 @@ namespace Microsoft.AspNetCore.StaticFiles // it is not returned for 304, 412, and 416 _response.ContentLength = _length; } - _options.OnPrepareResponse(new StaticFileResponseContext - { - Context = _context, - File = _fileInfo, - }); + + _options.OnPrepareResponse(new StaticFileResponseContext(_context, _fileInfo)); } public PreconditionState GetPreconditionState() diff --git a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs index 72b25c8259..a9743fdfa0 100644 --- a/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs +++ b/src/StaticFiles/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs @@ -1,6 +1,7 @@ // 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; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.FileProviders; @@ -11,14 +12,33 @@ namespace Microsoft.AspNetCore.StaticFiles /// public class StaticFileResponseContext { + [Obsolete("Use the constructor that passes in the HttpContext and IFileInfo parameters: StaticFileResponseContext(HttpContext context, IFileInfo file)", false)] + public StaticFileResponseContext() + { + } + + public StaticFileResponseContext(HttpContext context, IFileInfo file) + { + if (file == null) + { + throw new ArgumentNullException(nameof(file)); + } + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + Context = context; + File = file; + } + /// /// The request and response information. /// - public HttpContext Context { get; internal set; } + public HttpContext Context { get; } /// /// The file to be served. /// - public IFileInfo File { get; internal set; } + public IFileInfo File { get; } } } diff --git a/src/StaticFiles/version.props b/src/StaticFiles/version.props index 4889a26987..d977b437b6 100644 --- a/src/StaticFiles/version.props +++ b/src/StaticFiles/version.props @@ -1,12 +1,6 @@ - + - 2.2.0 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) + 3.0.0 + dev