From 0378cbbc515e2816ab3004df0ffab8c43be19729 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 9 Apr 2019 17:05:44 -0700 Subject: [PATCH 1/4] Rename StreamPipeReaderOptions to StreamPipeReaderAdapterOptions (#9177) --- .../ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs | 10 +++++----- src/Http/Http/src/StreamPipeReader.cs | 4 ++-- src/Http/Http/src/StreamPipeReaderOptions.cs | 8 ++++---- src/Http/Http/test/StreamPipeReaderTests.cs | 4 ++-- src/Http/Http/test/StreamPipeTest.cs | 2 +- .../Internal/Http/HttpProtocol.FeatureCollection.cs | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs b/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs index 623cfbb461..c2ac47f401 100644 --- a/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs +++ b/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs @@ -523,7 +523,7 @@ namespace System.IO.Pipelines public partial class StreamPipeReader : System.IO.Pipelines.PipeReader, System.IDisposable { public StreamPipeReader(System.IO.Stream readingStream) { } - public StreamPipeReader(System.IO.Stream readingStream, System.IO.Pipelines.StreamPipeReaderOptions options) { } + public StreamPipeReader(System.IO.Stream readingStream, System.IO.Pipelines.StreamPipeReaderAdapterOptions options) { } public System.IO.Stream InnerStream { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public override void AdvanceTo(System.SequencePosition consumed) { } public override void AdvanceTo(System.SequencePosition consumed, System.SequencePosition examined) { } @@ -535,13 +535,13 @@ namespace System.IO.Pipelines public override System.Threading.Tasks.ValueTask ReadAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public override bool TryRead(out System.IO.Pipelines.ReadResult result) { throw null; } } - public partial class StreamPipeReaderOptions + public partial class StreamPipeReaderAdapterOptions { public const int DefaultMinimumReadThreshold = 256; public const int DefaultMinimumSegmentSize = 4096; - public static System.IO.Pipelines.StreamPipeReaderOptions DefaultOptions; - public StreamPipeReaderOptions() { } - public StreamPipeReaderOptions(int minimumSegmentSize, int minimumReadThreshold, System.Buffers.MemoryPool memoryPool) { } + public static System.IO.Pipelines.StreamPipeReaderAdapterOptions DefaultOptions; + public StreamPipeReaderAdapterOptions() { } + public StreamPipeReaderAdapterOptions(int minimumSegmentSize, int minimumReadThreshold, System.Buffers.MemoryPool memoryPool) { } public System.Buffers.MemoryPool MemoryPool { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public int MinimumReadThreshold { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public int MinimumSegmentSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } diff --git a/src/Http/Http/src/StreamPipeReader.cs b/src/Http/Http/src/StreamPipeReader.cs index cbc360ddea..16e3e0ac32 100644 --- a/src/Http/Http/src/StreamPipeReader.cs +++ b/src/Http/Http/src/StreamPipeReader.cs @@ -37,7 +37,7 @@ namespace System.IO.Pipelines /// /// The stream to read from. public StreamPipeReader(Stream readingStream) - : this(readingStream, StreamPipeReaderOptions.DefaultOptions) + : this(readingStream, StreamPipeReaderAdapterOptions.DefaultOptions) { } @@ -46,7 +46,7 @@ namespace System.IO.Pipelines /// /// The stream to read from. /// The options to use. - public StreamPipeReader(Stream readingStream, StreamPipeReaderOptions options) + public StreamPipeReader(Stream readingStream, StreamPipeReaderAdapterOptions options) { InnerStream = readingStream ?? throw new ArgumentNullException(nameof(readingStream)); diff --git a/src/Http/Http/src/StreamPipeReaderOptions.cs b/src/Http/Http/src/StreamPipeReaderOptions.cs index 3a951db7cc..2a932e0c39 100644 --- a/src/Http/Http/src/StreamPipeReaderOptions.cs +++ b/src/Http/Http/src/StreamPipeReaderOptions.cs @@ -8,17 +8,17 @@ using System.Text; namespace System.IO.Pipelines { - public class StreamPipeReaderOptions + public class StreamPipeReaderAdapterOptions { - public static StreamPipeReaderOptions DefaultOptions = new StreamPipeReaderOptions(); + public static StreamPipeReaderAdapterOptions DefaultOptions = new StreamPipeReaderAdapterOptions(); public const int DefaultMinimumSegmentSize = 4096; public const int DefaultMinimumReadThreshold = 256; - public StreamPipeReaderOptions() + public StreamPipeReaderAdapterOptions() { } - public StreamPipeReaderOptions(int minimumSegmentSize, int minimumReadThreshold, MemoryPool memoryPool) + public StreamPipeReaderAdapterOptions(int minimumSegmentSize, int minimumReadThreshold, MemoryPool memoryPool) { MinimumSegmentSize = minimumSegmentSize; MinimumReadThreshold = minimumReadThreshold; diff --git a/src/Http/Http/test/StreamPipeReaderTests.cs b/src/Http/Http/test/StreamPipeReaderTests.cs index 97859f5940..bf76875001 100644 --- a/src/Http/Http/test/StreamPipeReaderTests.cs +++ b/src/Http/Http/test/StreamPipeReaderTests.cs @@ -532,7 +532,7 @@ namespace System.IO.Pipelines.Tests public void SetMinimumReadThresholdOfZeroThrows() { Assert.Throws(() => new StreamPipeReader(Stream, - new StreamPipeReaderOptions(minimumSegmentSize: 4096, minimumReadThreshold: 0, new TestMemoryPool()))); + new StreamPipeReaderAdapterOptions(minimumSegmentSize: 4096, minimumReadThreshold: 0, new TestMemoryPool()))); } [Fact] @@ -686,7 +686,7 @@ namespace System.IO.Pipelines.Tests private void CreateReader(int minimumSegmentSize = 16, int minimumReadThreshold = 4, MemoryPool memoryPool = null) { Reader = new StreamPipeReader(Stream, - new StreamPipeReaderOptions( + new StreamPipeReaderAdapterOptions( minimumSegmentSize, minimumReadThreshold, memoryPool ?? new TestMemoryPool())); diff --git a/src/Http/Http/test/StreamPipeTest.cs b/src/Http/Http/test/StreamPipeTest.cs index f75c5053f1..9c9f1f4b06 100644 --- a/src/Http/Http/test/StreamPipeTest.cs +++ b/src/Http/Http/test/StreamPipeTest.cs @@ -24,7 +24,7 @@ namespace System.IO.Pipelines.Tests Pool = new TestMemoryPool(); Stream = new MemoryStream(); Writer = new StreamPipeWriter(Stream, MinimumSegmentSize, Pool); - Reader = new StreamPipeReader(Stream, new StreamPipeReaderOptions(MinimumSegmentSize, minimumReadThreshold: 256, Pool)); + Reader = new StreamPipeReader(Stream, new StreamPipeReaderAdapterOptions(MinimumSegmentSize, minimumReadThreshold: 256, Pool)); } public void Dispose() diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs index ea4d2cad09..4d80e6e14c 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs @@ -101,7 +101,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http set { RequestBody = value; - var requestPipeReader = new StreamPipeReader(RequestBody, new StreamPipeReaderOptions( + var requestPipeReader = new StreamPipeReader(RequestBody, new StreamPipeReaderAdapterOptions( minimumSegmentSize: KestrelMemoryPool.MinimumSegmentSize, minimumReadThreshold: KestrelMemoryPool.MinimumSegmentSize / 4, _context.MemoryPool)); From 413f1ddd19d5771b21d34597d5da3d56933afe17 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 9 Apr 2019 17:06:06 -0700 Subject: [PATCH 2/4] Fix folder version for global module to only have 3 numbers (#9175) --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 4 ++-- .../AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs | 4 ++-- .../Windows/AspNetCoreModule-Setup/Directory.Build.props | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index a5ed751f14..49bae9932b 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -173,7 +173,7 @@ - + - + - + - + $(BUILD_MINOR) - 1$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(BUILD_MAJOR).0 + 1$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(BUILD_MAJOR) + $(ANCMFolderVersion).0 @@ -31,7 +32,7 @@ <_ServerIISBasePath>$(RepositoryRoot)\src\Servers\IIS\ BLDVERMAJOR=$(BLDVERMAJOR);BLDVERMINOR=$(BLDVERMINOR);BLDNUMMAJOR=$(BLDNUMMAJOR);BLDNUMMINOR=$(BLDNUMMINOR);$(DefineConstants) - ANCMMsiVersion=$(ANCMMsiVersion);ANCMOutOfProcessNugetPackageHandlerVersion=$(ANCMOutOfProcessNugetPackageHandlerVersion);$(DefineConstants) + ANCMMsiVersion=$(ANCMMsiVersion);ANCMFolderVersion=$(ANCMFolderVersion);ANCMOutOfProcessNugetPackageHandlerVersion=$(ANCMOutOfProcessNugetPackageHandlerVersion);$(DefineConstants) AspNetCoreSchemaPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml; AspNetCoreMofPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\ancm.mof; From 6545fc155b087cf03a3ca3969ea7db070abf9a12 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 9 Apr 2019 17:07:56 -0700 Subject: [PATCH 3/4] Update gRPC package versions (#9219) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7f78dc2868..7a412f2388 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,8 +174,8 @@ 4.2.1 4.2.1 3.7.0 - 0.1.19-pre2 - 1.20.0-pre1 + 0.1.20-pre1 + 1.20.0-pre3 3.0.0-preview3.4 3.0.0-preview3.4 3.0.0-preview3.4 From d1c7e90b9843c08601371780814175f869130ff3 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 9 Apr 2019 17:18:46 -0700 Subject: [PATCH 4/4] Rename Microsoft.AspNetCore.App.PlatformManifest.txt to PlatformManifest.txt (#9180) --- src/Framework/Directory.Build.props | 2 +- src/Framework/test/TargetingPackTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Framework/Directory.Build.props b/src/Framework/Directory.Build.props index befee0caad..5a05adc758 100644 --- a/src/Framework/Directory.Build.props +++ b/src/Framework/Directory.Build.props @@ -7,7 +7,7 @@ - Microsoft.AspNetCore.App.PlatformManifest.txt + PlatformManifest.txt $(ArtifactsObjDir)$(PlatformManifestFileName) diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs index 68832e2842..d1c7baf893 100644 --- a/src/Framework/test/TargetingPackTests.cs +++ b/src/Framework/test/TargetingPackTests.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore [Fact] public void PlatformManifestListsAllFiles() { - var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "Microsoft.AspNetCore.App.PlatformManifest.txt"); + var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt"); var expectedAssemblies = TestData.GetSharedFxDependencies() .Split(';', StringSplitOptions.RemoveEmptyEntries) .ToHashSet();