From 7fd42c4e946338f5725ef57f6c2eccf0ed9a078c Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Thu, 10 Oct 2019 04:41:00 +0000 Subject: [PATCH 001/116] Merged PR 3115: Wait to Complete Pipe Fixed the `PipeWriterStream` to properly detect a canceled write and throw an `OperationCanceledException` in those cases. And making sure `Complete` is called in a safe manner by ensuring it is in a lock so writes can't be in-progress. --- eng/PatchConfig.props | 6 ++ .../ts/FunctionalTests/selenium/run-tests.ts | 23 ++++++- .../src/Internal/HttpConnectionContext.cs | 28 ++++++++- .../src/Internal/HttpConnectionDispatcher.cs | 15 +++-- .../src/Internal/TaskExtensions.cs | 27 ++++++++ src/SignalR/common/Shared/PipeWriterStream.cs | 12 +++- .../server/Core/src/HubConnectionContext.cs | 61 +++++++++++++++++++ .../SignalR/test/HubConnectionHandlerTests.cs | 4 +- 8 files changed, 164 insertions(+), 12 deletions(-) create mode 100644 src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 3ba7babc57..83f2b24497 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -44,4 +44,10 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.CookiePolicy; + + + Microsoft.AspNetCore.Http.Connections; + Microsoft.AspNetCore.SignalR.Core; + + diff --git a/src/SignalR/clients/ts/FunctionalTests/selenium/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/selenium/run-tests.ts index c74603b12c..6f548f1534 100644 --- a/src/SignalR/clients/ts/FunctionalTests/selenium/run-tests.ts +++ b/src/SignalR/clients/ts/FunctionalTests/selenium/run-tests.ts @@ -1,7 +1,8 @@ import { ChildProcess, spawn } from "child_process"; -import * as fs from "fs"; +import * as _fs from "fs"; import { EOL } from "os"; import * as path from "path"; +import { promisify } from "util"; import { PassThrough, Readable } from "stream"; import { run } from "../../webdriver-tap-runner/lib"; @@ -9,6 +10,16 @@ import { run } from "../../webdriver-tap-runner/lib"; import * as _debug from "debug"; const debug = _debug("signalr-functional-tests:run"); +const ARTIFACTS_DIR = path.resolve(__dirname, "..", "..", "..", "..", "artifacts"); +const LOGS_DIR = path.resolve(ARTIFACTS_DIR, "logs"); + +// Promisify things from fs we want to use. +const fs = { + createWriteStream: _fs.createWriteStream, + exists: promisify(_fs.exists), + mkdir: promisify(_fs.mkdir), +}; + process.on("unhandledRejection", (reason) => { console.error(`Unhandled promise rejection: ${reason}`); process.exit(1); @@ -102,6 +113,13 @@ if (chromePath) { try { const serverPath = path.resolve(__dirname, "..", "bin", configuration, "netcoreapp2.1", "FunctionalTests.dll"); + if (!await fs.exists(ARTIFACTS_DIR)) { + await fs.mkdir(ARTIFACTS_DIR); + } + if (!await fs.exists(LOGS_DIR)) { + await fs.mkdir(LOGS_DIR); + } + debug(`Launching Functional Test Server: ${serverPath}`); const dotnet = spawn("dotnet", [serverPath], { env: { @@ -117,6 +135,9 @@ if (chromePath) { } } + const logStream = fs.createWriteStream(path.resolve(LOGS_DIR, "ts.functionaltests.dotnet.log")); + dotnet.stdout.pipe(logStream); + process.on("SIGINT", cleanup); process.on("exit", cleanup); diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs index 045e821ee1..425c15d76e 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs @@ -274,13 +274,35 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal // Cancel any pending flushes from back pressure Application?.Output.CancelPendingFlush(); - // Shutdown both sides and wait for nothing + // Normally it isn't safe to try and acquire this lock because the Send can hold onto it for a long time if there is backpressure + // It is safe to wait for this lock now because the Send will be in one of 4 states + // 1. In the middle of a write which is in the middle of being canceled by the CancelPendingFlush above, when it throws + // an OperationCanceledException it will complete the PipeWriter which will make any other Send waiting on the lock + // throw an InvalidOperationException if they call Write + // 2. About to write and see that there is a pending cancel from the CancelPendingFlush, go to 1 to see what happens + // 3. Enters the Send and sees the Dispose state from DisposeAndRemoveAsync and releases the lock + // 4. No Send in progress + await WriteLock.WaitAsync(); + try + { + // Complete the applications read loop + Application?.Output.Complete(transportTask.Exception?.InnerException); + } + finally + { + WriteLock.Release(); + } + + Log.WaitingForTransportAndApplication(_logger, TransportType); + + // Wait for application so we can complete the writer safely + await applicationTask.NoThrow(); + + // Shutdown application side now that it's finished Transport?.Output.Complete(applicationTask.Exception?.InnerException); - Application?.Output.Complete(transportTask.Exception?.InnerException); try { - Log.WaitingForTransportAndApplication(_logger, TransportType); // A poorly written application *could* in theory get stuck forever and it'll show up as a memory leak await Task.WhenAll(applicationTask, transportTask); } diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs index 50910bccfe..2d8b5c24ad 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs @@ -511,6 +511,14 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal context.Response.StatusCode = StatusCodes.Status404NotFound; context.Response.ContentType = "text/plain"; + + // There are no writes anymore (since this is the write "loop") + // So it is safe to complete the writer + // We complete the writer here because we already have the WriteLock acquired + // and it's unsafe to complete outside of the lock + // Other code isn't guaranteed to be able to acquire the lock before another write + // even if CancelPendingFlush is called, and the other write could hang if there is backpressure + connection.Application.Output.Complete(); return; } @@ -549,11 +557,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal Log.TerminatingConection(_logger); - // Complete the receiving end of the pipe - connection.Application.Output.Complete(); - - // Dispose the connection gracefully, but don't wait for it. We assign it here so we can wait in tests - connection.DisposeAndRemoveTask = _manager.DisposeAndRemoveAsync(connection, closeGracefully: true); + // Dispose the connection, but don't wait for it. We assign it here so we can wait in tests + connection.DisposeAndRemoveTask = _manager.DisposeAndRemoveAsync(connection, closeGracefully: false); context.Response.StatusCode = StatusCodes.Status202Accepted; context.Response.ContentType = "text/plain"; diff --git a/src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs b/src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs new file mode 100644 index 0000000000..a901379b75 --- /dev/null +++ b/src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs @@ -0,0 +1,27 @@ +// 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.Runtime.CompilerServices; + +namespace System.Threading.Tasks +{ + internal static class TaskExtensions + { + public static async Task NoThrow(this Task task) + { + await new NoThrowAwaiter(task); + } + } + + internal readonly struct NoThrowAwaiter : ICriticalNotifyCompletion + { + private readonly Task _task; + public NoThrowAwaiter(Task task) { _task = task; } + public NoThrowAwaiter GetAwaiter() => this; + public bool IsCompleted => _task.IsCompleted; + // Observe exception + public void GetResult() { _ = _task.Exception; } + public void OnCompleted(Action continuation) => _task.GetAwaiter().OnCompleted(continuation); + public void UnsafeOnCompleted(Action continuation) => OnCompleted(continuation); + } +} diff --git a/src/SignalR/common/Shared/PipeWriterStream.cs b/src/SignalR/common/Shared/PipeWriterStream.cs index eb5b6d5add..245731bfd9 100644 --- a/src/SignalR/common/Shared/PipeWriterStream.cs +++ b/src/SignalR/common/Shared/PipeWriterStream.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; @@ -76,7 +76,15 @@ namespace System.IO.Pipelines _length += source.Length; var task = _pipeWriter.WriteAsync(source); - if (!task.IsCompletedSuccessfully) + if (task.IsCompletedSuccessfully) + { + // Cancellation can be triggered by PipeWriter.CancelPendingFlush + if (task.Result.IsCanceled) + { + throw new OperationCanceledException(); + } + } + else if (!task.IsCompletedSuccessfully) { return WriteSlowAsync(task); } diff --git a/src/SignalR/server/Core/src/HubConnectionContext.cs b/src/SignalR/server/Core/src/HubConnectionContext.cs index 5a1049e780..085249438a 100644 --- a/src/SignalR/server/Core/src/HubConnectionContext.cs +++ b/src/SignalR/server/Core/src/HubConnectionContext.cs @@ -33,6 +33,7 @@ namespace Microsoft.AspNetCore.SignalR private long _lastSendTimestamp = Stopwatch.GetTimestamp(); private ReadOnlyMemory _cachedPingMessage; + private volatile bool _connectionAborted; /// /// Initializes a new instance of the class. @@ -99,6 +100,12 @@ namespace Microsoft.AspNetCore.SignalR return new ValueTask(WriteSlowAsync(message)); } + if (_connectionAborted) + { + _writeLock.Release(); + return default; + } + // This method should never throw synchronously var task = WriteCore(message); @@ -129,6 +136,12 @@ namespace Microsoft.AspNetCore.SignalR return new ValueTask(WriteSlowAsync(message)); } + if (_connectionAborted) + { + _writeLock.Release(); + return default; + } + // This method should never throw synchronously var task = WriteCore(message); @@ -158,6 +171,8 @@ namespace Microsoft.AspNetCore.SignalR { Log.FailedWritingMessage(_logger, ex); + Abort(); + return new ValueTask(new FlushResult(isCanceled: false, isCompleted: true)); } } @@ -175,6 +190,8 @@ namespace Microsoft.AspNetCore.SignalR { Log.FailedWritingMessage(_logger, ex); + Abort(); + return new ValueTask(new FlushResult(isCanceled: false, isCompleted: true)); } } @@ -188,6 +205,8 @@ namespace Microsoft.AspNetCore.SignalR catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); + + Abort(); } finally { @@ -201,6 +220,11 @@ namespace Microsoft.AspNetCore.SignalR await _writeLock.WaitAsync(); try { + if (_connectionAborted) + { + return; + } + // Failed to get the lock immediately when entering WriteAsync so await until it is available await WriteCore(message); @@ -208,6 +232,8 @@ namespace Microsoft.AspNetCore.SignalR catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); + + Abort(); } finally { @@ -219,6 +245,11 @@ namespace Microsoft.AspNetCore.SignalR { try { + if (_connectionAborted) + { + return; + } + // Failed to get the lock immediately when entering WriteAsync so await until it is available await _writeLock.WaitAsync(); @@ -227,6 +258,8 @@ namespace Microsoft.AspNetCore.SignalR catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); + + Abort(); } finally { @@ -250,6 +283,11 @@ namespace Microsoft.AspNetCore.SignalR { try { + if (_connectionAborted) + { + return; + } + await _connectionContext.Transport.Output.WriteAsync(_cachedPingMessage); Log.SentPing(_logger); @@ -257,6 +295,8 @@ namespace Microsoft.AspNetCore.SignalR catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); + + Abort(); } finally { @@ -293,6 +333,12 @@ namespace Microsoft.AspNetCore.SignalR /// public virtual void Abort() { + _connectionAborted = true; + + // Cancel any current writes or writes that are about to happen and have already gone past the _connectionAborted bool + // We have to do this outside of the lock otherwise it could hang if the write is observing backpressure + _connectionContext.Transport.Output.CancelPendingFlush(); + // If we already triggered the token then noop, this isn't thread safe but it's good enough // to avoid spawning a new task in the most common cases if (_connectionAbortedTokenSource.IsCancellationRequested) @@ -423,9 +469,24 @@ namespace Microsoft.AspNetCore.SignalR internal Task AbortAsync() { Abort(); + + // Acquire lock to make sure all writes are completed + if (!_writeLock.Wait(0)) + { + return AbortAsyncSlow(); + } + + _writeLock.Release(); return _abortCompletedTcs.Task; } + private async Task AbortAsyncSlow() + { + await _writeLock.WaitAsync(); + _writeLock.Release(); + await _abortCompletedTcs.Task; + } + private void KeepAliveTick() { var timestamp = Stopwatch.GetTimestamp(); diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs index 06fa3841eb..c310087095 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs @@ -79,9 +79,11 @@ namespace Microsoft.AspNetCore.SignalR.Tests { var connectionHandlerTask = await client.ConnectAsync(connectionHandler); - await client.InvokeAsync(nameof(AbortHub.Kill)); + await client.SendInvocationAsync(nameof(AbortHub.Kill)); await connectionHandlerTask.OrTimeout(); + + Assert.Null(client.TryRead()); } } From 57e68b069e4fe83720565717375a1e1a3bfeb74b Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Fri, 11 Oct 2019 01:46:11 +0000 Subject: [PATCH 002/116] Merged PR 3557: Revert "Wait to Complete Pipe" --- eng/PatchConfig.props | 6 -- .../ts/FunctionalTests/selenium/run-tests.ts | 23 +------ .../src/Internal/HttpConnectionContext.cs | 28 +-------- .../src/Internal/HttpConnectionDispatcher.cs | 15 ++--- .../src/Internal/TaskExtensions.cs | 27 -------- src/SignalR/common/Shared/PipeWriterStream.cs | 12 +--- .../server/Core/src/HubConnectionContext.cs | 61 ------------------- .../SignalR/test/HubConnectionHandlerTests.cs | 4 +- 8 files changed, 12 insertions(+), 164 deletions(-) delete mode 100644 src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 83f2b24497..3ba7babc57 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -44,10 +44,4 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.CookiePolicy; - - - Microsoft.AspNetCore.Http.Connections; - Microsoft.AspNetCore.SignalR.Core; - - diff --git a/src/SignalR/clients/ts/FunctionalTests/selenium/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/selenium/run-tests.ts index 6f548f1534..c74603b12c 100644 --- a/src/SignalR/clients/ts/FunctionalTests/selenium/run-tests.ts +++ b/src/SignalR/clients/ts/FunctionalTests/selenium/run-tests.ts @@ -1,8 +1,7 @@ import { ChildProcess, spawn } from "child_process"; -import * as _fs from "fs"; +import * as fs from "fs"; import { EOL } from "os"; import * as path from "path"; -import { promisify } from "util"; import { PassThrough, Readable } from "stream"; import { run } from "../../webdriver-tap-runner/lib"; @@ -10,16 +9,6 @@ import { run } from "../../webdriver-tap-runner/lib"; import * as _debug from "debug"; const debug = _debug("signalr-functional-tests:run"); -const ARTIFACTS_DIR = path.resolve(__dirname, "..", "..", "..", "..", "artifacts"); -const LOGS_DIR = path.resolve(ARTIFACTS_DIR, "logs"); - -// Promisify things from fs we want to use. -const fs = { - createWriteStream: _fs.createWriteStream, - exists: promisify(_fs.exists), - mkdir: promisify(_fs.mkdir), -}; - process.on("unhandledRejection", (reason) => { console.error(`Unhandled promise rejection: ${reason}`); process.exit(1); @@ -113,13 +102,6 @@ if (chromePath) { try { const serverPath = path.resolve(__dirname, "..", "bin", configuration, "netcoreapp2.1", "FunctionalTests.dll"); - if (!await fs.exists(ARTIFACTS_DIR)) { - await fs.mkdir(ARTIFACTS_DIR); - } - if (!await fs.exists(LOGS_DIR)) { - await fs.mkdir(LOGS_DIR); - } - debug(`Launching Functional Test Server: ${serverPath}`); const dotnet = spawn("dotnet", [serverPath], { env: { @@ -135,9 +117,6 @@ if (chromePath) { } } - const logStream = fs.createWriteStream(path.resolve(LOGS_DIR, "ts.functionaltests.dotnet.log")); - dotnet.stdout.pipe(logStream); - process.on("SIGINT", cleanup); process.on("exit", cleanup); diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs index 425c15d76e..045e821ee1 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs @@ -274,35 +274,13 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal // Cancel any pending flushes from back pressure Application?.Output.CancelPendingFlush(); - // Normally it isn't safe to try and acquire this lock because the Send can hold onto it for a long time if there is backpressure - // It is safe to wait for this lock now because the Send will be in one of 4 states - // 1. In the middle of a write which is in the middle of being canceled by the CancelPendingFlush above, when it throws - // an OperationCanceledException it will complete the PipeWriter which will make any other Send waiting on the lock - // throw an InvalidOperationException if they call Write - // 2. About to write and see that there is a pending cancel from the CancelPendingFlush, go to 1 to see what happens - // 3. Enters the Send and sees the Dispose state from DisposeAndRemoveAsync and releases the lock - // 4. No Send in progress - await WriteLock.WaitAsync(); - try - { - // Complete the applications read loop - Application?.Output.Complete(transportTask.Exception?.InnerException); - } - finally - { - WriteLock.Release(); - } - - Log.WaitingForTransportAndApplication(_logger, TransportType); - - // Wait for application so we can complete the writer safely - await applicationTask.NoThrow(); - - // Shutdown application side now that it's finished + // Shutdown both sides and wait for nothing Transport?.Output.Complete(applicationTask.Exception?.InnerException); + Application?.Output.Complete(transportTask.Exception?.InnerException); try { + Log.WaitingForTransportAndApplication(_logger, TransportType); // A poorly written application *could* in theory get stuck forever and it'll show up as a memory leak await Task.WhenAll(applicationTask, transportTask); } diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs index 2d8b5c24ad..50910bccfe 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs @@ -511,14 +511,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal context.Response.StatusCode = StatusCodes.Status404NotFound; context.Response.ContentType = "text/plain"; - - // There are no writes anymore (since this is the write "loop") - // So it is safe to complete the writer - // We complete the writer here because we already have the WriteLock acquired - // and it's unsafe to complete outside of the lock - // Other code isn't guaranteed to be able to acquire the lock before another write - // even if CancelPendingFlush is called, and the other write could hang if there is backpressure - connection.Application.Output.Complete(); return; } @@ -557,8 +549,11 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal Log.TerminatingConection(_logger); - // Dispose the connection, but don't wait for it. We assign it here so we can wait in tests - connection.DisposeAndRemoveTask = _manager.DisposeAndRemoveAsync(connection, closeGracefully: false); + // Complete the receiving end of the pipe + connection.Application.Output.Complete(); + + // Dispose the connection gracefully, but don't wait for it. We assign it here so we can wait in tests + connection.DisposeAndRemoveTask = _manager.DisposeAndRemoveAsync(connection, closeGracefully: true); context.Response.StatusCode = StatusCodes.Status202Accepted; context.Response.ContentType = "text/plain"; diff --git a/src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs b/src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs deleted file mode 100644 index a901379b75..0000000000 --- a/src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs +++ /dev/null @@ -1,27 +0,0 @@ -// 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.Runtime.CompilerServices; - -namespace System.Threading.Tasks -{ - internal static class TaskExtensions - { - public static async Task NoThrow(this Task task) - { - await new NoThrowAwaiter(task); - } - } - - internal readonly struct NoThrowAwaiter : ICriticalNotifyCompletion - { - private readonly Task _task; - public NoThrowAwaiter(Task task) { _task = task; } - public NoThrowAwaiter GetAwaiter() => this; - public bool IsCompleted => _task.IsCompleted; - // Observe exception - public void GetResult() { _ = _task.Exception; } - public void OnCompleted(Action continuation) => _task.GetAwaiter().OnCompleted(continuation); - public void UnsafeOnCompleted(Action continuation) => OnCompleted(continuation); - } -} diff --git a/src/SignalR/common/Shared/PipeWriterStream.cs b/src/SignalR/common/Shared/PipeWriterStream.cs index 245731bfd9..eb5b6d5add 100644 --- a/src/SignalR/common/Shared/PipeWriterStream.cs +++ b/src/SignalR/common/Shared/PipeWriterStream.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; @@ -76,15 +76,7 @@ namespace System.IO.Pipelines _length += source.Length; var task = _pipeWriter.WriteAsync(source); - if (task.IsCompletedSuccessfully) - { - // Cancellation can be triggered by PipeWriter.CancelPendingFlush - if (task.Result.IsCanceled) - { - throw new OperationCanceledException(); - } - } - else if (!task.IsCompletedSuccessfully) + if (!task.IsCompletedSuccessfully) { return WriteSlowAsync(task); } diff --git a/src/SignalR/server/Core/src/HubConnectionContext.cs b/src/SignalR/server/Core/src/HubConnectionContext.cs index 085249438a..5a1049e780 100644 --- a/src/SignalR/server/Core/src/HubConnectionContext.cs +++ b/src/SignalR/server/Core/src/HubConnectionContext.cs @@ -33,7 +33,6 @@ namespace Microsoft.AspNetCore.SignalR private long _lastSendTimestamp = Stopwatch.GetTimestamp(); private ReadOnlyMemory _cachedPingMessage; - private volatile bool _connectionAborted; /// /// Initializes a new instance of the class. @@ -100,12 +99,6 @@ namespace Microsoft.AspNetCore.SignalR return new ValueTask(WriteSlowAsync(message)); } - if (_connectionAborted) - { - _writeLock.Release(); - return default; - } - // This method should never throw synchronously var task = WriteCore(message); @@ -136,12 +129,6 @@ namespace Microsoft.AspNetCore.SignalR return new ValueTask(WriteSlowAsync(message)); } - if (_connectionAborted) - { - _writeLock.Release(); - return default; - } - // This method should never throw synchronously var task = WriteCore(message); @@ -171,8 +158,6 @@ namespace Microsoft.AspNetCore.SignalR { Log.FailedWritingMessage(_logger, ex); - Abort(); - return new ValueTask(new FlushResult(isCanceled: false, isCompleted: true)); } } @@ -190,8 +175,6 @@ namespace Microsoft.AspNetCore.SignalR { Log.FailedWritingMessage(_logger, ex); - Abort(); - return new ValueTask(new FlushResult(isCanceled: false, isCompleted: true)); } } @@ -205,8 +188,6 @@ namespace Microsoft.AspNetCore.SignalR catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); - - Abort(); } finally { @@ -220,11 +201,6 @@ namespace Microsoft.AspNetCore.SignalR await _writeLock.WaitAsync(); try { - if (_connectionAborted) - { - return; - } - // Failed to get the lock immediately when entering WriteAsync so await until it is available await WriteCore(message); @@ -232,8 +208,6 @@ namespace Microsoft.AspNetCore.SignalR catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); - - Abort(); } finally { @@ -245,11 +219,6 @@ namespace Microsoft.AspNetCore.SignalR { try { - if (_connectionAborted) - { - return; - } - // Failed to get the lock immediately when entering WriteAsync so await until it is available await _writeLock.WaitAsync(); @@ -258,8 +227,6 @@ namespace Microsoft.AspNetCore.SignalR catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); - - Abort(); } finally { @@ -283,11 +250,6 @@ namespace Microsoft.AspNetCore.SignalR { try { - if (_connectionAborted) - { - return; - } - await _connectionContext.Transport.Output.WriteAsync(_cachedPingMessage); Log.SentPing(_logger); @@ -295,8 +257,6 @@ namespace Microsoft.AspNetCore.SignalR catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); - - Abort(); } finally { @@ -333,12 +293,6 @@ namespace Microsoft.AspNetCore.SignalR /// public virtual void Abort() { - _connectionAborted = true; - - // Cancel any current writes or writes that are about to happen and have already gone past the _connectionAborted bool - // We have to do this outside of the lock otherwise it could hang if the write is observing backpressure - _connectionContext.Transport.Output.CancelPendingFlush(); - // If we already triggered the token then noop, this isn't thread safe but it's good enough // to avoid spawning a new task in the most common cases if (_connectionAbortedTokenSource.IsCancellationRequested) @@ -469,24 +423,9 @@ namespace Microsoft.AspNetCore.SignalR internal Task AbortAsync() { Abort(); - - // Acquire lock to make sure all writes are completed - if (!_writeLock.Wait(0)) - { - return AbortAsyncSlow(); - } - - _writeLock.Release(); return _abortCompletedTcs.Task; } - private async Task AbortAsyncSlow() - { - await _writeLock.WaitAsync(); - _writeLock.Release(); - await _abortCompletedTcs.Task; - } - private void KeepAliveTick() { var timestamp = Stopwatch.GetTimestamp(); diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs index c310087095..06fa3841eb 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs @@ -79,11 +79,9 @@ namespace Microsoft.AspNetCore.SignalR.Tests { var connectionHandlerTask = await client.ConnectAsync(connectionHandler); - await client.SendInvocationAsync(nameof(AbortHub.Kill)); + await client.InvokeAsync(nameof(AbortHub.Kill)); await connectionHandlerTask.OrTimeout(); - - Assert.Null(client.TryRead()); } } From 2c6456d4634df947e3cafd5e7dee02289dc12697 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2019 18:06:32 -0700 Subject: [PATCH 003/116] [release/3.0] Update dependencies from 4 repositories (#14425) * Update dependencies from https://github.com/dotnet/arcade build 20190924.3 * Update dependencies from https://github.com/aspnet/Blazor build 20191003.2 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191007.2 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191010.4 * Remove potentially unnecessary feeds * Install the runtime during source build * Pin m.nc.app.ref * Add aspnetcore-dev feed back to nuget.config * Pin internal refs package * Move efcore internal refs dependency * Compile against ref assemblies * Add manually generated internal ref assembly: * DataProtection * Kestrel * Hosting * Http * Mvc * Middleware * SignalR * Identity * Components * Fix crossgen for ref compilation * Fix tools for ref compilation * Explicitly specify ExcludeFromSourceBuild * Build targeting pack for 3.0.1 * Improve condition for building targeting pack in 3.0.1 * Fixing siteex build for ref compilation * Resolve reference assemblies from Extensions * Don't build refPack during source build * Add big list of project references, for tests to use * Exclude sources files from indirect references * The types in these packages will be compiled into the binaries of the projects that directly depended o it * Add manual indirect references to project references * Add samples/test assets * Don't add indirect refs for ProjectRefs with ReferenceOutputAssembly=false * Fix JSInterop for ref compilation * Do not substitute ext ref assemblies in ref pack * Disable the TestFramework assembly attribute from Logging.Testing There's custom logic in ProjectTemplates.Tests to use a different TestFramework instead * Fix Functional tests * Issues caused by incorrect deps files working around this via test infrastructure instead * Mvc * Analyzers * StaticFiles * SignalR * HttpOverrides --- Directory.Build.props | 3 + Directory.Build.targets | 4 +- NuGet.config | 20 +- eng/GenAPI.exclusions.txt | 9 +- eng/IndirectReferences.props | 10911 ++++++++++++++++ eng/Version.Details.xml | 309 +- eng/Versions.props | 146 +- eng/common/enable-cross-org-publishing.ps1 | 6 + eng/common/sdl/extract-artifact-packages.ps1 | 7 + .../channels/netcore-3-tools-validation.yml | 95 + ...netcore-dev-30.yml => netcore-3-tools.yml} | 44 +- .../post-build/channels/netcore-dev-31.yml | 8 +- .../post-build/channels/netcore-dev-5.yml | 8 +- .../channels/netcore-internal-30.yml | 8 +- .../channels/netcore-release-30.yml | 8 +- .../channels/netcore-release-31.yml | 8 +- .../channels/netcore-tools-latest.yml | 8 +- ...lease.yml => netcore-tools-validation.yml} | 12 +- .../templates/post-build/common-variables.yml | 14 +- .../templates/post-build/post-build.yml | 19 +- eng/scripts/ci-source-build.sh | 4 +- eng/targets/ReferenceAssembly.targets | 6 +- eng/targets/ResolveReferences.targets | 77 +- global.json | 4 +- .../Analyzers/test/AnalyzerTestBase.cs | 2 +- .../test/AnalyzersDiagnosticAnalyzerRunner.cs | 26 +- .../Microsoft.AspNetCore.Antiforgery.csproj | 2 + ...AspNetCore.Components.Authorization.csproj | 2 + .../Blazor/testassets/Directory.Build.props | 10 + .../Microsoft.AspNetCore.Components.csproj | 2 + ...crosoft.AspNetCore.Components.Forms.csproj | 2 + ...rosoft.AspNetCore.Components.Server.csproj | 2 + ...Microsoft.AspNetCore.Components.Web.csproj | 2 + ...soft.AspNetCore.Components.E2ETests.csproj | 6 +- .../test/testassets/Directory.Build.props | 10 + ...NetCore.DataProtection.Abstractions.csproj | 2 + .../ref/Directory.Build.props | 8 + ...AspNetCore.Cryptography.Internal.Manual.cs | 417 + ...ft.AspNetCore.Cryptography.Internal.csproj | 3 + ...pNetCore.Cryptography.KeyDerivation.csproj | 2 + ...Microsoft.AspNetCore.DataProtection.csproj | 2 + ...spNetCore.DataProtection.Extensions.csproj | 2 + .../ref/Microsoft.AspNetCore.csproj | 2 + .../testassets/Directory.Build.props | 7 + .../ref/Microsoft.AspNetCore.App.Ref.csproj | 9 +- .../Microsoft.AspNetCore.App.Runtime.csproj | 14 +- ...oft.AspNetCore.Hosting.Abstractions.csproj | 2 + .../ref/Microsoft.AspNetCore.Hosting.csproj | 2 + ...NetCore.Hosting.Server.Abstractions.csproj | 2 + .../IStartupInjectionAssemblyName.csproj | 5 + ...rosoft.AspNetCore.Html.Abstractions.csproj | 2 + ...NetCore.Authentication.Abstractions.csproj | 2 + ...soft.AspNetCore.Authentication.Core.csproj | 2 + .../ref/Microsoft.Net.Http.Headers.csproj | 2 + ...rosoft.AspNetCore.Http.Abstractions.csproj | 2 + ...icrosoft.AspNetCore.Http.Extensions.csproj | 2 + .../Microsoft.AspNetCore.Http.Features.csproj | 2 + .../Http/ref/Microsoft.AspNetCore.Http.csproj | 2 + .../ref/Microsoft.AspNetCore.Metadata.csproj | 2 + ...oft.AspNetCore.Routing.Abstractions.csproj | 2 + .../ref/Microsoft.AspNetCore.Routing.csproj | 2 + .../Microsoft.AspNetCore.WebUtilities.csproj | 2 + .../ref/Microsoft.AspNetCore.Identity.csproj | 2 + .../Microsoft.Extensions.Identity.Core.csproj | 2 + ...icrosoft.Extensions.Identity.Stores.csproj | 2 + .../Microsoft.AspNetCore.Identity.Test.csproj | 2 +- .../CORS/ref/Microsoft.AspNetCore.Cors.csproj | 2 + .../test/testassets/Directory.Build.props | 7 + ...AspNetCore.Diagnostics.Abstractions.csproj | 2 + .../Microsoft.AspNetCore.Diagnostics.csproj | 2 + ...AspNetCore.Diagnostics.HealthChecks.csproj | 2 + .../HealthChecksSample.csproj | 5 + .../Microsoft.AspNetCore.HostFiltering.csproj | 2 + .../Microsoft.AspNetCore.HttpOverrides.csproj | 2 + ...soft.AspNetCore.HttpOverrides.Tests.csproj | 5 + .../Microsoft.AspNetCore.HttpsPolicy.csproj | 2 + ...oft.AspNetCore.Localization.Routing.csproj | 2 + .../Microsoft.AspNetCore.Localization.csproj | 2 + ...etCore.ResponseCaching.Abstractions.csproj | 2 + ...icrosoft.AspNetCore.ResponseCaching.csproj | 2 + ...soft.AspNetCore.ResponseCompression.csproj | 2 + .../ref/Microsoft.AspNetCore.Rewrite.csproj | 2 + .../ref/Microsoft.AspNetCore.Session.csproj | 2 + .../Microsoft.AspNetCore.StaticFiles.csproj | 2 + ...NetCore.StaticFiles.FunctionalTests.csproj | 6 + .../Microsoft.AspNetCore.WebSockets.csproj | 2 + ...crosoft.AspNetCore.Mvc.Abstractions.csproj | 2 + ...ouldNotBeAppliedToPageModelAnalyzerTest.cs | 2 +- .../test/CodeAnalysisExtensionsTest.cs | 2 +- .../MvcDiagnosticAnalyzerRunner.cs | 27 +- .../test/TopLevelParameterNameAnalyzerTest.cs | 10 +- .../ActualApiResponseMetadataFactoryTest.cs | 8 +- ...AttributeCodeFixProviderIntegrationTest.cs | 4 +- ...ModelValidationCheckCodeFixProviderTest.cs | 4 +- .../test/ApiControllerFactsTest.cs | 4 +- .../test/IgnoreCS1701WarningCodeFixRunner.cs | 18 + .../Mvc.Api.Analyzers/test/MvcFactsTest.cs | 2 +- .../test/SymbolApiConventionMatcherTest.cs | 2 +- .../SymbolApiResponseMetadataProviderTest.cs | 2 +- ...icrosoft.AspNetCore.Mvc.ApiExplorer.csproj | 2 + src/Mvc/Mvc.Core/ref/Directory.Build.props | 7 + .../Microsoft.AspNetCore.Mvc.Core.Manual.cs | 1244 ++ .../ref/Microsoft.AspNetCore.Mvc.Core.csproj | 3 + .../src/Microsoft.AspNetCore.Mvc.Core.csproj | 2 + .../ref/Microsoft.AspNetCore.Mvc.Cors.csproj | 2 + .../ref/Directory.Build.props | 8 + ...t.AspNetCore.Mvc.DataAnnotations.Manual.cs | 94 + ...soft.AspNetCore.Mvc.DataAnnotations.csproj | 3 + ...soft.AspNetCore.Mvc.Formatters.Json.csproj | 2 + ...osoft.AspNetCore.Mvc.Formatters.Xml.csproj | 2 + ...osoft.AspNetCore.Mvc.Formatters.Xml.csproj | 2 + ...crosoft.AspNetCore.Mvc.Localization.csproj | 2 + .../test/AssemblyPartExtensionTest.cs | 2 +- src/Mvc/Mvc.Razor/ref/Directory.Build.props | 7 + .../Microsoft.AspNetCore.Mvc.Razor.Manual.cs | 243 + .../ref/Microsoft.AspNetCore.Mvc.Razor.csproj | 3 + ...soft.AspNetCore.Mvc.Razor.netcoreapp3.0.cs | 8 - .../Mvc.RazorPages/ref/Directory.Build.props | 4 + ...Microsoft.AspNetCore.Mvc.RazorPages.csproj | 2 + ...ore.Mvc.RazorPages.netcoreapp3.0.Manual.cs | 311 + ...AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs | 2 +- ...Microsoft.AspNetCore.Mvc.RazorPages.csproj | 2 + ...Microsoft.AspNetCore.Mvc.TagHelpers.csproj | 2 + .../ref/Directory.Build.props | 7 + ...soft.AspNetCore.Mvc.ViewFeatures.Manual.cs | 257 + ...crosoft.AspNetCore.Mvc.ViewFeatures.csproj | 3 + ...crosoft.AspNetCore.Mvc.ViewFeatures.csproj | 7 +- .../Mvc/ref/Microsoft.AspNetCore.Mvc.csproj | 2 + .../test/Microsoft.AspNetCore.Mvc.Test.csproj | 1 - .../Mvc.FunctionalTests/ErrorPageTests.cs | 25 +- .../Mvc.FunctionalTests/RazorBuildTest.cs | 23 +- src/Mvc/test/WebSites/Directory.Build.props | 7 + .../Infrastructure/GenerateTestProps.targets | 2 +- .../test/ProjectTemplates.Tests.csproj | 3 +- .../Microsoft.AspNetCore.Razor.Runtime.csproj | 2 + .../ref/Microsoft.AspNetCore.Razor.csproj | 2 + ...t.AspNetCore.Authentication.Cookies.csproj | 2 + ...Microsoft.AspNetCore.Authentication.csproj | 2 + ...oft.AspNetCore.Authentication.OAuth.csproj | 2 + .../Microsoft.AspNetCore.Authorization.csproj | 2 + ...oft.AspNetCore.Authorization.Policy.csproj | 2 + .../Microsoft.AspNetCore.CookiePolicy.csproj | 2 + .../AuthSamples.FunctionalTests.csproj | 7 +- ...AspNetCore.Connections.Abstractions.csproj | 2 + ...Microsoft.AspNetCore.Server.HttpSys.csproj | 2 + .../Microsoft.AspNetCore.Server.IIS.csproj | 2 + .../InProcessWebSite/InProcessWebSite.csproj | 5 + ...ft.AspNetCore.Server.IISIntegration.csproj | 2 + .../Kestrel/Core/ref/Directory.Build.props | 7 + ...t.AspNetCore.Server.Kestrel.Core.Manual.cs | 17 + ...soft.AspNetCore.Server.Kestrel.Core.csproj | 3 + ...Microsoft.AspNetCore.Server.Kestrel.csproj | 2 + ...re.Server.Kestrel.Transport.Sockets.csproj | 2 + .../Libuv.BindTests/Libuv.BindTests.csproj | 2 +- .../ServerComparison.TestSites.csproj | 5 + ...e.Http.Connections.Client.netcoreapp3.0.cs | 49 - .../SignalR.Client.FunctionalTestApp.csproj | 7 + ....AspNetCore.Http.Connections.Common.csproj | 2 + ...crosoft.AspNetCore.Http.Connections.csproj | 2 + ...t.AspNetCore.SignalR.Protocols.Json.csproj | 2 + src/SignalR/common/Shared/PipeWriterStream.cs | 5 +- ...Microsoft.AspNetCore.SignalR.Common.csproj | 2 + .../Microsoft.AspNetCore.SignalR.Core.csproj | 2 + .../ref/Microsoft.AspNetCore.SignalR.csproj | 2 + .../SignalRDependencyInjectionExtensions.cs | 1 - .../SignalR/test/HubConnectionHandlerTests.cs | 1 - ...Core.AzureAppServices.SiteExtension.csproj | 2 + ...ft.Extensions.ApiDescription.Server.csproj | 3 + 168 files changed, 14507 insertions(+), 400 deletions(-) create mode 100644 eng/IndirectReferences.props create mode 100644 eng/common/enable-cross-org-publishing.ps1 create mode 100644 eng/common/templates/post-build/channels/netcore-3-tools-validation.yml rename eng/common/templates/post-build/channels/{netcore-dev-30.yml => netcore-3-tools.yml} (82%) rename eng/common/templates/post-build/channels/{public-validation-release.yml => netcore-tools-validation.yml} (90%) create mode 100644 src/Components/Blazor/testassets/Directory.Build.props create mode 100644 src/Components/test/testassets/Directory.Build.props create mode 100644 src/DataProtection/Cryptography.Internal/ref/Directory.Build.props create mode 100644 src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs create mode 100644 src/Mvc/Mvc.Api.Analyzers/test/IgnoreCS1701WarningCodeFixRunner.cs create mode 100644 src/Mvc/Mvc.Core/ref/Directory.Build.props create mode 100644 src/Mvc/Mvc.DataAnnotations/ref/Directory.Build.props create mode 100644 src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs create mode 100644 src/Mvc/Mvc.Razor/ref/Directory.Build.props create mode 100644 src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs create mode 100644 src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props create mode 100644 src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs create mode 100644 src/Servers/Kestrel/Core/ref/Directory.Build.props create mode 100644 src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs delete mode 100644 src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp3.0.cs diff --git a/Directory.Build.props b/Directory.Build.props index 440c9d79a8..4eb0a65e92 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -93,6 +93,9 @@ false + + true + - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0.0 @@ -155,6 +154,7 @@ + diff --git a/NuGet.config b/NuGet.config index 4d7d2836ae..f4fb720278 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,22 +3,18 @@ - + - - + + - - - - - - - + + + - - + + diff --git a/eng/GenAPI.exclusions.txt b/eng/GenAPI.exclusions.txt index ebabc0ac7d..0c4ce95fc2 100644 --- a/eng/GenAPI.exclusions.txt +++ b/eng/GenAPI.exclusions.txt @@ -2,4 +2,11 @@ T:Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame # Manually implemented - https://github.com/dotnet/arcade/issues/2066 T:Microsoft.AspNetCore.Mvc.ApplicationModels.PageParameterModel -T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel \ No newline at end of file +T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel +# Manually implemented - Need to include internal setter +T:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider +F:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.{Cache}k__BackingField +M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.#ctor +P:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.Cache +M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.get_Cache +M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.set_Cache(Microsoft.Extensions.Caching.Memory.IMemoryCache) \ No newline at end of file diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props new file mode 100644 index 0000000000..c57e61024d --- /dev/null +++ b/eng/IndirectReferences.props @@ -0,0 +1,10911 @@ + + + + <_RefsToCheck Include="@(Reference->'%(Identity)')"/> + <_ProjectRefsToCheck Include="@(ProjectReference)" Exclude="@(ProjectReference->WithMetadataValue('ReferenceOutputAssembly', 'false'))" /> + <_RefsToCheck Include="@(ProjectReference->'%(Filename)')"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc99f09ed7..1ce977ca9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ --> - + https://github.com/aspnet/Blazor - 348e050ecd9bd8924581afb677089ae5e2d5e508 + c606594a0e5ebc36636d36e418ee0e189ce7a012 https://github.com/aspnet/AspNetCore-Tooling @@ -29,269 +29,269 @@ https://github.com/aspnet/AspNetCore-Tooling 4ef35e11af80a5907438d1a715e51803acf1077c - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 - + https://github.com/aspnet/EntityFrameworkCore - b403b17b493cb96059bdc3ef01d184a0213293f2 + e2fe2f425e976394d933ad5fcf304fd3de6759f5 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/dotnet/corefx @@ -381,25 +381,30 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 - - - https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf - + https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf https://github.com/dotnet/core-setup - 7d57652f33493fa022125b7f63aad0d70c52d810 + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf + + + + https://github.com/dotnet/core-setup + 903ca49e3ffddc551e12d2f94d7cca95f9a340bf + + + https://github.com/aspnet/Extensions + 0b951c16de0f39e13cce8372e11c28eb90576662 @@ -408,25 +413,25 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/dotnet/arcade - f8546fbab59a74a66c83b8cb76b3f6877ce1d374 + 0e9ffd6464aff37aef2dc41dc2162d258f266e32 - + https://github.com/dotnet/arcade - f8546fbab59a74a66c83b8cb76b3f6877ce1d374 + 0e9ffd6464aff37aef2dc41dc2162d258f266e32 - + https://github.com/dotnet/arcade - f8546fbab59a74a66c83b8cb76b3f6877ce1d374 + 0e9ffd6464aff37aef2dc41dc2162d258f266e32 - + https://github.com/aspnet/Extensions - 0b951c16de0f39e13cce8372e11c28eb90576662 + 40c00020ac632006c9db91383de246226f9cb44a https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2807f94588..32eab2e35e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,6 +22,8 @@ 9 preview$(BlazorClientPreReleasePreviewNumber) $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) + + 3.0.0 false - 1.0.0-beta.19462.4 + 1.0.0-beta.19474.3 3.3.1-beta4-19462-11 - 3.0.0 - 3.0.0 - 3.0.0 + 3.0.1 + 3.0.1 + 3.0.1 2.1.0 1.0.0 @@ -98,77 +100,77 @@ 3.0.0 - 3.0.0-preview9.19462.2 + 3.0.0-preview9.19503.2 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0-rc2.19463.5 - 3.0.0-rc2.19463.5 - 3.0.0 + 3.0.1-servicing.19510.1 + 3.0.1-servicing.19510.1 + 3.0.1-servicing.19510.1 + 3.0.1-servicing.19510.1 + 3.0.1-servicing.19510.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19510.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19510.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19510.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19510.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1-servicing.19510.1 + 3.0.1 + 3.0.1-servicing.19510.1 + 3.0.1-servicing.19510.1 + 3.0.1 3.0.0-rc2.19463.5 - 3.0.0 - 3.0.0 + 3.0.1 + 3.0.1 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 - 3.0.0 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 3.0.1 3.0.1 diff --git a/eng/common/enable-cross-org-publishing.ps1 b/eng/common/enable-cross-org-publishing.ps1 new file mode 100644 index 0000000000..eccbf9f1b1 --- /dev/null +++ b/eng/common/enable-cross-org-publishing.ps1 @@ -0,0 +1,6 @@ +param( + [string] $token +) + +Write-Host "##vso[task.setvariable variable=VSS_NUGET_ACCESSTOKEN]$token" +Write-Host "##vso[task.setvariable variable=VSS_NUGET_URI_PREFIXES]https://dnceng.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/dnceng/;https://devdiv.pkgs.visualstudio.com/;https://pkgs.dev.azure.com/devdiv/" diff --git a/eng/common/sdl/extract-artifact-packages.ps1 b/eng/common/sdl/extract-artifact-packages.ps1 index 1fdbb14329..6e6825013b 100644 --- a/eng/common/sdl/extract-artifact-packages.ps1 +++ b/eng/common/sdl/extract-artifact-packages.ps1 @@ -5,6 +5,13 @@ param( $ErrorActionPreference = "Stop" Set-StrictMode -Version 2.0 + +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +. $PSScriptRoot\..\tools.ps1 + $ExtractPackage = { param( [string] $PackagePath # Full path to a NuGet package diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml new file mode 100644 index 0000000000..cdb74031fc --- /dev/null +++ b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml @@ -0,0 +1,95 @@ +parameters: + artifactsPublishingAdditionalParameters: '' + publishInstallersAndChecksums: false + +stages: +- stage: NetCore_3_Tools_Validation_Publish + dependsOn: validate + variables: + - template: ../common-variables.yml + displayName: .NET 3 Tools - Validation Publishing + jobs: + - template: ../setup-maestro-vars.yml + + - job: publish_assets + displayName: Publish Assets + dependsOn: setupMaestroVars + variables: + - group: DotNet-Blob-Feed + - group: AzureDevOps-Artifact-Feeds-Pats + - name: BARBuildId + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] + - name: IsStableBuild + value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NETCore_3_Tools_Validation_Channel_Id)) + pool: + vmImage: 'windows-2019' + steps: + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: current + artifactName: PackageArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: current + artifactName: BlobArtifacts + + - task: DownloadBuildArtifacts@0 + displayName: Download Asset Manifests + inputs: + buildType: current + artifactName: AssetManifests + + - task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + + - task: PowerShell@2 + displayName: Publish Assets + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) + /p:IsStableBuild=$(IsStableBuild) + /p:IsInternalBuild=$(IsInternalBuild) + /p:RepositoryName=$(Build.Repository.Name) + /p:CommitSha=$(Build.SourceVersion) + /p:NugetPath=$(NuGetExeToolPath) + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release + /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} + /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) + /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) + /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) + /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) + /p:PublishToAzureDevOpsNuGetFeeds=true + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + ${{ parameters.artifactsPublishingAdditionalParameters }} + + - template: ../../steps/promote-build.yml + parameters: + ChannelId: ${{ variables.NETCore_3_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-30.yml b/eng/common/templates/post-build/channels/netcore-3-tools.yml similarity index 82% rename from eng/common/templates/post-build/channels/netcore-dev-30.yml rename to eng/common/templates/post-build/channels/netcore-3-tools.yml index 69f1a9013e..70eec773e7 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-30.yml +++ b/eng/common/templates/post-build/channels/netcore-3-tools.yml @@ -4,18 +4,18 @@ parameters: publishInstallersAndChecksums: false stages: -- stage: NetCore_Dev30_Publish +- stage: NetCore_3_Tools_Publish dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.0 Dev Publishing + displayName: .NET 3 Tools Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -56,7 +56,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -85,42 +85,46 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet + arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet /p:ArtifactsCategory=$(_DotNetArtifactsCategory) /p:IsStableBuild=$(IsStableBuild) /p:IsInternalBuild=$(IsInternalBuild) /p:RepositoryName=$(Build.Repository.Name) /p:CommitSha=$(Build.SourceVersion) /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release + /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' + /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' + /p:BARBuildId=$(BARBuildId) + /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' + /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' + /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' + /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' + /p:Configuration=Release /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }} + ChannelId: ${{ variables.NetCore_3_Tools_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml index 720a0ab08a..db21254187 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-31.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml index 9c81e39e9c..c4f5a16acb 100644 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ b/eng/common/templates/post-build/channels/netcore-dev-5.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml index 053163cf6a..177b38df35 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml @@ -84,10 +84,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml index 8ba9237ffc..16ade0db29 100644 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ b/eng/common/templates/post-build/channels/netcore-release-30.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/netcore-release-31.yml index d8270eadae..01d56410c7 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/netcore-release-31.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml index c75d186733..157d2d4b97 100644 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-latest.yml @@ -85,10 +85,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet diff --git a/eng/common/templates/post-build/channels/public-validation-release.yml b/eng/common/templates/post-build/channels/netcore-tools-validation.yml similarity index 90% rename from eng/common/templates/post-build/channels/public-validation-release.yml rename to eng/common/templates/post-build/channels/netcore-tools-validation.yml index fb2c23d0f4..d8447e49af 100644 --- a/eng/common/templates/post-build/channels/public-validation-release.yml +++ b/eng/common/templates/post-build/channels/netcore-tools-validation.yml @@ -21,7 +21,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicValidationRelease_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Validation_Channel_Id)) pool: vmImage: 'windows-2019' steps: @@ -50,10 +50,14 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish Assets - env: - AZURE_DEVOPS_EXT_PAT: $(dn-bot-dnceng-universal-packages-rw) inputs: filePath: eng\common\sdk-task.ps1 arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet @@ -88,4 +92,4 @@ stages: - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }} + ChannelId: ${{ variables.NetCore_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index adb2a854f2..b4eed6f186 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -3,10 +3,6 @@ variables: - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage - # .NET Core 3 Dev - - name: PublicDevRelease_30_Channel_Id - value: 3 - # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id value: 128 @@ -16,13 +12,21 @@ variables: value: 131 # .NET Tools - Validation - - name: PublicValidationRelease_30_Channel_Id + - name: NetCore_Tools_Validation_Channel_Id value: 9 # .NET Tools - Latest - name: NetCore_Tools_Latest_Channel_Id value: 2 + # .NET 3 Tools - Validation + - name: NETCore_3_Tools_Validation_Channel_Id + value: 390 + + # .NET 3 Tools - Latest + - name: NetCore_3_Tools_Channel_Id + value: 344 + # .NET Core 3.0 Internal Servicing - name: InternalServicing_30_Channel_Id value: 184 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 5b9d0a5d99..7ee82d9ff1 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -101,12 +101,6 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} -- template: \eng\common\templates\post-build\channels\netcore-dev-30.yml - parameters: - symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - - template: \eng\common\templates\post-build\channels\netcore-dev-31.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} @@ -119,11 +113,22 @@ stages: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} -- template: \eng\common\templates\post-build\channels\public-validation-release.yml +- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} +- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + +- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml + parameters: + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + - template: \eng\common\templates\post-build\channels\netcore-release-30.yml parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} diff --git a/eng/scripts/ci-source-build.sh b/eng/scripts/ci-source-build.sh index 8b4c801d3a..ebc50dad0a 100755 --- a/eng/scripts/ci-source-build.sh +++ b/eng/scripts/ci-source-build.sh @@ -30,10 +30,10 @@ trap "{ mv "$reporoot/global.bak.json" "$reporoot/global.json" }" EXIT -export DotNetBuildFromSource='true' - # Build repo tasks "$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj +export DotNetBuildFromSource='true' + # Build projects "$reporoot/eng/common/build.sh" --restore --build --pack "$@" \ No newline at end of file diff --git a/eng/targets/ReferenceAssembly.targets b/eng/targets/ReferenceAssembly.targets index 74cbf583e3..5f4345e0c4 100644 --- a/eng/targets/ReferenceAssembly.targets +++ b/eng/targets/ReferenceAssembly.targets @@ -23,11 +23,15 @@ + <_ExcludeFromSourceBuild Condition="'$(IsAspNetCoreApp)' == 'true' OR '$(IsAnalyzersProject)' == 'true'">false +]]> + - @(_ResultTargetFramework) + @(_ResultTargetFramework)$(_ExcludeFromSourceBuild) @(ProjectListContentItem->'%(Identity)', '%0A') diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 4efbe58e97..340ceabe64 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -50,10 +50,10 @@ true false - true + true false - true + true false @@ -157,7 +157,78 @@ - + + + + + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Memory" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.SqlServer" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.StackExchangeRedis" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.AzureKeyVault" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Binder" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.CommandLine" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.EnvironmentVariables" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.FileExtensions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Ini" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Json" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.KeyPerFile" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.NewtonsoftJson" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.UserSecrets" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DependencyInjection" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DiagnosticAdapter" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Diagnostics.HealthChecks" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Composite" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Embedded" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Physical" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileSystemGlobbing" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.Systemd" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.WindowsServices" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Http" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Http.Polly" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Localization.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Localization" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Abstractions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.AzureAppServices" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Configuration" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Console" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Debug" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.EventLog" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.EventSource" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.TraceSource" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.ObjectPool" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options.ConfigurationExtensions" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options.DataAnnotations" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Primitives" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.WebEncoders" /> + <_ExtensionInternalRefAssemblies Include="Microsoft.JSInterop" /> + <_ExtensionInternalRefAssemblies Include="Mono.WebAssembly.Interop" /> + + + <_NonExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Exclude="@(_ExtensionInternalRefAssemblies)" /> + <_ExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Exclude="@(_NonExtensionPackageReferences)" /> + + + <_LatestPackageReferenceWithVersion Remove="@(_ExtensionPackageReferences)" /> + + + + + + + + + true + <_BaselinePackageReferenceWithVersion Include="@(Reference)" Condition=" '$(IsServicingBuild)' == 'true' OR '$(UseLatestPackageReferences)' != 'true' "> diff --git a/global.json b/global.json index 5eca702e52..fa652db0a9 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19462.4", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19462.4" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19474.3" } } diff --git a/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs b/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs index ed80fa3d08..269c50a394 100644 --- a/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs +++ b/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs @@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Analyzers } var read = Read(source); - return DiagnosticProject.Create(GetType().Assembly, new[] { read.Source, }); + return AnalyzersDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { read.Source, }); } public Task CreateCompilationAsync(string source) diff --git a/src/Analyzers/Analyzers/test/AnalyzersDiagnosticAnalyzerRunner.cs b/src/Analyzers/Analyzers/test/AnalyzersDiagnosticAnalyzerRunner.cs index 57a8ce8a69..f54a187c0e 100644 --- a/src/Analyzers/Analyzers/test/AnalyzersDiagnosticAnalyzerRunner.cs +++ b/src/Analyzers/Analyzers/test/AnalyzersDiagnosticAnalyzerRunner.cs @@ -2,6 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; +using System.Linq; +using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Analyzer.Testing; using Microsoft.CodeAnalysis; @@ -20,7 +23,28 @@ namespace Microsoft.AspNetCore.Analyzers public Task GetDiagnosticsAsync(string source) { - return GetDiagnosticsAsync(sources: new[] { source }, Analyzer, Array.Empty()); + var project = CreateProjectWithReferencesInBinDir(GetType().Assembly, source); + + return GetDiagnosticsAsync(project); + } + + public static Project CreateProjectWithReferencesInBinDir(Assembly testAssembly, params string[] source) + { + // The deps file in the project is incorrect and does not contain "compile" nodes for some references. + // However these binaries are always present in the bin output. As a "temporary" workaround, we'll add + // every dll file that's present in the test's build output as a metadatareference. + + var project = DiagnosticProject.Create(testAssembly, source); + + foreach (var assembly in Directory.EnumerateFiles(AppContext.BaseDirectory, "*.dll")) + { + if (!project.MetadataReferences.Any(c => string.Equals(Path.GetFileNameWithoutExtension(c.Display), Path.GetFileNameWithoutExtension(assembly), StringComparison.OrdinalIgnoreCase))) + { + project = project.AddMetadataReference(MetadataReference.CreateFromFile(assembly)); + } + } + + return project; } public Task GetDiagnosticsAsync(Project project) diff --git a/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj b/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj index 5f34ef3e76..2a99290b34 100644 --- a/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj +++ b/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj index d60eb31594..8776ab9fef 100644 --- a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj +++ b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Components/Blazor/testassets/Directory.Build.props b/src/Components/Blazor/testassets/Directory.Build.props new file mode 100644 index 0000000000..938199f96e --- /dev/null +++ b/src/Components/Blazor/testassets/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj index 3f0b80424f..943bf67827 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj b/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj index 8e24904b63..b3fe863ead 100644 --- a/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj +++ b/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj index 21f0c740e5..3cdf8cc2be 100644 --- a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj +++ b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj index 74a0b82c27..6415de5e4f 100644 --- a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj +++ b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index 6b91b2d230..9bf03e1c50 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -9,13 +9,13 @@ false - + true - + false @@ -28,6 +28,8 @@ + + diff --git a/src/Components/test/testassets/Directory.Build.props b/src/Components/test/testassets/Directory.Build.props new file mode 100644 index 0000000000..938199f96e --- /dev/null +++ b/src/Components/test/testassets/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj index 62dd2d978a..4e04929cd1 100644 --- a/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj +++ b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj @@ -2,6 +2,8 @@ netstandard2.0 + false + diff --git a/src/DataProtection/Cryptography.Internal/ref/Directory.Build.props b/src/DataProtection/Cryptography.Internal/ref/Directory.Build.props new file mode 100644 index 0000000000..b500fb5d98 --- /dev/null +++ b/src/DataProtection/Cryptography.Internal/ref/Directory.Build.props @@ -0,0 +1,8 @@ + + + + + true + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs new file mode 100644 index 0000000000..8120f41699 --- /dev/null +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs @@ -0,0 +1,417 @@ +// 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 System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.KeyDerivation, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +namespace Microsoft.AspNetCore.Cryptography +{ + internal static partial class Constants + { + internal const string BCRYPT_3DES_112_ALGORITHM = "3DES_112"; + internal const string BCRYPT_3DES_ALGORITHM = "3DES"; + internal const string BCRYPT_AES_ALGORITHM = "AES"; + internal const string BCRYPT_AES_CMAC_ALGORITHM = "AES-CMAC"; + internal const string BCRYPT_AES_GMAC_ALGORITHM = "AES-GMAC"; + internal const string BCRYPT_AES_WRAP_KEY_BLOB = "Rfc3565KeyWrapBlob"; + internal const string BCRYPT_ALGORITHM_NAME = "AlgorithmName"; + internal const string BCRYPT_AUTH_TAG_LENGTH = "AuthTagLength"; + internal const string BCRYPT_BLOCK_LENGTH = "BlockLength"; + internal const string BCRYPT_BLOCK_SIZE_LIST = "BlockSizeList"; + internal const string BCRYPT_CAPI_KDF_ALGORITHM = "CAPI_KDF"; + internal const string BCRYPT_CHAINING_MODE = "ChainingMode"; + internal const string BCRYPT_CHAIN_MODE_CBC = "ChainingModeCBC"; + internal const string BCRYPT_CHAIN_MODE_CCM = "ChainingModeCCM"; + internal const string BCRYPT_CHAIN_MODE_CFB = "ChainingModeCFB"; + internal const string BCRYPT_CHAIN_MODE_ECB = "ChainingModeECB"; + internal const string BCRYPT_CHAIN_MODE_GCM = "ChainingModeGCM"; + internal const string BCRYPT_CHAIN_MODE_NA = "ChainingModeN/A"; + internal const string BCRYPT_DESX_ALGORITHM = "DESX"; + internal const string BCRYPT_DES_ALGORITHM = "DES"; + internal const string BCRYPT_DH_ALGORITHM = "DH"; + internal const string BCRYPT_DSA_ALGORITHM = "DSA"; + internal const string BCRYPT_ECDH_P256_ALGORITHM = "ECDH_P256"; + internal const string BCRYPT_ECDH_P384_ALGORITHM = "ECDH_P384"; + internal const string BCRYPT_ECDH_P521_ALGORITHM = "ECDH_P521"; + internal const string BCRYPT_ECDSA_P256_ALGORITHM = "ECDSA_P256"; + internal const string BCRYPT_ECDSA_P384_ALGORITHM = "ECDSA_P384"; + internal const string BCRYPT_ECDSA_P521_ALGORITHM = "ECDSA_P521"; + internal const string BCRYPT_EFFECTIVE_KEY_LENGTH = "EffectiveKeyLength"; + internal const string BCRYPT_HASH_BLOCK_LENGTH = "HashBlockLength"; + internal const string BCRYPT_HASH_LENGTH = "HashDigestLength"; + internal const string BCRYPT_HASH_OID_LIST = "HashOIDList"; + internal const string BCRYPT_IS_KEYED_HASH = "IsKeyedHash"; + internal const string BCRYPT_IS_REUSABLE_HASH = "IsReusableHash"; + internal const string BCRYPT_KEY_DATA_BLOB = "KeyDataBlob"; + internal const string BCRYPT_KEY_LENGTH = "KeyLength"; + internal const string BCRYPT_KEY_LENGTHS = "KeyLengths"; + internal const string BCRYPT_KEY_OBJECT_LENGTH = "KeyObjectLength"; + internal const string BCRYPT_KEY_STRENGTH = "KeyStrength"; + internal const string BCRYPT_MD2_ALGORITHM = "MD2"; + internal const string BCRYPT_MD4_ALGORITHM = "MD4"; + internal const string BCRYPT_MD5_ALGORITHM = "MD5"; + internal const string BCRYPT_MESSAGE_BLOCK_LENGTH = "MessageBlockLength"; + internal const string BCRYPT_OBJECT_LENGTH = "ObjectLength"; + internal const string BCRYPT_OPAQUE_KEY_BLOB = "OpaqueKeyBlob"; + internal const string BCRYPT_PADDING_SCHEMES = "PaddingSchemes"; + internal const string BCRYPT_PBKDF2_ALGORITHM = "PBKDF2"; + internal const string BCRYPT_PRIMITIVE_TYPE = "PrimitiveType"; + internal const string BCRYPT_PROVIDER_HANDLE = "ProviderHandle"; + internal const string BCRYPT_RC2_ALGORITHM = "RC2"; + internal const string BCRYPT_RC4_ALGORITHM = "RC4"; + internal const string BCRYPT_RNG_ALGORITHM = "RNG"; + internal const string BCRYPT_RNG_DUAL_EC_ALGORITHM = "DUALECRNG"; + internal const string BCRYPT_RNG_FIPS186_DSA_ALGORITHM = "FIPS186DSARNG"; + internal const string BCRYPT_RSA_ALGORITHM = "RSA"; + internal const string BCRYPT_RSA_SIGN_ALGORITHM = "RSA_SIGN"; + internal const string BCRYPT_SHA1_ALGORITHM = "SHA1"; + internal const string BCRYPT_SHA256_ALGORITHM = "SHA256"; + internal const string BCRYPT_SHA384_ALGORITHM = "SHA384"; + internal const string BCRYPT_SHA512_ALGORITHM = "SHA512"; + internal const string BCRYPT_SIGNATURE_LENGTH = "SignatureLength"; + internal const string BCRYPT_SP800108_CTR_HMAC_ALGORITHM = "SP800_108_CTR_HMAC"; + internal const string BCRYPT_SP80056A_CONCAT_ALGORITHM = "SP800_56A_CONCAT"; + internal const int MAX_STACKALLOC_BYTES = 256; + internal const string MS_PLATFORM_CRYPTO_PROVIDER = "Microsoft Platform Crypto Provider"; + internal const string MS_PRIMITIVE_PROVIDER = "Microsoft Primitive Provider"; + } + internal static partial class CryptoUtil + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void Assert(bool condition, string message) { } + public static void AssertPlatformIsWindows() { } + public static void AssertPlatformIsWindows8OrLater() { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void AssertSafeHandleIsValid(System.Runtime.InteropServices.SafeHandle safeHandle) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]public static System.Exception Fail(string message) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]public static T Fail(string message) where T : class { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining | System.Runtime.CompilerServices.MethodImplOptions.NoOptimization)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static bool TimeConstantBuffersAreEqual(byte* bufA, byte* bufB, uint count) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining | System.Runtime.CompilerServices.MethodImplOptions.NoOptimization)]public static bool TimeConstantBuffersAreEqual(byte[] bufA, int offsetA, int countA, byte[] bufB, int offsetB, int countB) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal unsafe partial struct DATA_BLOB + { + public uint cbData; + public byte* pbData; + } + internal static partial class UnsafeBufferUtil + { + [System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.MayFail)] + public static void BlockCopy(Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle from, Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle to, System.IntPtr length) { } + [System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.MayFail)] + public unsafe static void BlockCopy(Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle from, void* to, uint byteCount) { } + [System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.MayFail)] + public unsafe static void BlockCopy(void* from, Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle to, uint byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static void BlockCopy(void* from, void* to, int byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static void BlockCopy(void* from, void* to, uint byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]private unsafe static void BlockCopyCore(byte* from, byte* to, uint byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]private unsafe static void BlockCopyCore(byte* from, byte* to, ulong byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static void SecureZeroMemory(byte* buffer, int byteCount) { } + [System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static void SecureZeroMemory(byte* buffer, System.IntPtr length) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static void SecureZeroMemory(byte* buffer, uint byteCount) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + public unsafe static void SecureZeroMemory(byte* buffer, ulong byteCount) { } + } + [System.Security.SuppressUnmanagedCodeSecurityAttribute] + internal static partial class UnsafeNativeMethods + { + private const string BCRYPT_LIB = "bcrypt.dll"; + private const string CRYPT32_LIB = "crypt32.dll"; + private const string NCRYPT_LIB = "ncrypt.dll"; + private static readonly System.Lazy _lazyBCryptLibHandle; + private static readonly System.Lazy _lazyCrypt32LibHandle; + private static readonly System.Lazy _lazyNCryptLibHandle; + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern int BCryptCloseAlgorithmProvider(System.IntPtr hAlgorithm, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptCreateHash(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle hAlgorithm, out Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle phHash, System.IntPtr pbHashObject, uint cbHashObject, byte* pbSecret, uint cbSecret, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptDecrypt(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptKeyHandle hKey, byte* pbInput, uint cbInput, void* pPaddingInfo, byte* pbIV, uint cbIV, byte* pbOutput, uint cbOutput, out uint pcbResult, Microsoft.AspNetCore.Cryptography.Cng.BCryptEncryptFlags dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptDeriveKeyPBKDF2(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle hPrf, byte* pbPassword, uint cbPassword, byte* pbSalt, uint cbSalt, ulong cIterations, byte* pbDerivedKey, uint cbDerivedKey, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + internal static extern int BCryptDestroyHash(System.IntPtr hHash); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + internal static extern int BCryptDestroyKey(System.IntPtr hKey); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern int BCryptDuplicateHash(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle hHash, out Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle phNewHash, System.IntPtr pbHashObject, uint cbHashObject, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptEncrypt(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptKeyHandle hKey, byte* pbInput, uint cbInput, void* pPaddingInfo, byte* pbIV, uint cbIV, byte* pbOutput, uint cbOutput, out uint pcbResult, Microsoft.AspNetCore.Cryptography.Cng.BCryptEncryptFlags dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptFinishHash(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle hHash, byte* pbOutput, uint cbOutput, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptGenerateSymmetricKey(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle hAlgorithm, out Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptKeyHandle phKey, System.IntPtr pbKeyObject, uint cbKeyObject, byte* pbSecret, uint cbSecret, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptGenRandom(System.IntPtr hAlgorithm, byte* pbBuffer, uint cbBuffer, Microsoft.AspNetCore.Cryptography.Cng.BCryptGenRandomFlags dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptGetProperty(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle hObject, string pszProperty, void* pbOutput, uint cbOutput, out uint pcbResult, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptHashData(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle hHash, byte* pbInput, uint cbInput, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptKeyDerivation(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptKeyHandle hKey, Microsoft.AspNetCore.Cryptography.Cng.BCryptBufferDesc* pParameterList, byte* pbDerivedKey, uint cbDerivedKey, out uint pcbResult, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern int BCryptOpenAlgorithmProvider(out Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle phAlgorithm, string pszAlgId, string pszImplementation, uint dwFlags); + [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptSetProperty(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle hObject, string pszProperty, void* pbInput, uint cbInput, uint dwFlags); + [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern bool CryptProtectData(Microsoft.AspNetCore.Cryptography.DATA_BLOB* pDataIn, System.IntPtr szDataDescr, Microsoft.AspNetCore.Cryptography.DATA_BLOB* pOptionalEntropy, System.IntPtr pvReserved, System.IntPtr pPromptStruct, uint dwFlags, out Microsoft.AspNetCore.Cryptography.DATA_BLOB pDataOut); + [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]public static extern bool CryptProtectMemory(System.Runtime.InteropServices.SafeHandle pData, uint cbData, uint dwFlags); + [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern bool CryptUnprotectData(Microsoft.AspNetCore.Cryptography.DATA_BLOB* pDataIn, System.IntPtr ppszDataDescr, Microsoft.AspNetCore.Cryptography.DATA_BLOB* pOptionalEntropy, System.IntPtr pvReserved, System.IntPtr pPromptStruct, uint dwFlags, out Microsoft.AspNetCore.Cryptography.DATA_BLOB pDataOut); + [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]public unsafe static extern bool CryptUnprotectMemory(byte* pData, uint cbData, uint dwFlags); + [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]public static extern bool CryptUnprotectMemory(System.Runtime.InteropServices.SafeHandle pData, uint cbData, uint dwFlags); + private static System.Lazy GetLazyLibraryHandle(string libraryName) { throw null; } + [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + internal static extern int NCryptCloseProtectionDescriptor(System.IntPtr hDescriptor); + [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern int NCryptCreateProtectionDescriptor(string pwszDescriptorString, uint dwFlags, out Microsoft.AspNetCore.Cryptography.SafeHandles.NCryptDescriptorHandle phDescriptor); + [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern int NCryptGetProtectionDescriptorInfo(Microsoft.AspNetCore.Cryptography.SafeHandles.NCryptDescriptorHandle hDescriptor, System.IntPtr pMemPara, uint dwInfoType, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle ppvInfo); + [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int NCryptProtectSecret(Microsoft.AspNetCore.Cryptography.SafeHandles.NCryptDescriptorHandle hDescriptor, uint dwFlags, byte* pbData, uint cbData, System.IntPtr pMemPara, System.IntPtr hWnd, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle ppbProtectedBlob, out uint pcbProtectedBlob); + [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int NCryptUnprotectSecret(out Microsoft.AspNetCore.Cryptography.SafeHandles.NCryptDescriptorHandle phDescriptor, uint dwFlags, byte* pbProtectedBlob, uint cbProtectedBlob, System.IntPtr pMemPara, System.IntPtr hWnd, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle ppbData, out uint pcbData); + [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int NCryptUnprotectSecret(System.IntPtr phDescriptor, uint dwFlags, byte* pbProtectedBlob, uint cbProtectedBlob, System.IntPtr pMemPara, System.IntPtr hWnd, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle ppbData, out uint pcbData); + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static void ThrowExceptionForBCryptStatus(int ntstatus) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]private static void ThrowExceptionForBCryptStatusImpl(int ntstatus) { } + public static void ThrowExceptionForLastCrypt32Error() { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static void ThrowExceptionForNCryptStatus(int ntstatus) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]private static void ThrowExceptionForNCryptStatusImpl(int ntstatus) { } + } + internal static partial class WeakReferenceHelpers + { + public static T GetSharedInstance(ref System.WeakReference weakReference, System.Func factory) where T : class, System.IDisposable { throw null; } + } +} +namespace Microsoft.AspNetCore.Cryptography.Cng +{ + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct BCryptBuffer + { + public uint cbBuffer; // Length of buffer, in bytes + public BCryptKeyDerivationBufferType BufferType; // Buffer type + public IntPtr pvBuffer; // Pointer to buffer + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal unsafe partial struct BCryptBufferDesc + { + public uint ulVersion; // Version number + public uint cBuffers; // Number of buffers + public BCryptBuffer* pBuffers; // Pointer to array of buffers + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void Initialize(ref Microsoft.AspNetCore.Cryptography.Cng.BCryptBufferDesc bufferDesc) { } + } + [System.FlagsAttribute] + internal enum BCryptEncryptFlags + { + BCRYPT_BLOCK_PADDING = 1, + } + [System.FlagsAttribute] + internal enum BCryptGenRandomFlags + { + BCRYPT_RNG_USE_ENTROPY_IN_BUFFER = 1, + BCRYPT_USE_SYSTEM_PREFERRED_RNG = 2, + } + internal enum BCryptKeyDerivationBufferType + { + KDF_HASH_ALGORITHM = 0, + KDF_SECRET_PREPEND = 1, + KDF_SECRET_APPEND = 2, + KDF_HMAC_KEY = 3, + KDF_TLS_PRF_LABEL = 4, + KDF_TLS_PRF_SEED = 5, + KDF_SECRET_HANDLE = 6, + KDF_TLS_PRF_PROTOCOL = 7, + KDF_ALGORITHMID = 8, + KDF_PARTYUINFO = 9, + KDF_PARTYVINFO = 10, + KDF_SUPPPUBINFO = 11, + KDF_SUPPPRIVINFO = 12, + KDF_LABEL = 13, + KDF_CONTEXT = 14, + KDF_SALT = 15, + KDF_ITERATION_COUNT = 16, + } + internal static partial class BCryptUtil + { + public unsafe static void GenRandom(byte* pbBuffer, uint cbBuffer) { } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal unsafe partial struct BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO + { + public uint cbSize; + public uint dwInfoVersion; + public byte* pbNonce; + public uint cbNonce; + public byte* pbAuthData; + public uint cbAuthData; + public byte* pbTag; + public uint cbTag; + public byte* pbMacContext; + public uint cbMacContext; + public uint cbAAD; + public ulong cbData; + public uint dwFlags; + public static void Init(out Microsoft.AspNetCore.Cryptography.Cng.BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO info) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct BCRYPT_KEY_LENGTHS_STRUCT + { + // MSDN says these fields represent the key length in bytes. + // It's wrong: these key lengths are all actually in bits. + internal uint dwMinLength; + internal uint dwMaxLength; + internal uint dwIncrement; + public void EnsureValidKeyLength(uint keyLengthInBits) { } + private bool IsValidKeyLength(uint keyLengthInBits) { throw null; } + } + internal static partial class CachedAlgorithmHandles + { + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _aesCbc; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _aesGcm; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _hmacSha1; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _hmacSha256; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _hmacSha512; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _pbkdf2; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _sha1; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _sha256; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _sha512; + private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _sp800_108_ctr_hmac; + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle AES_CBC { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle AES_GCM { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle HMAC_SHA1 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle HMAC_SHA256 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle HMAC_SHA512 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle PBKDF2 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle SHA1 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle SHA256 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle SHA512 { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle SP800_108_CTR_HMAC { get { throw null; } } + private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetAesAlgorithm(string chainingMode) { throw null; } + private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetHashAlgorithm(string algorithm) { throw null; } + private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetHmacAlgorithm(string algorithm) { throw null; } + private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetPbkdf2Algorithm() { throw null; } + private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetSP800_108_CTR_HMACAlgorithm() { throw null; } + + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + private partial struct CachedAlgorithmInfo + { + private object _dummy; + public CachedAlgorithmInfo(System.Func factory) { throw null; } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetAlgorithmHandle(ref Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo cachedAlgorithmInfo) { throw null; } + } + } + [System.FlagsAttribute] + internal enum NCryptEncryptFlags + { + NCRYPT_NO_PADDING_FLAG = 1, + NCRYPT_PAD_PKCS1_FLAG = 2, + NCRYPT_PAD_OAEP_FLAG = 4, + NCRYPT_PAD_PSS_FLAG = 8, + NCRYPT_SILENT_FLAG = 64, + } + internal static partial class OSVersionUtil + { + private static readonly Microsoft.AspNetCore.Cryptography.Cng.OSVersionUtil.OSVersion _osVersion; + private static Microsoft.AspNetCore.Cryptography.Cng.OSVersionUtil.OSVersion GetOSVersion() { throw null; } + public static bool IsWindows() { throw null; } + public static bool IsWindows8OrLater() { throw null; } + private enum OSVersion + { + NotWindows = 0, + Win7OrLater = 1, + Win8OrLater = 2, + } + } +} +namespace Microsoft.AspNetCore.Cryptography.Internal +{ + internal static partial class Resources + { + private static System.Resources.ResourceManager s_resourceManager; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private static System.Globalization.CultureInfo _Culture_k__BackingField; + internal static string BCryptAlgorithmHandle_ProviderNotFound { get { throw null; } } + internal static string BCRYPT_KEY_LENGTHS_STRUCT_InvalidKeyLength { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static string Platform_Windows7Required { get { throw null; } } + internal static string Platform_Windows8Required { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string FormatBCryptAlgorithmHandle_ProviderNotFound(object p0) { throw null; } + internal static string FormatBCRYPT_KEY_LENGTHS_STRUCT_InvalidKeyLength(object p0, object p1, object p2, object p3) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } + private static string GetResourceString(string resourceKey, string[] formatterNames) { throw null; } + } +} +namespace Microsoft.AspNetCore.Cryptography.SafeHandles +{ + internal sealed partial class BCryptAlgorithmHandle : Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle + { + private BCryptAlgorithmHandle() { } + public Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle CreateHash() { throw null; } + private unsafe Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle CreateHashCore(byte* pbKey, uint cbKey) { throw null; } + public unsafe Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle CreateHmac(byte* pbKey, uint cbKey) { throw null; } + public unsafe Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptKeyHandle GenerateSymmetricKey(byte* pbSecret, uint cbSecret) { throw null; } + public string GetAlgorithmName() { throw null; } + public uint GetCipherBlockLength() { throw null; } + public uint GetHashBlockLength() { throw null; } + public uint GetHashDigestLength() { throw null; } + public Microsoft.AspNetCore.Cryptography.Cng.BCRYPT_KEY_LENGTHS_STRUCT GetSupportedKeyLengths() { throw null; } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle OpenAlgorithmHandle(string algorithmId, string implementation = null, bool hmac = false) { throw null; } + protected override bool ReleaseHandle() { throw null; } + public void SetChainingMode(string chainingMode) { } + } + internal abstract partial class BCryptHandle : Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid + { + protected BCryptHandle() : base (default(bool)) { } + protected unsafe uint GetProperty(string pszProperty, void* pbOutput, uint cbOutput) { throw null; } + protected unsafe void SetProperty(string pszProperty, void* pbInput, uint cbInput) { } + } + internal sealed partial class BCryptHashHandle : Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle + { + private Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle _algProviderHandle; + private BCryptHashHandle() { } + public Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle DuplicateHash() { throw null; } + public unsafe void HashData(byte* pbInput, uint cbInput, byte* pbHashDigest, uint cbHashDigest) { } + protected override bool ReleaseHandle() { throw null; } + internal void SetAlgorithmProviderHandle(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle algProviderHandle) { } + } + internal sealed partial class BCryptKeyHandle : Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle + { + private Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle _algProviderHandle; + private BCryptKeyHandle() { } + protected override bool ReleaseHandle() { throw null; } + internal void SetAlgorithmProviderHandle(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle algProviderHandle) { } + } + internal partial class LocalAllocHandle : Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid + { + protected LocalAllocHandle() : base (default(bool)) { } + protected override bool ReleaseHandle() { throw null; } + } + internal sealed partial class NCryptDescriptorHandle : Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid + { + private NCryptDescriptorHandle() : base (default(bool)) { } + public string GetProtectionDescriptorRuleString() { throw null; } + protected override bool ReleaseHandle() { throw null; } + } + internal sealed partial class SafeLibraryHandle : Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid + { + private SafeLibraryHandle() : base (default(bool)) { } + public bool DoesProcExist(string lpProcName) { throw null; } + public void ForbidUnload() { } + public string FormatMessage(int messageId) { throw null; } + public TDelegate GetProcAddress(string lpProcName, bool throwIfNotFound = true) where TDelegate : class { throw null; } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle Open(string filename) { throw null; } + protected override bool ReleaseHandle() { throw null; } + [System.Security.SuppressUnmanagedCodeSecurityAttribute] + private static partial class UnsafeNativeMethods + { + [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]public static extern int FormatMessage(uint dwFlags, Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle lpSource, uint dwMessageId, uint dwLanguageId, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle lpBuffer, uint nSize, System.IntPtr Arguments); + [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] + internal static extern bool FreeLibrary(System.IntPtr hModule); + [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern bool GetModuleHandleEx(uint dwFlags, Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle lpModuleName, out System.IntPtr phModule); + [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern System.IntPtr GetProcAddress(Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle hModule, string lpProcName); + [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle LoadLibraryEx(string lpFileName, System.IntPtr hFile, uint dwFlags); + internal static void ThrowExceptionForLastWin32Error() { } + } + } + internal sealed partial class SecureLocalAllocHandle : Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle + { + private readonly System.IntPtr _cb; + private SecureLocalAllocHandle(System.IntPtr cb) { } + public System.IntPtr Length { get { throw null; } } + public static Microsoft.AspNetCore.Cryptography.SafeHandles.SecureLocalAllocHandle Allocate(System.IntPtr cb) { throw null; } + [System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.MayFail)] + private void AllocateImpl(System.IntPtr cb) { } + public Microsoft.AspNetCore.Cryptography.SafeHandles.SecureLocalAllocHandle Duplicate() { throw null; } + protected override bool ReleaseHandle() { throw null; } + } +} diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj index ec4ae22e0e..62133dcbe8 100644 --- a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj @@ -2,9 +2,12 @@ netstandard2.0 + false + + diff --git a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj index 0dd3dbf34c..ad9a99c463 100644 --- a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj +++ b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp2.0 + false + diff --git a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj index 2a41fa1e75..9f8c21ba0f 100644 --- a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj +++ b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj index 32b774090f..d2d166c02d 100644 --- a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj +++ b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj b/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj index dd42476a01..b232f9b6b3 100644 --- a/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj +++ b/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/DefaultBuilder/testassets/Directory.Build.props b/src/DefaultBuilder/testassets/Directory.Build.props index b49282fb6f..b8ad72d258 100644 --- a/src/DefaultBuilder/testassets/Directory.Build.props +++ b/src/DefaultBuilder/testassets/Directory.Build.props @@ -6,4 +6,11 @@ + + + + + diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index 4f34f355d5..c54cd6e237 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -37,7 +37,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant true - MSB3243 + MSB3243 + + $(NoWarn);NU5131;NU5128 FrameworkList.xml @@ -151,7 +153,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant Outputs="$(TargetDir)$(PackageConflictManifestFileName)"> - <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition=" '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> + + <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(MicrosoftInternalExtensionsRefsPath)%(ReferencePath.NuGetPackageId).dll') AND '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> + + <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|$(MicrosoftInternalExtensionsRefsPackageOverrideVersion)')" Condition="Exists('$(MicrosoftInternalExtensionsRefsPath)%(ReferencePath.NuGetPackageId).dll') AND '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(ReferencePackSharedFxVersion)')" Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' AND '%(ReferencePath.IsReferenceAssembly)' == 'true' " /> diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index 9b6fe29f6f..d227769965 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -21,6 +21,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant true DotnetPlatform + + false + true + aspnetcore_base_runtime.version $(InstallersOutputPath)$(BaseRuntimeVersionFileName) @@ -293,11 +297,13 @@ This package is an internal implementation of the .NET Core SDK and is not meant --> $(IntermediateOutputPath)crossgen\ + $(IntermediateOutputPath)platformAssemblies\ $(CrossgenToolDir)$(LibPrefix)clrjit$(LibExtension) + @@ -306,13 +312,19 @@ This package is an internal implementation of the .NET Core SDK and is not meant + + + <_PlatformAssemblyPaths Include="$(CrossgenToolDir)" /> - <_PlatformAssemblyPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)')" /> + + <_PlatformAssemblyPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)')" Condition="'%(ReferenceCopyLocalPaths.ProjectPath)' == ''"/> + + <_PlatformAssemblyPaths Include="$(CrossgenPlatformAssembliesDir)"/> diff --git a/src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.csproj index 494c7d61ae..6b19abf98b 100644 --- a/src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.csproj +++ b/src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj index 40455060c2..b05a67027c 100644 --- a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj +++ b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Hosting/Server.Abstractions/ref/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj b/src/Hosting/Server.Abstractions/ref/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj index b9c84f7e33..74101ce3e9 100644 --- a/src/Hosting/Server.Abstractions/ref/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj +++ b/src/Hosting/Server.Abstractions/ref/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj b/src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj index 3ea37b679b..da860f1783 100644 --- a/src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj +++ b/src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj @@ -6,6 +6,11 @@ + + + diff --git a/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.csproj b/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.csproj index e78b021524..20451ebbd5 100644 --- a/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.csproj +++ b/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.csproj b/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.csproj index 192cf51270..8f174166c1 100644 --- a/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.csproj +++ b/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.csproj b/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.csproj index 9f4bc43e08..4be3f75582 100644 --- a/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.csproj +++ b/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Headers/ref/Microsoft.Net.Http.Headers.csproj b/src/Http/Headers/ref/Microsoft.Net.Http.Headers.csproj index 4ac03925e9..167dfca0e1 100644 --- a/src/Http/Headers/ref/Microsoft.Net.Http.Headers.csproj +++ b/src/Http/Headers/ref/Microsoft.Net.Http.Headers.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj index fe49c287c4..2d9a7fc6c2 100644 --- a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj +++ b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Http.Extensions/ref/Microsoft.AspNetCore.Http.Extensions.csproj b/src/Http/Http.Extensions/ref/Microsoft.AspNetCore.Http.Extensions.csproj index bba8cc701e..cb0f176577 100644 --- a/src/Http/Http.Extensions/ref/Microsoft.AspNetCore.Http.Extensions.csproj +++ b/src/Http/Http.Extensions/ref/Microsoft.AspNetCore.Http.Extensions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj index 1e342f6be0..410b369e19 100644 --- a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj +++ b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Http/Http/ref/Microsoft.AspNetCore.Http.csproj b/src/Http/Http/ref/Microsoft.AspNetCore.Http.csproj index f59274ed7f..ee10cacf37 100644 --- a/src/Http/Http/ref/Microsoft.AspNetCore.Http.csproj +++ b/src/Http/Http/ref/Microsoft.AspNetCore.Http.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj b/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj index 5bd3e643f1..4507a5bf69 100644 --- a/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj +++ b/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj @@ -2,6 +2,8 @@ netstandard2.0 + false + diff --git a/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj b/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj index fe6fa231aa..5d03f3ad8b 100644 --- a/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj +++ b/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj index a68d86a042..a2214046b7 100644 --- a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj +++ b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.csproj b/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.csproj index e48d4616af..b0338e92a7 100644 --- a/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.csproj +++ b/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.csproj b/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.csproj index 29f919fbe6..f67a4d2fcf 100644 --- a/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.csproj +++ b/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj index 50615ee4e1..1d35660722 100644 --- a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj +++ b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj index 7a0f728cb4..c101e8c68d 100644 --- a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj +++ b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj index 9ed81cbcb8..4b7ada7431 100644 --- a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj +++ b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj @@ -26,7 +26,7 @@ <_Parameter1>Microsoft.AspNetCore.Testing.DefaultUIProjectPath <_Parameter2>$([System.IO.Path]::GetDirectoryName('%(_IdentitUIDefaultUI.MSBuildSourceProjectFile)')) - + diff --git a/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.csproj b/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.csproj index 7f2aea4570..9a9c7c1a77 100644 --- a/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.csproj +++ b/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/CORS/test/testassets/Directory.Build.props b/src/Middleware/CORS/test/testassets/Directory.Build.props index b49282fb6f..b8ad72d258 100644 --- a/src/Middleware/CORS/test/testassets/Directory.Build.props +++ b/src/Middleware/CORS/test/testassets/Directory.Build.props @@ -6,4 +6,11 @@ + + + + + diff --git a/src/Middleware/Diagnostics.Abstractions/ref/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj b/src/Middleware/Diagnostics.Abstractions/ref/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj index eeb85ae239..474f1b32be 100644 --- a/src/Middleware/Diagnostics.Abstractions/ref/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj +++ b/src/Middleware/Diagnostics.Abstractions/ref/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj b/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj index a33f66dfdc..8e7f04791b 100644 --- a/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj +++ b/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/HealthChecks/ref/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj b/src/Middleware/HealthChecks/ref/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj index fc35786978..a47255bc03 100644 --- a/src/Middleware/HealthChecks/ref/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj +++ b/src/Middleware/HealthChecks/ref/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj b/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj index d41b783539..c471797b20 100644 --- a/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj +++ b/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj @@ -5,6 +5,11 @@ + + + diff --git a/src/Middleware/HostFiltering/ref/Microsoft.AspNetCore.HostFiltering.csproj b/src/Middleware/HostFiltering/ref/Microsoft.AspNetCore.HostFiltering.csproj index 0c879a2ba6..96216afaf5 100644 --- a/src/Middleware/HostFiltering/ref/Microsoft.AspNetCore.HostFiltering.csproj +++ b/src/Middleware/HostFiltering/ref/Microsoft.AspNetCore.HostFiltering.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.csproj index c2cc319345..59fcb83baa 100644 --- a/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.csproj +++ b/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj index c5f9652ddc..eb0950221c 100644 --- a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj +++ b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj @@ -5,6 +5,11 @@ + + + diff --git a/src/Middleware/HttpsPolicy/ref/Microsoft.AspNetCore.HttpsPolicy.csproj b/src/Middleware/HttpsPolicy/ref/Microsoft.AspNetCore.HttpsPolicy.csproj index 05f6a42637..8a24b069bf 100644 --- a/src/Middleware/HttpsPolicy/ref/Microsoft.AspNetCore.HttpsPolicy.csproj +++ b/src/Middleware/HttpsPolicy/ref/Microsoft.AspNetCore.HttpsPolicy.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/Localization.Routing/ref/Microsoft.AspNetCore.Localization.Routing.csproj b/src/Middleware/Localization.Routing/ref/Microsoft.AspNetCore.Localization.Routing.csproj index 050ea0a4af..3dccb4a64b 100644 --- a/src/Middleware/Localization.Routing/ref/Microsoft.AspNetCore.Localization.Routing.csproj +++ b/src/Middleware/Localization.Routing/ref/Microsoft.AspNetCore.Localization.Routing.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/Localization/ref/Microsoft.AspNetCore.Localization.csproj b/src/Middleware/Localization/ref/Microsoft.AspNetCore.Localization.csproj index 9ae583c9ec..5ec5751618 100644 --- a/src/Middleware/Localization/ref/Microsoft.AspNetCore.Localization.csproj +++ b/src/Middleware/Localization/ref/Microsoft.AspNetCore.Localization.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/ResponseCaching.Abstractions/ref/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj b/src/Middleware/ResponseCaching.Abstractions/ref/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj index fe10c4e2a8..dbc557d005 100644 --- a/src/Middleware/ResponseCaching.Abstractions/ref/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj +++ b/src/Middleware/ResponseCaching.Abstractions/ref/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.csproj b/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.csproj index 985bcdbbc9..8fa81e3f4a 100644 --- a/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.csproj +++ b/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.csproj b/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.csproj index 4cf1f5fef4..8f6c10f1e8 100644 --- a/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.csproj +++ b/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.csproj b/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.csproj index a4014b3f94..6d6b32b2d9 100644 --- a/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.csproj +++ b/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/Session/ref/Microsoft.AspNetCore.Session.csproj b/src/Middleware/Session/ref/Microsoft.AspNetCore.Session.csproj index 3c0a92ba63..ce87d521d4 100644 --- a/src/Middleware/Session/ref/Microsoft.AspNetCore.Session.csproj +++ b/src/Middleware/Session/ref/Microsoft.AspNetCore.Session.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.csproj b/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.csproj index 0bd2351f38..d59c4f309c 100644 --- a/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.csproj +++ b/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj index e6c8278b30..82bb9259ae 100644 --- a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj +++ b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj @@ -26,6 +26,12 @@ + + + + diff --git a/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj b/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj index e5ae8749c6..d5319c29c1 100644 --- a/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj +++ b/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj index 90b63669a8..9e352d857f 100644 --- a/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj +++ b/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs index baac0e3b4f..2c271ff932 100644 --- a/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs +++ b/src/Mvc/Mvc.Analyzers/test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Analyzer.Testing; using Microsoft.CodeAnalysis; using Xunit; -namespace Microsoft.AspNetCore.Mvc.Analyzers.Test +namespace Microsoft.AspNetCore.Mvc.Analyzers { public class AttributesShouldNotBeAppliedToPageModelAnalyzerTest { diff --git a/src/Mvc/Mvc.Analyzers/test/CodeAnalysisExtensionsTest.cs b/src/Mvc/Mvc.Analyzers/test/CodeAnalysisExtensionsTest.cs index a9630cba1f..129ed81059 100644 --- a/src/Mvc/Mvc.Analyzers/test/CodeAnalysisExtensionsTest.cs +++ b/src/Mvc/Mvc.Analyzers/test/CodeAnalysisExtensionsTest.cs @@ -491,7 +491,7 @@ namespace Microsoft.AspNetCore.Mvc.Analyzers private Task GetCompilation([CallerMemberName] string testMethod = "") { var testSource = MvcTestSource.Read(GetType().Name, testMethod); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); return project.GetCompilationAsync(); } diff --git a/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs index f29cff84d1..2b4b8dca9a 100644 --- a/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs +++ b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs @@ -2,6 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections.Immutable; +using System.IO; +using System.Linq; +using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Analyzer.Testing; using Microsoft.CodeAnalysis; @@ -20,7 +24,28 @@ namespace Microsoft.AspNetCore.Mvc public Task GetDiagnosticsAsync(string source) { - return GetDiagnosticsAsync(sources: new[] { source }, Analyzer, Array.Empty()); + var project = CreateProjectWithReferencesInBinDir(GetType().Assembly, source); + + return GetDiagnosticsAsync(project); + } + + public static Project CreateProjectWithReferencesInBinDir(Assembly testAssembly, params string[] source) + { + // The deps file in the project is incorrect and does not contain "compile" nodes for some references. + // However these binaries are always present in the bin output. As a "temporary" workaround, we'll add + // every dll file that's present in the test's build output as a metadatareference. + + var project = DiagnosticProject.Create(testAssembly, source); + + foreach (var assembly in Directory.EnumerateFiles(AppContext.BaseDirectory, "*.dll")) + { + if (!project.MetadataReferences.Any(c => string.Equals(Path.GetFileNameWithoutExtension(c.Display), Path.GetFileNameWithoutExtension(assembly), StringComparison.OrdinalIgnoreCase))) + { + project = project.AddMetadataReference(MetadataReference.CreateFromFile(assembly)); + } + } + + return project; } public Task GetDiagnosticsAsync(Project project) diff --git a/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs b/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs index 361f6d3cb5..8efec91c16 100644 --- a/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs +++ b/src/Mvc/Mvc.Analyzers/test/TopLevelParameterNameAnalyzerTest.cs @@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Mvc.Analyzers private async Task IsProblematicParameterTest([CallerMemberName] string testMethod = "") { var testSource = MvcTestSource.Read(GetType().Name, testMethod); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); var compilation = await project.GetCompilationAsync(); @@ -207,7 +207,7 @@ namespace Microsoft.AspNetCore.Mvc.Analyzers private async Task GetCompilationForGetName() { var testSource = MvcTestSource.Read(GetType().Name, "GetNameTests"); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); var compilation = await project.GetCompilationAsync(); return compilation; @@ -218,7 +218,7 @@ namespace Microsoft.AspNetCore.Mvc.Analyzers { var testMethod = nameof(SpecifiesModelType_ReturnsFalse_IfModelBinderDoesNotSpecifyType); var testSource = MvcTestSource.Read(GetType().Name, "SpecifiesModelTypeTests"); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); var compilation = await project.GetCompilationAsync(); Assert.True(TopLevelParameterNameAnalyzer.SymbolCache.TryCreate(compilation, out var symbolCache)); @@ -236,7 +236,7 @@ namespace Microsoft.AspNetCore.Mvc.Analyzers { var testMethod = nameof(SpecifiesModelType_ReturnsTrue_IfModelBinderSpecifiesTypeFromConstructor); var testSource = MvcTestSource.Read(GetType().Name, "SpecifiesModelTypeTests"); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); var compilation = await project.GetCompilationAsync(); Assert.True(TopLevelParameterNameAnalyzer.SymbolCache.TryCreate(compilation, out var symbolCache)); @@ -254,7 +254,7 @@ namespace Microsoft.AspNetCore.Mvc.Analyzers { var testMethod = nameof(SpecifiesModelType_ReturnsTrue_IfModelBinderSpecifiesTypeFromProperty); var testSource = MvcTestSource.Read(GetType().Name, "SpecifiesModelTypeTests"); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); var compilation = await project.GetCompilationAsync(); Assert.True(TopLevelParameterNameAnalyzer.SymbolCache.TryCreate(compilation, out var symbolCache)); diff --git a/src/Mvc/Mvc.Api.Analyzers/test/ActualApiResponseMetadataFactoryTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ActualApiResponseMetadataFactoryTest.cs index d9c15bddaa..cca12582dd 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/ActualApiResponseMetadataFactoryTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/ActualApiResponseMetadataFactoryTest.cs @@ -64,7 +64,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers } } }"; - var project = DiagnosticProject.Create(GetType().Assembly, new[] { source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { source }); var compilation = await project.GetCompilationAsync(); Assert.True(ApiControllerSymbolCache.TryCreate(compilation, out var symbolCache)); @@ -301,7 +301,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers private async Task<(bool result, IList responseMetadatas, TestSource testSource)> TryGetActualResponseMetadata(string typeName, string methodName) { var testSource = MvcTestSource.Read(GetType().Name, "TryGetActualResponseMetadataTests"); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); var compilation = await GetCompilation("TryGetActualResponseMetadataTests"); @@ -340,7 +340,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers private async Task RunInspectReturnStatementSyntax(string source, string test) { - var project = DiagnosticProject.Create(GetType().Assembly, new[] { source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { source }); var compilation = await project.GetCompilationAsync(); Assert.True(ApiControllerSymbolCache.TryCreate(compilation, out var symbolCache)); @@ -361,7 +361,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers private Task GetCompilation(string test) { var testSource = MvcTestSource.Read(GetType().Name, test); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); return project.GetCompilationAsync(); } diff --git a/src/Mvc/Mvc.Api.Analyzers/test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs index 9ba677d101..10a77b8b42 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers { private MvcDiagnosticAnalyzerRunner AnalyzerRunner { get; } = new MvcDiagnosticAnalyzerRunner(new ApiConventionAnalyzer()); - private CodeFixRunner CodeFixRunner => CodeFixRunner.Default; + private CodeFixRunner CodeFixRunner { get; } = new IgnoreCS1701WarningCodeFixRunner(); [Fact] public Task CodeFixAddsStatusCodes() => RunTest(); @@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers private Project GetProject(string testMethod) { var testSource = Read(testMethod + ".Input"); - return DiagnosticProject.Create(GetType().Assembly, new[] { testSource }); + return MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource }); } private string Read(string fileName) diff --git a/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs index 918a04940a..b8b096d9c9 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers { private MvcDiagnosticAnalyzerRunner AnalyzerRunner { get; } = new MvcDiagnosticAnalyzerRunner(new ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer()); - private CodeFixRunner CodeFixRunner => CodeFixRunner.Default; + private CodeFixRunner CodeFixRunner { get; } = new IgnoreCS1701WarningCodeFixRunner(); [Fact] public Task CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck() @@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers private Project GetProject(string testMethod) { var testSource = Read(testMethod + ".Input"); - return DiagnosticProject.Create(GetType().Assembly, new[] { testSource }); + return MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource }); } private string Read(string fileName) diff --git a/src/Mvc/Mvc.Api.Analyzers/test/ApiControllerFactsTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/ApiControllerFactsTest.cs index 786aeeb9d7..6c2f5a81d1 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/ApiControllerFactsTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/ApiControllerFactsTest.cs @@ -35,7 +35,7 @@ namespace TestNamespace } } }"; - var project = DiagnosticProject.Create(GetType().Assembly, new[] { source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { source }); var compilation = await project.GetCompilationAsync(); Assert.True(ApiControllerSymbolCache.TryCreate(compilation, out var symbolCache)); var method = (IMethodSymbol)compilation.GetTypeByMetadataName("TestNamespace.TestController").GetMembers("Get").First(); @@ -130,7 +130,7 @@ namespace TestNamespace private Task GetCompilation(string testFile = "TestFile") { var testSource = MvcTestSource.Read(GetType().Name, testFile); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); return project.GetCompilationAsync(); } diff --git a/src/Mvc/Mvc.Api.Analyzers/test/IgnoreCS1701WarningCodeFixRunner.cs b/src/Mvc/Mvc.Api.Analyzers/test/IgnoreCS1701WarningCodeFixRunner.cs new file mode 100644 index 0000000000..e46b39f145 --- /dev/null +++ b/src/Mvc/Mvc.Api.Analyzers/test/IgnoreCS1701WarningCodeFixRunner.cs @@ -0,0 +1,18 @@ +// 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.Linq; +using Microsoft.AspNetCore.Analyzer.Testing; +using Microsoft.CodeAnalysis; + +namespace Microsoft.AspNetCore.Mvc.Api.Analyzers +{ + public class IgnoreCS1701WarningCodeFixRunner : CodeFixRunner + { + protected override CompilationOptions ConfigureCompilationOptions(CompilationOptions options) + { + options = base.ConfigureCompilationOptions(options); + return options.WithSpecificDiagnosticOptions(new[] { "CS1701" }.ToDictionary(c => c, _ => ReportDiagnostic.Suppress)); + } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.Api.Analyzers/test/MvcFactsTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/MvcFactsTest.cs index 0544262951..4498d009f1 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/MvcFactsTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/MvcFactsTest.cs @@ -226,7 +226,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers private Task GetCompilation(string test) { var testSource = MvcTestSource.Read(GetType().Name, test); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); return project.GetCompilationAsync(); } diff --git a/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiConventionMatcherTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiConventionMatcherTest.cs index 1d0ab00c1b..011485292c 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiConventionMatcherTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiConventionMatcherTest.cs @@ -559,7 +559,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers private Task GetCompilationAsync(string test = "SymbolApiConventionMatcherTestFile") { var testSource = MvcTestSource.Read(GetType().Name, test); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); return project.GetCompilationAsync(); } diff --git a/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiResponseMetadataProviderTest.cs b/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiResponseMetadataProviderTest.cs index f9adfa062a..daf18e83f1 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiResponseMetadataProviderTest.cs +++ b/src/Mvc/Mvc.Api.Analyzers/test/SymbolApiResponseMetadataProviderTest.cs @@ -478,7 +478,7 @@ namespace Microsoft.AspNetCore.Mvc.Api.Analyzers private Task GetCompilation(string test) { var testSource = MvcTestSource.Read(GetType().Name, test); - var project = DiagnosticProject.Create(GetType().Assembly, new[] { testSource.Source }); + var project = MvcDiagnosticAnalyzerRunner.CreateProjectWithReferencesInBinDir(GetType().Assembly, new[] { testSource.Source }); return project.GetCompilationAsync(); } diff --git a/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj b/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj index 10680b3401..5e6529a67f 100644 --- a/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj +++ b/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Core/ref/Directory.Build.props b/src/Mvc/Mvc.Core/ref/Directory.Build.props new file mode 100644 index 0000000000..ea5de23302 --- /dev/null +++ b/src/Mvc/Mvc.Core/ref/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs index d3e44fb471..1e37951241 100644 --- a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs +++ b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs @@ -5,3 +5,1247 @@ using System.Runtime.CompilerServices; using Microsoft.AspNetCore.Mvc.Formatters; [assembly: TypeForwardedTo(typeof(InputFormatterException))] + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ApiExplorer, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Cors, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.DataAnnotations, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Formatters.Xml, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Localization, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Testing, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] + +namespace Microsoft.AspNetCore.Internal +{ + internal partial interface IResponseCacheFilter + { + } +} +namespace Microsoft.AspNetCore.Mvc +{ + internal partial class MvcCoreMvcOptionsSetup + { + private readonly Microsoft.Extensions.Options.IOptions _jsonOptions; + private readonly Microsoft.Extensions.Logging.ILoggerFactory _loggerFactory; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory _readerFactory; + public MvcCoreMvcOptionsSetup(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory readerFactory) { } + public MvcCoreMvcOptionsSetup(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory readerFactory, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.Options.IOptions jsonOptions) { } + public void Configure(Microsoft.AspNetCore.Mvc.MvcOptions options) { } + internal static void ConfigureAdditionalModelMetadataDetailsProviders(System.Collections.Generic.IList modelMetadataDetailsProviders) { } + public void PostConfigure(string name, Microsoft.AspNetCore.Mvc.MvcOptions options) { } + } +} +namespace Microsoft.AspNetCore.Mvc.Controllers +{ + internal delegate System.Threading.Tasks.Task ControllerBinderDelegate(Microsoft.AspNetCore.Mvc.ControllerContext controllerContext, object controller, System.Collections.Generic.Dictionary arguments); +} +namespace Microsoft.AspNetCore.Mvc.ActionConstraints +{ + internal partial class DefaultActionConstraintProvider : Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintProvider + { + public DefaultActionConstraintProvider() { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintProviderContext context) { } + private void ProvideConstraint(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintItem item, System.IServiceProvider services) { } + } + internal partial class ActionConstraintCache + { + private readonly Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintProvider[] _actionConstraintProviders; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _collectionProvider; + private volatile Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache.InnerCache _currentCache; + public ActionConstraintCache(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, System.Collections.Generic.IEnumerable actionConstraintProviders) { } + internal Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache.InnerCache CurrentCache { get { throw null; } } + private void ExecuteProviders(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, System.Collections.Generic.List items) { } + private System.Collections.Generic.IReadOnlyList ExtractActionConstraints(System.Collections.Generic.List items) { throw null; } + public System.Collections.Generic.IReadOnlyList GetActionConstraints(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action) { throw null; } + private System.Collections.Generic.IReadOnlyList GetActionConstraintsFromEntry(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache.CacheEntry entry, Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action) { throw null; } + internal readonly partial struct CacheEntry + { + private readonly object _dummy; + public CacheEntry(System.Collections.Generic.IReadOnlyList actionConstraints) { throw null; } + public CacheEntry(System.Collections.Generic.List items) { throw null; } + public System.Collections.Generic.IReadOnlyList ActionConstraints { get { throw null; } } + public System.Collections.Generic.List Items { get { throw null; } } + } + internal partial class InnerCache + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection _actions; + private readonly System.Collections.Concurrent.ConcurrentDictionary _Entries_k__BackingField; + public InnerCache(Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection actions) { } + public System.Collections.Concurrent.ConcurrentDictionary Entries { get { throw null; } } + public int Version { get { throw null; } } + } + } +} +namespace Microsoft.AspNetCore.Mvc.ApplicationModels +{ + internal partial class ApiBehaviorApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider + { + private readonly System.Collections.Generic.List _ActionModelConventions_k__BackingField; + public ApiBehaviorApplicationModelProvider(Microsoft.Extensions.Options.IOptions apiBehaviorOptions, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.Infrastructure.IClientErrorFactory clientErrorFactory, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public System.Collections.Generic.List ActionModelConventions { get { throw null; } } + public int Order { get { throw null; } } + private static void EnsureActionIsAttributeRouted(Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel actionModel) { } + private static bool IsApiController(Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel controller) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } + internal partial class ApplicationModelFactory + { + private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider[] _applicationModelProviders; + private readonly System.Collections.Generic.IList _conventions; + public ApplicationModelFactory(System.Collections.Generic.IEnumerable applicationModelProviders, Microsoft.Extensions.Options.IOptions options) { } + private static void AddActionToMethodInfoMap(System.Collections.Generic.Dictionary>> actionsByMethod, Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel action, Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel selector) { } + private static void AddActionToRouteNameMap(System.Collections.Generic.Dictionary>> actionsByRouteName, Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel action, Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel selector) { } + private static System.Collections.Generic.List AddErrorNumbers(System.Collections.Generic.IEnumerable namedRoutedErrors) { throw null; } + public Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel CreateApplicationModel(System.Collections.Generic.IEnumerable controllerTypes) { throw null; } + private static string CreateAttributeRoutingAggregateErrorMessage(System.Collections.Generic.IEnumerable individualErrors) { throw null; } + private static string CreateMixedRoutedActionDescriptorsErrorMessage(System.Reflection.MethodInfo method, System.Collections.Generic.List> actions) { throw null; } + public static System.Collections.Generic.List Flatten(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel application, System.Func flattener) { throw null; } + private static void ReplaceAttributeRouteTokens(Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel controller, Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel action, Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel selector, System.Collections.Generic.List errors) { } + private static void ValidateActionGroupConfiguration(System.Reflection.MethodInfo method, System.Collections.Generic.List> actions, System.Collections.Generic.IDictionary routingConfigurationErrors) { } + private static System.Collections.Generic.List ValidateNamedAttributeRoutedActions(System.Collections.Generic.Dictionary>> actionsByRouteName) { throw null; } + } + internal partial class ControllerActionDescriptorProvider + { + private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelFactory _applicationModelFactory; + private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _partManager; + public ControllerActionDescriptorProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager partManager, Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelFactory applicationModelFactory) { } + public int Order { get { throw null; } } + private System.Collections.Generic.IEnumerable GetControllerTypes() { throw null; } + internal System.Collections.Generic.IEnumerable GetDescriptors() { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext context) { } + } + internal partial class AuthorizationApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider + { + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + private readonly Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider _policyProvider; + public AuthorizationApplicationModelProvider(Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider policyProvider, Microsoft.Extensions.Options.IOptions mvcOptions) { } + public int Order { get { throw null; } } + public static Microsoft.AspNetCore.Mvc.Authorization.AuthorizeFilter GetFilter(Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider policyProvider, System.Collections.Generic.IEnumerable authData) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } + internal partial class DefaultApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider + { + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _modelMetadataProvider; + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + private readonly System.Func _supportsAllRequests; + private readonly System.Func _supportsNonGetRequests; + public DefaultApplicationModelProvider(Microsoft.Extensions.Options.IOptions mvcOptionsAccessor, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider) { } + public int Order { get { throw null; } } + private static void AddRange(System.Collections.Generic.IList list, System.Collections.Generic.IEnumerable items) { } + private string CanonicalizeActionName(string actionName) { throw null; } + internal Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel CreateActionModel(System.Reflection.TypeInfo typeInfo, System.Reflection.MethodInfo methodInfo) { throw null; } + internal Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel CreateControllerModel(System.Reflection.TypeInfo typeInfo) { throw null; } + internal Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModel CreateParameterModel(System.Reflection.ParameterInfo parameterInfo) { throw null; } + internal Microsoft.AspNetCore.Mvc.ApplicationModels.PropertyModel CreatePropertyModel(System.Reflection.PropertyInfo propertyInfo) { throw null; } + private static Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel CreateSelectorModel(Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider route, System.Collections.Generic.IList attributes) { throw null; } + private System.Collections.Generic.IList CreateSelectors(System.Collections.Generic.IList attributes) { throw null; } + private static bool InRouteProviders(System.Collections.Generic.List routeProviders, object attribute) { throw null; } + internal bool IsAction(System.Reflection.TypeInfo typeInfo, System.Reflection.MethodInfo methodInfo) { throw null; } + private bool IsIDisposableMethod(System.Reflection.MethodInfo methodInfo) { throw null; } + private bool IsSilentRouteAttribute(Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider routeTemplateProvider) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } +} +namespace Microsoft.AspNetCore.Mvc.Core +{ + internal static partial class Resources + { + private static System.Resources.ResourceManager s_resourceManager; + private static System.Globalization.CultureInfo _Culture_k__BackingField; + internal static string AcceptHeaderParser_ParseAcceptHeader_InvalidValues { get { throw null; } } + internal static string ActionDescriptorMustBeBasedOnControllerAction { get { throw null; } } + internal static string ActionExecutor_UnexpectedTaskInstance { get { throw null; } } + internal static string ActionExecutor_WrappedTaskInstance { get { throw null; } } + internal static string ActionInvokerFactory_CouldNotCreateInvoker { get { throw null; } } + internal static string ActionResult_ActionReturnValueCannotBeNull { get { throw null; } } + internal static string ApiController_AttributeRouteRequired { get { throw null; } } + internal static string ApiController_MultipleBodyParametersFound { get { throw null; } } + internal static string ApiConventionMethod_AmbiguousMethodName { get { throw null; } } + internal static string ApiConventionMethod_NoMethodFound { get { throw null; } } + internal static string ApiConventionMustBeStatic { get { throw null; } } + internal static string ApiConventions_Title_400 { get { throw null; } } + internal static string ApiConventions_Title_401 { get { throw null; } } + internal static string ApiConventions_Title_403 { get { throw null; } } + internal static string ApiConventions_Title_404 { get { throw null; } } + internal static string ApiConventions_Title_406 { get { throw null; } } + internal static string ApiConventions_Title_409 { get { throw null; } } + internal static string ApiConventions_Title_415 { get { throw null; } } + internal static string ApiConventions_Title_422 { get { throw null; } } + internal static string ApiConventions_Title_500 { get { throw null; } } + internal static string ApiConvention_UnsupportedAttributesOnConvention { get { throw null; } } + internal static string ApiExplorer_UnsupportedAction { get { throw null; } } + internal static string ApplicationAssembliesProvider_DuplicateRelatedAssembly { get { throw null; } } + internal static string ApplicationAssembliesProvider_RelatedAssemblyCannotDefineAdditional { get { throw null; } } + internal static string ApplicationPartFactory_InvalidFactoryType { get { throw null; } } + internal static string ArgumentCannotBeNullOrEmpty { get { throw null; } } + internal static string Argument_InvalidOffsetLength { get { throw null; } } + internal static string AsyncActionFilter_InvalidShortCircuit { get { throw null; } } + internal static string AsyncResourceFilter_InvalidShortCircuit { get { throw null; } } + internal static string AsyncResultFilter_InvalidShortCircuit { get { throw null; } } + internal static string AttributeRoute_AggregateErrorMessage { get { throw null; } } + internal static string AttributeRoute_AggregateErrorMessage_ErrorNumber { get { throw null; } } + internal static string AttributeRoute_CannotContainParameter { get { throw null; } } + internal static string AttributeRoute_DuplicateNames { get { throw null; } } + internal static string AttributeRoute_DuplicateNames_Item { get { throw null; } } + internal static string AttributeRoute_IndividualErrorMessage { get { throw null; } } + internal static string AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod { get { throw null; } } + internal static string AttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item { get { throw null; } } + internal static string AttributeRoute_NullTemplateRepresentation { get { throw null; } } + internal static string AttributeRoute_TokenReplacement_EmptyTokenNotAllowed { get { throw null; } } + internal static string AttributeRoute_TokenReplacement_ImbalancedSquareBrackets { get { throw null; } } + internal static string AttributeRoute_TokenReplacement_InvalidSyntax { get { throw null; } } + internal static string AttributeRoute_TokenReplacement_ReplacementValueNotFound { get { throw null; } } + internal static string AttributeRoute_TokenReplacement_UnclosedToken { get { throw null; } } + internal static string AttributeRoute_TokenReplacement_UnescapedBraceInToken { get { throw null; } } + internal static string AuthorizeFilter_AuthorizationPolicyCannotBeCreated { get { throw null; } } + internal static string BinderType_MustBeIModelBinder { get { throw null; } } + internal static string BindingSource_CannotBeComposite { get { throw null; } } + internal static string BindingSource_CannotBeGreedy { get { throw null; } } + internal static string CacheProfileNotFound { get { throw null; } } + internal static string CandidateResolver_DifferentCasedReference { get { throw null; } } + internal static string Common_PropertyNotFound { get { throw null; } } + internal static string ComplexTypeModelBinder_NoParameterlessConstructor_ForParameter { get { throw null; } } + internal static string ComplexTypeModelBinder_NoParameterlessConstructor_ForProperty { get { throw null; } } + internal static string ComplexTypeModelBinder_NoParameterlessConstructor_ForType { get { throw null; } } + internal static string CouldNotCreateIModelBinder { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { get { throw null; } set { } } + internal static string DefaultActionSelector_AmbiguousActions { get { throw null; } } + internal static string FileResult_InvalidPath { get { throw null; } } + internal static string FileResult_PathNotRooted { get { throw null; } } + internal static string FilterFactoryAttribute_TypeMustImplementIFilter { get { throw null; } } + internal static string FormatFormatterMappings_GetMediaTypeMappingForFormat_InvalidFormat { get { throw null; } } + internal static string FormatterMappings_NotValidMediaType { get { throw null; } } + internal static string Formatter_NoMediaTypes { get { throw null; } } + internal static string Format_NotValid { get { throw null; } } + internal static string FormCollectionModelBinder_CannotBindToFormCollection { get { throw null; } } + internal static string HtmlGeneration_NonPropertyValueMustBeNumber { get { throw null; } } + internal static string HtmlGeneration_ValueIsInvalid { get { throw null; } } + internal static string HtmlGeneration_ValueMustBeNumber { get { throw null; } } + internal static string InputFormatterNoEncoding { get { throw null; } } + internal static string InputFormattersAreRequired { get { throw null; } } + internal static string InvalidTypeTForActionResultOfT { get { throw null; } } + internal static string Invalid_IncludePropertyExpression { get { throw null; } } + internal static string JQueryFormValueProviderFactory_MissingClosingBracket { get { throw null; } } + internal static string KeyValuePair_BothKeyAndValueMustBePresent { get { throw null; } } + internal static string MatchAllContentTypeIsNotAllowed { get { throw null; } } + internal static string MiddewareFilter_ConfigureMethodOverload { get { throw null; } } + internal static string MiddewareFilter_NoConfigureMethod { get { throw null; } } + internal static string MiddlewareFilterBuilder_NoMiddlewareFeature { get { throw null; } } + internal static string MiddlewareFilterBuilder_NullApplicationBuilder { get { throw null; } } + internal static string MiddlewareFilterConfigurationProvider_CreateConfigureDelegate_CannotCreateType { get { throw null; } } + internal static string MiddlewareFilter_InvalidConfigureReturnType { get { throw null; } } + internal static string MiddlewareFilter_ServiceResolutionFail { get { throw null; } } + internal static string ModelBinderProvidersAreRequired { get { throw null; } } + internal static string ModelBinderUtil_ModelCannotBeNull { get { throw null; } } + internal static string ModelBinderUtil_ModelInstanceIsWrong { get { throw null; } } + internal static string ModelBinderUtil_ModelMetadataCannotBeNull { get { throw null; } } + internal static string ModelBinding_ExceededMaxModelBindingCollectionSize { get { throw null; } } + internal static string ModelBinding_ExceededMaxModelBindingRecursionDepth { get { throw null; } } + internal static string ModelBinding_MissingBindRequiredMember { get { throw null; } } + internal static string ModelBinding_MissingRequestBodyRequiredMember { get { throw null; } } + internal static string ModelBinding_NullValueNotValid { get { throw null; } } + internal static string ModelState_AttemptedValueIsInvalid { get { throw null; } } + internal static string ModelState_NonPropertyAttemptedValueIsInvalid { get { throw null; } } + internal static string ModelState_NonPropertyUnknownValueIsInvalid { get { throw null; } } + internal static string ModelState_UnknownValueIsInvalid { get { throw null; } } + internal static string ModelType_WrongType { get { throw null; } } + internal static string NoRoutesMatched { get { throw null; } } + internal static string NoRoutesMatchedForPage { get { throw null; } } + internal static string ObjectResultExecutor_MaxEnumerationExceeded { get { throw null; } } + internal static string ObjectResult_MatchAllContentType { get { throw null; } } + internal static string OutputFormatterNoMediaType { get { throw null; } } + internal static string OutputFormattersAreRequired { get { throw null; } } + internal static string PropertyOfTypeCannotBeNull { get { throw null; } } + internal static string Property_MustBeInstanceOfType { get { throw null; } } + internal static string ReferenceToNewtonsoftJsonRequired { get { throw null; } } + internal static string RelatedAssemblyAttribute_AssemblyCannotReferenceSelf { get { throw null; } } + internal static string RelatedAssemblyAttribute_CouldNotBeFound { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string ResponseCache_SpecifyDuration { get { throw null; } } + internal static string SerializableError_DefaultError { get { throw null; } } + internal static string TextInputFormatter_SupportedEncodingsMustNotBeEmpty { get { throw null; } } + internal static string TextOutputFormatter_SupportedEncodingsMustNotBeEmpty { get { throw null; } } + internal static string TextOutputFormatter_WriteResponseBodyAsyncNotSupported { get { throw null; } } + internal static string TypeMethodMustReturnNotNullValue { get { throw null; } } + internal static string TypeMustDeriveFromType { get { throw null; } } + internal static string UnableToFindServices { get { throw null; } } + internal static string UnexpectedJsonEnd { get { throw null; } } + internal static string UnsupportedContentType { get { throw null; } } + internal static string UrlHelper_RelativePagePathIsNotSupported { get { throw null; } } + internal static string UrlNotLocal { get { throw null; } } + internal static string ValidationProblemDescription_Title { get { throw null; } } + internal static string ValidationVisitor_ExceededMaxDepth { get { throw null; } } + internal static string ValidationVisitor_ExceededMaxDepthFix { get { throw null; } } + internal static string ValidationVisitor_ExceededMaxPropertyDepth { get { throw null; } } + internal static string ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated { get { throw null; } } + internal static string ValueProviderResult_NoConverterExists { get { throw null; } } + internal static string VaryByQueryKeys_Requires_ResponseCachingMiddleware { get { throw null; } } + internal static string VirtualFileResultExecutor_NoFileProviderConfigured { get { throw null; } } + internal static string FormatAcceptHeaderParser_ParseAcceptHeader_InvalidValues(object p0) { throw null; } + internal static string FormatActionDescriptorMustBeBasedOnControllerAction(object p0) { throw null; } + internal static string FormatActionExecutor_UnexpectedTaskInstance(object p0, object p1) { throw null; } + internal static string FormatActionExecutor_WrappedTaskInstance(object p0, object p1, object p2) { throw null; } + internal static string FormatActionInvokerFactory_CouldNotCreateInvoker(object p0) { throw null; } + internal static string FormatActionResult_ActionReturnValueCannotBeNull(object p0) { throw null; } + internal static string FormatApiController_AttributeRouteRequired(object p0, object p1) { throw null; } + internal static string FormatApiController_MultipleBodyParametersFound(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatApiConventionMethod_AmbiguousMethodName(object p0, object p1) { throw null; } + internal static string FormatApiConventionMethod_NoMethodFound(object p0, object p1) { throw null; } + internal static string FormatApiConventionMustBeStatic(object p0) { throw null; } + internal static string FormatApiConvention_UnsupportedAttributesOnConvention(object p0, object p1, object p2) { throw null; } + internal static string FormatApiExplorer_UnsupportedAction(object p0) { throw null; } + internal static string FormatApplicationAssembliesProvider_DuplicateRelatedAssembly(object p0) { throw null; } + internal static string FormatApplicationAssembliesProvider_RelatedAssemblyCannotDefineAdditional(object p0, object p1) { throw null; } + internal static string FormatApplicationPartFactory_InvalidFactoryType(object p0, object p1, object p2) { throw null; } + internal static string FormatArgument_InvalidOffsetLength(object p0, object p1) { throw null; } + internal static string FormatAsyncActionFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatAsyncResourceFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatAsyncResultFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatAttributeRoute_AggregateErrorMessage(object p0, object p1) { throw null; } + internal static string FormatAttributeRoute_AggregateErrorMessage_ErrorNumber(object p0, object p1, object p2) { throw null; } + internal static string FormatAttributeRoute_CannotContainParameter(object p0, object p1, object p2) { throw null; } + internal static string FormatAttributeRoute_DuplicateNames(object p0, object p1, object p2) { throw null; } + internal static string FormatAttributeRoute_DuplicateNames_Item(object p0, object p1) { throw null; } + internal static string FormatAttributeRoute_IndividualErrorMessage(object p0, object p1, object p2) { throw null; } + internal static string FormatAttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod(object p0, object p1, object p2) { throw null; } + internal static string FormatAttributeRoute_MixedAttributeAndConventionallyRoutedActions_ForMethod_Item(object p0, object p1, object p2) { throw null; } + internal static string FormatAttributeRoute_TokenReplacement_InvalidSyntax(object p0, object p1) { throw null; } + internal static string FormatAttributeRoute_TokenReplacement_ReplacementValueNotFound(object p0, object p1, object p2) { throw null; } + internal static string FormatAuthorizeFilter_AuthorizationPolicyCannotBeCreated(object p0, object p1) { throw null; } + internal static string FormatBinderType_MustBeIModelBinder(object p0, object p1) { throw null; } + internal static string FormatBindingSource_CannotBeComposite(object p0, object p1) { throw null; } + internal static string FormatBindingSource_CannotBeGreedy(object p0, object p1) { throw null; } + internal static string FormatCacheProfileNotFound(object p0) { throw null; } + internal static string FormatCandidateResolver_DifferentCasedReference(object p0) { throw null; } + internal static string FormatCommon_PropertyNotFound(object p0, object p1) { throw null; } + internal static string FormatComplexTypeModelBinder_NoParameterlessConstructor_ForParameter(object p0, object p1) { throw null; } + internal static string FormatComplexTypeModelBinder_NoParameterlessConstructor_ForProperty(object p0, object p1, object p2) { throw null; } + internal static string FormatComplexTypeModelBinder_NoParameterlessConstructor_ForType(object p0) { throw null; } + internal static string FormatCouldNotCreateIModelBinder(object p0) { throw null; } + internal static string FormatDefaultActionSelector_AmbiguousActions(object p0, object p1) { throw null; } + internal static string FormatFileResult_InvalidPath(object p0) { throw null; } + internal static string FormatFileResult_PathNotRooted(object p0) { throw null; } + internal static string FormatFilterFactoryAttribute_TypeMustImplementIFilter(object p0, object p1) { throw null; } + internal static string FormatFormatFormatterMappings_GetMediaTypeMappingForFormat_InvalidFormat(object p0) { throw null; } + internal static string FormatFormatterMappings_NotValidMediaType(object p0) { throw null; } + internal static string FormatFormatter_NoMediaTypes(object p0, object p1) { throw null; } + internal static string FormatFormat_NotValid(object p0) { throw null; } + internal static string FormatFormCollectionModelBinder_CannotBindToFormCollection(object p0, object p1, object p2) { throw null; } + internal static string FormatHtmlGeneration_ValueIsInvalid(object p0) { throw null; } + internal static string FormatHtmlGeneration_ValueMustBeNumber(object p0) { throw null; } + internal static string FormatInputFormatterNoEncoding(object p0) { throw null; } + internal static string FormatInputFormattersAreRequired(object p0, object p1, object p2) { throw null; } + internal static string FormatInvalidTypeTForActionResultOfT(object p0, object p1) { throw null; } + internal static string FormatInvalid_IncludePropertyExpression(object p0) { throw null; } + internal static string FormatJQueryFormValueProviderFactory_MissingClosingBracket(object p0) { throw null; } + internal static string FormatMatchAllContentTypeIsNotAllowed(object p0) { throw null; } + internal static string FormatMiddewareFilter_ConfigureMethodOverload(object p0) { throw null; } + internal static string FormatMiddewareFilter_NoConfigureMethod(object p0, object p1) { throw null; } + internal static string FormatMiddlewareFilterBuilder_NoMiddlewareFeature(object p0) { throw null; } + internal static string FormatMiddlewareFilterBuilder_NullApplicationBuilder(object p0) { throw null; } + internal static string FormatMiddlewareFilterConfigurationProvider_CreateConfigureDelegate_CannotCreateType(object p0, object p1) { throw null; } + internal static string FormatMiddlewareFilter_InvalidConfigureReturnType(object p0, object p1, object p2) { throw null; } + internal static string FormatMiddlewareFilter_ServiceResolutionFail(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatModelBinderProvidersAreRequired(object p0, object p1, object p2) { throw null; } + internal static string FormatModelBinderUtil_ModelCannotBeNull(object p0) { throw null; } + internal static string FormatModelBinderUtil_ModelInstanceIsWrong(object p0, object p1) { throw null; } + internal static string FormatModelBinding_ExceededMaxModelBindingCollectionSize(object p0, object p1, object p2, object p3, object p4) { throw null; } + internal static string FormatModelBinding_ExceededMaxModelBindingRecursionDepth(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatModelBinding_MissingBindRequiredMember(object p0) { throw null; } + internal static string FormatModelBinding_NullValueNotValid(object p0) { throw null; } + internal static string FormatModelState_AttemptedValueIsInvalid(object p0, object p1) { throw null; } + internal static string FormatModelState_NonPropertyAttemptedValueIsInvalid(object p0) { throw null; } + internal static string FormatModelState_UnknownValueIsInvalid(object p0) { throw null; } + internal static string FormatModelType_WrongType(object p0, object p1) { throw null; } + internal static string FormatNoRoutesMatchedForPage(object p0) { throw null; } + internal static string FormatObjectResultExecutor_MaxEnumerationExceeded(object p0, object p1) { throw null; } + internal static string FormatObjectResult_MatchAllContentType(object p0, object p1) { throw null; } + internal static string FormatOutputFormatterNoMediaType(object p0) { throw null; } + internal static string FormatOutputFormattersAreRequired(object p0, object p1, object p2) { throw null; } + internal static string FormatPropertyOfTypeCannotBeNull(object p0, object p1) { throw null; } + internal static string FormatProperty_MustBeInstanceOfType(object p0, object p1, object p2) { throw null; } + internal static string FormatReferenceToNewtonsoftJsonRequired(object p0, object p1, object p2, object p3, object p4) { throw null; } + internal static string FormatRelatedAssemblyAttribute_AssemblyCannotReferenceSelf(object p0, object p1) { throw null; } + internal static string FormatRelatedAssemblyAttribute_CouldNotBeFound(object p0, object p1, object p2) { throw null; } + internal static string FormatResponseCache_SpecifyDuration(object p0, object p1) { throw null; } + internal static string FormatTextInputFormatter_SupportedEncodingsMustNotBeEmpty(object p0) { throw null; } + internal static string FormatTextOutputFormatter_SupportedEncodingsMustNotBeEmpty(object p0) { throw null; } + internal static string FormatTextOutputFormatter_WriteResponseBodyAsyncNotSupported(object p0, object p1, object p2) { throw null; } + internal static string FormatTypeMethodMustReturnNotNullValue(object p0, object p1) { throw null; } + internal static string FormatTypeMustDeriveFromType(object p0, object p1) { throw null; } + internal static string FormatUnableToFindServices(object p0, object p1, object p2) { throw null; } + internal static string FormatUnsupportedContentType(object p0) { throw null; } + internal static string FormatUrlHelper_RelativePagePathIsNotSupported(object p0, object p1, object p2) { throw null; } + internal static string FormatValidationVisitor_ExceededMaxDepth(object p0, object p1, object p2) { throw null; } + internal static string FormatValidationVisitor_ExceededMaxDepthFix(object p0, object p1) { throw null; } + internal static string FormatValidationVisitor_ExceededMaxPropertyDepth(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated(object p0, object p1) { throw null; } + internal static string FormatValueProviderResult_NoConverterExists(object p0, object p1) { throw null; } + internal static string FormatVaryByQueryKeys_Requires_ResponseCachingMiddleware(object p0) { throw null; } + internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } + private static string GetResourceString(string resourceKey, string[] formatterNames) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Controllers +{ + internal partial class DefaultControllerPropertyActivator : Microsoft.AspNetCore.Mvc.Controllers.IControllerPropertyActivator + { + private System.Collections.Concurrent.ConcurrentDictionary[]> _activateActions; + private static readonly System.Func[]> _getPropertiesToActivate; + private bool _initialized; + private object _initializeLock; + public DefaultControllerPropertyActivator() { } + public void Activate(Microsoft.AspNetCore.Mvc.ControllerContext context, object controller) { } + public System.Action GetActivatorDelegate(Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor actionDescriptor) { throw null; } + private static Microsoft.Extensions.Internal.PropertyActivator[] GetPropertiesToActivate(System.Type type) { throw null; } + } + internal partial interface IControllerPropertyActivator + { + void Activate(Microsoft.AspNetCore.Mvc.ControllerContext context, object controller); + System.Action GetActivatorDelegate(Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor actionDescriptor); + } +} +namespace Microsoft.AspNetCore.Mvc.Filters +{ + internal partial class DefaultFilterProvider + { + public DefaultFilterProvider() { } + public int Order { get { throw null; } } + private void ApplyFilterToContainer(object actualFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filterMetadata) { } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext context) { } + public void ProvideFilter(Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext context, Microsoft.AspNetCore.Mvc.Filters.FilterItem filterItem) { } + } + internal readonly partial struct FilterFactoryResult + { + private readonly object _dummy; + public FilterFactoryResult(Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cacheableFilters, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) { throw null; } + public Microsoft.AspNetCore.Mvc.Filters.FilterItem[] CacheableFilters { get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] Filters { get { throw null; } } + } + internal static partial class FilterFactory + { + public static Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] CreateUncachedFilters(Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] filterProviders, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cachedFilterItems) { throw null; } + private static Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] CreateUncachedFiltersCore(Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] filterProviders, Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.List filterItems) { throw null; } + public static Microsoft.AspNetCore.Mvc.Filters.FilterFactoryResult GetAllFilters(Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] filterProviders, Microsoft.AspNetCore.Mvc.ActionContext actionContext) { throw null; } + } + internal partial interface IResponseCacheFilter : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata + { + } + internal partial struct FilterCursor + { + private object _dummy; + private int _dummyPrimitive; + public FilterCursor(Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) { throw null; } + public Microsoft.AspNetCore.Mvc.Filters.FilterCursorItem GetNextFilter() where TFilter : class where TFilterAsync : class { throw null; } + public void Reset() { } + } + internal partial class ResponseCacheFilterExecutor + { + private int? _cacheDuration; + private Microsoft.AspNetCore.Mvc.ResponseCacheLocation? _cacheLocation; + private bool? _cacheNoStore; + private readonly Microsoft.AspNetCore.Mvc.CacheProfile _cacheProfile; + private string _cacheVaryByHeader; + private string[] _cacheVaryByQueryKeys; + public ResponseCacheFilterExecutor(Microsoft.AspNetCore.Mvc.CacheProfile cacheProfile) { } + public int Duration { get { throw null; } set { } } + public Microsoft.AspNetCore.Mvc.ResponseCacheLocation Location { get { throw null; } set { } } + public bool NoStore { get { throw null; } set { } } + public string VaryByHeader { get { throw null; } set { } } + public string[] VaryByQueryKeys { get { throw null; } set { } } + public void Execute(Microsoft.AspNetCore.Mvc.Filters.FilterContext context) { } + } + internal readonly partial struct FilterCursorItem + { + private readonly TFilter _Filter_k__BackingField; + private readonly TFilterAsync _FilterAsync_k__BackingField; + private readonly int _dummyPrimitive; + public FilterCursorItem(TFilter filter, TFilterAsync filterAsync) { throw null; } + public TFilter Filter { get { throw null; } } + public TFilterAsync FilterAsync { get { throw null; } } + } +} +namespace Microsoft.AspNetCore.Mvc.Formatters +{ + internal static partial class MediaTypeHeaderValues + { + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationAnyJsonSyntax; + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationAnyXmlSyntax; + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationJson; + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationJsonPatch; + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationXml; + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue TextJson; + public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue TextXml; + } + internal static partial class ResponseContentTypeHelper + { + public static void ResolveContentTypeAndEncoding(string actionResultContentType, string httpResponseContentType, string defaultContentType, out string resolvedContentType, out System.Text.Encoding resolvedContentTypeEncoding) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Infrastructure +{ + internal abstract partial class ActionMethodExecutor + { + private static readonly Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor[] Executors; + protected ActionMethodExecutor() { } + protected abstract bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor); + private Microsoft.AspNetCore.Mvc.IActionResult ConvertToActionResult(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, object returnValue, System.Type declaredType) { throw null; } + private static void EnsureActionResultNotNull(Microsoft.Extensions.Internal.ObjectMethodExecutor executor, Microsoft.AspNetCore.Mvc.IActionResult actionResult) { } + public abstract System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments); + public static Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor GetExecutor(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + private partial class AwaitableObjectResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public AwaitableObjectResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class AwaitableResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public AwaitableResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class SyncActionResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public SyncActionResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class SyncObjectResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public SyncObjectResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class TaskOfActionResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public TaskOfActionResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class TaskOfIActionResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public TaskOfIActionResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class TaskResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public TaskResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + private partial class VoidResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor + { + public VoidResultExecutor() { } + protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } + public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } + } + } + internal partial class ControllerActionInvokerCacheEntry + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor _ActionMethodExecutor_k__BackingField; + private readonly Microsoft.AspNetCore.Mvc.Filters.FilterItem[] _CachedFilters_k__BackingField; + private readonly Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegate _ControllerBinderDelegate_k__BackingField; + private readonly System.Func _ControllerFactory_k__BackingField; + private readonly System.Action _ControllerReleaser_k__BackingField; + private readonly Microsoft.Extensions.Internal.ObjectMethodExecutor _ObjectMethodExecutor_k__BackingField; + internal ControllerActionInvokerCacheEntry(Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cachedFilters, System.Func controllerFactory, System.Action controllerReleaser, Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegate controllerBinderDelegate, Microsoft.Extensions.Internal.ObjectMethodExecutor objectMethodExecutor, Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor actionMethodExecutor) { } + internal Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor ActionMethodExecutor { get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.FilterItem[] CachedFilters { get { throw null; } } + public Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegate ControllerBinderDelegate { get { throw null; } } + public System.Func ControllerFactory { get { throw null; } } + public System.Action ControllerReleaser { get { throw null; } } + internal Microsoft.Extensions.Internal.ObjectMethodExecutor ObjectMethodExecutor { get { throw null; } } + } + internal partial class ControllerActionInvokerCache + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _collectionProvider; + private readonly Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider _controllerFactoryProvider; + private volatile Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache.InnerCache _currentCache; + private readonly Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] _filterProviders; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory _modelBinderFactory; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _modelMetadataProvider; + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder _parameterBinder; + public ControllerActionInvokerCache(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, System.Collections.Generic.IEnumerable filterProviders, Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider factoryProvider, Microsoft.Extensions.Options.IOptions mvcOptions) { } + private Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache.InnerCache CurrentCache { get { throw null; } } + public (Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCacheEntry cacheEntry, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) GetCachedResult(Microsoft.AspNetCore.Mvc.ControllerContext controllerContext) { throw null; } + private partial class InnerCache + { + private readonly System.Collections.Concurrent.ConcurrentDictionary _Entries_k__BackingField; + private readonly int _Version_k__BackingField; + public InnerCache(int version) { } + public System.Collections.Concurrent.ConcurrentDictionary Entries { get { throw null; } } + public int Version { get { throw null; } } + } + } + internal partial class MvcOptionsConfigureCompatibilityOptions : Microsoft.AspNetCore.Mvc.Infrastructure.ConfigureCompatibilityOptions + { + public MvcOptionsConfigureCompatibilityOptions(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.Options.IOptions compatibilityOptions) : base(loggerFactory, compatibilityOptions) { } + protected override System.Collections.Generic.IReadOnlyDictionary DefaultValues { get { throw null; } } + } + internal partial class DefaultActionDescriptorCollectionProvider : Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollectionProvider + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorChangeProvider[] _actionDescriptorChangeProviders; + private readonly Microsoft.AspNetCore.Mvc.Abstractions.IActionDescriptorProvider[] _actionDescriptorProviders; + private System.Threading.CancellationTokenSource _cancellationTokenSource; + private Microsoft.Extensions.Primitives.IChangeToken _changeToken; + private Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection _collection; + private readonly object _lock; + private int _version; + public DefaultActionDescriptorCollectionProvider(System.Collections.Generic.IEnumerable actionDescriptorProviders, System.Collections.Generic.IEnumerable actionDescriptorChangeProviders) { } + public override Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection ActionDescriptors { get { throw null; } } + public override Microsoft.Extensions.Primitives.IChangeToken GetChangeToken() { throw null; } + private Microsoft.Extensions.Primitives.IChangeToken GetCompositeChangeToken() { throw null; } + private void Initialize() { } + private void UpdateCollection() { } + } + internal partial class ControllerActionInvokerProvider + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor _actionContextAccessor; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache _controllerActionInvokerCache; + private readonly System.Diagnostics.DiagnosticListener _diagnosticListener; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper _mapper; + private readonly int _maxModelValidationErrors; + private readonly System.Collections.Generic.IReadOnlyList _valueProviderFactories; + public ControllerActionInvokerProvider(Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache controllerActionInvokerCache, Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper) { } + public ControllerActionInvokerProvider(Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache controllerActionInvokerCache, Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor) { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context) { } + } + internal partial class ActionSelector : Microsoft.AspNetCore.Mvc.Infrastructure.IActionSelector + { + private readonly Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache _actionConstraintCache; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _actionDescriptorCollectionProvider; + private Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable _cache; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + public ActionSelector(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actionDescriptorCollectionProvider, Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache actionConstraintCache, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + private Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Current { get { throw null; } } + private System.Collections.Generic.IReadOnlyList EvaluateActionConstraints(Microsoft.AspNetCore.Routing.RouteContext context, System.Collections.Generic.IReadOnlyList actions) { throw null; } + private System.Collections.Generic.IReadOnlyList EvaluateActionConstraintsCore(Microsoft.AspNetCore.Routing.RouteContext context, System.Collections.Generic.IReadOnlyList candidates, int? startingOrder) { throw null; } + private System.Collections.Generic.IReadOnlyList SelectBestActions(System.Collections.Generic.IReadOnlyList actions) { throw null; } + public Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor SelectBestCandidate(Microsoft.AspNetCore.Routing.RouteContext context, System.Collections.Generic.IReadOnlyList candidates) { throw null; } + public System.Collections.Generic.IReadOnlyList SelectCandidates(Microsoft.AspNetCore.Routing.RouteContext context) { throw null; } + } + internal partial class CopyOnWriteList : System.Collections.Generic.IList + { + private System.Collections.Generic.List _copy; + private readonly System.Collections.Generic.IReadOnlyList _source; + public CopyOnWriteList(System.Collections.Generic.IReadOnlyList source) { } + public int Count { get { throw null; } } + public bool IsReadOnly { get { throw null; } } + public T this[int index] { get { throw null; } set { } } + private System.Collections.Generic.IReadOnlyList Readable { get { throw null; } } + private System.Collections.Generic.List Writable { get { throw null; } } + public void Add(T item) { } + public void Clear() { } + public bool Contains(T item) { throw null; } + public void CopyTo(T[] array, int arrayIndex) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { throw null; } + public int IndexOf(T item) { throw null; } + public void Insert(int index, T item) { } + public bool Remove(T item) { throw null; } + public void RemoveAt(int index) { } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + } + public partial class ActionContextAccessor : Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor + { + internal static readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor Null; + } + internal static partial class ParameterDefaultValues + { + private static object GetParameterDefaultValue(System.Reflection.ParameterInfo parameterInfo) { throw null; } + public static object[] GetParameterDefaultValues(System.Reflection.MethodInfo methodInfo) { throw null; } + public static bool TryGetDeclaredParameterDefaultValue(System.Reflection.ParameterInfo parameterInfo, out object defaultValue) { throw null; } + } + internal partial interface ITypeActivatorCache + { + TInstance CreateInstance(System.IServiceProvider serviceProvider, System.Type optionType); + } + internal partial class NonDisposableStream : System.IO.Stream + { + private readonly System.IO.Stream _innerStream; + public NonDisposableStream(System.IO.Stream innerStream) { } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanTimeout { get { throw null; } } + public override bool CanWrite { get { throw null; } } + private System.IO.Stream InnerStream { get { throw null; } } + public override long Length { get { throw null; } } + public override long Position { get { throw null; } set { } } + public override int ReadTimeout { get { throw null; } set { } } + public override int WriteTimeout { get { throw null; } set { } } + public override System.IAsyncResult BeginRead(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + public override System.IAsyncResult BeginWrite(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + public override void Close() { } + public override System.Threading.Tasks.Task CopyToAsync(System.IO.Stream destination, int bufferSize, System.Threading.CancellationToken cancellationToken) { throw null; } + protected override void Dispose(bool disposing) { } + public override int EndRead(System.IAsyncResult asyncResult) { throw null; } + public override void EndWrite(System.IAsyncResult asyncResult) { } + public override void Flush() { } + public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override int ReadByte() { throw null; } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public override void SetLength(long value) { } + public override void Write(byte[] buffer, int offset, int count) { } + public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override void WriteByte(byte value) { } + } + internal partial class ActionSelectionTable + { + private readonly System.Collections.Generic.Dictionary> _OrdinalEntries_k__BackingField; + private readonly System.Collections.Generic.Dictionary> _OrdinalIgnoreCaseEntries_k__BackingField; + private readonly string[] _RouteKeys_k__BackingField; + private readonly int _Version_k__BackingField; + private ActionSelectionTable(int version, string[] routeKeys, System.Collections.Generic.Dictionary> ordinalEntries, System.Collections.Generic.Dictionary> ordinalIgnoreCaseEntries) { } + private System.Collections.Generic.Dictionary> OrdinalEntries { get { throw null; } } + private System.Collections.Generic.Dictionary> OrdinalIgnoreCaseEntries { get { throw null; } } + private string[] RouteKeys { get { throw null; } } + public int Version { get { throw null; } } + public static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Create(Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection actions) { throw null; } + public static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Create(System.Collections.Generic.IEnumerable endpoints) { throw null; } + private static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable CreateCore(int version, System.Collections.Generic.IEnumerable items, System.Func> getRouteKeys, System.Func getRouteValue) { throw null; } + public System.Collections.Generic.IReadOnlyList Select(Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } + } + internal abstract partial class ResourceInvoker + { + protected readonly Microsoft.AspNetCore.Mvc.ActionContext _actionContext; + protected readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor _actionContextAccessor; + private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.AuthorizationFilterContextSealed _authorizationContext; + protected Microsoft.AspNetCore.Mvc.Filters.FilterCursor _cursor; + protected readonly System.Diagnostics.DiagnosticListener _diagnosticListener; + private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ExceptionContextSealed _exceptionContext; + protected readonly Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] _filters; + protected object _instance; + protected readonly Microsoft.Extensions.Logging.ILogger _logger; + protected readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper _mapper; + private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResourceExecutedContextSealed _resourceExecutedContext; + private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResourceExecutingContextSealed _resourceExecutingContext; + protected Microsoft.AspNetCore.Mvc.IActionResult _result; + private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResultExecutedContextSealed _resultExecutedContext; + private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResultExecutingContextSealed _resultExecutingContext; + protected readonly System.Collections.Generic.IList _valueProviderFactories; + public ResourceInvoker(System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters, System.Collections.Generic.IList valueProviderFactories) { } + private System.Threading.Tasks.Task InvokeAlwaysRunResultFilters() { throw null; } + public virtual System.Threading.Tasks.Task InvokeAsync() { throw null; } + private System.Threading.Tasks.Task InvokeFilterPipelineAsync() { throw null; } + protected abstract System.Threading.Tasks.Task InvokeInnerFilterAsync(); + private System.Threading.Tasks.Task InvokeNextExceptionFilterAsync() { throw null; } + private System.Threading.Tasks.Task InvokeNextResourceFilter() { throw null; } + private System.Threading.Tasks.Task InvokeNextResourceFilterAwaitedAsync() { throw null; } + private System.Threading.Tasks.Task InvokeNextResultFilterAsync() where TFilter : class, Microsoft.AspNetCore.Mvc.Filters.IResultFilter where TFilterAsync : class, Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter { throw null; } + private System.Threading.Tasks.Task InvokeNextResultFilterAwaitedAsync() where TFilter : class, Microsoft.AspNetCore.Mvc.Filters.IResultFilter where TFilterAsync : class, Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter { throw null; } + protected virtual System.Threading.Tasks.Task InvokeResultAsync(Microsoft.AspNetCore.Mvc.IActionResult result) { throw null; } + private System.Threading.Tasks.Task InvokeResultFilters() { throw null; } + private System.Threading.Tasks.Task Next(ref Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.State next, ref Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.Scope scope, ref object state, ref bool isCompleted) { throw null; } + protected abstract void ReleaseResources(); + private System.Threading.Tasks.Task ResultNext(ref Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.State next, ref Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.Scope scope, ref object state, ref bool isCompleted) where TFilter : class, Microsoft.AspNetCore.Mvc.Filters.IResultFilter where TFilterAsync : class, Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter { throw null; } + private static void Rethrow(Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ExceptionContextSealed context) { } + private static void Rethrow(Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResourceExecutedContextSealed context) { } + private static void Rethrow(Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResultExecutedContextSealed context) { } + private sealed partial class AuthorizationFilterContextSealed + { + public AuthorizationFilterContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters) { } + } + private sealed partial class ExceptionContextSealed + { + public ExceptionContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters) { } + } + private static partial class FilterTypeConstants + { + public const string ActionFilter = "Action Filter"; + public const string AlwaysRunResultFilter = "Always Run Result Filter"; + public const string AuthorizationFilter = "Authorization Filter"; + public const string ExceptionFilter = "Exception Filter"; + public const string ResourceFilter = "Resource Filter"; + public const string ResultFilter = "Result Filter"; + } + private sealed partial class ResourceExecutedContextSealed + { + public ResourceExecutedContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters) { } + } + private sealed partial class ResourceExecutingContextSealed + { + public ResourceExecutingContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters, System.Collections.Generic.IList valueProviderFactories) { } + } + private sealed partial class ResultExecutedContextSealed + { + public ResultExecutedContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters, Microsoft.AspNetCore.Mvc.IActionResult result, object controller) { } + } + private sealed partial class ResultExecutingContextSealed + { + public ResultExecutingContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters, Microsoft.AspNetCore.Mvc.IActionResult result, object controller) { } + } + private enum Scope + { + Invoker = 0, + Resource = 1, + Exception = 2, + Result = 3, + } + private enum State + { + InvokeBegin = 0, + AuthorizationBegin = 1, + AuthorizationNext = 2, + AuthorizationAsyncBegin = 3, + AuthorizationAsyncEnd = 4, + AuthorizationSync = 5, + AuthorizationShortCircuit = 6, + AuthorizationEnd = 7, + ResourceBegin = 8, + ResourceNext = 9, + ResourceAsyncBegin = 10, + ResourceAsyncEnd = 11, + ResourceSyncBegin = 12, + ResourceSyncEnd = 13, + ResourceShortCircuit = 14, + ResourceInside = 15, + ResourceInsideEnd = 16, + ResourceEnd = 17, + ExceptionBegin = 18, + ExceptionNext = 19, + ExceptionAsyncBegin = 20, + ExceptionAsyncResume = 21, + ExceptionAsyncEnd = 22, + ExceptionSyncBegin = 23, + ExceptionSyncEnd = 24, + ExceptionInside = 25, + ExceptionHandled = 26, + ExceptionEnd = 27, + ActionBegin = 28, + ActionEnd = 29, + ResultBegin = 30, + ResultNext = 31, + ResultAsyncBegin = 32, + ResultAsyncEnd = 33, + ResultSyncBegin = 34, + ResultSyncEnd = 35, + ResultInside = 36, + ResultEnd = 37, + InvokeEnd = 38, + } + } +} +namespace Microsoft.AspNetCore.Mvc.ModelBinding +{ + internal static partial class PropertyValueSetter + { + private static readonly System.Reflection.MethodInfo CallPropertyAddRangeOpenGenericMethod; + private static void CallPropertyAddRange(object target, object source) { } + public static void SetValue(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata, object instance, object value) { } + } + internal static partial class ModelBindingHelper + { + public static bool CanGetCompatibleCollection(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { throw null; } + internal static TModel CastOrDefault(object model) { throw null; } + public static void ClearValidationStateForModel(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary modelState, string modelKey) { } + public static void ClearValidationStateForModel(System.Type modelType, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary modelState, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, string modelKey) { } + private static object ConvertSimpleType(object value, System.Type destinationType, System.Globalization.CultureInfo culture) { throw null; } + public static object ConvertTo(object value, System.Type type, System.Globalization.CultureInfo culture) { throw null; } + public static T ConvertTo(object value, System.Globalization.CultureInfo culture) { throw null; } + private static System.Collections.Generic.List CreateList(int? capacity) { throw null; } + public static System.Collections.Generic.ICollection GetCompatibleCollection(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { throw null; } + public static System.Collections.Generic.ICollection GetCompatibleCollection(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext, int capacity) { throw null; } + private static System.Collections.Generic.ICollection GetCompatibleCollection(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext, int? capacity) { throw null; } + private static System.Linq.Expressions.Expression> GetPredicateExpression(System.Linq.Expressions.Expression> expression) { throw null; } + public static System.Linq.Expressions.Expression> GetPropertyFilterExpression(System.Linq.Expressions.Expression>[] expressions) { throw null; } + internal static string GetPropertyName(System.Linq.Expressions.Expression expression) { throw null; } + public static System.Threading.Tasks.Task TryUpdateModelAsync(object model, System.Type modelType, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator) { throw null; } + public static System.Threading.Tasks.Task TryUpdateModelAsync(object model, System.Type modelType, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator, System.Func propertyFilter) { throw null; } + public static System.Threading.Tasks.Task TryUpdateModelAsync(TModel model, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator) where TModel : class { throw null; } + public static System.Threading.Tasks.Task TryUpdateModelAsync(TModel model, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator, System.Func propertyFilter) where TModel : class { throw null; } + public static System.Threading.Tasks.Task TryUpdateModelAsync(TModel model, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator, params System.Linq.Expressions.Expression>[] includeExpressions) where TModel : class { throw null; } + private static System.Type UnwrapNullableType(System.Type destinationType) { throw null; } + private static object UnwrapPossibleArrayType(object value, System.Type destinationType, System.Globalization.CultureInfo culture) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation +{ + internal partial class DefaultModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IMetadataBasedModelValidatorProvider + { + public DefaultModelValidatorProvider() { } + public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidatorProviderContext context) { } + public bool HasValidators(System.Type modelType, System.Collections.Generic.IList validatorMetadata) { throw null; } + } + internal partial class HasValidatorsValidationMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider + { + private readonly bool _hasOnlyMetadataBasedValidators; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IMetadataBasedModelValidatorProvider[] _validatorProviders; + public HasValidatorsValidationMetadataProvider(System.Collections.Generic.IList modelValidatorProviders) { } + public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } + } +} +namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata +{internal partial class DefaultBindingMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider + { + public DefaultBindingMetadataProvider() { } + public void CreateBindingMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext context) { } + private static Microsoft.AspNetCore.Mvc.ModelBinding.BindingBehaviorAttribute FindBindingBehavior(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext context) { throw null; } + private partial class CompositePropertyFilterProvider + { + private readonly System.Collections.Generic.IEnumerable _providers; + public CompositePropertyFilterProvider(System.Collections.Generic.IEnumerable providers) { } + public System.Func PropertyFilter { get { throw null; } } + private System.Func CreatePropertyFilter() { throw null; } + } + } + internal partial class DefaultCompositeMetadataDetailsProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ICompositeMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IDisplayMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider + { + private readonly System.Collections.Generic.IEnumerable _providers; + public DefaultCompositeMetadataDetailsProvider(System.Collections.Generic.IEnumerable providers) { } + public void CreateBindingMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext context) { } + public void CreateDisplayMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadataProviderContext context) { } + public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } + } + internal partial class DefaultValidationMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider + { + public DefaultValidationMetadataProvider() { } + public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } + } +} +namespace Microsoft.AspNetCore.Internal +{ + internal partial class ChunkingCookieManager + { + private const string ChunkCountPrefix = "chunks-"; + private const string ChunkKeySuffix = "C"; + public const int DefaultChunkSize = 4050; + private int? _ChunkSize_k__BackingField; + private bool _ThrowForPartialCookies_k__BackingField; + public ChunkingCookieManager() { } + public int? ChunkSize { get { throw null; } set { } } + public bool ThrowForPartialCookies { get { throw null; } set { } } + public void AppendResponseCookie(Microsoft.AspNetCore.Http.HttpContext context, string key, string value, Microsoft.AspNetCore.Http.CookieOptions options) { } + public void DeleteCookie(Microsoft.AspNetCore.Http.HttpContext context, string key, Microsoft.AspNetCore.Http.CookieOptions options) { } + public string GetRequestCookie(Microsoft.AspNetCore.Http.HttpContext context, string key) { throw null; } + private static int ParseChunksCount(string value) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc +{ + internal partial class ApiDescriptionActionData + { + private string _GroupName_k__BackingField; + public ApiDescriptionActionData() { } + public string GroupName { get { throw null; } set { } } + } +} +namespace Microsoft.AspNetCore.Mvc.Routing +{ + internal static partial class ViewEnginePath + { + private const string CurrentDirectoryToken = "."; + private const string ParentDirectoryToken = ".."; + public static readonly char[] PathSeparators; + public static string CombinePath(string first, string second) { throw null; } + public static string ResolvePath(string path) { throw null; } + } + internal static partial class NormalizedRouteValue + { + public static string GetNormalizedRouteValue(Microsoft.AspNetCore.Mvc.ActionContext context, string key) { throw null; } + } + internal partial class ControllerActionEndpointDataSource : Microsoft.AspNetCore.Mvc.Routing.ActionEndpointDataSourceBase + { + private readonly Microsoft.AspNetCore.Mvc.Routing.ActionEndpointFactory _endpointFactory; + private int _order; + private readonly System.Collections.Generic.List _routes; + private bool _CreateInertEndpoints_k__BackingField; + private readonly Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder _DefaultBuilder_k__BackingField; + public ControllerActionEndpointDataSource(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actions, Microsoft.AspNetCore.Mvc.Routing.ActionEndpointFactory endpointFactory) : base (default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider)) { } + public bool CreateInertEndpoints { get { throw null; } set { } } + public Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder DefaultBuilder { get { throw null; } } + public Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder AddRoute(string routeName, string pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults, System.Collections.Generic.IDictionary constraints, Microsoft.AspNetCore.Routing.RouteValueDictionary dataTokens) { throw null; } + protected override System.Collections.Generic.List CreateEndpoints(System.Collections.Generic.IReadOnlyList actions, System.Collections.Generic.IReadOnlyList> conventions) { throw null; } + } + internal readonly partial struct ConventionalRouteEntry + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public ConventionalRouteEntry(string routeName, string pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults, System.Collections.Generic.IDictionary constraints, Microsoft.AspNetCore.Routing.RouteValueDictionary dataTokens, int order, System.Collections.Generic.List> conventions) { throw null; } + } + internal partial class ActionConstraintMatcherPolicy : Microsoft.AspNetCore.Routing.MatcherPolicy, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy + { + private static readonly System.Collections.Generic.IReadOnlyList EmptyEndpoints; + internal static readonly Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor NonAction; + private readonly Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache _actionConstraintCache; + public ActionConstraintMatcherPolicy(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache actionConstraintCache) { } + public override int Order { get { throw null; } } + public bool AppliesToEndpoints(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } + public System.Threading.Tasks.Task ApplyAsync(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidateSet) { throw null; } + private System.Collections.Generic.IReadOnlyList> EvaluateActionConstraints(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidateSet) { throw null; } + private System.Collections.Generic.IReadOnlyList> EvaluateActionConstraintsCore(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidateSet, System.Collections.Generic.IReadOnlyList> items, int? startingOrder) { throw null; } + } + internal abstract partial class ActionEndpointDataSourceBase : Microsoft.AspNetCore.Routing.EndpointDataSource, System.IDisposable + { + protected readonly System.Collections.Generic.List> Conventions; + protected readonly object Lock; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _actions; + private System.Threading.CancellationTokenSource _cancellationTokenSource; + private Microsoft.Extensions.Primitives.IChangeToken _changeToken; + private System.IDisposable _disposable; + private System.Collections.Generic.List _endpoints; + public ActionEndpointDataSourceBase(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actions) { } + public override System.Collections.Generic.IReadOnlyList Endpoints { get { throw null; } } + protected abstract System.Collections.Generic.List CreateEndpoints(System.Collections.Generic.IReadOnlyList actions, System.Collections.Generic.IReadOnlyList> conventions); + public void Dispose() { } + public override Microsoft.Extensions.Primitives.IChangeToken GetChangeToken() { throw null; } + private void Initialize() { } + protected void Subscribe() { } + private void UpdateEndpoints() { } + } + internal partial class ActionEndpointFactory + { + private readonly Microsoft.AspNetCore.Http.RequestDelegate _requestDelegate; + private readonly Microsoft.AspNetCore.Routing.Patterns.RoutePatternTransformer _routePatternTransformer; + public ActionEndpointFactory(Microsoft.AspNetCore.Routing.Patterns.RoutePatternTransformer routePatternTransformer) { } + private void AddActionDataToBuilder(Microsoft.AspNetCore.Builder.EndpointBuilder builder, System.Collections.Generic.HashSet routeNames, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, string routeName, Microsoft.AspNetCore.Routing.RouteValueDictionary dataTokens, bool suppressLinkGeneration, bool suppressPathMatching, System.Collections.Generic.IReadOnlyList> conventions, System.Collections.Generic.IReadOnlyList> perRouteConventions) { } + public void AddConventionalLinkGenerationRoute(System.Collections.Generic.List endpoints, System.Collections.Generic.HashSet routeNames, System.Collections.Generic.HashSet keys, Microsoft.AspNetCore.Mvc.Routing.ConventionalRouteEntry route, System.Collections.Generic.IReadOnlyList> conventions) { } + public void AddEndpoints(System.Collections.Generic.List endpoints, System.Collections.Generic.HashSet routeNames, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, System.Collections.Generic.IReadOnlyList routes, System.Collections.Generic.IReadOnlyList> conventions, bool createInertEndpoints) { } + private static Microsoft.AspNetCore.Http.RequestDelegate CreateRequestDelegate() { throw null; } + private static (Microsoft.AspNetCore.Routing.Patterns.RoutePattern resolvedRoutePattern, System.Collections.Generic.IDictionary resolvedRequiredValues) ResolveDefaultsAndRequiredValues(Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, Microsoft.AspNetCore.Routing.Patterns.RoutePattern attributeRoutePattern) { throw null; } + private partial class InertEndpointBuilder : Microsoft.AspNetCore.Builder.EndpointBuilder + { + public InertEndpointBuilder() { } + public override Microsoft.AspNetCore.Http.Endpoint Build() { throw null; } + } + } + internal partial class DynamicControllerEndpointSelector + { + private readonly Microsoft.AspNetCore.Routing.DataSourceDependentCache> _cache; + private readonly Microsoft.AspNetCore.Routing.EndpointDataSource _dataSource; + public DynamicControllerEndpointSelector(Microsoft.AspNetCore.Mvc.Routing.ControllerActionEndpointDataSource dataSource) { } + protected DynamicControllerEndpointSelector(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource) { } + private Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Table { get { throw null; } } + public void Dispose() { } + private static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Initialize(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } + public System.Collections.Generic.IReadOnlyList SelectEndpoints(Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } + } +} +namespace Microsoft.AspNetCore.Routing +{ + internal sealed partial class DataSourceDependentCache where T : class + { + private readonly Microsoft.AspNetCore.Routing.EndpointDataSource _dataSource; + private System.IDisposable _disposable; + private bool _disposed; + private readonly System.Func, T> _initializeCore; + private bool _initialized; + private readonly System.Func _initializer; + private readonly System.Action _initializerWithState; + private object _lock; + private T _value; + public DataSourceDependentCache(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource, System.Func, T> initialize) { } + public T Value { get { throw null; } } + public void Dispose() { } + public T EnsureInitialized() { throw null; } + private T Initialize() { throw null; } + } +} +namespace Microsoft.Extensions.DependencyInjection +{ + internal partial class ApiBehaviorOptionsSetup + { + private Microsoft.AspNetCore.Mvc.Infrastructure.ProblemDetailsFactory _problemDetailsFactory; + public ApiBehaviorOptionsSetup() { } + public void Configure(Microsoft.AspNetCore.Mvc.ApiBehaviorOptions options) { } + internal static void ConfigureClientErrorMapping(Microsoft.AspNetCore.Mvc.ApiBehaviorOptions options) { } + internal static Microsoft.AspNetCore.Mvc.IActionResult ProblemDetailsInvalidModelStateResponse(Microsoft.AspNetCore.Mvc.Infrastructure.ProblemDetailsFactory problemDetailsFactory, Microsoft.AspNetCore.Mvc.ActionContext context) { throw null; } + } + internal partial class MvcCoreRouteOptionsSetup + { + public MvcCoreRouteOptionsSetup() { } + public void Configure(Microsoft.AspNetCore.Routing.RouteOptions options) { } + } + internal partial class MvcCoreBuilder : Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder + { + private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _PartManager_k__BackingField; + private readonly Microsoft.Extensions.DependencyInjection.IServiceCollection _Services_k__BackingField; + public MvcCoreBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager manager) { } + public Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager PartManager { get { throw null; } } + public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { get { throw null; } } + } + internal partial class MvcBuilder : Microsoft.Extensions.DependencyInjection.IMvcBuilder + { + private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _PartManager_k__BackingField; + private readonly Microsoft.Extensions.DependencyInjection.IServiceCollection _Services_k__BackingField; + public MvcBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager manager) { } + public Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager PartManager { get { throw null; } } + public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { get { throw null; } } + } +} +namespace Microsoft.Extensions.Internal +{ + internal partial class CopyOnWriteDictionary : System.Collections.Generic.IDictionary + { + private readonly System.Collections.Generic.IEqualityComparer _comparer; + private System.Collections.Generic.IDictionary _innerDictionary; + private readonly System.Collections.Generic.IDictionary _sourceDictionary; + public CopyOnWriteDictionary(System.Collections.Generic.IDictionary sourceDictionary, System.Collections.Generic.IEqualityComparer comparer) { } + public virtual int Count { get { throw null; } } + public virtual bool IsReadOnly { get { throw null; } } + public virtual TValue this[TKey key] { get { throw null; } set { } } + public virtual System.Collections.Generic.ICollection Keys { get { throw null; } } + private System.Collections.Generic.IDictionary ReadDictionary { get { throw null; } } + public virtual System.Collections.Generic.ICollection Values { get { throw null; } } + private System.Collections.Generic.IDictionary WriteDictionary { get { throw null; } } + public virtual void Add(System.Collections.Generic.KeyValuePair item) { } + public virtual void Add(TKey key, TValue value) { } + public virtual void Clear() { } + public virtual bool Contains(System.Collections.Generic.KeyValuePair item) { throw null; } + public virtual bool ContainsKey(TKey key) { throw null; } + public virtual void CopyTo(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { } + public virtual System.Collections.Generic.IEnumerator> GetEnumerator() { throw null; } + public bool Remove(System.Collections.Generic.KeyValuePair item) { throw null; } + public virtual bool Remove(TKey key) { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + public virtual bool TryGetValue(TKey key, out TValue value) { throw null; } + } + internal readonly partial struct AwaitableInfo + { + private readonly object _dummy; + public AwaitableInfo(System.Type awaiterType, System.Reflection.PropertyInfo awaiterIsCompletedProperty, System.Reflection.MethodInfo awaiterGetResultMethod, System.Reflection.MethodInfo awaiterOnCompletedMethod, System.Reflection.MethodInfo awaiterUnsafeOnCompletedMethod, System.Type resultType, System.Reflection.MethodInfo getAwaiterMethod) { throw null; } + public System.Reflection.MethodInfo AwaiterGetResultMethod { get { throw null; } } + public System.Reflection.PropertyInfo AwaiterIsCompletedProperty { get { throw null; } } + public System.Reflection.MethodInfo AwaiterOnCompletedMethod { get { throw null; } } + public System.Type AwaiterType { get { throw null; } } + public System.Reflection.MethodInfo AwaiterUnsafeOnCompletedMethod { get { throw null; } } + public System.Reflection.MethodInfo GetAwaiterMethod { get { throw null; } } + public System.Type ResultType { get { throw null; } } + public static bool IsTypeAwaitable(System.Type type, out Microsoft.Extensions.Internal.AwaitableInfo awaitableInfo) { throw null; } + } + internal readonly partial struct CoercedAwaitableInfo + { + private readonly object _dummy; + public CoercedAwaitableInfo(Microsoft.Extensions.Internal.AwaitableInfo awaitableInfo) { throw null; } + public CoercedAwaitableInfo(System.Linq.Expressions.Expression coercerExpression, System.Type coercerResultType, Microsoft.Extensions.Internal.AwaitableInfo coercedAwaitableInfo) { throw null; } + public Microsoft.Extensions.Internal.AwaitableInfo AwaitableInfo { get { throw null; } } + public System.Linq.Expressions.Expression CoercerExpression { get { throw null; } } + public System.Type CoercerResultType { get { throw null; } } + public bool RequiresCoercion { get { throw null; } } + public static bool IsTypeAwaitable(System.Type type, out Microsoft.Extensions.Internal.CoercedAwaitableInfo info) { throw null; } + } + internal partial class ObjectMethodExecutor + { + private readonly Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutor _executor; + private readonly Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutorAsync _executorAsync; + private static readonly System.Reflection.ConstructorInfo _objectMethodExecutorAwaitableConstructor; + private readonly object[] _parameterDefaultValues; + private readonly System.Type _AsyncResultType_k__BackingField; + private readonly bool _IsMethodAsync_k__BackingField; + private readonly System.Reflection.MethodInfo _MethodInfo_k__BackingField; + private readonly System.Reflection.ParameterInfo[] _MethodParameters_k__BackingField; + private System.Type _MethodReturnType_k__BackingField; + private readonly System.Reflection.TypeInfo _TargetTypeInfo_k__BackingField; + private ObjectMethodExecutor(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo, object[] parameterDefaultValues) { } + public System.Type AsyncResultType { get { throw null; } } + public bool IsMethodAsync { get { throw null; } } + public System.Reflection.MethodInfo MethodInfo { get { throw null; } } + public System.Reflection.ParameterInfo[] MethodParameters { get { throw null; } } + public System.Type MethodReturnType { get { throw null; } internal set { } } + public System.Reflection.TypeInfo TargetTypeInfo { get { throw null; } } + public static Microsoft.Extensions.Internal.ObjectMethodExecutor Create(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo) { throw null; } + public static Microsoft.Extensions.Internal.ObjectMethodExecutor Create(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo, object[] parameterDefaultValues) { throw null; } + public object Execute(object target, object[] parameters) { throw null; } + public Microsoft.Extensions.Internal.ObjectMethodExecutorAwaitable ExecuteAsync(object target, object[] parameters) { throw null; } + public object GetDefaultValueForParameter(int index) { throw null; } + private static Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutor GetExecutor(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo) { throw null; } + private static Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutorAsync GetExecutorAsync(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo, Microsoft.Extensions.Internal.CoercedAwaitableInfo coercedAwaitableInfo) { throw null; } + private static Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutor WrapVoidMethod(Microsoft.Extensions.Internal.ObjectMethodExecutor.VoidMethodExecutor executor) { throw null; } + private delegate object MethodExecutor(object target, object[] parameters); + private delegate Microsoft.Extensions.Internal.ObjectMethodExecutorAwaitable MethodExecutorAsync(object target, object[] parameters); + private delegate void VoidMethodExecutor(object target, object[] parameters); + } + internal readonly partial struct ObjectMethodExecutorAwaitable + { + private readonly object _dummy; + public ObjectMethodExecutorAwaitable(object customAwaitable, System.Func getAwaiterMethod, System.Func isCompletedMethod, System.Func getResultMethod, System.Action onCompletedMethod, System.Action unsafeOnCompletedMethod) { throw null; } + public Microsoft.Extensions.Internal.ObjectMethodExecutorAwaitable.Awaiter GetAwaiter() { throw null; } + public readonly partial struct Awaiter : System.Runtime.CompilerServices.ICriticalNotifyCompletion + { + private readonly object _dummy; + public Awaiter(object customAwaiter, System.Func isCompletedMethod, System.Func getResultMethod, System.Action onCompletedMethod, System.Action unsafeOnCompletedMethod) { throw null; } + public bool IsCompleted { get { throw null; } } + public object GetResult() { throw null; } + public void OnCompleted(System.Action continuation) { } + public void UnsafeOnCompleted(System.Action continuation) { } + } + } + internal partial class PropertyActivator + { + private readonly System.Action _fastPropertySetter; + private readonly System.Func _valueAccessor; + private System.Reflection.PropertyInfo _PropertyInfo_k__BackingField; + public PropertyActivator(System.Reflection.PropertyInfo propertyInfo, System.Func valueAccessor) { } + public System.Reflection.PropertyInfo PropertyInfo { get { throw null; } private set { } } + public object Activate(object instance, TContext context) { throw null; } + public static Microsoft.Extensions.Internal.PropertyActivator[] GetPropertiesToActivate(System.Type type, System.Type activateAttributeType, System.Func> createActivateInfo) { throw null; } + public static Microsoft.Extensions.Internal.PropertyActivator[] GetPropertiesToActivate(System.Type type, System.Type activateAttributeType, System.Func> createActivateInfo, bool includeNonPublic) { throw null; } + } + internal partial class PropertyHelper + { + private static readonly System.Reflection.MethodInfo CallNullSafePropertyGetterByReferenceOpenGenericMethod; + private static readonly System.Reflection.MethodInfo CallNullSafePropertyGetterOpenGenericMethod; + private static readonly System.Reflection.MethodInfo CallPropertyGetterByReferenceOpenGenericMethod; + private static readonly System.Reflection.MethodInfo CallPropertyGetterOpenGenericMethod; + private static readonly System.Reflection.MethodInfo CallPropertySetterOpenGenericMethod; + private static readonly System.Type IsByRefLikeAttribute; + private static readonly System.Collections.Concurrent.ConcurrentDictionary PropertiesCache; + private static readonly System.Collections.Concurrent.ConcurrentDictionary VisiblePropertiesCache; + private System.Func _valueGetter; + private System.Action _valueSetter; + private string _Name_k__BackingField; + private readonly System.Reflection.PropertyInfo _Property_k__BackingField; + public PropertyHelper(System.Reflection.PropertyInfo property) { } + public virtual string Name { get { throw null; } protected set { } } + public System.Reflection.PropertyInfo Property { get { throw null; } } + public System.Func ValueGetter { get { throw null; } } + public System.Action ValueSetter { get { throw null; } } + private static object CallNullSafePropertyGetterByReference(Microsoft.Extensions.Internal.PropertyHelper.ByRefFunc getter, object target) { throw null; } + private static object CallNullSafePropertyGetter(System.Func getter, object target) { throw null; } + private static object CallPropertyGetterByReference(Microsoft.Extensions.Internal.PropertyHelper.ByRefFunc getter, object target) { throw null; } + private static object CallPropertyGetter(System.Func getter, object target) { throw null; } + private static void CallPropertySetter(System.Action setter, object target, object value) { } + private static Microsoft.Extensions.Internal.PropertyHelper CreateInstance(System.Reflection.PropertyInfo property) { throw null; } + public static Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Reflection.TypeInfo typeInfo) { throw null; } + public static Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Type type) { throw null; } + protected static Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Type type, System.Func createPropertyHelper, System.Collections.Concurrent.ConcurrentDictionary cache) { throw null; } + public object GetValue(object instance) { throw null; } + public static Microsoft.Extensions.Internal.PropertyHelper[] GetVisibleProperties(System.Reflection.TypeInfo typeInfo) { throw null; } + public static Microsoft.Extensions.Internal.PropertyHelper[] GetVisibleProperties(System.Type type) { throw null; } + protected static Microsoft.Extensions.Internal.PropertyHelper[] GetVisibleProperties(System.Type type, System.Func createPropertyHelper, System.Collections.Concurrent.ConcurrentDictionary allPropertiesCache, System.Collections.Concurrent.ConcurrentDictionary visiblePropertiesCache) { throw null; } + private static bool IsInterestingProperty(System.Reflection.PropertyInfo property) { throw null; } + private static bool IsRefStructProperty(System.Reflection.PropertyInfo property) { throw null; } + public static System.Func MakeFastPropertyGetter(System.Reflection.PropertyInfo propertyInfo) { throw null; } + private static System.Func MakeFastPropertyGetter(System.Reflection.PropertyInfo propertyInfo, System.Reflection.MethodInfo propertyGetterWrapperMethod, System.Reflection.MethodInfo propertyGetterByRefWrapperMethod) { throw null; } + private static System.Func MakeFastPropertyGetter(System.Type openGenericDelegateType, System.Reflection.MethodInfo propertyGetMethod, System.Reflection.MethodInfo openGenericWrapperMethod) { throw null; } + public static System.Action MakeFastPropertySetter(System.Reflection.PropertyInfo propertyInfo) { throw null; } + public static System.Func MakeNullSafeFastPropertyGetter(System.Reflection.PropertyInfo propertyInfo) { throw null; } + public static System.Collections.Generic.IDictionary ObjectToDictionary(object value) { throw null; } + public void SetValue(object instance, object value) { } + private delegate TValue ByRefFunc(ref TDeclaringType arg); + } +} +namespace System.Text.Json +{ + internal static partial class JsonSerializerOptionsCopyConstructor + { + public static System.Text.Json.JsonSerializerOptions Copy(this System.Text.Json.JsonSerializerOptions serializerOptions, System.Text.Encodings.Web.JavaScriptEncoder encoder) { throw null; } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj index e6b5b968a8..e468693de9 100644 --- a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + @@ -18,6 +20,7 @@ + diff --git a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj index 203e5cdddf..983aed9ca1 100644 --- a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj @@ -20,6 +20,7 @@ Microsoft.AspNetCore.Mvc.RouteAttribute + @@ -48,6 +49,7 @@ Microsoft.AspNetCore.Mvc.RouteAttribute + diff --git a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj index a3bf5f99a6..315dc16d7c 100644 --- a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj +++ b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.DataAnnotations/ref/Directory.Build.props b/src/Mvc/Mvc.DataAnnotations/ref/Directory.Build.props new file mode 100644 index 0000000000..b500fb5d98 --- /dev/null +++ b/src/Mvc/Mvc.DataAnnotations/ref/Directory.Build.props @@ -0,0 +1,8 @@ + + + + + true + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs new file mode 100644 index 0000000000..355dbe4c15 --- /dev/null +++ b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs @@ -0,0 +1,94 @@ +// 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +namespace Microsoft.AspNetCore.Mvc.DataAnnotations +{ + internal partial class DataAnnotationsMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IDisplayMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider + { + private const string NullableAttributeFullTypeName = "System.Runtime.CompilerServices.NullableAttribute"; + private const string NullableContextAttributeFullName = "System.Runtime.CompilerServices.NullableContextAttribute"; + private const string NullableContextFlagsFieldName = "Flag"; + private const string NullableFlagsFieldName = "NullableFlags"; + private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions _localizationOptions; + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _options; + private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; + public DataAnnotationsMetadataProvider(Microsoft.AspNetCore.Mvc.MvcOptions options, Microsoft.Extensions.Options.IOptions localizationOptions, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } + public void CreateBindingMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext context) { } + public void CreateDisplayMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadataProviderContext context) { } + public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } + private static string GetDisplayGroup(System.Reflection.FieldInfo field) { throw null; } + private static string GetDisplayName(System.Reflection.FieldInfo field, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) { throw null; } + internal static bool HasNullableAttribute(System.Collections.Generic.IEnumerable attributes, out bool isNullable) { throw null; } + internal static bool IsNullableBasedOnContext(System.Type containingType, System.Reflection.MemberInfo member) { throw null; } + internal static bool IsNullableReferenceType(System.Type containingType, System.Reflection.MemberInfo member, System.Collections.Generic.IEnumerable attributes) { throw null; } + } + internal partial class DefaultClientModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider + { + public DefaultClientModelValidatorProvider() { } + public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorProviderContext context) { } + } + internal partial class DataAnnotationsClientModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider + { + private readonly Microsoft.Extensions.Options.IOptions _options; + private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; + private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; + public DataAnnotationsClientModelValidatorProvider(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } + public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorProviderContext context) { } + } + internal partial class NumericClientModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider + { + public NumericClientModelValidatorProvider() { } + public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorProviderContext context) { } + } + internal sealed partial class DataAnnotationsModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IMetadataBasedModelValidatorProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider + { + private readonly Microsoft.Extensions.Options.IOptions _options; + private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; + private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; + public DataAnnotationsModelValidatorProvider(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } + public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidatorProviderContext context) { } + public bool HasValidators(System.Type modelType, System.Collections.Generic.IList validatorMetadata) { throw null; } + } + internal partial class StringLengthAttributeAdapter : Microsoft.AspNetCore.Mvc.DataAnnotations.AttributeAdapterBase + { + private readonly string _max; + private readonly string _min; + public StringLengthAttributeAdapter(System.ComponentModel.DataAnnotations.StringLengthAttribute attribute, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) : base (default(System.ComponentModel.DataAnnotations.StringLengthAttribute), default(Microsoft.Extensions.Localization.IStringLocalizer)) { } + public override void AddValidation(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext context) { } + public override string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } + } + internal partial class DataAnnotationsModelValidator : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidator + { + private static readonly object _emptyValidationContextInstance; + private readonly Microsoft.Extensions.Localization.IStringLocalizer _stringLocalizer; + private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.ComponentModel.DataAnnotations.ValidationAttribute _Attribute_k__BackingField; + public DataAnnotationsModelValidator(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, System.ComponentModel.DataAnnotations.ValidationAttribute attribute, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) { } + public System.ComponentModel.DataAnnotations.ValidationAttribute Attribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + private string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } + public System.Collections.Generic.IEnumerable Validate(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContext validationContext) { throw null; } + } + internal partial class ValidatableObjectAdapter : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidator + { + public ValidatableObjectAdapter() { } + public System.Collections.Generic.IEnumerable Validate(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContext context) { throw null; } + } +} +namespace Microsoft.Extensions.DependencyInjection +{ + internal partial class MvcDataAnnotationsMvcOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions + { + private readonly Microsoft.Extensions.Options.IOptions _dataAnnotationLocalizationOptions; + private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; + private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; + public MvcDataAnnotationsMvcOptionsSetup(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Options.IOptions dataAnnotationLocalizationOptions) { } + public MvcDataAnnotationsMvcOptionsSetup(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Options.IOptions dataAnnotationLocalizationOptions, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } + public void Configure(Microsoft.AspNetCore.Mvc.MvcOptions options) { } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj index 31f61788d1..396d4391a3 100644 --- a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj @@ -2,9 +2,12 @@ netcoreapp3.0 + false + + diff --git a/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj b/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj index 520d3abb20..b020972f0a 100644 --- a/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj +++ b/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj index c83f79c76f..401f13b62f 100644 --- a/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj +++ b/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj index 72e0ef3fdc..6c9b248d01 100644 --- a/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj +++ b/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj @@ -11,6 +11,8 @@ + + diff --git a/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.csproj b/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.csproj index 1021609ed3..19eedd135a 100644 --- a/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.csproj +++ b/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs index eb84d85728..b66e0df3c9 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts { public class AssemblyPartExtensionTest { - [Fact] + [Fact(Skip = "Deps file generation is incorrect, investigation ongoing.")] public void GetReferencePaths_ReturnsReferencesFromDependencyContext_IfPreserveCompilationContextIsSet() { // Arrange diff --git a/src/Mvc/Mvc.Razor/ref/Directory.Build.props b/src/Mvc/Mvc.Razor/ref/Directory.Build.props new file mode 100644 index 0000000000..ea5de23302 --- /dev/null +++ b/src/Mvc/Mvc.Razor/ref/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs new file mode 100644 index 0000000000..453edf2999 --- /dev/null +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs @@ -0,0 +1,243 @@ +// 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] + +namespace Microsoft.AspNetCore.Mvc.ApplicationParts +{ + internal partial class RazorCompiledItemFeatureProvider + { + public RazorCompiledItemFeatureProvider() { } + public void PopulateFeature(System.Collections.Generic.IEnumerable parts, Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeature feature) { } + } +} +namespace Microsoft.AspNetCore.Mvc.Razor +{ + public partial class RazorPageActivator : Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator + { + internal Microsoft.AspNetCore.Mvc.Razor.RazorPagePropertyActivator GetOrAddCacheEntry(Microsoft.AspNetCore.Mvc.Razor.IRazorPage page) { throw null; } + } + internal partial class DefaultTagHelperFactory : Microsoft.AspNetCore.Mvc.Razor.ITagHelperFactory + { + private readonly Microsoft.AspNetCore.Mvc.Razor.ITagHelperActivator _activator; + private static readonly System.Func> _createActivateInfo; + private readonly System.Func[]> _getPropertiesToActivate; + private readonly System.Collections.Concurrent.ConcurrentDictionary[]> _injectActions; + public DefaultTagHelperFactory(Microsoft.AspNetCore.Mvc.Razor.ITagHelperActivator activator) { } + private static Microsoft.Extensions.Internal.PropertyActivator CreateActivateInfo(System.Reflection.PropertyInfo property) { throw null; } + public TTagHelper CreateTagHelper(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) where TTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper { throw null; } + private static void InitializeTagHelper(TTagHelper tagHelper, Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) where TTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper { } + } + public partial class RazorView + { + internal System.Action OnAfterPageActivated { get { throw null; } set { } } + } + internal partial class RazorPagePropertyActivator + { + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _metadataProvider; + private readonly System.Func _nestedFactory; + private readonly Microsoft.Extensions.Internal.PropertyActivator[] _propertyActivators; + private readonly System.Func _rootFactory; + private readonly System.Type _viewDataDictionaryType; + public RazorPagePropertyActivator(System.Type pageType, System.Type declaredModelType, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.Razor.RazorPagePropertyActivator.PropertyValueAccessors propertyValueAccessors) { } + public void Activate(object page, Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) { } + private static Microsoft.Extensions.Internal.PropertyActivator CreateActivateInfo(System.Reflection.PropertyInfo property, Microsoft.AspNetCore.Mvc.Razor.RazorPagePropertyActivator.PropertyValueAccessors valueAccessors) { throw null; } + internal Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary CreateViewDataDictionary(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) { throw null; } + public partial class PropertyValueAccessors + { + private System.Func _DiagnosticSourceAccessor_k__BackingField; + private System.Func _HtmlEncoderAccessor_k__BackingField; + private System.Func _JsonHelperAccessor_k__BackingField; + private System.Func _ModelExpressionProviderAccessor_k__BackingField; + private System.Func _UrlHelperAccessor_k__BackingField; + public PropertyValueAccessors() { } + public System.Func DiagnosticSourceAccessor { get { throw null; } set { } } + public System.Func HtmlEncoderAccessor { get { throw null; } set { } } + public System.Func JsonHelperAccessor { get { throw null; } set { } } + public System.Func ModelExpressionProviderAccessor { get { throw null; } set { } } + public System.Func UrlHelperAccessor { get { throw null; } set { } } + } + } + internal partial interface IModelTypeProvider + { + System.Type GetModelType(); + } + internal static partial class RazorFileHierarchy + { + private const string ViewStartFileName = "_ViewStart.cshtml"; + public static System.Collections.Generic.IEnumerable GetViewStartPaths(string path) { throw null; } + } + internal partial class RazorViewEngineOptionsSetup + { + public RazorViewEngineOptionsSetup() { } + public void Configure(Microsoft.AspNetCore.Mvc.Razor.RazorViewEngineOptions options) { } + } + internal partial class DefaultViewCompiler : Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler + { + private readonly System.Collections.Generic.Dictionary> _compiledViews; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly System.Collections.Concurrent.ConcurrentDictionary _normalizedPathCache; + public DefaultViewCompiler(System.Collections.Generic.IList compiledViews, Microsoft.Extensions.Logging.ILogger logger) { } + public System.Threading.Tasks.Task CompileAsync(string relativePath) { throw null; } + private string GetNormalizedPath(string relativePath) { throw null; } + } + internal static partial class ViewPath + { + public static string NormalizePath(string path) { throw null; } + } + internal partial class ServiceBasedTagHelperActivator : Microsoft.AspNetCore.Mvc.Razor.ITagHelperActivator + { + public ServiceBasedTagHelperActivator() { } + public TTagHelper Create(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) where TTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper { throw null; } + } + internal partial class TagHelperComponentManager : Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentManager + { + private readonly System.Collections.Generic.ICollection _Components_k__BackingField; + public TagHelperComponentManager(System.Collections.Generic.IEnumerable tagHelperComponents) { } + public System.Collections.Generic.ICollection Components { get { throw null; } } + } + internal static partial class Resources + { + private static System.Resources.ResourceManager s_resourceManager; + private static System.Globalization.CultureInfo _Culture_k__BackingField; + internal static string ArgumentCannotBeNullOrEmpty { get { throw null; } } + internal static string CompilationFailed { get { throw null; } } + internal static string Compilation_MissingReferences { get { throw null; } } + internal static string CompiledViewDescriptor_NoData { get { throw null; } } + internal static string CouldNotResolveApplicationRelativeUrl_TagHelper { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { get { throw null; } set { } } + internal static string FileProvidersAreRequired { get { throw null; } } + internal static string FlushPointCannotBeInvoked { get { throw null; } } + internal static string GeneratedCodeFileName { get { throw null; } } + internal static string LayoutCannotBeLocated { get { throw null; } } + internal static string LayoutCannotBeRendered { get { throw null; } } + internal static string LayoutHasCircularReference { get { throw null; } } + internal static string PropertyMustBeSet { get { throw null; } } + internal static string RazorPage_CannotFlushWhileInAWritingScope { get { throw null; } } + internal static string RazorPage_InvalidTagHelperIndexerAssignment { get { throw null; } } + internal static string RazorPage_MethodCannotBeCalled { get { throw null; } } + internal static string RazorPage_NestingAttributeWritingScopesNotSupported { get { throw null; } } + internal static string RazorPage_ThereIsNoActiveWritingScopeToEnd { get { throw null; } } + internal static string RazorProject_PathMustStartWithForwardSlash { get { throw null; } } + internal static string RazorViewCompiler_ViewPathsDifferOnlyInCase { get { throw null; } } + internal static string RenderBodyNotCalled { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string SectionAlreadyDefined { get { throw null; } } + internal static string SectionAlreadyRendered { get { throw null; } } + internal static string SectionNotDefined { get { throw null; } } + internal static string SectionsNotRendered { get { throw null; } } + internal static string UnsupportedDebugInformationFormat { get { throw null; } } + internal static string ViewContextMustBeSet { get { throw null; } } + internal static string ViewLocationFormatsIsRequired { get { throw null; } } + internal static string FormatCompilation_MissingReferences(object p0) { throw null; } + internal static string FormatCompiledViewDescriptor_NoData(object p0, object p1) { throw null; } + internal static string FormatCouldNotResolveApplicationRelativeUrl_TagHelper(object p0, object p1, object p2, object p3, object p4, object p5) { throw null; } + internal static string FormatFileProvidersAreRequired(object p0, object p1, object p2) { throw null; } + internal static string FormatFlushPointCannotBeInvoked(object p0) { throw null; } + internal static string FormatLayoutCannotBeLocated(object p0, object p1) { throw null; } + internal static string FormatLayoutCannotBeRendered(object p0, object p1) { throw null; } + internal static string FormatLayoutHasCircularReference(object p0, object p1) { throw null; } + internal static string FormatPropertyMustBeSet(object p0, object p1) { throw null; } + internal static string FormatRazorPage_CannotFlushWhileInAWritingScope(object p0, object p1) { throw null; } + internal static string FormatRazorPage_InvalidTagHelperIndexerAssignment(object p0, object p1, object p2) { throw null; } + internal static string FormatRazorPage_MethodCannotBeCalled(object p0, object p1) { throw null; } + internal static string FormatRenderBodyNotCalled(object p0, object p1, object p2) { throw null; } + internal static string FormatSectionAlreadyDefined(object p0) { throw null; } + internal static string FormatSectionAlreadyRendered(object p0, object p1, object p2) { throw null; } + internal static string FormatSectionNotDefined(object p0, object p1, object p2) { throw null; } + internal static string FormatSectionsNotRendered(object p0, object p1, object p2) { throw null; } + internal static string FormatUnsupportedDebugInformationFormat(object p0) { throw null; } + internal static string FormatViewContextMustBeSet(object p0, object p1) { throw null; } + internal static string FormatViewLocationFormatsIsRequired(object p0) { throw null; } + internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } + private static string GetResourceString(string resourceKey, string[] formatterNames) { throw null; } + } + internal partial class DefaultRazorPageFactoryProvider : Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider + { + private readonly Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompilerProvider _viewCompilerProvider; + public DefaultRazorPageFactoryProvider(Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompilerProvider viewCompilerProvider) { } + private Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler Compiler { get { throw null; } } + public Microsoft.AspNetCore.Mvc.Razor.RazorPageFactoryResult CreateFactory(string relativePath) { throw null; } + } + public partial class RazorViewEngine : Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine + { + internal System.Collections.Generic.IEnumerable GetViewLocationFormats(Microsoft.AspNetCore.Mvc.Razor.ViewLocationExpanderContext context) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Razor.Infrastructure +{ + internal static partial class CryptographyAlgorithms + { + public static System.Security.Cryptography.SHA256 CreateSHA256() { throw null; } + } + + internal partial class DefaultFileVersionProvider : Microsoft.AspNetCore.Mvc.ViewFeatures.IFileVersionProvider + { + private static readonly char[] QueryStringAndFragmentTokens; + private const string VersionKey = "v"; + private readonly Microsoft.Extensions.Caching.Memory.IMemoryCache _Cache_k__BackingField; + private readonly Microsoft.Extensions.FileProviders.IFileProvider _FileProvider_k__BackingField; + public DefaultFileVersionProvider(Microsoft.AspNetCore.Hosting.IWebHostEnvironment hostingEnvironment, Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider cacheProvider) { } + public Microsoft.Extensions.Caching.Memory.IMemoryCache Cache { get { throw null; } } + public Microsoft.Extensions.FileProviders.IFileProvider FileProvider { get { throw null; } } + public string AddFileVersionToPath(Microsoft.AspNetCore.Http.PathString requestPathBase, string path) { throw null; } + private static string GetHashForFile(Microsoft.Extensions.FileProviders.IFileInfo fileInfo) { throw null; } + } + internal partial class DefaultTagHelperActivator : Microsoft.AspNetCore.Mvc.Razor.ITagHelperActivator + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.ITypeActivatorCache _typeActivatorCache; + public DefaultTagHelperActivator(Microsoft.AspNetCore.Mvc.Infrastructure.ITypeActivatorCache typeActivatorCache) { } + public TTagHelper Create(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) where TTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper { throw null; } + } + public sealed partial class TagHelperMemoryCacheProvider + { + private Microsoft.Extensions.Caching.Memory.IMemoryCache _Cache_k__BackingField; + public TagHelperMemoryCacheProvider() { } + public Microsoft.Extensions.Caching.Memory.IMemoryCache Cache { get { throw null; } internal set { } } + } +} +namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers +{ + internal partial class TagHelperComponentPropertyActivator : Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentPropertyActivator + { + private static readonly System.Func> _createActivateInfo; + private readonly System.Func[]> _getPropertiesToActivate; + private readonly System.Collections.Concurrent.ConcurrentDictionary[]> _propertiesToActivate; + public TagHelperComponentPropertyActivator() { } + public void Activate(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context, Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent tagHelperComponent) { } + private static Microsoft.Extensions.Internal.PropertyActivator CreateActivateInfo(System.Reflection.PropertyInfo property) { throw null; } + private static Microsoft.Extensions.Internal.PropertyActivator[] GetPropertiesToActivate(System.Type type) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Razor.Compilation +{ + internal partial class DefaultViewCompilerProvider : Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompilerProvider + { + private readonly Microsoft.AspNetCore.Mvc.Razor.Compilation.DefaultViewCompiler _compiler; + public DefaultViewCompilerProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationPartManager, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler GetCompiler() { throw null; } + } + internal partial class DefaultViewCompiler : Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler + { + private readonly System.Collections.Generic.Dictionary> _compiledViews; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly System.Collections.Concurrent.ConcurrentDictionary _normalizedPathCache; + public DefaultViewCompiler(System.Collections.Generic.IList compiledViews, Microsoft.Extensions.Logging.ILogger logger) { } + public System.Threading.Tasks.Task CompileAsync(string relativePath) { throw null; } + private string GetNormalizedPath(string relativePath) { throw null; } + } +} +namespace Microsoft.Extensions.DependencyInjection +{ + internal partial class MvcRazorMvcViewOptionsSetup + { + private readonly Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine _razorViewEngine; + public MvcRazorMvcViewOptionsSetup(Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine razorViewEngine) { } + public void Configure(Microsoft.AspNetCore.Mvc.MvcViewOptions options) { } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj index eb432ae8ad..3141b53f1a 100644 --- a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj @@ -2,9 +2,12 @@ netcoreapp3.0 + false + + diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp3.0.cs b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp3.0.cs index d7bb661a5b..af11f8aa37 100644 --- a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp3.0.cs +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp3.0.cs @@ -290,14 +290,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation public System.Collections.Generic.IList ViewDescriptors { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } } } -namespace Microsoft.AspNetCore.Mvc.Razor.Infrastructure -{ - public sealed partial class TagHelperMemoryCacheProvider - { - public TagHelperMemoryCacheProvider() { } - public Microsoft.Extensions.Caching.Memory.IMemoryCache Cache { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} namespace Microsoft.AspNetCore.Mvc.Razor.Internal { [System.AttributeUsageAttribute(System.AttributeTargets.Property, AllowMultiple=false, Inherited=true)] diff --git a/src/Mvc/Mvc.RazorPages/ref/Directory.Build.props b/src/Mvc/Mvc.RazorPages/ref/Directory.Build.props index db0125b36c..da31f31a30 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Directory.Build.props +++ b/src/Mvc/Mvc.RazorPages/ref/Directory.Build.props @@ -2,6 +2,10 @@ + + $(NoWarn);CS0169 + + diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.csproj index 8928351fd2..c21c532d01 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.csproj +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs index 64141594e4..912d7222b0 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs @@ -1,6 +1,27 @@ // 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + +namespace Microsoft.AspNetCore.Builder +{ + internal partial class CompiledPageRouteModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelProvider + { + private static readonly string RazorPageDocumentKind; + private static readonly string RouteTemplateKey; + private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _applicationManager; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _pagesOptions; + private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelFactory _routeModelFactory; + public CompiledPageRouteModelProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager, Microsoft.Extensions.Options.IOptions pagesOptionsAccessor, Microsoft.Extensions.Logging.ILogger logger) { } + public int Order { get { throw null; } } + internal static string GetRouteTemplate(Microsoft.AspNetCore.Mvc.Razor.Compilation.CompiledViewDescriptor viewDescriptor) { throw null; } + protected virtual Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeature GetViewFeature(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } + } +} namespace Microsoft.AspNetCore.Mvc.ApplicationModels { // https://github.com/dotnet/arcade/issues/2066 @@ -28,4 +49,294 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels System.Collections.Generic.IReadOnlyList Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel.Attributes { get { throw null; } } System.Collections.Generic.IDictionary Microsoft.AspNetCore.Mvc.ApplicationModels.IPropertyModel.Properties { get { throw null; } } } + internal partial class PageRouteModelFactory + { + private static readonly string IndexFileName; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly string _normalizedAreaRootDirectory; + private readonly string _normalizedRootDirectory; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _options; + private static readonly System.Action _unsupportedAreaPath; + public PageRouteModelFactory(Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions options, Microsoft.Extensions.Logging.ILogger logger) { } + private static string CreateAreaRoute(string areaName, string viewEnginePath) { throw null; } + public Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel CreateAreaRouteModel(string relativePath, string routeTemplate) { throw null; } + public Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel CreateRouteModel(string relativePath, string routeTemplate) { throw null; } + private static Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel CreateSelectorModel(string prefix, string routeTemplate) { throw null; } + private string GetViewEnginePath(string rootDirectory, string path) { throw null; } + private static string NormalizeDirectory(string directory) { throw null; } + private static void PopulateRouteModel(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel model, string pageRoute, string routeTemplate) { } + internal bool TryParseAreaPath(string relativePath, out (string areaName, string viewEnginePath) result) { throw null; } + } + internal partial class AuthorizationPageApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider + { + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + private readonly Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider _policyProvider; + public AuthorizationPageApplicationModelProvider(Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider policyProvider, Microsoft.Extensions.Options.IOptions mvcOptions) { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + } + internal partial class DefaultPageApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider + { + private const string ModelPropertyName = "Model"; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandleOptionsRequestsPageFilter _handleOptionsRequestsFilter; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _modelMetadataProvider; + private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelPartsProvider _pageApplicationModelPartsProvider; + private readonly Microsoft.AspNetCore.Mvc.Filters.PageHandlerPageFilter _pageHandlerPageFilter; + private readonly Microsoft.AspNetCore.Mvc.Filters.PageHandlerResultFilter _pageHandlerResultFilter; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _razorPagesOptions; + public DefaultPageApplicationModelProvider(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.Extensions.Options.IOptions razorPagesOptions, Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelPartsProvider pageApplicationModelPartsProvider) { } + public int Order { get { throw null; } } + protected virtual Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel CreateModel(Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor actionDescriptor, System.Reflection.TypeInfo pageTypeInfo) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + internal void PopulateFilters(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel pageModel) { } + internal void PopulateHandlerMethods(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel pageModel) { } + internal void PopulateHandlerProperties(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel pageModel) { } + } + internal partial class TempDataFilterPageApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider + { + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer _tempDataSerializer; + public TempDataFilterPageApplicationModelProvider(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer) { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + } + internal partial class ViewDataAttributePageApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider + { + public ViewDataAttributePageApplicationModelProvider() { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + } + internal partial class ResponseCacheFilterApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider + { + private readonly Microsoft.Extensions.Logging.ILoggerFactory _loggerFactory; + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + public ResponseCacheFilterApplicationModelProvider(Microsoft.Extensions.Options.IOptions mvcOptionsAccessor, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + } + internal partial class CompiledPageRouteModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelProvider + { + private static readonly string RazorPageDocumentKind; + private static readonly string RouteTemplateKey; + private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _applicationManager; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _pagesOptions; + private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelFactory _routeModelFactory; + public CompiledPageRouteModelProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager, Microsoft.Extensions.Options.IOptions pagesOptionsAccessor, Microsoft.Extensions.Logging.ILogger logger) { } + public int Order { get { throw null; } } + private void CreateModels(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } + private System.Collections.Generic.IEnumerable GetViewDescriptors(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager) { throw null; } + protected virtual Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeature GetViewFeature(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } + } } +namespace Microsoft.AspNetCore.Mvc.Filters +{ + internal partial class PageHandlerPageFilter : Microsoft.AspNetCore.Mvc.Filters.IAsyncPageFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + public PageHandlerPageFilter() { } + public int Order { get { throw null; } } + public System.Threading.Tasks.Task OnPageHandlerExecutionAsync(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext context, Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutionDelegate next) { throw null; } + public System.Threading.Tasks.Task OnPageHandlerSelectionAsync(Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext context) { throw null; } + } + internal partial class PageHandlerResultFilter : Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + public PageHandlerResultFilter() { } + public int Order { get { throw null; } } + public System.Threading.Tasks.Task OnResultExecutionAsync(Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext context, Microsoft.AspNetCore.Mvc.Filters.ResultExecutionDelegate next) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure +{ + internal sealed partial class HandleOptionsRequestsPageFilter : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter, Microsoft.AspNetCore.Mvc.Filters.IPageFilter + { + public HandleOptionsRequestsPageFilter() { } + public int Order { get { throw null; } } + public void OnPageHandlerExecuted(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext context) { } + public void OnPageHandlerExecuting(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext context) { } + public void OnPageHandlerSelected(Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext context) { } + } + internal delegate System.Threading.Tasks.Task PageHandlerExecutorDelegate(object handler, object[] arguments); + internal partial class PageActionInvoker : Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker, Microsoft.AspNetCore.Mvc.Abstractions.IActionInvoker + { + private readonly Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor _actionDescriptor; + private System.Collections.Generic.Dictionary _arguments; + private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor _handler; + private Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext _handlerExecutedContext; + private Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext _handlerExecutingContext; + private Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext _handlerSelectedContext; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelperOptions _htmlHelperOptions; + private Microsoft.AspNetCore.Mvc.RazorPages.PageBase _page; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.PageContext _pageContext; + private object _pageModel; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder _parameterBinder; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector _selector; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory _tempDataFactory; + private Microsoft.AspNetCore.Mvc.Rendering.ViewContext _viewContext; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry _CacheEntry_k__BackingField; + public PageActionInvoker(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector handlerMethodSelector, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.RazorPages.PageContext pageContext, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filterMetadata, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry cacheEntry, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelperOptions htmlHelperOptions) : base (default(System.Diagnostics.DiagnosticListener), default(Microsoft.Extensions.Logging.ILogger), default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor), default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper), default(Microsoft.AspNetCore.Mvc.ActionContext), default(Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[]), default(System.Collections.Generic.IList)) { } + internal Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry CacheEntry { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + private bool HasPageModel { get { throw null; } } + internal Microsoft.AspNetCore.Mvc.RazorPages.PageContext PageContext { get { throw null; } } + private System.Threading.Tasks.Task BindArgumentsAsync() { throw null; } + protected override System.Threading.Tasks.Task InvokeInnerFilterAsync() { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + private System.Threading.Tasks.Task InvokeNextPageFilterAwaitedAsync() { throw null; } + protected override System.Threading.Tasks.Task InvokeResultAsync(Microsoft.AspNetCore.Mvc.IActionResult result) { throw null; } + private System.Threading.Tasks.Task Next(ref Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvoker.State next, ref Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvoker.Scope scope, ref object state, ref bool isCompleted) { throw null; } + private static object[] PrepareArguments(System.Collections.Generic.IDictionary argumentsInDictionary, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor handler) { throw null; } + protected override void ReleaseResources() { } + private static void Rethrow(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext context) { } + private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor SelectHandler() { throw null; } + private enum Scope + { + Invoker = 0, + Page = 1, + } + private enum State + { + PageBegin = 0, + PageSelectHandlerBegin = 1, + PageSelectHandlerNext = 2, + PageSelectHandlerAsyncBegin = 3, + PageSelectHandlerAsyncEnd = 4, + PageSelectHandlerSync = 5, + PageSelectHandlerEnd = 6, + PageNext = 7, + PageAsyncBegin = 8, + PageAsyncEnd = 9, + PageSyncBegin = 10, + PageSyncEnd = 11, + PageInside = 12, + PageEnd = 13, + } + } + internal partial class PageActionInvokerCacheEntry + { + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor _ActionDescriptor_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly Microsoft.AspNetCore.Mvc.Filters.FilterItem[] _CacheableFilters_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate[] _HandlerBinders_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerExecutorDelegate[] _HandlerExecutors_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Func _ModelFactory_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Func _PageFactory_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Func _PropertyBinder_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Action _ReleaseModel_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Action _ReleasePage_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Func _ViewDataFactory_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Collections.Generic.IReadOnlyList> _ViewStartFactories_k__BackingField; + public PageActionInvokerCacheEntry(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor, System.Func viewDataFactory, System.Func pageFactory, System.Action releasePage, System.Func modelFactory, System.Action releaseModel, System.Func propertyBinder, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerExecutorDelegate[] handlerExecutors, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate[] handlerBinders, System.Collections.Generic.IReadOnlyList> viewStartFactories, Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cacheableFilters) { } + public Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor ActionDescriptor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.FilterItem[] CacheableFilters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate[] HandlerBinders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerExecutorDelegate[] HandlerExecutors { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Func ModelFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Func PageFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Func PropertyBinder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Action ReleaseModel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Action ReleasePage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Func ViewDataFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IReadOnlyList> ViewStartFactories { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class PageActionInvokerProvider : Microsoft.AspNetCore.Mvc.Abstractions.IActionInvokerProvider + { + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor _actionContextAccessor; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _collectionProvider; + private volatile Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerProvider.InnerCache _currentCache; + private readonly System.Diagnostics.DiagnosticListener _diagnosticListener; + private readonly Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] _filterProviders; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageLoader _loader; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper _mapper; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory _modelBinderFactory; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider _modelFactoryProvider; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _modelMetadataProvider; + private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; + private readonly Microsoft.AspNetCore.Mvc.MvcViewOptions _mvcViewOptions; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider _pageFactoryProvider; + private readonly Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder _parameterBinder; + private readonly Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider _razorPageFactoryProvider; + private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector _selector; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory _tempDataFactory; + private readonly System.Collections.Generic.IReadOnlyList _valueProviderFactories; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly int _Order_k__BackingField; + public PageActionInvokerProvider(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageLoader loader, Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider pageFactoryProvider, Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider modelFactoryProvider, Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider razorPageFactoryProvider, Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, System.Collections.Generic.IEnumerable filterProviders, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory, Microsoft.Extensions.Options.IOptions mvcOptions, Microsoft.Extensions.Options.IOptions mvcViewOptions, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector selector, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper) { } + public PageActionInvokerProvider(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageLoader loader, Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider pageFactoryProvider, Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider modelFactoryProvider, Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider razorPageFactoryProvider, Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, System.Collections.Generic.IEnumerable filterProviders, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory, Microsoft.Extensions.Options.IOptions mvcOptions, Microsoft.Extensions.Options.IOptions mvcViewOptions, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector selector, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor) { } + private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerProvider.InnerCache CurrentCache { get { throw null; } } + public int Order { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvoker CreateActionInvoker(Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry cacheEntry, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) { throw null; } + private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry CreateCacheEntry(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context, Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cachedFilters) { throw null; } + private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate[] GetHandlerBinders(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } + private static Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerExecutorDelegate[] GetHandlerExecutors(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } + internal System.Collections.Generic.List> GetViewStartFactories(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor descriptor) { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context) { } + internal partial class InnerCache + { + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly System.Collections.Concurrent.ConcurrentDictionary _Entries_k__BackingField; + [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + private readonly int _Version_k__BackingField; + public InnerCache(int version) { } + public System.Collections.Concurrent.ConcurrentDictionary Entries { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Version { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + } + internal static partial class PageBinderFactory + { + internal static readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate NullHandlerBinder = (context, arguments) => System.Threading.Tasks.Task.CompletedTask; + internal static readonly System.Func NullPropertyBinder = (context, arguments) => System.Threading.Tasks.Task.CompletedTask; + public static Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate CreateHandlerBinder(Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor handler, Microsoft.AspNetCore.Mvc.MvcOptions mvcOptions) { throw null; } + public static System.Func CreatePropertyBinder(Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + private readonly partial struct BinderItem + { + private readonly object _dummy; + public BinderItem(Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder modelBinder, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata) { throw null; } + public Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder ModelBinder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata ModelMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + } + internal delegate System.Threading.Tasks.Task PageHandlerBinderDelegate(Microsoft.AspNetCore.Mvc.RazorPages.PageContext pageContext, System.Collections.Generic.IDictionary arguments); +} +namespace Microsoft.Extensions.DependencyInjection +{ + internal partial class RazorPagesRazorViewEngineOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions + { + private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _pagesOptions; + public RazorPagesRazorViewEngineOptionsSetup(Microsoft.Extensions.Options.IOptions pagesOptions) { } + private static string CombinePath(string path1, string path2) { throw null; } + public void Configure(Microsoft.AspNetCore.Mvc.Razor.RazorViewEngineOptions options) { } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs index e8959d832a..6bf3847a86 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs @@ -694,7 +694,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure } public partial class PageResultExecutor : Microsoft.AspNetCore.Mvc.ViewFeatures.ViewExecutor { - public PageResultExecutor(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory writerFactory, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine compositeViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine razorViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator razorPageActivator, System.Diagnostics.DiagnosticListener diagnosticListener, System.Text.Encodings.Web.HtmlEncoder htmlEncoder) : base (default(Microsoft.Extensions.Options.IOptions), default(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory), default(Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine), default(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory), default(System.Diagnostics.DiagnosticListener), default(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider)) { } + public PageResultExecutor(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory writerFactory, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine compositeViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine razorViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator razorPageActivator, System.Diagnostics.DiagnosticListener diagnosticListener, System.Text.Encodings.Web.HtmlEncoder htmlEncoder) : base (default(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory), default(Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine), default(System.Diagnostics.DiagnosticListener)) { } public virtual System.Threading.Tasks.Task ExecuteAsync(Microsoft.AspNetCore.Mvc.RazorPages.PageContext pageContext, Microsoft.AspNetCore.Mvc.RazorPages.PageResult result) { throw null; } } public partial class PageViewLocationExpander : Microsoft.AspNetCore.Mvc.Razor.IViewLocationExpander diff --git a/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj index 0986fbcdb7..1f7fe61e41 100644 --- a/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj +++ b/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj @@ -11,6 +11,8 @@ + + diff --git a/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.csproj index 2c0acec9fc..54c737be53 100644 --- a/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.csproj +++ b/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props b/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props new file mode 100644 index 0000000000..ea5de23302 --- /dev/null +++ b/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs new file mode 100644 index 0000000000..f5f2f9d984 --- /dev/null +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs @@ -0,0 +1,257 @@ +// 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] + +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers +{ + internal partial class CharArrayBufferSource : Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ICharBufferSource + { + public static readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.CharArrayBufferSource Instance; + public CharArrayBufferSource() { } + public char[] Rent(int bufferSize) { throw null; } + public void Return(char[] buffer) { } + } + internal partial interface ICharBufferSource + { + char[] Rent(int bufferSize); + void Return(char[] buffer); + } + internal partial class PagedCharBuffer + { + public const int PageSize = 1024; + private int _charIndex; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ICharBufferSource _BufferSource_k__BackingField; + private char[] _CurrentPage_k__BackingField; + private readonly System.Collections.Generic.List _Pages_k__BackingField; + public PagedCharBuffer(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ICharBufferSource bufferSource) { } + public Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ICharBufferSource BufferSource { get { throw null; } } + private char[] CurrentPage { get { throw null; } set { } } + public int Length { get { throw null; } } + public System.Collections.Generic.List Pages { get { throw null; } } + public void Append(char value) { } + public void Append(char[] buffer, int index, int count) { } + public void Append(string value) { } + public void Clear() { } + public void Dispose() { } + private char[] GetCurrentPage() { throw null; } + private char[] NewPage() { throw null; } + } + internal partial class ViewBuffer : Microsoft.AspNetCore.Html.IHtmlContentBuilder + { + public static readonly int PartialViewPageSize; + public static readonly int TagHelperPageSize; + public static readonly int ViewComponentPageSize; + public static readonly int ViewPageSize; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.IViewBufferScope _bufferScope; + private Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage _currentPage; + private System.Collections.Generic.List _multiplePages; + private readonly string _name; + private readonly int _pageSize; + public ViewBuffer(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.IViewBufferScope bufferScope, string name, int pageSize) { } + public int Count { get { throw null; } } + public Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage this[int index] { get { throw null; } } + private void AddPage(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage page) { } + public Microsoft.AspNetCore.Html.IHtmlContentBuilder Append(string unencoded) { throw null; } + public Microsoft.AspNetCore.Html.IHtmlContentBuilder AppendHtml(Microsoft.AspNetCore.Html.IHtmlContent content) { throw null; } + public Microsoft.AspNetCore.Html.IHtmlContentBuilder AppendHtml(string encoded) { throw null; } + private Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage AppendNewPage() { throw null; } + private void AppendValue(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue value) { } + public Microsoft.AspNetCore.Html.IHtmlContentBuilder Clear() { throw null; } + public void CopyTo(Microsoft.AspNetCore.Html.IHtmlContentBuilder destination) { } + private string DebuggerToString() { throw null; } + private Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage GetCurrentPage() { throw null; } + public void MoveTo(Microsoft.AspNetCore.Html.IHtmlContentBuilder destination) { } + private void MoveTo(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer destination) { } + public void WriteTo(System.IO.TextWriter writer, System.Text.Encodings.Web.HtmlEncoder encoder) { } + public System.Threading.Tasks.Task WriteToAsync(System.IO.TextWriter writer, System.Text.Encodings.Web.HtmlEncoder encoder) { throw null; } + private partial class EncodingWrapper + { + private readonly string _unencoded; + public EncodingWrapper(string unencoded) { } + public void WriteTo(System.IO.TextWriter writer, System.Text.Encodings.Web.HtmlEncoder encoder) { } + } + } + internal partial class ViewBufferTextWriter : System.IO.TextWriter + { + private readonly System.Text.Encodings.Web.HtmlEncoder _htmlEncoder; + private readonly System.IO.TextWriter _inner; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer _Buffer_k__BackingField; + private readonly System.Text.Encoding _Encoding_k__BackingField; + private bool _Flushed_k__BackingField; + public ViewBufferTextWriter(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer buffer, System.Text.Encoding encoding) { } + public ViewBufferTextWriter(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer buffer, System.Text.Encoding encoding, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, System.IO.TextWriter inner) { } + public Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer Buffer { get { throw null; } } + public override System.Text.Encoding Encoding { get { throw null; } } + public bool Flushed { get { throw null; } private set { } } + public override void Flush() { } + public override System.Threading.Tasks.Task FlushAsync() { throw null; } + public void Write(Microsoft.AspNetCore.Html.IHtmlContent value) { } + public void Write(Microsoft.AspNetCore.Html.IHtmlContentContainer value) { } + public override void Write(char value) { } + public override void Write(char[] buffer, int index, int count) { } + public override void Write(object value) { } + public override void Write(string value) { } + public override System.Threading.Tasks.Task WriteAsync(char value) { throw null; } + public override System.Threading.Tasks.Task WriteAsync(char[] buffer, int index, int count) { throw null; } + public override System.Threading.Tasks.Task WriteAsync(string value) { throw null; } + public override void WriteLine() { } + public override void WriteLine(object value) { } + public override void WriteLine(string value) { } + public override System.Threading.Tasks.Task WriteLineAsync() { throw null; } + public override System.Threading.Tasks.Task WriteLineAsync(char value) { throw null; } + public override System.Threading.Tasks.Task WriteLineAsync(char[] value, int start, int offset) { throw null; } + public override System.Threading.Tasks.Task WriteLineAsync(string value) { throw null; } + } + internal partial class ViewBufferPage + { + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue[] _Buffer_k__BackingField; + private int _Count_k__BackingField; + public ViewBufferPage(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue[] buffer) { } + public Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue[] Buffer { get { throw null; } } + public int Capacity { get { throw null; } } + public int Count { get { throw null; } set { } } + public bool IsFull { get { throw null; } } + public void Append(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue value) { } + } +} +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters +{ + internal partial class ViewDataAttributeApplicationModelProvider + { + public ViewDataAttributeApplicationModelProvider() { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } + internal static partial class ViewDataAttributePropertyProvider + { + public static System.Collections.Generic.IReadOnlyList GetViewDataProperties(System.Type type) { throw null; } + } + internal partial interface ISaveTempDataCallback + { + void OnTempDataSaving(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary tempData); + } + internal partial interface IViewDataValuesProviderFeature + { + void ProvideViewDataValues(Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary viewData); + } + internal abstract partial class SaveTempDataPropertyFilterBase : Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.ISaveTempDataCallback + { + protected readonly Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory _tempDataFactory; + private readonly System.Collections.Generic.IDictionary _OriginalValues_k__BackingField; + private System.Collections.Generic.IReadOnlyList _Properties_k__BackingField; + private object _Subject_k__BackingField; + public SaveTempDataPropertyFilterBase(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory) { } + public System.Collections.Generic.IDictionary OriginalValues { get { throw null; } } + public System.Collections.Generic.IReadOnlyList Properties { get { throw null; } set { } } + public object Subject { get { throw null; } set { } } + public static System.Collections.Generic.IReadOnlyList GetTempDataProperties(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer, System.Type type) { throw null; } + public void OnTempDataSaving(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary tempData) { } + protected void SetPropertyValues(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary tempData) { } + private static bool ValidateProperty(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer, System.Collections.Generic.List errorMessages, System.Reflection.PropertyInfo property) { throw null; } + } + internal readonly partial struct LifecycleProperty + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public LifecycleProperty(System.Reflection.PropertyInfo propertyInfo, string key) { throw null; } + public string Key { get { throw null; } } + public System.Reflection.PropertyInfo PropertyInfo { get { throw null; } } + public object GetValue(object instance) { throw null; } + public void SetValue(object instance, object value) { } + } +} +namespace Microsoft.AspNetCore.Mvc.ViewFeatures +{ + internal partial class TempDataApplicationModelProvider + { + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer _tempDataSerializer; + public TempDataApplicationModelProvider(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer) { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } + internal partial class NullView : Microsoft.AspNetCore.Mvc.ViewEngines.IView + { + public static readonly Microsoft.AspNetCore.Mvc.ViewFeatures.NullView Instance; + public NullView() { } + public string Path { get { throw null; } } + public System.Threading.Tasks.Task RenderAsync(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) { throw null; } + } + internal partial class TemplateRenderer + { + private const string DisplayTemplateViewPath = "DisplayTemplates"; + private const string EditorTemplateViewPath = "EditorTemplates"; + public const string IEnumerableOfIFormFileName = "IEnumerable`IFormFile"; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.IViewBufferScope _bufferScope; + private static readonly System.Collections.Generic.Dictionary> _defaultDisplayActions; + private static readonly System.Collections.Generic.Dictionary> _defaultEditorActions; + private readonly bool _readOnly; + private readonly string _templateName; + private readonly Microsoft.AspNetCore.Mvc.Rendering.ViewContext _viewContext; + private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary _viewData; + private readonly Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine _viewEngine; + public TemplateRenderer(Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine viewEngine, Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.IViewBufferScope bufferScope, Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext, Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary viewData, string templateName, bool readOnly) { } + private System.Collections.Generic.Dictionary> GetDefaultActions() { throw null; } + public static System.Collections.Generic.IEnumerable GetTypeNames(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata, System.Type fieldType) { throw null; } + private System.Collections.Generic.IEnumerable GetViewNames() { throw null; } + private static Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper MakeHtmlHelper(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext, Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary viewData) { throw null; } + public Microsoft.AspNetCore.Html.IHtmlContent Render() { throw null; } + } + internal static partial class FormatWeekHelper + { + public static string GetFormattedWeek(Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer modelExplorer) { throw null; } + } + internal static partial class ViewDataDictionaryFactory + { + public static System.Func CreateFactory(System.Reflection.TypeInfo modelType) { throw null; } + public static System.Func CreateNestedFactory(System.Reflection.TypeInfo modelType) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure +{ + internal partial class DefaultTempDataSerializer : Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer + { + public DefaultTempDataSerializer() { } + public override bool CanSerializeType(System.Type type) { throw null; } + public override System.Collections.Generic.IDictionary Deserialize(byte[] value) { throw null; } + private static object DeserializeArray(in System.Text.Json.JsonElement arrayElement) { throw null; } + private System.Collections.Generic.IDictionary DeserializeDictionary(System.Text.Json.JsonElement rootElement) { throw null; } + private static object DeserializeDictionaryEntry(in System.Text.Json.JsonElement objectElement) { throw null; } + public override byte[] Serialize(System.Collections.Generic.IDictionary values) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Rendering +{ + internal partial class SystemTextJsonHelper : Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper + { + private readonly System.Text.Json.JsonSerializerOptions _htmlSafeJsonSerializerOptions; + public SystemTextJsonHelper(Microsoft.Extensions.Options.IOptions options) { } + private static System.Text.Json.JsonSerializerOptions GetHtmlSafeSerializerOptions(System.Text.Json.JsonSerializerOptions serializerOptions) { throw null; } + public Microsoft.AspNetCore.Html.IHtmlContent Serialize(object value) { throw null; } + } +} +namespace Microsoft.Extensions.DependencyInjection +{ + internal partial class MvcViewOptionsSetup + { + private readonly Microsoft.Extensions.Options.IOptions _dataAnnotationsLocalizationOptions; + private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; + private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; + public MvcViewOptionsSetup(Microsoft.Extensions.Options.IOptions dataAnnotationLocalizationOptions, Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider) { } + public MvcViewOptionsSetup(Microsoft.Extensions.Options.IOptions dataAnnotationOptions, Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } + public void Configure(Microsoft.AspNetCore.Mvc.MvcViewOptions options) { } + } + internal partial class TempDataMvcOptionsSetup + { + public TempDataMvcOptionsSetup() { } + public void Configure(Microsoft.AspNetCore.Mvc.MvcOptions options) { } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj index ede007ec0c..3746041b8b 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -2,9 +2,12 @@ netcoreapp3.0 + false + + diff --git a/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj index 90f5f2fcc8..17a5090169 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -31,9 +31,10 @@ - - - + + + + diff --git a/src/Mvc/Mvc/ref/Microsoft.AspNetCore.Mvc.csproj b/src/Mvc/Mvc/ref/Microsoft.AspNetCore.Mvc.csproj index 0bd19fa8af..1d94cff584 100644 --- a/src/Mvc/Mvc/ref/Microsoft.AspNetCore.Mvc.csproj +++ b/src/Mvc/Mvc/ref/Microsoft.AspNetCore.Mvc.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj b/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj index c1b0ad0c05..46985d1996 100644 --- a/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj +++ b/src/Mvc/Mvc/test/Microsoft.AspNetCore.Mvc.Test.csproj @@ -12,7 +12,6 @@ - diff --git a/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs index 5cd72354c6..6ca0e5c650 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs +++ b/src/Mvc/test/Mvc.FunctionalTests/ErrorPageTests.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.IO; using System.Linq; using System.Net; using System.Net.Http; @@ -9,6 +10,8 @@ using System.Net.Http.Headers; using System.Text.Encodings.Web; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation; +using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; @@ -27,6 +30,8 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests "If you're seeing this in a published application, set 'CopyRefAssembliesToPublishDirectory' to true in your project file to ensure files in the refs directory are published."); private readonly AssemblyTestLog _assemblyTestLog; + private readonly MvcTestFixture _fixture; + public ErrorPageTests( MvcTestFixture fixture, ITestOutputHelper testOutputHelper) @@ -41,6 +46,8 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests .CreateDefaultClient(); // These tests want to verify runtime compilation and formatting in the HTML of the error page Client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("text/html")); + + _fixture = fixture; } public HttpClient Client { get; } @@ -49,12 +56,18 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests public async Task CompilationFailuresAreListedByErrorPageMiddleware() { // Arrange + var factory = _fixture.Factories.FirstOrDefault() ?? _fixture.WithWebHostBuilder(b => b.UseStartup()); + factory = factory.WithWebHostBuilder(b => b.ConfigureTestServices(serviceCollection => serviceCollection.Configure(ConfigureRuntimeCompilationOptions))); + + var client = factory.CreateDefaultClient(); + client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("text/html")); + var action = "CompilationFailure"; var expected = "Cannot implicitly convert type 'int' to 'string'"; var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8"); // Act - var response = await Client.GetAsync("http://localhost/" + action); + var response = await client.GetAsync("http://localhost/" + action); // Assert Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); @@ -63,6 +76,16 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests Assert.Contains($"{action}.cshtml", content); Assert.Contains(expected, content); Assert.DoesNotContain(PreserveCompilationContextMessage, content); + + static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions options) + { + // Workaround for incorrectly generated deps file. The build output has all of the binaries required to compile. We'll grab these and + // add it to the list of assemblies runtime compilation uses. + foreach (var path in Directory.EnumerateFiles(AppContext.BaseDirectory, "*.dll")) + { + options.AdditionalReferencePaths.Add(path); + } + } } [Fact] diff --git a/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs index ba90b35947..26ba921a68 100644 --- a/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs +++ b/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs @@ -3,9 +3,15 @@ using System; using System.Collections.Generic; +using System.IO; +using System.Linq; using System.Net; using System.Net.Http; using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation; +using Microsoft.AspNetCore.TestHost; +using Microsoft.Extensions.DependencyInjection; using Xunit; namespace Microsoft.AspNetCore.Mvc.FunctionalTests @@ -14,7 +20,20 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests { public RazorBuildTest(MvcTestFixture fixture) { - Client = fixture.CreateDefaultClient(); + var factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(b => b.UseStartup()); + factory = factory.WithWebHostBuilder(b => b.ConfigureTestServices(serviceCollection => serviceCollection.Configure(ConfigureRuntimeCompilationOptions))); + + Client = factory.CreateDefaultClient(); + + static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions options) + { + // Workaround for incorrectly generated deps file. The build output has all of the binaries required to compile. We'll grab these and + // add it to the list of assemblies runtime compilation uses. + foreach (var path in Directory.EnumerateFiles(AppContext.BaseDirectory, "*.dll")) + { + options.AdditionalReferencePaths.Add(path); + } + } } public HttpClient Client { get; } @@ -77,7 +96,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests var actual2 = body.Trim(); Assert.NotEqual(expected1, actual2); - // Act - 3 + // Act - 3 // With all things being the same, expect a cached compilation body = await Client.GetStringAsync("/UpdateableViews"); diff --git a/src/Mvc/test/WebSites/Directory.Build.props b/src/Mvc/test/WebSites/Directory.Build.props index 16d5bfcfea..74f5a5de5a 100644 --- a/src/Mvc/test/WebSites/Directory.Build.props +++ b/src/Mvc/test/WebSites/Directory.Build.props @@ -4,4 +4,11 @@ + + + + + diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index b9b5903ff2..6e78a1593e 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -14,7 +14,7 @@ - @(TargetingPackVersionInfo.PackageVersion) + %(_TargetingPackVersionInfo.PackageVersion) $(AspNetCoreBaselineVersion) diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 7b26d044d2..2e7d562230 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -22,6 +22,7 @@ TestTemplates\ $([MSBuild]::EnsureTrailingSlash('$(RepoRoot)'))obj\template-restore\ TemplateTests.props + false @@ -62,7 +63,7 @@ <_Parameter2>true - + $([MSBuild]::NormalizePath('$(OutputPath)$(TestTemplateCreationFolder)')) diff --git a/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj b/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj index 8f18b18879..b93f53387b 100644 --- a/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj +++ b/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj b/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj index c4c063edb8..2138edbbf9 100644 --- a/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj +++ b/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Security/Authentication/Cookies/ref/Microsoft.AspNetCore.Authentication.Cookies.csproj b/src/Security/Authentication/Cookies/ref/Microsoft.AspNetCore.Authentication.Cookies.csproj index c6b74638d1..30f48fd466 100644 --- a/src/Security/Authentication/Cookies/ref/Microsoft.AspNetCore.Authentication.Cookies.csproj +++ b/src/Security/Authentication/Cookies/ref/Microsoft.AspNetCore.Authentication.Cookies.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Security/Authentication/Core/ref/Microsoft.AspNetCore.Authentication.csproj b/src/Security/Authentication/Core/ref/Microsoft.AspNetCore.Authentication.csproj index 0f53ab690a..d210d921c5 100644 --- a/src/Security/Authentication/Core/ref/Microsoft.AspNetCore.Authentication.csproj +++ b/src/Security/Authentication/Core/ref/Microsoft.AspNetCore.Authentication.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Security/Authentication/OAuth/ref/Microsoft.AspNetCore.Authentication.OAuth.csproj b/src/Security/Authentication/OAuth/ref/Microsoft.AspNetCore.Authentication.OAuth.csproj index 748ac04e8a..1806276892 100644 --- a/src/Security/Authentication/OAuth/ref/Microsoft.AspNetCore.Authentication.OAuth.csproj +++ b/src/Security/Authentication/OAuth/ref/Microsoft.AspNetCore.Authentication.OAuth.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj index 6b81f7e2ca..88480c4611 100644 --- a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj +++ b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj b/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj index 2abea2d038..9cde58e848 100644 --- a/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj +++ b/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Security/CookiePolicy/ref/Microsoft.AspNetCore.CookiePolicy.csproj b/src/Security/CookiePolicy/ref/Microsoft.AspNetCore.CookiePolicy.csproj index be94f37e47..7f243e54d6 100644 --- a/src/Security/CookiePolicy/ref/Microsoft.AspNetCore.CookiePolicy.csproj +++ b/src/Security/CookiePolicy/ref/Microsoft.AspNetCore.CookiePolicy.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj index a0055c58bc..d5dd2d3c17 100644 --- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj +++ b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj @@ -22,6 +22,11 @@ + + + @@ -70,7 +75,7 @@ - + netstandard2.0;netstandard2.1;netcoreapp3.0 + false + diff --git a/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.csproj b/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.csproj index 5735d7254d..2b92e312fd 100644 --- a/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.csproj +++ b/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj index 371f23089c..95c9adfce8 100644 --- a/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj index 8c80a84b62..9e4c1832f8 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj @@ -15,6 +15,11 @@ + + + diff --git a/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj index e5054cf688..7574056789 100644 --- a/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Servers/Kestrel/Core/ref/Directory.Build.props b/src/Servers/Kestrel/Core/ref/Directory.Build.props new file mode 100644 index 0000000000..ea5de23302 --- /dev/null +++ b/src/Servers/Kestrel/Core/ref/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + $(NoWarn);CS0169 + + \ No newline at end of file diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs new file mode 100644 index 0000000000..3027febf33 --- /dev/null +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs @@ -0,0 +1,17 @@ +// 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] + +namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal +{ + internal partial class KestrelServerOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions + { + private System.IServiceProvider _services; + public KestrelServerOptionsSetup(System.IServiceProvider services) { } + public void Configure(Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions options) { } + } +} diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index 367e32ffec..760057395e 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -2,9 +2,12 @@ netcoreapp3.0 + false + + diff --git a/src/Servers/Kestrel/Kestrel/ref/Microsoft.AspNetCore.Server.Kestrel.csproj b/src/Servers/Kestrel/Kestrel/ref/Microsoft.AspNetCore.Server.Kestrel.csproj index 4773f25252..821e25a7e9 100644 --- a/src/Servers/Kestrel/Kestrel/ref/Microsoft.AspNetCore.Server.Kestrel.csproj +++ b/src/Servers/Kestrel/Kestrel/ref/Microsoft.AspNetCore.Server.Kestrel.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj index d5f1350fec..3b493ee96f 100644 --- a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj +++ b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj index 9019aa904b..acdbaa11d5 100644 --- a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj +++ b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj index eb8d5f9d98..25f206d9c5 100644 --- a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj +++ b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj @@ -9,6 +9,11 @@ + + + diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp3.0.cs b/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp3.0.cs deleted file mode 100644 index 35b6c7cc35..0000000000 --- a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp3.0.cs +++ /dev/null @@ -1,49 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Http.Connections.Client -{ - public partial class HttpConnection : Microsoft.AspNetCore.Connections.ConnectionContext, Microsoft.AspNetCore.Connections.Features.IConnectionInherentKeepAliveFeature - { - public HttpConnection(Microsoft.AspNetCore.Http.Connections.Client.HttpConnectionOptions httpConnectionOptions, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public HttpConnection(System.Uri url) { } - public HttpConnection(System.Uri url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports) { } - public HttpConnection(System.Uri url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public override string ConnectionId { get { throw null; } set { } } - public override Microsoft.AspNetCore.Http.Features.IFeatureCollection Features { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override System.Collections.Generic.IDictionary Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - bool Microsoft.AspNetCore.Connections.Features.IConnectionInherentKeepAliveFeature.HasInherentKeepAlive { get { throw null; } } - public override System.IO.Pipelines.IDuplexPipe Transport { get { throw null; } set { } } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task StartAsync(Microsoft.AspNetCore.Connections.TransferFormat transferFormat, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class HttpConnectionOptions - { - public HttpConnectionOptions() { } - public System.Func> AccessTokenProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Security.Cryptography.X509Certificates.X509CertificateCollection ClientCertificates { get { throw null; } set { } } - public System.TimeSpan CloseTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.CookieContainer Cookies { get { throw null; } set { } } - public System.Net.ICredentials Credentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IDictionary Headers { get { throw null; } set { } } - public System.Func HttpMessageHandlerFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.IWebProxy Proxy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SkipNegotiation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.Connections.HttpTransportType Transports { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Uri Url { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool? UseDefaultCredentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Action WebSocketConfiguration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class NoTransportSupportedException : System.Exception - { - public NoTransportSupportedException(string message) { } - } - public partial class TransportFailedException : System.Exception - { - public TransportFailedException(string transportType, string message, System.Exception innerException = null) { } - public string TransportType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj index 64a4eb43ca..eb6dcab8f2 100644 --- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj @@ -41,6 +41,13 @@ + + + + + diff --git a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj index e7de246e93..12cd68e60b 100644 --- a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj +++ b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj b/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj index d22a24c9d7..09619247c7 100644 --- a/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj +++ b/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj index 7e0ddcd3da..9b5134468f 100644 --- a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj +++ b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/SignalR/common/Shared/PipeWriterStream.cs b/src/SignalR/common/Shared/PipeWriterStream.cs index c569d09ed2..ec72d5fdc2 100644 --- a/src/SignalR/common/Shared/PipeWriterStream.cs +++ b/src/SignalR/common/Shared/PipeWriterStream.cs @@ -1,12 +1,9 @@ -// 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; using System.Buffers; -using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Internal; namespace System.IO.Pipelines { diff --git a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj index e1fb26d63e..95fdf6b70e 100644 --- a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj +++ b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj @@ -2,6 +2,8 @@ netstandard2.0;netcoreapp3.0 + false + diff --git a/src/SignalR/server/Core/ref/Microsoft.AspNetCore.SignalR.Core.csproj b/src/SignalR/server/Core/ref/Microsoft.AspNetCore.SignalR.Core.csproj index 1681bddc30..f5ec5324f3 100644 --- a/src/SignalR/server/Core/ref/Microsoft.AspNetCore.SignalR.Core.csproj +++ b/src/SignalR/server/Core/ref/Microsoft.AspNetCore.SignalR.Core.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.csproj b/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.csproj index 9f65eda535..82457dcd45 100644 --- a/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.csproj +++ b/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + false + diff --git a/src/SignalR/server/SignalR/src/SignalRDependencyInjectionExtensions.cs b/src/SignalR/server/SignalR/src/SignalRDependencyInjectionExtensions.cs index a7ec121154..1f8bdc92c9 100644 --- a/src/SignalR/server/SignalR/src/SignalRDependencyInjectionExtensions.cs +++ b/src/SignalR/server/SignalR/src/SignalRDependencyInjectionExtensions.cs @@ -4,7 +4,6 @@ using System; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.SignalR; -using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs index 9a45f00e68..6284a75515 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs @@ -16,7 +16,6 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Connections.Features; -using Microsoft.AspNetCore.Http.Connections.Internal; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Protocol; using Microsoft.Extensions.DependencyInjection; diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index 240809107d..b0ecbfc69b 100644 --- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -16,6 +16,8 @@ true true true + false + true $(RestoreAdditionalProjectSources);$(ArtifactsNonShippingPackagesDir) diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj index c4c5f3aa7f..ec17e4ad6a 100644 --- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj +++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj @@ -13,6 +13,9 @@ MSBuild;Swagger;OpenAPI;code generation;Web API;service reference;document generation true true + + true + false From 80ff7fdc29bc951d21ae7feabbdbded293efcfc7 Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 31 Oct 2019 20:27:35 -0700 Subject: [PATCH 005/116] Pin Microsoft.NETCore.App.Ref (#16707) * Pin Microsoft.NETCore.App.Ref * Update SHA --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 305e601575..b4f649c28a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -398,9 +398,9 @@ 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/core-setup - 903ca49e3ffddc551e12d2f94d7cca95f9a340bf + 7d57652f33493fa022125b7f63aad0d70c52d810 https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index 32eab2e35e..b225da2ca7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,7 +71,7 @@ 3.3.1-beta4-19462-11 3.0.1 - 3.0.1 + 3.0.0 3.0.1 2.1.0 From 8757775179ecd2bf052550887f2b04ace49269ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Nov 2019 10:25:39 -0700 Subject: [PATCH 006/116] [release/3.0] Update dependencies from 2 repositories (#16712) * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191031.5 - Microsoft.EntityFrameworkCore.Tools - 3.0.1 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.1 - dotnet-ef - 3.0.1 - Microsoft.EntityFrameworkCore - 3.0.1 - Microsoft.EntityFrameworkCore.InMemory - 3.0.1 - Microsoft.EntityFrameworkCore.Relational - 3.0.1 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.1 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.1-servicing.19517.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.1-servicing.19517.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.1-servicing.19517.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.1-servicing.19517.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.1-servicing.19517.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.1-servicing.19517.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.1-servicing.19517.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.1-servicing.19517.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.1-servicing.19517.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.1-servicing.19517.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyModel - 3.0.1 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers - 3.0.1-servicing.19517.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.1-servicing.19517.2 (parent: Microsoft.EntityFrameworkCore) * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191031.12 - Microsoft.EntityFrameworkCore.Tools - 3.0.1 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.1 - dotnet-ef - 3.0.1 - Microsoft.EntityFrameworkCore - 3.0.1 - Microsoft.EntityFrameworkCore.InMemory - 3.0.1 - Microsoft.EntityFrameworkCore.Relational - 3.0.1 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.1 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.1-servicing.19531.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.1-servicing.19531.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.1-servicing.19531.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.1-servicing.19531.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.1-servicing.19531.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.1-servicing.19531.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.1-servicing.19531.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.1-servicing.19531.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.1-servicing.19531.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.1-servicing.19531.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.1 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.1 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyModel - 3.0.1 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers - 3.0.1-servicing.19531.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.1-servicing.19531.3 (parent: Microsoft.EntityFrameworkCore) * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191031.10 - Microsoft.NET.Sdk.Razor - 3.0.1 - Microsoft.CodeAnalysis.Razor - 3.0.1 - Microsoft.AspNetCore.Razor.Language - 3.0.1 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.1 --- NuGet.config | 8 +- eng/Version.Details.xml | 170 ++++++++++++++++++++-------------------- eng/Versions.props | 24 +++--- 3 files changed, 102 insertions(+), 100 deletions(-) diff --git a/NuGet.config b/NuGet.config index f4fb720278..6afc240e32 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,12 @@ + + - - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4f649c28a..8af484ff38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,271 +15,271 @@ https://github.com/aspnet/AspNetCore-Tooling - 4ef35e11af80a5907438d1a715e51803acf1077c + 7471a3daf7ba17c22da59cf5815ff1a2b9926bcf https://github.com/aspnet/AspNetCore-Tooling - 4ef35e11af80a5907438d1a715e51803acf1077c + 7471a3daf7ba17c22da59cf5815ff1a2b9926bcf https://github.com/aspnet/AspNetCore-Tooling - 4ef35e11af80a5907438d1a715e51803acf1077c + 7471a3daf7ba17c22da59cf5815ff1a2b9926bcf https://github.com/aspnet/AspNetCore-Tooling - 4ef35e11af80a5907438d1a715e51803acf1077c + 7471a3daf7ba17c22da59cf5815ff1a2b9926bcf https://github.com/aspnet/EntityFrameworkCore - e2fe2f425e976394d933ad5fcf304fd3de6759f5 + be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 https://github.com/aspnet/EntityFrameworkCore - e2fe2f425e976394d933ad5fcf304fd3de6759f5 + be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 https://github.com/aspnet/EntityFrameworkCore - e2fe2f425e976394d933ad5fcf304fd3de6759f5 + be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 https://github.com/aspnet/EntityFrameworkCore - e2fe2f425e976394d933ad5fcf304fd3de6759f5 + be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 https://github.com/aspnet/EntityFrameworkCore - e2fe2f425e976394d933ad5fcf304fd3de6759f5 + be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 https://github.com/aspnet/EntityFrameworkCore - e2fe2f425e976394d933ad5fcf304fd3de6759f5 + be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 https://github.com/aspnet/EntityFrameworkCore - e2fe2f425e976394d933ad5fcf304fd3de6759f5 + be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 - + https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 - + https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 - + https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 - + https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 - + https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 - + https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 - + https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 - + https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 - + https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 - + https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions @@ -287,11 +287,11 @@ https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/dotnet/corefx @@ -383,7 +383,7 @@ https://github.com/dotnet/core-setup - 903ca49e3ffddc551e12d2f94d7cca95f9a340bf + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 https://github.com/dotnet/core-setup - 903ca49e3ffddc551e12d2f94d7cca95f9a340bf + 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 https://github.com/dotnet/core-setup @@ -413,9 +413,9 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/dotnet/arcade @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 0e9ffd6464aff37aef2dc41dc2162d258f266e32 - + https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a + 7dbc3ebd20c79ecf311c768be865c02ff4676836 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index b225da2ca7..71199e7360 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,16 +102,16 @@ 3.0.0-preview9.19503.2 - 3.0.1-servicing.19510.1 - 3.0.1-servicing.19510.1 - 3.0.1-servicing.19510.1 - 3.0.1-servicing.19510.1 - 3.0.1-servicing.19510.1 + 3.0.1-servicing.19531.3 + 3.0.1-servicing.19531.3 + 3.0.1-servicing.19531.3 + 3.0.1-servicing.19531.3 + 3.0.1-servicing.19531.3 3.0.1 3.0.1 3.0.1 3.0.1 - 3.0.1-servicing.19510.1 + 3.0.1-servicing.19531.3 3.0.1 3.0.1 3.0.1 @@ -134,10 +134,10 @@ 3.0.1 3.0.1 3.0.1 - 3.0.1-servicing.19510.1 + 3.0.1-servicing.19531.3 3.0.1 3.0.1 - 3.0.1-servicing.19510.1 + 3.0.1-servicing.19531.3 3.0.1 3.0.1 3.0.1 @@ -149,16 +149,16 @@ 3.0.1 3.0.1 3.0.1 - 3.0.1-servicing.19510.1 + 3.0.1-servicing.19531.3 3.0.1 3.0.1 3.0.1 3.0.1 3.0.1 - 3.0.1-servicing.19510.1 + 3.0.1-servicing.19531.3 3.0.1 - 3.0.1-servicing.19510.1 - 3.0.1-servicing.19510.1 + 3.0.1-servicing.19531.3 + 3.0.1-servicing.19531.3 3.0.1 3.0.0-rc2.19463.5 3.0.1 From 0f54cd75536340715c02e9913aa5a8d435e76518 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 1 Nov 2019 13:39:35 -0700 Subject: [PATCH 007/116] Set new HTTPS environment variable when using out of process (#16724) * Set new HTTPS environment variable when using out of process * Add https redirection test * Update HttpsTests.cs * Update patch config --- eng/PatchConfig.props | 2 + .../src/HttpsRedirectionMiddleware.cs | 5 +- .../serverprocess.cpp | 1 - .../environmentvariablehash.h | 2 +- .../environmentvariablehelpers.h | 2 +- .../test/Common.FunctionalTests/HttpsTests.cs | 59 ++++++++++++++++--- .../InProcessNewShimWebSite.csproj | 3 + .../InProcessWebSite/InProcessWebSite.csproj | 1 + .../testassets/InProcessWebSite/Startup.cs | 11 ++++ .../src/XElementExtensions.cs | 8 +++ 10 files changed, 82 insertions(+), 12 deletions(-) diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 60adba37fa..5bc3a724cb 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -23,6 +23,8 @@ Directory.Build.props checks this property using the following condition: Microsoft.AspNetCore.Http.Abstractions; Microsoft.AspNetCore.Http.Features; Microsoft.AspNetCore.CookiePolicy; + Microsoft.AspNetCore.HttpsPolicy; + Microsoft.AspNetCore.AspNetCoreModuleV2; diff --git a/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs b/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs index 021a030e17..e20e8b8a33 100644 --- a/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs +++ b/src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs @@ -122,8 +122,9 @@ namespace Microsoft.AspNetCore.HttpsPolicy // 1. Set in the HttpsRedirectionOptions // 2. HTTPS_PORT environment variable // 3. IServerAddressesFeature - // 4. Fail if not set - var nullablePort = _config.GetValue("HTTPS_PORT"); + // 4. Fail if not sets + + var nullablePort = _config.GetValue("HTTPS_PORT") ?? _config.GetValue("ANCM_HTTPS_PORT"); if (nullablePort.HasValue) { var port = nullablePort.Value; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp index 89f806dd45..5216e072d4 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp @@ -13,7 +13,6 @@ #define STARTUP_TIME_LIMIT_INCREMENT_IN_MILLISECONDS 5000 - HRESULT SERVER_PROCESS::Initialize( PROCESS_MANAGER *pProcessManager, diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h index dfb72556c4..82541f1bdf 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h @@ -8,7 +8,7 @@ #define ASPNETCORE_IIS_AUTH_ENV_STR L"ASPNETCORE_IIS_HTTPAUTH" #define ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED_ENV_STR L"ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED" #define ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR L"ASPNETCORE_IIS_PHYSICAL_PATH" -#define ASPNETCORE_HTTPS_PORT_ENV_STR L"ASPNETCORE_HTTPS_PORT" +#define ASPNETCORE_ANCM_HTTPS_PORT_ENV_STR L"ASPNETCORE_ANCM_HTTPS_PORT" #define ASPNETCORE_IIS_AUTH_WINDOWS L"windows;" #define ASPNETCORE_IIS_AUTH_BASIC L"basic;" #define ASPNETCORE_IIS_AUTH_ANONYMOUS L"anonymous;" diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h index c595fb3d80..2842dc0245 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h @@ -43,7 +43,7 @@ public: environmentVariables.insert_or_assign(ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR, pApplicationPhysicalPath); if (pHttpsPort) { - environmentVariables.try_emplace(ASPNETCORE_HTTPS_PORT_ENV_STR, pHttpsPort); + environmentVariables.try_emplace(ASPNETCORE_ANCM_HTTPS_PORT_ENV_STR, pHttpsPort); } std::wstring strIisAuthEnvValue; diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs index f0000fb681..b19530058f 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.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 System.Linq; using System.Net; using System.Net.Http; @@ -56,14 +57,14 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests if (DeployerSelector.HasNewHandler && DeployerSelector.HasNewShim) { - // We expect ServerAddress to be set for InProcess and HTTPS_PORT for OutOfProcess + // We expect ServerAddress to be set for InProcess and ANCM_HTTPS_PORT for OutOfProcess if (variant.HostingModel == HostingModel.InProcess) { Assert.Equal(deploymentParameters.ApplicationBaseUriHint, await client.GetStringAsync("/ServerAddresses")); } else { - Assert.Equal(port.ToString(), await client.GetStringAsync("/HTTPS_PORT")); + Assert.Equal(port.ToString(), await client.GetStringAsync("/ANCM_HTTPS_PORT")); } } } @@ -92,9 +93,8 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests } [ConditionalFact] - [RequiresNewHandler] [RequiresNewShim] - public async Task HttpsPortCanBeOverriden() + public async Task AncmHttpsPortCanBeOverriden() { var deploymentParameters = Fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess); @@ -106,12 +106,57 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests .SetAttributeValue("bindingInformation", $":{TestPortHelper.GetNextSSLPort()}:localhost"); }); - deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_HTTPS_PORT"] = "123"; + deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_ANCM_HTTPS_PORT"] = "123"; var deploymentResult = await DeployAsync(deploymentParameters); var client = CreateNonValidatingClient(deploymentResult); - Assert.Equal("123", await client.GetStringAsync("/HTTPS_PORT")); + Assert.Equal("123", await client.GetStringAsync("/ANCM_HTTPS_PORT")); + Assert.Equal("NOVALUE", await client.GetStringAsync("/HTTPS_PORT")); + } + + [ConditionalFact] + [RequiresNewShim] + public async Task HttpsRedirectionWorksIn30AndNot22() + { + var port = TestPortHelper.GetNextSSLPort(); + var deploymentParameters = Fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess); + deploymentParameters.WebConfigBasedEnvironmentVariables["ENABLE_HTTPS_REDIRECTION"] = "true"; + deploymentParameters.ApplicationBaseUriHint = $"http://localhost:{TestPortHelper.GetNextPort()}/"; + + deploymentParameters.AddServerConfigAction( + element => { + element.Descendants("bindings") + .Single() + .AddAndGetInnerElement("binding", "protocol", "https") + .SetAttributeValue("bindingInformation", $":{port}:localhost"); + + element.Descendants("access") + .Single() + .SetAttributeValue("sslFlags", "None"); + }); + + var deploymentResult = await DeployAsync(deploymentParameters); + var handler = new HttpClientHandler + { + ServerCertificateCustomValidationCallback = (a, b, c, d) => true, + AllowAutoRedirect = false + }; + var client = new HttpClient(handler) + { + BaseAddress = new Uri(deploymentParameters.ApplicationBaseUriHint) + }; + + if (DeployerSelector.HasNewHandler) + { + var response = await client.GetAsync("/ANCM_HTTPS_PORT"); + Assert.Equal(307, (int)response.StatusCode); + } + else + { + var response = await client.GetAsync("/ANCM_HTTPS_PORT"); + Assert.Equal(200, (int)response.StatusCode); + } } [ConditionalFact] @@ -140,7 +185,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests var deploymentResult = await DeployAsync(deploymentParameters); var client = CreateNonValidatingClient(deploymentResult); - Assert.Equal("NOVALUE", await client.GetStringAsync("/HTTPS_PORT")); + Assert.Equal("NOVALUE", await client.GetStringAsync("/ANCM_HTTPS_PORT")); } private static HttpClient CreateNonValidatingClient(IISDeploymentResult deploymentResult) diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index a27cd396a8..eb4e1029c1 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -42,6 +42,9 @@ true + + true + true diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj index 9e4c1832f8..aea732a885 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj @@ -28,6 +28,7 @@ + diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs index 504c544e7f..f25dca8633 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.cs @@ -34,6 +34,10 @@ namespace TestSite { public void Configure(IApplicationBuilder app) { + if (Environment.GetEnvironmentVariable("ENABLE_HTTPS_REDIRECTION") != null) + { + app.UseHttpsRedirection(); + } TestStartup.Register(app, this); } @@ -981,6 +985,13 @@ namespace TestSite await context.Response.WriteAsync(Process.GetCurrentProcess().Id.ToString()); } + public async Task ANCM_HTTPS_PORT(HttpContext context) + { + var httpsPort = context.RequestServices.GetService().GetValue("ANCM_HTTPS_PORT"); + + await context.Response.WriteAsync(httpsPort.HasValue ? httpsPort.Value.ToString() : "NOVALUE"); + } + public async Task HTTPS_PORT(HttpContext context) { var httpsPort = context.RequestServices.GetService().GetValue("HTTPS_PORT"); diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/XElementExtensions.cs b/src/Servers/IIS/IntegrationTesting.IIS/src/XElementExtensions.cs index 35d1b013cd..55f2452e48 100644 --- a/src/Servers/IIS/IntegrationTesting.IIS/src/XElementExtensions.cs +++ b/src/Servers/IIS/IntegrationTesting.IIS/src/XElementExtensions.cs @@ -43,5 +43,13 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS return existing; } + + public static XElement AddAndGetInnerElement(this XElement element, string name, string attribute, string attributeValue) + { + var innerElement = new XElement(name, new XAttribute(attribute, attributeValue)); + element.Add(innerElement); + + return innerElement; + } } } From b45e2471203be16110d235dbf02a85c19f9fa009 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 1 Nov 2019 21:52:33 -0700 Subject: [PATCH 008/116] [release/3.0] Stabilize package versions (#14933) * Stabilize package versions * Fixup UseProjectReferences * Update condition for UseLatestPackageReference * Add package references for transitive corefx packages for servicing builds * Allow SuppressBaselineReference in 3.0.1 * Add App.Ref and App.Runtime to patchConfig.props and update targetingt pack version * Add project templates to patchConfig.props * Attempt to fix source build * Build Runtime pack nupkg * Zip Targeting Pack in 3.0.1 * Is301 -> IsTargetingPackPatching * Commit missed file * Update patch config logic to include ProjectTemplates * Fix runtimeconfig.json We need to specify the latest version of NETCore.App in runtimeconfig.json * Add Projects needed for templates to patchConfig.props * Try fixing logic for _GetPackageVersionInfo * Skip InProcessWebSite standalone on ARM * Include extensions ref assemblies if used * Update package override contents * Add exclusions for unneeded ref assembly references --- Directory.Build.props | 5 +++- Directory.Build.targets | 12 +++++++- eng/Dependencies.props | 3 ++ eng/PatchConfig.props | 11 +++++++ eng/Versions.props | 4 +-- eng/targets/Packaging.targets | 2 +- eng/targets/ResolveReferences.targets | 8 +++-- .../ref/Microsoft.AspNetCore.App.Ref.csproj | 29 ++++++++++++++----- .../Microsoft.AspNetCore.App.Runtime.csproj | 2 ++ .../InProcessNewShimWebSite.csproj | 2 +- .../InProcessWebSite/InProcessWebSite.csproj | 2 +- 11 files changed, 63 insertions(+), 17 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 4eb0a65e92..80e6bb14f0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -90,11 +90,14 @@ aspnetcore-runtime aspnetcore-targeting-pack + + true + false - true + true + $(PackageId) + $(PackageId.Replace('.$(RuntimeIdentifier)','')) + $(PackagesInPatch.Contains(' $(PackageIdWithoutRID);')) @@ -70,6 +73,10 @@ false + + $(PackageVersion) + + $(BaselinePackageVersion.Substring(0, $(BaselinePackageVersion.IndexOf('-')))).0 @@ -83,6 +90,9 @@ --> $(BaselinePackageVersion) $(BaselinePackageVersion) + + + $(BaselinePackageVersion) diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 2e11857b1b..8e7bb0ecd5 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -82,12 +82,14 @@ and are generated based on the last package release. + + @@ -99,6 +101,7 @@ and are generated based on the last package release. + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 5bc3a724cb..cc39ea0a52 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -5,6 +5,11 @@ This file contains a list of the package IDs which are patching in a given relea CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky. When adding a new package, make sure the new line ends with a semicolon and starts with a space. +NOTE: Package IDs may be different from the project name. For example Microsoft.DotNet.Web.ProjectTemplates.csproj +Produces Microsoft.DotNet.Web.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) package. Also, +for the sake of simplicity, Microsoft.AspNetCore.App.Runtime.{RID} package IDs will be resolved as +Microsoft.AspNetCore.App.Runtime in this file; you do not need to append the RIDs when addint it to this file. + Directory.Build.props checks this property using the following condition: $(PackagesInPatch.Contains(' $(PackageId);')) --> @@ -25,6 +30,12 @@ Directory.Build.props checks this property using the following condition: Microsoft.AspNetCore.CookiePolicy; Microsoft.AspNetCore.HttpsPolicy; Microsoft.AspNetCore.AspNetCoreModuleV2; + Microsoft.AspNetCore.App.Ref; + Microsoft.AspNetCore.App.Runtime; + Microsoft.DotNet.Web.Client.ItemTemplates; + Microsoft.DotNet.Web.ItemTemplates; + Microsoft.DotNet.Web.ProjectTemplates.3.0; + Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0; diff --git a/eng/Versions.props b/eng/Versions.props index 71199e7360..7fb19ff9b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ - false + true release true false @@ -37,7 +37,7 @@ $(VersionPrefix) - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0 + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).1 0.3.$(AspNetCorePatchVersion) $([MSBuild]::Add(10, $(AspNetCoreMajorVersion))) diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets index fdef1de7a3..ea8dabdb46 100644 --- a/eng/targets/Packaging.targets +++ b/eng/targets/Packaging.targets @@ -13,7 +13,7 @@ <_ProjectPathWithVersion Include="$(MSBuildProjectFullPath)"> $(PackageId) - $(PackageVersion) + $(PackageVersionForPackageVersionInfo) $(VersionSuffix) $(PackageId.Replace('.',''))PackageVersion diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 340ceabe64..dfac85df6f 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -33,8 +33,10 @@ * preparing a new major or minor release (i.e. a non-servicing builds) * when a project is a test or sample project * when a package is releasing a new patch (we like to update external dependencies in patches when possible) + * the targeting pack is being patched --> true + true true true @@ -44,9 +46,11 @@ Projects should only use the project references instead of baseline package references when: * preparing a new major or minor release (i.e. a non-servicing builds) * when a project is a test or sample project + * the targeting pack is being patched We don't use project references between components in servicing builds between compontents to preserve the baseline as much as possible. --> true + true true false @@ -142,8 +146,8 @@ - - + + $(BuildDependsOn); - GeneratePackageConflictManifest; _ResolveTargetingPackContent; + GeneratePackageConflictManifest; IncludeFrameworkListFile; _BatchCopyToLayoutTargetDir; _InstallTargetingPackIntoLocalDotNet; @@ -110,15 +110,27 @@ This package is an internal implementation of the .NET Core SDK and is not meant + + + + + + + + + @@ -148,16 +160,17 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(MicrosoftInternalExtensionsRefsPath)%(ReferencePath.NuGetPackageId).dll') AND '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> + <_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(MicrosoftInternalExtensionsRefsPath)%(AspNetCoreReferenceAssemblyPath.NuGetPackageId).dll') AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.Internal.Extensions.Refs' AND '%(AspNetCoreReferenceAssemblyPath.NuGetSourceType)' == 'Package' " /> + - <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|$(MicrosoftInternalExtensionsRefsPackageOverrideVersion)')" Condition="Exists('$(MicrosoftInternalExtensionsRefsPath)%(ReferencePath.NuGetPackageId).dll') AND '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> - <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(ReferencePackSharedFxVersion)')" Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' AND '%(ReferencePath.IsReferenceAssembly)' == 'true' " /> + <_AspNetCoreAppPackageOverrides Include="@(_SelectedExtensionsRefAssemblies->'%(FileName)|$(MicrosoftInternalExtensionsRefsPackageOverrideVersion)')" /> + + <_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(FileName)|$(ReferencePackSharedFxVersion)')" Condition=" '%(AspNetCoreReferenceAssemblyPath.ReferenceSourceTarget)' == 'ProjectReference' AND '%(AspNetCoreReferenceAssemblyPath.IsReferenceAssembly)' == 'true' " /> + Condition="'$(IsPackable)' == 'true' OR '$(IsTargetingPackPatching)' == 'true' "> <_TarCommand>tar <_TarCommand Condition="Exists('$(RepoRoot).tools\tar.exe')">$(RepoRoot).tools\tar.exe diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index d227769965..90a77196ff 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -56,6 +56,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant true $(SharedFxName).runtimeconfig.json + + true false diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index eb4e1029c1..0f4df9e8ae 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj index aea732a885..d1b825a185 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj @@ -9,7 +9,7 @@ - + From 0b713e577716e915082021942065aff1d20a0604 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 4 Nov 2019 06:45:22 -0800 Subject: [PATCH 009/116] Do not always create targeting pack archive (#16781) --- src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index 264e92586d..255efbf900 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -208,7 +208,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant + Condition="'$(IsPackable)' == 'true' "> <_TarCommand>tar <_TarCommand Condition="Exists('$(RepoRoot).tools\tar.exe')">$(RepoRoot).tools\tar.exe From 22dedcb2f0de59022e0383e1f05c9caffc708522 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 4 Nov 2019 16:09:29 -0800 Subject: [PATCH 010/116] Use M.NC.App RefPack version for dotnet targeting pack dependency version (#16832) --- src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj index cafd5c3d1e..ee3b3f707f 100644 --- a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj +++ b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj @@ -21,7 +21,7 @@ - + From 2b2153afe6be52842eb58814c6780a57943529df Mon Sep 17 00:00:00 2001 From: Brennan Date: Sat, 9 Nov 2019 17:00:10 -0800 Subject: [PATCH 011/116] Change how we resolve dotnet in tests (#16934) --- src/Tools/dotnet-watch/test/Scenario/WatchableApp.cs | 7 ++++++- src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Tools/dotnet-watch/test/Scenario/WatchableApp.cs b/src/Tools/dotnet-watch/test/Scenario/WatchableApp.cs index da77434c8d..6d89b4861a 100644 --- a/src/Tools/dotnet-watch/test/Scenario/WatchableApp.cs +++ b/src/Tools/dotnet-watch/test/Scenario/WatchableApp.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Reflection; using System.Runtime.CompilerServices; using System.Threading.Tasks; using Microsoft.Extensions.CommandLineUtils; @@ -88,15 +89,19 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests }; args.AddRange(arguments); + var dotnetPath = typeof(WatchableApp).Assembly.GetCustomAttributes() + .Single(s => s.Key == "DotnetPath").Value; + var spec = new ProcessSpec { - Executable = DotNetMuxer.MuxerPathOrDefault(), + Executable = dotnetPath, Arguments = args, WorkingDirectory = SourceDirectory, EnvironmentVariables = { ["DOTNET_CLI_CONTEXT_VERBOSE"] = bool.TrueString, ["DOTNET_USE_POLLING_FILE_WATCHER"] = UsePollingWatcher.ToString(), + ["DOTNET_ROOT"] = Directory.GetParent(dotnetPath).FullName, }, }; diff --git a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj index b51c978aa7..1a78c90359 100644 --- a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj +++ b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj @@ -17,6 +17,13 @@ + + + <_Parameter1>DotnetPath + <_Parameter2>$(DotNetTool) + + + From aff6ee3c19690079b99d55c4187ea9ac65a40b86 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 19 Nov 2019 01:26:10 -0800 Subject: [PATCH 012/116] Update branding to 3.0.2 (#17219) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7fb19ff9b1..119e47573d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,11 +8,11 @@ 3 0 - 1 + 2 - true + false release true false From 7891c8318f1026deb1c96054eebead058bb4f50f Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 19 Nov 2019 07:12:48 -0800 Subject: [PATCH 013/116] Stop paying attention to PatchConfig.props (#16748) - remove references to PatchConfig.props - delete the file itself --- Directory.Build.props | 1 - Directory.Build.targets | 5 +-- docs/PreparingPatchUpdates.md | 2 - docs/ReferenceResolution.md | 1 - eng/PatchConfig.props | 41 ------------------- eng/Versions.props | 2 +- .../java/signalr/signalr.client.java.javaproj | 6 --- 7 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 eng/PatchConfig.props diff --git a/Directory.Build.props b/Directory.Build.props index 80e6bb14f0..06d608b84f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -183,7 +183,6 @@ - diff --git a/Directory.Build.targets b/Directory.Build.targets index b03555c354..6066ff7fc6 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -60,10 +60,7 @@ - - $(PackageId) - $(PackageId.Replace('.$(RuntimeIdentifier)','')) - $(PackagesInPatch.Contains(' $(PackageIdWithoutRID);')) + true diff --git a/docs/PreparingPatchUpdates.md b/docs/PreparingPatchUpdates.md index ee153b4d03..5b069cb4b0 100644 --- a/docs/PreparingPatchUpdates.md +++ b/docs/PreparingPatchUpdates.md @@ -12,5 +12,3 @@ In order to prepare this repo to build a new servicing update, the following cha * Update the package baselines. This is used to ensure packages keep a consistent set of dependencies between releases. See [eng/tools/BaselineGenerator/](/eng/tools/BaselineGenerator/README.md) for instructions on how to run this tool. - -* Update the list of packages in [eng/PatchConfig.props](/eng/PatchConfig.props) to list which packages should be patching in this release. diff --git a/docs/ReferenceResolution.md b/docs/ReferenceResolution.md index 8f1fe70675..043082f4ec 100644 --- a/docs/ReferenceResolution.md +++ b/docs/ReferenceResolution.md @@ -31,7 +31,6 @@ The requirements that led to this system are: * [eng/Baseline.xml](/eng/Baseline.xml) - this contains the 'baseline' of the latest servicing release for this branch. It should be modified and used to update the generated file, Baseline.Designer.props. * [eng/Dependencies.props](/eng/Dependencies.props) - contains a list of all package references that might be used in the repo. -* [eng/PatchConfig.props](/eng/PatchConfig.props) - lists which assemblies or packages are patching in the current build. * [eng/ProjectReferences.props](/eng/ProjectReferences.props) - lists which assemblies or packages might be available to be referenced as a local project. * [eng/Versions.props](/eng/Versions.props) - contains a list of versions which may be updated by automation. This is used by MSBuild to restore and build. * [eng/Version.Details.xml](/eng/Version.Details.xml) - used by automation to update dependencies variables in other files. diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props deleted file mode 100644 index cc39ea0a52..0000000000 --- a/eng/PatchConfig.props +++ /dev/null @@ -1,41 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - Microsoft.Net.Http.Headers; - Microsoft.AspNetCore.CookiePolicy; - Microsoft.AspNetCore.DataProtection.EntityFrameworkCore; - @microsoft/signalr; - Microsoft.Net.Http.Headers; - Microsoft.AspNetCore.Http.Abstractions; - Microsoft.AspNetCore.Http.Features; - Microsoft.AspNetCore.CookiePolicy; - Microsoft.AspNetCore.HttpsPolicy; - Microsoft.AspNetCore.AspNetCoreModuleV2; - Microsoft.AspNetCore.App.Ref; - Microsoft.AspNetCore.App.Runtime; - Microsoft.DotNet.Web.Client.ItemTemplates; - Microsoft.DotNet.Web.ItemTemplates; - Microsoft.DotNet.Web.ProjectTemplates.3.0; - Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0; - - - diff --git a/eng/Versions.props b/eng/Versions.props index 119e47573d..bafdb7c86b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ false true diff --git a/src/SignalR/clients/java/signalr/signalr.client.java.javaproj b/src/SignalR/clients/java/signalr/signalr.client.java.javaproj index c6a61e3233..78bf2cc36b 100644 --- a/src/SignalR/clients/java/signalr/signalr.client.java.javaproj +++ b/src/SignalR/clients/java/signalr/signalr.client.java.javaproj @@ -2,13 +2,7 @@ - - - java:signalr - - true - true From 4ba64f54705ec8dcdcaa04729302d0acc51bcf2d Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 19 Nov 2019 07:14:34 -0800 Subject: [PATCH 014/116] Re-enable signing validation (#13899) - #13864 - use latest Arcade from '.NET 3 Tools' - pick up @joeloff's #4083 signing validation fixes - update signing validation exclusions to get them working - remove custom embedded package icon bits and use Arcade approach - also switch VS.Redist.* packages to use license expressions --- .azure/pipelines/ci.yml | 1 - Directory.Build.props | 6 ------ eng/SignCheckExclusionsFile.txt | 9 +++++---- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- packageIcon.png | Bin 7006 -> 0 bytes .../src/Microsoft.AspNetCore.Analyzers.csproj | 1 - .../src/Microsoft.AspNetCore.Analyzers.nuspec | 3 +-- .../src/Microsoft.AspNetCore.Blazor.Build.csproj | 1 - .../src/Microsoft.AspNetCore.Blazor.Build.nuspec | 3 +-- .../Microsoft.AspNetCore.Blazor.DevServer.csproj | 1 - .../Microsoft.AspNetCore.Blazor.DevServer.nuspec | 3 +-- .../Microsoft.AspNetCore.Blazor.Templates.csproj | 4 ---- .../Microsoft.AspNetCore.Blazor.Templates.nuspec | 3 +-- .../src/Microsoft.AspNetCore.Components.csproj | 1 - ...soft.AspNetCore.Components.multitarget.nuspec | 3 +-- ...ft.AspNetCore.Components.netcoreapp3.0.nuspec | 3 +-- .../Windows/GenerateNugetPackageWithMsi.ps1 | 15 +++++++++++---- .../SharedFramework/SharedFramework.wixproj | 8 +++----- .../SharedFrameworkPackage.nuspec | 6 +++--- .../Windows/TargetingPack/TargetingPack.wixproj | 8 +++----- .../TargetingPack/TargetingPackPackage.nuspec | 6 +++--- .../Microsoft.AspNetCore.Mvc.Analyzers.csproj | 1 - .../Microsoft.AspNetCore.Mvc.Analyzers.nuspec | 3 +-- ...Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj | 1 - ...Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec | 3 +-- src/ProjectTemplates/TemplateProjects.props | 4 ---- src/ProjectTemplates/templates.nuspec | 3 +-- ...osoft.Extensions.ApiDescription.Client.csproj | 1 - ...osoft.Extensions.ApiDescription.Client.nuspec | 3 +-- ...osoft.Extensions.ApiDescription.Server.csproj | 1 - ...osoft.Extensions.ApiDescription.Server.nuspec | 3 +-- 33 files changed, 48 insertions(+), 78 deletions(-) delete mode 100644 packageIcon.png diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 01b3300006..cb6efa8aa4 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -590,5 +590,4 @@ stages: parameters: # See https://github.com/dotnet/arcade/issues/2871 enableSymbolValidation: false - enableSigningValidation: false publishInstallersAndChecksums: true diff --git a/Directory.Build.props b/Directory.Build.props index 06d608b84f..77df19d4c3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -46,8 +46,6 @@ nugetaspnet@microsoft.com - packageIcon.png - $(MSBuildThisFileDirectory)packageIcon.png https://asp.net $(MSBuildProjectDirectory) @@ -56,10 +54,6 @@ netcoreapp$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) - - - - true diff --git a/eng/SignCheckExclusionsFile.txt b/eng/SignCheckExclusionsFile.txt index e047f630ec..a65b9f27f9 100644 --- a/eng/SignCheckExclusionsFile.txt +++ b/eng/SignCheckExclusionsFile.txt @@ -1,4 +1,5 @@ -apphost.exe;; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it. -.js;; We do not sign JavaScript files. -.binlog;; MSBuild binary logs are not signed though they are sometimes placed where validation thinks they should be. -WixUIWixca|WixDepCA;; We do not sign WiX content in our installers. +*apphost.exe;; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it. +*.binlog;; MSBuild binary logs are not signed though they are sometimes placed where validation thinks they should be. +*.js;; We do not sign JavaScript files. +*netfxca|*wixca|*wixdepca|*wixuiwixca;*.msi; We do not sign WiX content in our installers. +*wixstdba.dll;*.exe; diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8af484ff38..f5352c34f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -417,17 +417,17 @@ https://github.com/aspnet/Extensions 7dbc3ebd20c79ecf311c768be865c02ff4676836 - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + 5a666a2e3e7eadfd61ca34a0003630103a0486b0 - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + 5a666a2e3e7eadfd61ca34a0003630103a0486b0 - + https://github.com/dotnet/arcade - 0e9ffd6464aff37aef2dc41dc2162d258f266e32 + 5a666a2e3e7eadfd61ca34a0003630103a0486b0 https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index bafdb7c86b..077f48f703 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ --> - 1.0.0-beta.19474.3 + 1.0.0-beta.19530.2 3.3.1-beta4-19462-11 diff --git a/global.json b/global.json index fa652db0a9..a5281606b2 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19474.3", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19474.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19530.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19530.2" } } diff --git a/packageIcon.png b/packageIcon.png deleted file mode 100644 index a0f1fdbf4d5eae0e561018cccee74f6a454cdb9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7006 zcmeHMXH-+`n%)#eMU;C)kZw7O2nvFLpcE@A^-u+AN(mh$UH*JD5Jjm{4}uUR zs5C(zdURn*zrcHqdVxK)P)7322TAMVbNR4HRzo3_~zdgjvf?Ot98@H{LHdy zK*)TM=g&B9f}+9IKfm=aF5e3_{PQJ$ zY4?9DHvtd+Y14o8TQs=)&+P)Wjb3|LIT@*NDqyYm#gu^q*EFSow<%yKVx`_Ka)!0 z2YAaQr%LYyQ%n$Rjx)e%JeM5_ov70FUMveJTS(J+%C4(L)~h*MQ8!wJtf_X{`Ol?k z;{27%#**2uiR&R6-eaRK1Mdgl2xHQ=uS(~VqsTVrsUnQhc zRIK5>@(05w3gHYdsI0;;sOO66pUEl)DGyD(D4>$7drUDFZ|uxx;-nWj7d|rj=u+D@ z-HU+mLOInrsXdSL1Z6nVB&D z@>f4!yq=_B+16+qw5k=4o#*tf;6Oe*F;`&L!)bT{U7Wc3YmG2;NRxb%woCt~*Yr2E zfwiUdS=7SK&5>df-aqY8lp~SEUG*ziXGvHMLp_#vgvVMQ*&{+d@(a>v4;7p_%Jte0Ga5zNbUI28WAgY5f?FX^;q`1WTw2~t|P54N&e^@=nFqDj}W#o z_-kZBWDQ%($YJH43Y7YrbjfsUrAEjla>?j0;YLdXxjK}P@xDGc%r&c)6`t?XW=*{r z%Z^p)?6*7obKU_;NZK_ejh9n&?qzO0#(}Uo+KSm|e}q1+f$wM!G8>lLvKK1UK^uz5 zDk&5(DuUnzQy{aQ8%b~*_4Ri`TOj}Dd{0OCls}^VD8=qDC%Q9tSSt5LZoxd!|ai3oGtf&cOy(`^W9zMNR;bII|OS+Pe(-9=f!m6}w zV>f(mH^BYE-=Wl=)Q2s2TF*j&tRkN0KOu3-(VN?4?-v|?W^Xj)@u4^bNB%bN+f|D= z?r1ey$UbahYv!qISaxV8>+1Mnz!M&S1o+~titx|65MA`iQMjscL!+LOGjZ?p>}x6d z4`FiZV9i-E6F8c|Fq37-TTTtJOdIZ9<*YrJU86UuQr6dipNC%AxT?lXa9U=`iq+2= zOT!CFUlJM1&INj~InR!=@x@{Z8BnvgL~_>nN)y@!r<0$uGCJ<0B-q!vZn@~#5^Ig8B}}g&dYBee=x50Wv$R^^f%aTE~g_a7&8Y(5L>! zkYgCl@1ZVqFSwkH(ns-EtYbOFLrarf#r6W9#x8rO<<_6h33faYV{<&_gBahO#ga9j z$|}=ea)vEm|Hb`E%L9Gn#Osxg( z&sxXz7lsse+_i@<_LUl@8$916h*m6!R?~zr_ZQU^H3F(aC1is#I$VP$GO(s!pT&Y# z85JYcwQqu6Ja6sje&x*)nOdx;bt1hNMTSwSikFeKE)+MRrW?mg=8mp^AR_kz{C%e* z32H_>c600^d$9)ob+$yzpyxHa+k0Sz7GG41I0A59bKJf?X}E6mX$pU~Wc%_?$2w1s zZEbk$svZ4U+WH;XPEb^-IqhGQX1U|z8KWp8&jVlWFPP+7Um6;oMy?>TFU`cMT5bYx z;7_~MfZ(sumPQHg++U)9PT=+=zxu+qmP==xJ&oI%XgD8=YZo%*rGq2U_J^D4d%7H`}jau-;<_^n?THcf9*rKD^J#%p%l zA8DILPr+wPY^MpxQbxGXG2f0xcjxSw;wjl53EsXe0poYHgfc(T;v5J;H$neUhElxe zrX0NdQ4e#4L4e-JmsN$%C+#BKX8TYA1YlhN`|QyqnlH{Igil*i0?NrD9qi2Fw_&~eMSk3UGyWzcay4oPaWE~nJ{R}-u+%oE z^4pk7G%~M66x6$a(@21!KD)Us1JG?!Xn4Zb;NYOn2SGc%JK!@mQv*PGMGxMb{#a4F z_#t!~GhhJR9)$w;fi20azFx86@7j4yB zpC7-bK<170rK@aOPg zDv69Iy;oMY0yq-ORy`~=Y8>ZQ_}+6m=ElBFD(BO@q9)h-K%)s9-^rh(;7T`vu={0p zCzf*G!~Iex?wWwWS?rOOYx{i!_Lh~OXJ7gYPR(bWfke`)l(GCjjtT06t7+0hHGHhh zA9y}JSM5#_xw|dqtlV?PVqZwGRm*pM)dvDj|LAzkF?4x}RLkCA#>G3V21ZLIt^gG< zQI&0O8}Rf;Def0;ZbweV+|x(R-?(Vnj5F9~eOT)4!nDr7Yq-5!y1bz1t;HjQSLn-A zt1qf%FzvKZ`+#!ufUYj;;FE!eL$>Pcse)qp0BW@>*U{2zo_CWHpgvHpnGofD&KYKY z+!}avbdRD^hZQf zU#$@f{W=^JvL7g)bcEZ<)O9tw4?Dxp&lksZ;$I_{?{l;o=>&}=tF-5MU&27^*rhJT zcd0DiLPxBSPJ<5cx}JGQAds^*(&j4-nHoTwx>dVUGJHkMM7w*nPbN5n_W)JJ zoSF~F)URWm1xS-QkhpAB(#}xq`0?;AQ=#^xj8iv{-*?l`8a;)kpuatAQXeVT+=;#A zT0rvGu`_`{>KMvxzgLkb$EeCy`RyvAx+nC!D381cssru;3nBjt{S>AGvQAs(kxLO{ zIp*xXImIAQJ>kiL&b~R(P_(nAu2z<~Dc*-_c3=C`sjCz@AZVOwgE5s@G#uy{iQNJ} z*pY1bjnx4K{yik#93ftw2}MI#Dt>w>)q5vp~-G zX7!=BUrYpB-3#04(mvmC$-Y!WY8${8gcraWB}q}i z(|PAS*SoXp)9`8tTYTuy7`=#uWFoR#J2(AVcxr-9uF+7kB$GxNkA$Vfoz}l40*Ydo zXReR;i`X4$Te~{&2?RE~^39WlS?>E>my@CS3|paiTe-zGjS$iwI*YbAHOwW*PD@wI z=Nl-L-*Y(4b+hX{-tb98arKb!Q^EK+RA0Lfp4`cv&x7o<`~ghNZ#@Z$`B6O*2R6%R z+kg>9tGG(TtYgVXWD_X)ySeq_3Tq2*GEPMlF@o;BBxfbxC%!xOuwUa+?wXac%Dce> z+d&$P_VsrSw*$bMY#z8~U%K$AIc8vOosw2D4`XdBe5NKVuc+s10x-cw)v;&2Yd`@# z6UL-Y1G;FY$G$?{@cwL6zaRL5p_lTzugeI5PB@eSk^x^LJ=N!qHsScr*=1fnx>1;L zY5eqB8dlecz6GSs<7{=#sl?FWEY66Ejk>f}1odw~P?}i0yH&4d%vKKZ@hTi7-IW8%;{(vI`&L;i z@`wN4O!SHFV&u%JzXt*g%E%4J$^z@6FOtA7Yc(*Rz2%_90Exxp+}r^Vb|pF?C;F8w zu&f+_Jsvg^Wp?I6!+uV$Bi#fzohClm^T{PdQzz%Nn}GENT0zaz{xqo+NWJ!QdLYKf zBHdX|LMnBh5jXZ;>OoAWv*rOX&O8Sbzjyl*y-%<2V2oE_*lEG(1GlpzBZ6aoOp%y8 ze&=uJp63A7*h}C9j-sY70bc4bHQr`@q#!@&!5LxUu`)c;-&WVK?$9+vP%D`7v^_`5 zrOcY7w(+sWUl!hkCI>q|qg_*OZ$os^0Fsg`di5ki_Tzr$8gh}#WNKHtX|hlAupfW6 zk_ZWVB&Hjb9ZbLk!Ie1lMyGd?qhgq8>{#iC>Kg^*taLx^YuW+VQG;}IK{6+Y@0i7& z6iRAQBlI8*LwK}P>x0;cL*en^{8^OvUg%KTXIa~~>xA%u_2)y{h_+YQ?tpDgX9rIe zOo3t5%oVK)PzXFaqN#F2^qJbgB3HzT`{nJcFO`#ATLWNBXfYU5CYHs&PnH^f*Wl6k z?<0KM*e@M?auAvtBi}A#6V#ej{yvSOE8v?4^Jb8y4~i{ zSIC{Kc9#!&HhKqJI9L>s*NbwiwWXI+w-X6TM}&3$PlPOE+G8HP8Hi(#UMtyKy= zLo(ZOb7qTQ^r{NHBg^h=C`gbboZigk0*;z5+XW@P;EzUwQZv5|SZ6W0tBbATVDt$& z4th!!{t_tBc>V9qZE^8&@=VbaMh;!ivCF~IC28PzN2Z{@`)H;y3+{?j%eQl6gP|I9 z-agi;Y>P($m>0yG48Z>=AC0W_h5((46THSuk)X||?u=A_N-{J)`M9Q^WnUMh84VTQ zIvQlFtG4Z5X~3!o0K!K+^E@{TZ;5W3XkNzy z*j?DZB4J)s(LK@K0K1T4u&xvPHDTX zs$=NfQalJo9RXF+0@j1~t~aK@*DAWgsI@Sl{8AP8%T`P`Vu~Tv_%ZmbJz^#V>NJZl-TbST^RMK5DlNOs$kegkbICLYRJk-}g{l-Wn^Vya`SL3T1tiIw^Z zm~h)cx+UimpKrqQ=$a*_BCrvMGi%5Nr5qU)hq|P1Tjp!gLgpIqRRIs`qsDGjcel*OH-c~&6W812bsUI z>umkx8_8Ottu&n?L`^t@;63h8!Nb19V4*G1v2?3e;$WrvvX7%#JaxH?R) zN@KLmgq3q$NONDrj=7c`8~kK5VTf>xS$Q2C8@T{(7ygTX1N^6hZ&3*F7Z@!5FaMz+ n@b3Qu^xx$8Uk}h2jH{d|uJ4jrSC|P(2)ca1@;v^m$K8JeR7TPQ diff --git a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj index cc4201ca79..feec3324be 100644 --- a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj +++ b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj @@ -25,7 +25,6 @@ - diff --git a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec index 106615a7da..2cba2a2f13 100644 --- a/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec +++ b/src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec @@ -2,12 +2,11 @@ $CommonMetadataElements$ - packageIcon.png + $CommonFileElements$ - diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj index aa5a484bf5..adfa71ef6b 100644 --- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj +++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj @@ -23,7 +23,6 @@ - diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec index feffe95c50..26ca818d7f 100644 --- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec +++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec @@ -5,14 +5,13 @@ - packageIcon.png + $CommonFileElements$ - diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj index 3862555a0e..b12f55ef82 100644 --- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj +++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj @@ -33,7 +33,6 @@ - diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec index b59725fc14..2f0f6b8479 100644 --- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec +++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec @@ -2,12 +2,11 @@ $CommonMetadataElements$ - packageIcon.png + $CommonFileElements$ - diff --git a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj index 640d8f21d0..c91a32128d 100644 --- a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj +++ b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj @@ -15,10 +15,6 @@ false - - - - diff --git a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec index cde7bc4c1f..fd19750231 100644 --- a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec +++ b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec @@ -5,13 +5,12 @@ - packageIcon.png + $CommonFileElements$ - diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj index bffd047457..754bb93a53 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj @@ -55,7 +55,6 @@ - diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec index 585e6ed49c..6a1498d4dc 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec @@ -15,13 +15,12 @@ - packageIcon.png + $CommonFileElements$ - diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec index 239e775650..bba7d2cac9 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec @@ -9,13 +9,12 @@ - packageIcon.png + $CommonFileElements$ - diff --git a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 index b0c497b985..5be7b4d3d0 100644 --- a/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 +++ b/src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 @@ -12,7 +12,9 @@ param( [Parameter(Mandatory=$true)][string]$RepoRoot, [Parameter(Mandatory=$true)][string]$MajorVersion, [Parameter(Mandatory=$true)][string]$MinorVersion, - [Parameter(Mandatory=$true)][string]$PackageIconPath + [Parameter(Mandatory=$true)][string]$PackageIcon, + [Parameter(Mandatory=$true)][string]$PackageIconFullPath, + [Parameter(Mandatory=$true)][string]$PackageLicenseExpression ) $NuGetDir = Join-Path $RepoRoot "artifacts\Tools\nuget\$Name\$Architecture" @@ -23,10 +25,15 @@ if (-not (Test-Path $NuGetDir)) { } if (-not (Test-Path $NuGetExe)) { - # Using 3.5.0 to workaround https://github.com/NuGet/Home/issues/5016 + # Using 5.3.0 to workaround https://github.com/NuGet/Home/issues/5016 Write-Output "Downloading nuget.exe to $NuGetExe" wget https://dist.nuget.org/win-x86-commandline/v5.3.0/nuget.exe -OutFile $NuGetExe } -& $NuGetExe pack $NuspecFile -Version $PackageVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=$MajorVersion`;MINOR=$MinorVersion`;PACKAGE_ICON_PATH=$PackageIconPath`; -Exit $LastExitCode \ No newline at end of file +& $NuGetExe pack $NuspecFile ` + -Version $PackageVersion ` + -OutputDirectory $OutputDirectory ` + -NoDefaultExcludes ` + -NoPackageAnalysis ` + -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=$MajorVersion`;MINOR=$MinorVersion`;PackageIcon=$PackageIcon`;PackageIconFullPath=$PackageIconFullPath`;PackageLicenseExpression=$PackageLicenseExpression`; +Exit $LastExitCode diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj index 4404e17ce7..c29667fb21 100644 --- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj +++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj @@ -24,10 +24,6 @@ $(RepoRoot)\src\Installers\Windows\SharedFramework\SharedFrameworkPackage.nuspec - - - - $(WixExtDir)\WixDependencyExtension.dll @@ -107,6 +103,8 @@ '$(RepoRoot)' ^ '$(AspNetCoreMajorVersion)' ^ '$(AspNetCoreMinorVersion)' ^ - '$(PackageIconFullPath)'" /> + '$(PackageIcon)' ^ + '$(PackageIconFullPath)' ^ + '$(PackageLicenseExpression)' " /> diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec index 66e9055af4..49ea59a3a8 100644 --- a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec +++ b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec @@ -6,9 +6,9 @@ VS.Redist.Common.AspNetCore.SharedFramework.$ARCH$.$MAJOR$.$MINOR$ Microsoft Microsoft - https://www.microsoft.com/net/dotnet_library_license.htm + $PackageLicenseExpression$ https://github.com/aspnet/aspnetcore - packageIcon.png + $PackageIcon$ true $MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption © Microsoft Corporation. All rights reserved. @@ -16,6 +16,6 @@ - + diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj index 72c6afc6a0..f2cdd79e20 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj @@ -23,10 +23,6 @@ $(RepoRoot)\src\Installers\Windows\TargetingPack\TargetingPackPackage.nuspec - - - - $(WixExtDir)\WixDependencyExtension.dll @@ -104,6 +100,8 @@ '$(RepoRoot)' ^ '$(AspNetCoreMajorVersion)' ^ '$(AspNetCoreMinorVersion)' ^ - '$(PackageIconFullPath)'" /> + '$(PackageIcon)' ^ + '$(PackageIconFullPath)' ^ + '$(PackageLicenseExpression)' " /> diff --git a/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec b/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec index 5c85b569ba..25c24f3b28 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec +++ b/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec @@ -6,15 +6,15 @@ VS.Redist.Common.AspNetCore.TargetingPack.$ARCH$.$MAJOR$.$MINOR$ Microsoft Microsoft - https://www.microsoft.com/net/dotnet_library_license.htm + $PackageLicenseExpression$ https://github.com/aspnet/aspnetcore - packageIcon.png + $PackageIcon$ true $MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption © Microsoft Corporation. All rights reserved. - + diff --git a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj index b098c7cad2..2ece75d8d8 100644 --- a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj +++ b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj @@ -19,7 +19,6 @@ - diff --git a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec index 106615a7da..2cba2a2f13 100644 --- a/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec +++ b/src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.nuspec @@ -2,12 +2,11 @@ $CommonMetadataElements$ - packageIcon.png + $CommonFileElements$ - diff --git a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj index 0ae605cb69..d3a6e138f1 100644 --- a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj +++ b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj @@ -24,7 +24,6 @@ - diff --git a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec index 106615a7da..2cba2a2f13 100644 --- a/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec +++ b/src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec @@ -2,12 +2,11 @@ $CommonMetadataElements$ - packageIcon.png + $CommonFileElements$ - diff --git a/src/ProjectTemplates/TemplateProjects.props b/src/ProjectTemplates/TemplateProjects.props index fd6dc06fe4..8cfab01c93 100644 --- a/src/ProjectTemplates/TemplateProjects.props +++ b/src/ProjectTemplates/TemplateProjects.props @@ -21,8 +21,4 @@ - - - - diff --git a/src/ProjectTemplates/templates.nuspec b/src/ProjectTemplates/templates.nuspec index 49a1d320ec..33cb467b12 100644 --- a/src/ProjectTemplates/templates.nuspec +++ b/src/ProjectTemplates/templates.nuspec @@ -5,13 +5,12 @@ - packageIcon.png + $CommonFileElements$ - diff --git a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj index cef31805db..c50a0115fa 100644 --- a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj +++ b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj @@ -21,6 +21,5 @@ - diff --git a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec index ce25cc5f93..09c913fde6 100644 --- a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec +++ b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.nuspec @@ -2,13 +2,12 @@ $CommonMetadataElements$ - packageIcon.png + $CommonFileElements$ - diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj index ec17e4ad6a..891e11b609 100644 --- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj +++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj @@ -33,7 +33,6 @@ - diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec index 2839a1d0b2..57a21d4cf7 100644 --- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec +++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec @@ -2,16 +2,15 @@ $CommonMetadataElements$ - packageIcon.png + $CommonFileElements$ - From 0d37794d1880b779246e8456d6af342ca3f3814f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 16:33:26 -0800 Subject: [PATCH 015/116] [release/3.0] Update dependencies from 2 repositories (#17224) ### Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191119.1 - Microsoft.NET.Sdk.Razor - 3.0.2-servicing.19569.1 - Microsoft.CodeAnalysis.Razor - 3.0.2-servicing.19569.1 - Microsoft.AspNetCore.Razor.Language - 3.0.2-servicing.19569.1 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.2-servicing.19569.1 ### Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191119.3 - Microsoft.EntityFrameworkCore.Tools - 3.0.2-servicing.19569.3 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.2-servicing.19569.3 - dotnet-ef - 3.0.2-servicing.19569.3 - Microsoft.EntityFrameworkCore - 3.0.2-servicing.19569.3 - Microsoft.EntityFrameworkCore.InMemory - 3.0.2-servicing.19569.3 - Microsoft.EntityFrameworkCore.Relational - 3.0.2-servicing.19569.3 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.2-servicing.19569.3 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Internal.AspNetCore.Analyzers - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.2-servicing.19569.2 (parent: Microsoft.EntityFrameworkCore) --- NuGet.config | 4 - eng/Version.Details.xml | 284 ++++++++++++++++++++-------------------- eng/Versions.props | 142 ++++++++++---------- 3 files changed, 213 insertions(+), 217 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6afc240e32..beff41b791 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,13 +3,9 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5352c34f0..e5150e5a86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,285 +13,285 @@ https://github.com/aspnet/Blazor c606594a0e5ebc36636d36e418ee0e189ce7a012 - + https://github.com/aspnet/AspNetCore-Tooling - 7471a3daf7ba17c22da59cf5815ff1a2b9926bcf + d43b8b3266a08c871ff8ecabcdb7e7428d4148e4 - + https://github.com/aspnet/AspNetCore-Tooling - 7471a3daf7ba17c22da59cf5815ff1a2b9926bcf + d43b8b3266a08c871ff8ecabcdb7e7428d4148e4 - + https://github.com/aspnet/AspNetCore-Tooling - 7471a3daf7ba17c22da59cf5815ff1a2b9926bcf + d43b8b3266a08c871ff8ecabcdb7e7428d4148e4 - + https://github.com/aspnet/AspNetCore-Tooling - 7471a3daf7ba17c22da59cf5815ff1a2b9926bcf + d43b8b3266a08c871ff8ecabcdb7e7428d4148e4 - + https://github.com/aspnet/EntityFrameworkCore - be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 + ecf6c80c547924b22ee6ec77787b3aca660d7cf3 - + https://github.com/aspnet/EntityFrameworkCore - be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 + ecf6c80c547924b22ee6ec77787b3aca660d7cf3 - + https://github.com/aspnet/EntityFrameworkCore - be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 + ecf6c80c547924b22ee6ec77787b3aca660d7cf3 - + https://github.com/aspnet/EntityFrameworkCore - be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 + ecf6c80c547924b22ee6ec77787b3aca660d7cf3 - + https://github.com/aspnet/EntityFrameworkCore - be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 + ecf6c80c547924b22ee6ec77787b3aca660d7cf3 - + https://github.com/aspnet/EntityFrameworkCore - be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 + ecf6c80c547924b22ee6ec77787b3aca660d7cf3 - + https://github.com/aspnet/EntityFrameworkCore - be2fd3d4508c7c6bf2c0776616ad55d86a154bb4 + ecf6c80c547924b22ee6ec77787b3aca660d7cf3 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 https://github.com/aspnet/Extensions 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 https://github.com/dotnet/corefx @@ -413,9 +413,9 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 https://github.com/dotnet/arcade @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 5a666a2e3e7eadfd61ca34a0003630103a0486b0 - + https://github.com/aspnet/Extensions - 7dbc3ebd20c79ecf311c768be865c02ff4676836 + 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 077f48f703..0c1cf5c105 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -102,80 +102,80 @@ 3.0.0-preview9.19503.2 - 3.0.1-servicing.19531.3 - 3.0.1-servicing.19531.3 - 3.0.1-servicing.19531.3 - 3.0.1-servicing.19531.3 - 3.0.1-servicing.19531.3 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1-servicing.19531.3 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1-servicing.19531.3 - 3.0.1 - 3.0.1 - 3.0.1-servicing.19531.3 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1-servicing.19531.3 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1-servicing.19531.3 - 3.0.1 - 3.0.1-servicing.19531.3 - 3.0.1-servicing.19531.3 - 3.0.1 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 3.0.0-rc2.19463.5 - 3.0.1 - 3.0.1 + 3.0.2-servicing.19569.2 + 3.0.2-servicing.19569.2 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 + 3.0.2-servicing.19569.3 + 3.0.2-servicing.19569.3 + 3.0.2-servicing.19569.3 + 3.0.2-servicing.19569.3 + 3.0.2-servicing.19569.3 + 3.0.2-servicing.19569.3 + 3.0.2-servicing.19569.3 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 + 3.0.2-servicing.19569.1 + 3.0.2-servicing.19569.1 + 3.0.2-servicing.19569.1 + 3.0.2-servicing.19569.1 @@ -235,7 +235,7 @@ - 2.1.2 + 2.1.14 @@ -1219,7 +1219,7 @@ - 2.1.1 + 2.1.14 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 8ab070f7e9..69761f4e19 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. --> - + @@ -30,7 +30,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + @@ -124,7 +124,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + \ No newline at end of file diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 3ba7babc57..513d6f73b1 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -44,4 +44,8 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.CookiePolicy; + + + + diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt @@ -0,0 +1 @@ + diff --git a/version.props b/version.props index ed48958394..6f78c654d6 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ 2 1 - 14 + 15 servicing Servicing t000 From 43ca89b13dee6e31a25cbb54365da2de47257d76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2019 19:51:20 -0800 Subject: [PATCH 017/116] [release/3.0] Update dependencies from dotnet/arcade aspnet/Blazor (#17270) * Update dependencies from https://github.com/dotnet/arcade build 20191119.2 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19569.2 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19569.2 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19569.2 * Update dependencies from https://github.com/aspnet/Blazor build 20191120.2 - Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19570.2 --- eng/Version.Details.xml | 16 +- eng/Versions.props | 4 +- eng/common/templates/job/execute-sdl.yml | 28 ++- ...al-30.yml => generic-internal-channel.yml} | 25 ++- ...ease-31.yml => generic-public-channel.yml} | 40 ++-- .../channels/netcore-3-tools-validation.yml | 95 ---------- .../post-build/channels/netcore-3-tools.yml | 130 ------------- .../post-build/channels/netcore-dev-31.yml | 130 ------------- .../post-build/channels/netcore-dev-5.yml | 130 ------------- .../channels/netcore-release-30.yml | 130 ------------- .../channels/netcore-tools-latest.yml | 130 ------------- .../channels/netcore-tools-validation.yml | 95 ---------- .../templates/post-build/common-variables.yml | 12 +- .../templates/post-build/post-build.yml | 173 +++++++++++++++--- global.json | 4 +- 15 files changed, 235 insertions(+), 907 deletions(-) rename eng/common/templates/post-build/channels/{netcore-internal-30.yml => generic-internal-channel.yml} (85%) rename eng/common/templates/post-build/channels/{netcore-release-31.yml => generic-public-channel.yml} (79%) delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools-validation.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-3-tools.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-31.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-dev-5.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-release-30.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-latest.yml delete mode 100644 eng/common/templates/post-build/channels/netcore-tools-validation.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5150e5a86..1bf3c00bf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ --> - + https://github.com/aspnet/Blazor - c606594a0e5ebc36636d36e418ee0e189ce7a012 + a10163f767cf263d593836c9249d8314e8948d89 https://github.com/aspnet/AspNetCore-Tooling @@ -417,17 +417,17 @@ https://github.com/aspnet/Extensions 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 - + https://github.com/dotnet/arcade - 5a666a2e3e7eadfd61ca34a0003630103a0486b0 + e34d933e18ba1cd393bbafcb6018e0f858d3e89e - + https://github.com/dotnet/arcade - 5a666a2e3e7eadfd61ca34a0003630103a0486b0 + e34d933e18ba1cd393bbafcb6018e0f858d3e89e - + https://github.com/dotnet/arcade - 5a666a2e3e7eadfd61ca34a0003630103a0486b0 + e34d933e18ba1cd393bbafcb6018e0f858d3e89e https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index 0c1cf5c105..a7c277cb2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ --> - 1.0.0-beta.19530.2 + 1.0.0-beta.19569.2 3.3.1-beta4-19462-11 @@ -100,7 +100,7 @@ 3.0.0 - 3.0.0-preview9.19503.2 + 3.0.0-preview9.19570.2 3.0.2-servicing.19569.2 3.0.2-servicing.19569.2 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index a7f9964195..52e2ff021d 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -6,6 +6,11 @@ parameters: # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; dependsOn: '' # Optional: dependencies of the job + artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts + # Usage: + # artifactNames: + # - 'BlobArtifacts' + # - 'Artifacts_Windows_NT_Release' jobs: - job: Run_SDL @@ -18,13 +23,22 @@ jobs: steps: - checkout: self clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: current - downloadType: specific files - matchingPattern: "**" - downloadPath: $(Build.SourcesDirectory)\artifacts + - ${{ if ne(parameters.artifactNames, '') }}: + - ${{ each artifactName in parameters.artifactNames }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + artifactName: ${{ artifactName }} + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts + - ${{ if eq(parameters.artifactNames, '') }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + downloadType: specific files + itemPattern: "**" + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml similarity index 85% rename from eng/common/templates/post-build/channels/netcore-internal-30.yml rename to eng/common/templates/post-build/channels/generic-internal-channel.yml index 177b38df35..68fdec0290 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -1,20 +1,26 @@ parameters: + publishInstallersAndChecksums: false symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_30_Internal_Servicing_Publishing +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.0 Internal Servicing Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -55,7 +61,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -115,14 +121,15 @@ stages: /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:PublishToMSDL=false ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml similarity index 79% rename from eng/common/templates/post-build/channels/netcore-release-31.yml rename to eng/common/templates/post-build/channels/generic-public-channel.yml index 01d56410c7..c4bc1897d8 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -1,21 +1,27 @@ parameters: - symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + symbolPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_Release31_Publish +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.1 Release Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -33,6 +39,18 @@ stages: artifactName: 'PDBArtifacts' continueOnError: true + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish inputs: @@ -50,13 +68,11 @@ stages: displayName: Publish Assets dependsOn: setupMaestroVars variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -65,12 +81,14 @@ stages: inputs: buildType: current artifactName: PackageArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: buildType: current artifactName: BlobArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Asset Manifests @@ -117,14 +135,14 @@ stages: /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml deleted file mode 100644 index cdb74031fc..0000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Validation_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NETCore_3_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NETCore_3_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools.yml b/eng/common/templates/post-build/channels/netcore-3-tools.yml deleted file mode 100644 index 70eec773e7..0000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_3_Tools_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml deleted file mode 100644 index db21254187..0000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev31_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.1 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml deleted file mode 100644 index c4f5a16acb..0000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev5_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 5 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml deleted file mode 100644 index 16ade0db29..0000000000 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Release30_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.0 Release Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml deleted file mode 100644 index 157d2d4b97..0000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Tools_Latest_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Latest Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-tools-validation.yml deleted file mode 100644 index d8447e49af..0000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: PVR_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index b4eed6f186..0a2c40c103 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,7 +1,9 @@ variables: - - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage + - group: Publish-Build-Assets # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id @@ -39,6 +41,14 @@ variables: - name: PublicRelease_31_Channel_Id value: 129 + # General Testing + - name: GeneralTesting_Channel_Id + value: 529 + + # .NET Core 3.1 Blazor Features + - name: NetCore_31_Blazor_Features_Channel_Id + value: 531 + # Whether the build is internal or not - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 7ee82d9ff1..ec80c65a92 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -8,6 +8,7 @@ parameters: enable: false continueOnError: false params: '' + artifactNames: '' # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation @@ -94,54 +95,172 @@ stages: parameters: additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} + artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} -- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev5_Publish' + channelName: '.NET Core 5 Dev' + channelId: 131 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev31_Publish' + channelName: '.NET Core 3.1 Dev' + channelId: 128 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + stageName: 'NetCore_Tools_Latest_Publish' + channelName: '.NET Tools - Latest' + channelId: 2 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'PVR_Publish' + channelName: '.NET Tools - Validation' + channelId: 9 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-release-30.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Validation_Publish' + channelName: '.NET 3 Tools - Validation' + channelId: 390 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-release-31.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Publish' + channelName: '.NET 3 Tools' + channelId: 344 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-internal-30.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release30_Publish' + channelName: '.NET Core 3.0 Release' + channelId: 19 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release31_Publish' + channelName: '.NET Core 3.1 Release' + channelId: 129 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Blazor31_Features_Publish' + channelName: '.NET Core 3.1 Blazor Features' + channelId: 531 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_30_Internal_Servicing_Publishing' + channelName: '.NET Core 3.0 Internal Servicing' + channelId: 184 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_31_Internal_Servicing_Publishing' + channelName: '.NET Core 3.1 Internal Servicing' + channelId: 550 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'General_Testing_Publish' + channelName: 'General Testing' + channelId: 529 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Dev_Publishing' + channelName: '.NET Core Tooling Dev' + channelId: 548 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Release_Publishing' + channelName: '.NET Core Tooling Release' + channelId: 549 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' diff --git a/global.json b/global.json index a5281606b2..f4fb3fa92c 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19530.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19530.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19569.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19569.2" } } From 64d3a351a192a9d817a0a6a489a0e78acddaf1dd Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 19 Nov 2019 12:29:45 -0800 Subject: [PATCH 018/116] Update EF submodule to head of its 'release/2.2' branch --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 01da710cde..2ff4480523 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 01da710cdeff0431fc60379580aa63f335fbc165 +Subproject commit 2ff4480523415fbc04158015fc336cd61df07fba From 898bf484fea731b9eab82e37eb968c26513f324b Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 21 Nov 2019 19:50:16 -0800 Subject: [PATCH 019/116] Update baselines for 3.0.1 release (#17245) - hold Microsoft.AspNetCore.DataProtection.EntityFrameworkCore at 3.0.0 --- eng/Baseline.Designer.props | 18 +++++++++--------- eng/Baseline.xml | 17 ++++++++--------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 1e28129d00..aeb0b64b50 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 3.0.0 + 3.0.1 @@ -35,7 +35,7 @@ - 3.0.0 + 3.0.1 @@ -407,14 +407,14 @@ - 3.0.0 + 3.0.1 - + - + @@ -635,19 +635,19 @@ - 3.0.0 + 3.0.1 - 3.0.0 + 3.0.1 - 3.0.0 + 3.0.1 - 3.0.0 + 3.0.1 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 52cbb358f4..638d42dd71 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -1,16 +1,15 @@  - - + - + @@ -53,7 +52,7 @@ Update this list when preparing for a new patch. - + @@ -78,10 +77,10 @@ Update this list when preparing for a new patch. - - - - + + + + From 07579555be5735509af961d505882ad33e6eee36 Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Fri, 22 Nov 2019 23:28:28 +0000 Subject: [PATCH 020/116] Merged PR 2918: Cancel Sends if they take too long --- eng/Baseline.Designer.props | 2 + eng/PatchConfig.props | 2 + .../ts/FunctionalTests/selenium/run-tests.ts | 23 +- .../src/Internal/HttpConnectionContext.cs | 91 ++++- .../src/Internal/HttpConnectionDispatcher.cs | 35 +- .../src/Internal/HttpConnectionManager.cs | 14 +- .../src/Internal/TaskExtensions.cs | 27 ++ .../Transports/LongPollingTransport.cs | 57 ++-- .../ServerSentEventsMessageFormatter.cs | 18 +- .../Transports/ServerSentEventsTransport.cs | 13 +- .../Transports/WebSocketsTransport.cs | 8 +- ...crosoft.AspNetCore.Http.Connections.csproj | 3 +- .../test/HttpConnectionDispatcherTests.cs | 319 +++++++++++++++++- .../test/HttpConnectionManagerTests.cs | 2 +- .../test/TestWebSocketConnectionFeature.cs | 28 +- src/SignalR/common/Shared/PipeWriterStream.cs | 12 +- .../testassets/Tests.Utils/TestClient.cs | 31 +- .../Core/src/DefaultHubLifetimeManager.cs | 27 +- .../server/Core/src/HubConnectionContext.cs | 118 +++++-- .../Core/src/Internal/HubCallerClients.cs | 2 +- .../server/Core/src/Internal/Proxies.cs | 2 +- .../test/DefaultHubLifetimeManagerTests.cs | 288 ++++++++++++++++ .../SignalR/test/HubConnectionHandlerTests.cs | 4 +- 23 files changed, 1016 insertions(+), 110 deletions(-) create mode 100644 src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 29e2efcf98..4ca09124b6 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -463,6 +463,7 @@ + @@ -472,6 +473,7 @@ + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 513d6f73b1..48bab5aea1 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -46,6 +46,8 @@ Later on, this will be checked using this condition: + Microsoft.AspNetCore.Http.Connections; + Microsoft.AspNetCore.SignalR.Core; diff --git a/src/SignalR/clients/ts/FunctionalTests/selenium/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/selenium/run-tests.ts index c74603b12c..6f548f1534 100644 --- a/src/SignalR/clients/ts/FunctionalTests/selenium/run-tests.ts +++ b/src/SignalR/clients/ts/FunctionalTests/selenium/run-tests.ts @@ -1,7 +1,8 @@ import { ChildProcess, spawn } from "child_process"; -import * as fs from "fs"; +import * as _fs from "fs"; import { EOL } from "os"; import * as path from "path"; +import { promisify } from "util"; import { PassThrough, Readable } from "stream"; import { run } from "../../webdriver-tap-runner/lib"; @@ -9,6 +10,16 @@ import { run } from "../../webdriver-tap-runner/lib"; import * as _debug from "debug"; const debug = _debug("signalr-functional-tests:run"); +const ARTIFACTS_DIR = path.resolve(__dirname, "..", "..", "..", "..", "artifacts"); +const LOGS_DIR = path.resolve(ARTIFACTS_DIR, "logs"); + +// Promisify things from fs we want to use. +const fs = { + createWriteStream: _fs.createWriteStream, + exists: promisify(_fs.exists), + mkdir: promisify(_fs.mkdir), +}; + process.on("unhandledRejection", (reason) => { console.error(`Unhandled promise rejection: ${reason}`); process.exit(1); @@ -102,6 +113,13 @@ if (chromePath) { try { const serverPath = path.resolve(__dirname, "..", "bin", configuration, "netcoreapp2.1", "FunctionalTests.dll"); + if (!await fs.exists(ARTIFACTS_DIR)) { + await fs.mkdir(ARTIFACTS_DIR); + } + if (!await fs.exists(LOGS_DIR)) { + await fs.mkdir(LOGS_DIR); + } + debug(`Launching Functional Test Server: ${serverPath}`); const dotnet = spawn("dotnet", [serverPath], { env: { @@ -117,6 +135,9 @@ if (chromePath) { } } + const logStream = fs.createWriteStream(path.resolve(LOGS_DIR, "ts.functionaltests.dotnet.log")); + dotnet.stdout.pipe(logStream); + process.on("SIGINT", cleanup); process.on("exit", cleanup); diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs index 045e821ee1..cf04d5ff48 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs @@ -27,6 +27,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal IHttpTransportFeature, IConnectionInherentKeepAliveFeature { + private static long _tenSeconds = TimeSpan.FromSeconds(10).Ticks; + private readonly object _itemsLock = new object(); private readonly object _heartbeatLock = new object(); private List<(Action handler, object state)> _heartbeatHandlers; @@ -35,6 +37,13 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal private IDuplexPipe _application; private IDictionary _items; + private CancellationTokenSource _sendCts; + private bool _activeSend; + private long _startedSendTime; + private readonly object _sendingLock = new object(); + + internal CancellationToken SendingToken { get; private set; } + // This tcs exists so that multiple calls to DisposeAsync all wait asynchronously // on the same task private readonly TaskCompletionSource _disposeTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -274,24 +283,45 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal // Cancel any pending flushes from back pressure Application?.Output.CancelPendingFlush(); - // Shutdown both sides and wait for nothing - Transport?.Output.Complete(applicationTask.Exception?.InnerException); - Application?.Output.Complete(transportTask.Exception?.InnerException); - + // Normally it isn't safe to try and acquire this lock because the Send can hold onto it for a long time if there is backpressure + // It is safe to wait for this lock now because the Send will be in one of 4 states + // 1. In the middle of a write which is in the middle of being canceled by the CancelPendingFlush above, when it throws + // an OperationCanceledException it will complete the PipeWriter which will make any other Send waiting on the lock + // throw an InvalidOperationException if they call Write + // 2. About to write and see that there is a pending cancel from the CancelPendingFlush, go to 1 to see what happens + // 3. Enters the Send and sees the Dispose state from DisposeAndRemoveAsync and releases the lock + // 4. No Send in progress + await WriteLock.WaitAsync(); try { - Log.WaitingForTransportAndApplication(_logger, TransportType); - // A poorly written application *could* in theory get stuck forever and it'll show up as a memory leak - await Task.WhenAll(applicationTask, transportTask); + // Complete the applications read loop + Application?.Output.Complete(transportTask.Exception?.InnerException); } finally { - Log.TransportAndApplicationComplete(_logger, TransportType); - - // Close the reading side after both sides run - Application?.Input.Complete(); - Transport?.Input.Complete(); + WriteLock.Release(); } + + Application?.Input.CancelPendingRead(); + + await transportTask.NoThrow(); + Application?.Input.Complete(); + + Log.WaitingForTransportAndApplication(_logger, TransportType); + + // A poorly written application *could* in theory get stuck forever and it'll show up as a memory leak + // Wait for application so we can complete the writer safely + await applicationTask.NoThrow(); + Log.TransportAndApplicationComplete(_logger, TransportType); + + // Shutdown application side now that it's finished + Transport?.Output.Complete(applicationTask.Exception?.InnerException); + + // Close the reading side after both sides run + Transport?.Input.Complete(); + + // Observe exceptions + await Task.WhenAll(transportTask, applicationTask); } // Notify all waiters that we're done disposing @@ -311,6 +341,43 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal } } + internal void StartSendCancellation() + { + lock (_sendingLock) + { + if (_sendCts == null || _sendCts.IsCancellationRequested) + { + _sendCts = new CancellationTokenSource(); + SendingToken = _sendCts.Token; + } + + _startedSendTime = DateTime.UtcNow.Ticks; + _activeSend = true; + } + } + + internal void TryCancelSend(long currentTicks) + { + lock (_sendingLock) + { + if (_activeSend) + { + if (currentTicks - _startedSendTime > _tenSeconds) + { + _sendCts.Cancel(); + } + } + } + } + + internal void StopSendCancellation() + { + lock (_sendingLock) + { + _activeSend = false; + } + } + private static class Log { private static readonly Action _disposingConnection = diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs index 50910bccfe..0449e193f1 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs @@ -144,7 +144,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal connection.SupportedFormats = TransferFormat.Text; // We only need to provide the Input channel since writing to the application is handled through /send. - var sse = new ServerSentEventsTransport(connection.Application.Input, connection.ConnectionId, _loggerFactory); + var sse = new ServerSentEventsTransport(connection.Application.Input, connection.ConnectionId, connection, _loggerFactory); await DoPersistentConnection(connectionDelegate, sse, context, connection); } @@ -264,7 +264,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal context.Response.RegisterForDispose(timeoutSource); context.Response.RegisterForDispose(tokenSource); - var longPolling = new LongPollingTransport(timeoutSource.Token, connection.Application.Input, _loggerFactory); + var longPolling = new LongPollingTransport(timeoutSource.Token, connection.Application.Input, _loggerFactory, connection); // Start the transport connection.TransportTask = longPolling.ProcessRequestAsync(context, tokenSource.Token); @@ -291,7 +291,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal connection.Transport.Output.Complete(connection.ApplicationTask.Exception); // Wait for the transport to run - await connection.TransportTask; + // Ignore exceptions, it has been logged if there is one and the application has finished + // So there is no one to give the exception to + await connection.TransportTask.NoThrow(); // If the status code is a 204 it means the connection is done if (context.Response.StatusCode == StatusCodes.Status204NoContent) @@ -307,6 +309,18 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal pollAgain = false; } } + else if (connection.TransportTask.IsFaulted || connection.TransportTask.IsCanceled) + { + // Cancel current request to release any waiting poll and let dispose aquire the lock + currentRequestTcs.TrySetCanceled(); + + // We should be able to safely dispose because there's no more data being written + // We don't need to wait for close here since we've already waited for both sides + await _manager.DisposeAndRemoveAsync(connection, closeGracefully: false); + + // Don't poll again if we've removed the connection completely + pollAgain = false; + } else if (context.Response.StatusCode == StatusCodes.Status204NoContent) { // Don't poll if the transport task was canceled @@ -511,6 +525,14 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal context.Response.StatusCode = StatusCodes.Status404NotFound; context.Response.ContentType = "text/plain"; + + // There are no writes anymore (since this is the write "loop") + // So it is safe to complete the writer + // We complete the writer here because we already have the WriteLock acquired + // and it's unsafe to complete outside of the lock + // Other code isn't guaranteed to be able to acquire the lock before another write + // even if CancelPendingFlush is called, and the other write could hang if there is backpressure + connection.Application.Output.Complete(); return; } @@ -549,11 +571,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal Log.TerminatingConection(_logger); - // Complete the receiving end of the pipe - connection.Application.Output.Complete(); - - // Dispose the connection gracefully, but don't wait for it. We assign it here so we can wait in tests - connection.DisposeAndRemoveTask = _manager.DisposeAndRemoveAsync(connection, closeGracefully: true); + // Dispose the connection, but don't wait for it. We assign it here so we can wait in tests + connection.DisposeAndRemoveTask = _manager.DisposeAndRemoveAsync(connection, closeGracefully: false); context.Response.StatusCode = StatusCodes.Status202Accepted; context.Response.ContentType = "text/plain"; diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs index 43e5982748..d6860b7ad1 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs @@ -30,6 +30,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal private readonly TimerAwaitable _nextHeartbeat; private readonly ILogger _logger; private readonly ILogger _connectionLogger; + private readonly bool _useSendTimeout = true; public HttpConnectionManager(ILoggerFactory loggerFactory, IApplicationLifetime appLifetime) { @@ -38,6 +39,11 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal appLifetime.ApplicationStarted.Register(() => Start()); appLifetime.ApplicationStopping.Register(() => CloseConnections()); _nextHeartbeat = new TimerAwaitable(_heartbeatTickRate, _heartbeatTickRate); + + if (AppContext.TryGetSwitch("Microsoft.AspNetCore.Http.Connections.DoNotUseSendTimeout", out var timeoutDisabled)) + { + _useSendTimeout = !timeoutDisabled; + } } public void Start() @@ -156,9 +162,10 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal connection.StateLock.Release(); } + var utcNow = DateTimeOffset.UtcNow; // Once the decision has been made to dispose we don't check the status again // But don't clean up connections while the debugger is attached. - if (!Debugger.IsAttached && status == HttpConnectionStatus.Inactive && (DateTimeOffset.UtcNow - lastSeenUtc).TotalSeconds > 5) + if (!Debugger.IsAttached && status == HttpConnectionStatus.Inactive && (utcNow - lastSeenUtc).TotalSeconds > 5) { Log.ConnectionTimedOut(_logger, connection.ConnectionId); HttpConnectionsEventSource.Log.ConnectionTimedOut(connection.ConnectionId); @@ -170,6 +177,11 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal } else { + if (!Debugger.IsAttached && _useSendTimeout) + { + connection.TryCancelSend(utcNow.Ticks); + } + // Tick the heartbeat, if the connection is still active connection.TickHeartbeat(); } diff --git a/src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs b/src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs new file mode 100644 index 0000000000..a901379b75 --- /dev/null +++ b/src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs @@ -0,0 +1,27 @@ +// 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.Runtime.CompilerServices; + +namespace System.Threading.Tasks +{ + internal static class TaskExtensions + { + public static async Task NoThrow(this Task task) + { + await new NoThrowAwaiter(task); + } + } + + internal readonly struct NoThrowAwaiter : ICriticalNotifyCompletion + { + private readonly Task _task; + public NoThrowAwaiter(Task task) { _task = task; } + public NoThrowAwaiter GetAwaiter() => this; + public bool IsCompleted => _task.IsCompleted; + // Observe exception + public void GetResult() { _ = _task.Exception; } + public void OnCompleted(Action continuation) => _task.GetAwaiter().OnCompleted(continuation); + public void UnsafeOnCompleted(Action continuation) => OnCompleted(continuation); + } +} diff --git a/src/SignalR/common/Http.Connections/src/Internal/Transports/LongPollingTransport.cs b/src/SignalR/common/Http.Connections/src/Internal/Transports/LongPollingTransport.cs index cf5638d74d..15eb302605 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/Transports/LongPollingTransport.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/Transports/LongPollingTransport.cs @@ -16,6 +16,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports private readonly PipeReader _application; private readonly ILogger _logger; private readonly CancellationToken _timeoutToken; + private readonly HttpConnectionContext _connection; public LongPollingTransport(CancellationToken timeoutToken, PipeReader application, ILoggerFactory loggerFactory) { @@ -24,6 +25,12 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports _logger = loggerFactory.CreateLogger(); } + internal LongPollingTransport(CancellationToken timeoutToken, PipeReader application, ILoggerFactory loggerFactory, HttpConnectionContext connection) + : this(timeoutToken, application, loggerFactory) + { + _connection = connection; + } + public async Task ProcessRequestAsync(HttpContext context, CancellationToken token) { try @@ -31,37 +38,40 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports var result = await _application.ReadAsync(token); var buffer = result.Buffer; - if (buffer.IsEmpty && result.IsCompleted) - { - Log.LongPolling204(_logger); - context.Response.ContentType = "text/plain"; - context.Response.StatusCode = StatusCodes.Status204NoContent; - return; - } - - // We're intentionally not checking cancellation here because we need to drain messages we've got so far, - // but it's too late to emit the 204 required by being canceled. - - Log.LongPollingWritingMessage(_logger, buffer.Length); - - context.Response.ContentLength = buffer.Length; - context.Response.ContentType = "application/octet-stream"; - try { - await context.Response.Body.WriteAsync(buffer); + if (buffer.IsEmpty && (result.IsCompleted || result.IsCanceled)) + { + Log.LongPolling204(_logger); + context.Response.ContentType = "text/plain"; + context.Response.StatusCode = StatusCodes.Status204NoContent; + return; + } + + // We're intentionally not checking cancellation here because we need to drain messages we've got so far, + // but it's too late to emit the 204 required by being canceled. + + Log.LongPollingWritingMessage(_logger, buffer.Length); + + context.Response.ContentLength = buffer.Length; + context.Response.ContentType = "application/octet-stream"; + + _connection?.StartSendCancellation(); + await context.Response.Body.WriteAsync(buffer, _connection?.SendingToken ?? default); } finally { + _connection?.StopSendCancellation(); _application.AdvanceTo(buffer.End); } } catch (OperationCanceledException) { - // 3 cases: + // 4 cases: // 1 - Request aborted, the client disconnected (no response) // 2 - The poll timeout is hit (204) - // 3 - A new request comes in and cancels this request (204) + // 3 - SendingToken was canceled, abort the connection + // 4 - A new request comes in and cancels this request (204) // Case 1 if (context.RequestAborted.IsCancellationRequested) @@ -79,9 +89,16 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports context.Response.ContentType = "text/plain"; context.Response.StatusCode = StatusCodes.Status200OK; } - else + else if (_connection?.SendingToken.IsCancellationRequested == true) { // Case 3 + context.Response.ContentType = "text/plain"; + context.Response.StatusCode = StatusCodes.Status204NoContent; + throw; + } + else + { + // Case 4 Log.LongPolling204(_logger); context.Response.ContentType = "text/plain"; context.Response.StatusCode = StatusCodes.Status204NoContent; diff --git a/src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsMessageFormatter.cs b/src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsMessageFormatter.cs index 0122344e0e..e0d0898324 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsMessageFormatter.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsMessageFormatter.cs @@ -4,6 +4,7 @@ using System; using System.Buffers; using System.IO; +using System.Threading; using System.Threading.Tasks; namespace Microsoft.AspNetCore.Http.Connections.Internal @@ -15,19 +16,24 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal private const byte LineFeed = (byte)'\n'; - public static async Task WriteMessageAsync(ReadOnlySequence payload, Stream output) + public static Task WriteMessageAsync(ReadOnlySequence payload, Stream output) + { + return WriteMessageAsync(payload, output, default); + } + + internal static async Task WriteMessageAsync(ReadOnlySequence payload, Stream output, CancellationToken token) { // Payload does not contain a line feed so write it directly to output if (payload.PositionOf(LineFeed) == null) { if (payload.Length > 0) { - await output.WriteAsync(DataPrefix, 0, DataPrefix.Length); - await output.WriteAsync(payload); - await output.WriteAsync(Newline, 0, Newline.Length); + await output.WriteAsync(DataPrefix, 0, DataPrefix.Length, token); + await output.WriteAsync(payload, token); + await output.WriteAsync(Newline, 0, Newline.Length, token); } - await output.WriteAsync(Newline, 0, Newline.Length); + await output.WriteAsync(Newline, 0, Newline.Length, token); return; } @@ -37,7 +43,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal await WriteMessageToMemory(ms, payload); ms.Position = 0; - await ms.CopyToAsync(output); + await ms.CopyToAsync(output, bufferSize: 81920, token); } /// diff --git a/src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsTransport.cs b/src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsTransport.cs index 1c0dd85719..8ffacd9b2a 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsTransport.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsTransport.cs @@ -15,6 +15,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports private readonly PipeReader _application; private readonly string _connectionId; private readonly ILogger _logger; + private readonly HttpConnectionContext _connection; public ServerSentEventsTransport(PipeReader application, string connectionId, ILoggerFactory loggerFactory) { @@ -23,6 +24,12 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports _logger = loggerFactory.CreateLogger(); } + internal ServerSentEventsTransport(PipeReader application, string connectionId, HttpConnectionContext connection, ILoggerFactory loggerFactory) + : this(application, connectionId, loggerFactory) + { + _connection = connection; + } + public async Task ProcessRequestAsync(HttpContext context, CancellationToken token) { context.Response.ContentType = "text/event-stream"; @@ -52,15 +59,17 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports { Log.SSEWritingMessage(_logger, buffer.Length); - await ServerSentEventsMessageFormatter.WriteMessageAsync(buffer, context.Response.Body); + _connection?.StartSendCancellation(); + await ServerSentEventsMessageFormatter.WriteMessageAsync(buffer, context.Response.Body, _connection?.SendingToken ?? default); } - else if (result.IsCompleted) + else if (result.IsCompleted || result.IsCanceled) { break; } } finally { + _connection?.StopSendCancellation(); _application.AdvanceTo(buffer.End); } } diff --git a/src/SignalR/common/Http.Connections/src/Internal/Transports/WebSocketsTransport.cs b/src/SignalR/common/Http.Connections/src/Internal/Transports/WebSocketsTransport.cs index e77dbfe102..ee183eeefd 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/Transports/WebSocketsTransport.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/Transports/WebSocketsTransport.cs @@ -241,7 +241,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports if (WebSocketCanSend(socket)) { - await socket.SendAsync(buffer, webSocketMessageType); + _connection.StartSendCancellation(); + await socket.SendAsync(buffer, webSocketMessageType, _connection.SendingToken); } else { @@ -256,6 +257,10 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports } break; } + finally + { + _connection.StopSendCancellation(); + } } else if (result.IsCompleted) { @@ -283,7 +288,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports _application.Input.Complete(); } - } private static bool WebSocketCanSend(WebSocket ws) diff --git a/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj b/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj index b8ded535e0..a7a8321eec 100644 --- a/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj +++ b/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj @@ -1,4 +1,4 @@ - + Components for providing real-time bi-directional communication across the Web. @@ -28,6 +28,7 @@ + diff --git a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs index 39d19723bd..cb80af23c8 100644 --- a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs +++ b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs @@ -912,6 +912,215 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests } } + private class BlockingStream : Stream + { + private readonly SyncPoint _sync; + private bool _isSSE; + + public BlockingStream(SyncPoint sync, bool isSSE = false) + { + _sync = sync; + _isSSE = isSSE; + } + + public override bool CanRead => throw new NotImplementedException(); + + public override bool CanSeek => throw new NotImplementedException(); + + public override bool CanWrite => throw new NotImplementedException(); + + public override long Length => throw new NotImplementedException(); + + public override long Position { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } + + public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) + { + throw new NotImplementedException(); + } + + public override void Flush() + { + } + + public override int Read(byte[] buffer, int offset, int count) + { + throw new NotImplementedException(); + } + + public override long Seek(long offset, SeekOrigin origin) + { + throw new NotImplementedException(); + } + + public override void SetLength(long value) + { + throw new NotImplementedException(); + } + + public override void Write(byte[] buffer, int offset, int count) + { + throw new NotImplementedException(); + } + + public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + if (_isSSE) + { + // SSE does an initial write of :\r\n that we want to ignore in testing + _isSSE = false; + return; + } + await _sync.WaitToContinue(); + cancellationToken.ThrowIfCancellationRequested(); + } + +#if NETCOREAPP2_1 + public override async ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default) + { + if (_isSSE) + { + // SSE does an initial write of :\r\n that we want to ignore in testing + _isSSE = false; + return; + } + await _sync.WaitToContinue(); + cancellationToken.ThrowIfCancellationRequested(); + } +#endif + } + + [Fact] + public async Task LongPollingConnectionClosesWhenSendTimeoutReached() + { + bool ExpectedErrors(WriteContext writeContext) + { + return (writeContext.LoggerName == typeof(Internal.Transports.LongPollingTransport).FullName && + writeContext.EventId.Name == "LongPollingTerminated") || + (writeContext.LoggerName == typeof(HttpConnectionManager).FullName && writeContext.EventId.Name == "FailedDispose"); + } + + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug, expectedErrorsFilter: ExpectedErrors)) + { + var manager = CreateConnectionManager(loggerFactory); + var connection = manager.CreateConnection(); + connection.TransportType = HttpTransportType.LongPolling; + + var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); + + var context = MakeRequest("/foo", connection); + + var services = new ServiceCollection(); + services.AddSingleton(); + var builder = new ConnectionBuilder(services.BuildServiceProvider()); + builder.UseConnectionHandler(); + var app = builder.Build(); + var options = new HttpConnectionDispatcherOptions(); + // First poll completes immediately + await dispatcher.ExecuteAsync(context, options, app).OrTimeout(); + + var sync = new SyncPoint(); + context.Response.Body = new BlockingStream(sync); + var dispatcherTask = dispatcher.ExecuteAsync(context, options, app); + + await connection.Transport.Output.WriteAsync(new byte[] { 1 }).OrTimeout(); + + await sync.WaitForSyncPoint().OrTimeout(); + // Cancel write to response body + connection.TryCancelSend(long.MaxValue); + sync.Continue(); + + await dispatcherTask.OrTimeout(); + + // Connection should be removed on canceled write + Assert.False(manager.TryGetConnection(connection.ConnectionId, out var _)); + } + } + + [Fact] + public async Task SSEConnectionClosesWhenSendTimeoutReached() + { + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) + { + var manager = CreateConnectionManager(loggerFactory); + var connection = manager.CreateConnection(); + connection.TransportType = HttpTransportType.ServerSentEvents; + + var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); + + var context = MakeRequest("/foo", connection); + SetTransport(context, connection.TransportType); + + var services = new ServiceCollection(); + services.AddSingleton(); + var builder = new ConnectionBuilder(services.BuildServiceProvider()); + builder.UseConnectionHandler(); + var app = builder.Build(); + + var sync = new SyncPoint(); + context.Response.Body = new BlockingStream(sync, isSSE: true); + + var options = new HttpConnectionDispatcherOptions(); + var dispatcherTask = dispatcher.ExecuteAsync(context, options, app); + + await connection.Transport.Output.WriteAsync(new byte[] { 1 }).OrTimeout(); + + await sync.WaitForSyncPoint().OrTimeout(); + // Cancel write to response body + connection.TryCancelSend(long.MaxValue); + sync.Continue(); + + await dispatcherTask.OrTimeout(); + + // Connection should be removed on canceled write + Assert.False(manager.TryGetConnection(connection.ConnectionId, out var _)); + } + } + + [Fact] + public async Task WebSocketConnectionClosesWhenSendTimeoutReached() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(Internal.Transports.WebSocketsTransport).FullName && + writeContext.EventId.Name == "ErrorWritingFrame"; + } + + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug, expectedErrorsFilter: ExpectedErrors)) + { + var manager = CreateConnectionManager(loggerFactory); + var connection = manager.CreateConnection(); + connection.TransportType = HttpTransportType.WebSockets; + + var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); + + var sync = new SyncPoint(); + var context = MakeRequest("/foo", connection); + SetTransport(context, connection.TransportType, sync); + + var services = new ServiceCollection(); + services.AddSingleton(); + var builder = new ConnectionBuilder(services.BuildServiceProvider()); + builder.UseConnectionHandler(); + var app = builder.Build(); + + var options = new HttpConnectionDispatcherOptions(); + options.WebSockets.CloseTimeout = TimeSpan.FromSeconds(0); + var dispatcherTask = dispatcher.ExecuteAsync(context, options, app); + + await connection.Transport.Output.WriteAsync(new byte[] { 1 }).OrTimeout(); + + await sync.WaitForSyncPoint().OrTimeout(); + // Cancel write to response body + connection.TryCancelSend(long.MaxValue); + sync.Continue(); + + await dispatcherTask.OrTimeout(); + + // Connection should be removed on canceled write + Assert.False(manager.TryGetConnection(connection.ConnectionId, out var _)); + } + } + [Fact] public async Task WebSocketTransportTimesOutWhenCloseFrameNotReceived() { @@ -1719,6 +1928,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests Assert.Equal(StatusCodes.Status202Accepted, deleteContext.Response.StatusCode); Assert.Equal("text/plain", deleteContext.Response.ContentType); + await connection.DisposeAndRemoveTask.OrTimeout(); + // Verify the connection was removed from the manager Assert.False(manager.TryGetConnection(connection.ConnectionId, out _)); } @@ -1772,6 +1983,110 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests } } + [Fact] + public async Task DeleteEndpointTerminatesLongPollingWithHangingApplication() + { + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) + { + var manager = CreateConnectionManager(loggerFactory); + var pipeOptions = new PipeOptions(pauseWriterThreshold: 2, resumeWriterThreshold: 1); + var connection = manager.CreateConnection(pipeOptions, pipeOptions); + connection.TransportType = HttpTransportType.LongPolling; + + var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); + + var context = MakeRequest("/foo", connection); + + var services = new ServiceCollection(); + services.AddSingleton(); + var builder = new ConnectionBuilder(services.BuildServiceProvider()); + builder.UseConnectionHandler(); + var app = builder.Build(); + var options = new HttpConnectionDispatcherOptions(); + + var pollTask = dispatcher.ExecuteAsync(context, options, app); + Assert.True(pollTask.IsCompleted); + + // Now send the second poll + pollTask = dispatcher.ExecuteAsync(context, options, app); + + // Issue the delete request and make sure the poll completes + var deleteContext = new DefaultHttpContext(); + deleteContext.Request.Path = "/foo"; + deleteContext.Request.QueryString = new QueryString($"?id={connection.ConnectionId}"); + deleteContext.Request.Method = "DELETE"; + + Assert.False(pollTask.IsCompleted); + + await dispatcher.ExecuteAsync(deleteContext, options, app).OrTimeout(); + + await pollTask.OrTimeout(); + + // Verify that transport shuts down + await connection.TransportTask.OrTimeout(); + + // Verify the response from the DELETE request + Assert.Equal(StatusCodes.Status202Accepted, deleteContext.Response.StatusCode); + Assert.Equal("text/plain", deleteContext.Response.ContentType); + Assert.Equal(HttpConnectionStatus.Disposed, connection.Status); + + // Verify the connection not removed because application is hanging + Assert.True(manager.TryGetConnection(connection.ConnectionId, out _)); + } + } + + [Fact] + public async Task PollCanReceiveFinalMessageAfterAppCompletes() + { + using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) + { + var transportType = HttpTransportType.LongPolling; + var manager = CreateConnectionManager(loggerFactory); + var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); + var connection = manager.CreateConnection(); + connection.TransportType = transportType; + + var waitForMessageTcs1 = new TaskCompletionSource(); + var messageTcs1 = new TaskCompletionSource(); + var waitForMessageTcs2 = new TaskCompletionSource(); + var messageTcs2 = new TaskCompletionSource(); + ConnectionDelegate connectionDelegate = async c => + { + await waitForMessageTcs1.Task.OrTimeout(); + await c.Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Message1")).OrTimeout(); + messageTcs1.TrySetResult(null); + await waitForMessageTcs2.Task.OrTimeout(); + await c.Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Message2")).OrTimeout(); + messageTcs2.TrySetResult(null); + }; + { + var options = new HttpConnectionDispatcherOptions(); + var context = MakeRequest("/foo", connection); + await dispatcher.ExecuteAsync(context, options, connectionDelegate).OrTimeout(); + + // second poll should have data + waitForMessageTcs1.SetResult(null); + await messageTcs1.Task.OrTimeout(); + + var ms = new MemoryStream(); + context.Response.Body = ms; + // Now send the second poll + await dispatcher.ExecuteAsync(context, options, connectionDelegate).OrTimeout(); + Assert.Equal("Message1", Encoding.UTF8.GetString(ms.ToArray())); + + waitForMessageTcs2.SetResult(null); + await messageTcs2.Task.OrTimeout(); + + context = MakeRequest("/foo", connection); + ms.Seek(0, SeekOrigin.Begin); + context.Response.Body = ms; + // This is the third poll which gets the final message after the app is complete + await dispatcher.ExecuteAsync(context, options, connectionDelegate).OrTimeout(); + Assert.Equal("Message2", Encoding.UTF8.GetString(ms.ToArray())); + } + } + } + [Fact] public async Task NegotiateDoesNotReturnWebSocketsWhenNotAvailable() { @@ -2080,12 +2395,12 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests return context; } - private static void SetTransport(HttpContext context, HttpTransportType transportType) + private static void SetTransport(HttpContext context, HttpTransportType transportType, SyncPoint sync = null) { switch (transportType) { case HttpTransportType.WebSockets: - context.Features.Set(new TestWebSocketConnectionFeature()); + context.Features.Set(new TestWebSocketConnectionFeature(sync)); break; case HttpTransportType.ServerSentEvents: context.Request.Headers["Accept"] = "text/event-stream"; diff --git a/src/SignalR/common/Http.Connections/test/HttpConnectionManagerTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionManagerTests.cs index 820d28749d..720ba58b5c 100644 --- a/src/SignalR/common/Http.Connections/test/HttpConnectionManagerTests.cs +++ b/src/SignalR/common/Http.Connections/test/HttpConnectionManagerTests.cs @@ -178,7 +178,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests var result = await connection.Application.Input.ReadAsync(); try { - Assert.True(result.IsCompleted); + Assert.True(result.IsCanceled); } finally { diff --git a/src/SignalR/common/Http.Connections/test/TestWebSocketConnectionFeature.cs b/src/SignalR/common/Http.Connections/test/TestWebSocketConnectionFeature.cs index c0711f4ace..1ca861cbd2 100644 --- a/src/SignalR/common/Http.Connections/test/TestWebSocketConnectionFeature.cs +++ b/src/SignalR/common/Http.Connections/test/TestWebSocketConnectionFeature.cs @@ -5,11 +5,21 @@ using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.SignalR.Tests; namespace Microsoft.AspNetCore.Http.Connections.Tests { internal class TestWebSocketConnectionFeature : IHttpWebSocketFeature, IDisposable { + public TestWebSocketConnectionFeature() + { } + + public TestWebSocketConnectionFeature(SyncPoint sync) + { + _sync = sync; + } + + private readonly SyncPoint _sync; private readonly TaskCompletionSource _accepted = new TaskCompletionSource(); public bool IsWebSocketRequest => true; @@ -27,8 +37,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests var clientToServer = Channel.CreateUnbounded(); var serverToClient = Channel.CreateUnbounded(); - var clientSocket = new WebSocketChannel(serverToClient.Reader, clientToServer.Writer); - var serverSocket = new WebSocketChannel(clientToServer.Reader, serverToClient.Writer); + var clientSocket = new WebSocketChannel(serverToClient.Reader, clientToServer.Writer, _sync); + var serverSocket = new WebSocketChannel(clientToServer.Reader, serverToClient.Writer, _sync); Client = clientSocket; SubProtocol = context.SubProtocol; @@ -45,16 +55,18 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests { private readonly ChannelReader _input; private readonly ChannelWriter _output; + private readonly SyncPoint _sync; private WebSocketCloseStatus? _closeStatus; private string _closeStatusDescription; private WebSocketState _state; private WebSocketMessage _internalBuffer = new WebSocketMessage(); - public WebSocketChannel(ChannelReader input, ChannelWriter output) + public WebSocketChannel(ChannelReader input, ChannelWriter output, SyncPoint sync = null) { _input = input; _output = output; + _sync = sync; } public override WebSocketCloseStatus? CloseStatus => _closeStatus; @@ -173,11 +185,17 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests throw new InvalidOperationException("Unexpected close"); } - public override Task SendAsync(ArraySegment buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) + public override async Task SendAsync(ArraySegment buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) { + if (_sync != null) + { + await _sync.WaitToContinue(); + } + cancellationToken.ThrowIfCancellationRequested(); + var copy = new byte[buffer.Count]; Buffer.BlockCopy(buffer.Array, buffer.Offset, copy, 0, buffer.Count); - return SendMessageAsync(new WebSocketMessage + await SendMessageAsync(new WebSocketMessage { Buffer = copy, MessageType = messageType, diff --git a/src/SignalR/common/Shared/PipeWriterStream.cs b/src/SignalR/common/Shared/PipeWriterStream.cs index eb5b6d5add..245731bfd9 100644 --- a/src/SignalR/common/Shared/PipeWriterStream.cs +++ b/src/SignalR/common/Shared/PipeWriterStream.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; @@ -76,7 +76,15 @@ namespace System.IO.Pipelines _length += source.Length; var task = _pipeWriter.WriteAsync(source); - if (!task.IsCompletedSuccessfully) + if (task.IsCompletedSuccessfully) + { + // Cancellation can be triggered by PipeWriter.CancelPendingFlush + if (task.Result.IsCanceled) + { + throw new OperationCanceledException(); + } + } + else if (!task.IsCompletedSuccessfully) { return WriteSlowAsync(task); } diff --git a/src/SignalR/common/testassets/Tests.Utils/TestClient.cs b/src/SignalR/common/testassets/Tests.Utils/TestClient.cs index 534e83cf2b..39fcd06a37 100644 --- a/src/SignalR/common/testassets/Tests.Utils/TestClient.cs +++ b/src/SignalR/common/testassets/Tests.Utils/TestClient.cs @@ -32,9 +32,10 @@ namespace Microsoft.AspNetCore.SignalR.Tests public TransferFormat ActiveFormat { get; set; } - public TestClient(IHubProtocol protocol = null, IInvocationBinder invocationBinder = null, string userIdentifier = null) + public TestClient(IHubProtocol protocol = null, IInvocationBinder invocationBinder = null, string userIdentifier = null, long pauseWriterThreshold = 32768) { - var options = new PipeOptions(readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); + var options = new PipeOptions(readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false, + pauseWriterThreshold: pauseWriterThreshold, resumeWriterThreshold: pauseWriterThreshold / 2); var pair = DuplexPipe.CreateConnectionPair(options, options); Connection = new DefaultConnectionContext(Guid.NewGuid().ToString(), pair.Transport, pair.Application); @@ -65,16 +66,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests { if (sendHandshakeRequestMessage) { - var memoryBufferWriter = MemoryBufferWriter.Get(); - try - { - HandshakeProtocol.WriteRequestMessage(new HandshakeRequestMessage(_protocol.Name, _protocol.Version), memoryBufferWriter); - await Connection.Application.Output.WriteAsync(memoryBufferWriter.ToArray()); - } - finally - { - MemoryBufferWriter.Return(memoryBufferWriter); - } + await Connection.Application.Output.WriteAsync(GetHandshakeRequestMessage()); } var connection = handler.OnConnectedAsync(Connection); @@ -290,6 +282,21 @@ namespace Microsoft.AspNetCore.SignalR.Tests } } } + + public byte[] GetHandshakeRequestMessage() + { + var memoryBufferWriter = MemoryBufferWriter.Get(); + try + { + HandshakeProtocol.WriteRequestMessage(new HandshakeRequestMessage(_protocol.Name, _protocol.Version), memoryBufferWriter); + return memoryBufferWriter.ToArray(); + } + finally + { + MemoryBufferWriter.Return(memoryBufferWriter); + } + } + private class DefaultInvocationBinder : IInvocationBinder { public IReadOnlyList GetParameterTypes(string methodName) diff --git a/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs b/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs index 3c835ab933..d9183ae7cc 100644 --- a/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs +++ b/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs @@ -82,10 +82,10 @@ namespace Microsoft.AspNetCore.SignalR /// public override Task SendAllAsync(string methodName, object[] args, CancellationToken cancellationToken = default) { - return SendToAllConnections(methodName, args, null); + return SendToAllConnections(methodName, args, include: null, cancellationToken); } - private Task SendToAllConnections(string methodName, object[] args, Func include) + private Task SendToAllConnections(string methodName, object[] args, Func include, CancellationToken cancellationToken) { List tasks = null; SerializedHubMessage message = null; @@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.SignalR message = CreateSerializedInvocationMessage(methodName, args); } - var task = connection.WriteAsync(message); + var task = connection.WriteAsync(message, cancellationToken); if (!task.IsCompletedSuccessfully) { @@ -127,7 +127,8 @@ namespace Microsoft.AspNetCore.SignalR // Tasks and message are passed by ref so they can be lazily created inside the method post-filtering, // while still being re-usable when sending to multiple groups - private void SendToGroupConnections(string methodName, object[] args, ConcurrentDictionary connections, Func include, ref List tasks, ref SerializedHubMessage message) + private void SendToGroupConnections(string methodName, object[] args, ConcurrentDictionary connections, Func include, + ref List tasks, ref SerializedHubMessage message, CancellationToken cancellationToken) { // foreach over ConcurrentDictionary avoids allocating an enumerator foreach (var connection in connections) @@ -142,7 +143,7 @@ namespace Microsoft.AspNetCore.SignalR message = CreateSerializedInvocationMessage(methodName, args); } - var task = connection.Value.WriteAsync(message); + var task = connection.Value.WriteAsync(message, cancellationToken); if (!task.IsCompletedSuccessfully) { @@ -175,7 +176,7 @@ namespace Microsoft.AspNetCore.SignalR // Write message directly to connection without caching it in memory var message = CreateInvocationMessage(methodName, args); - return connection.WriteAsync(message).AsTask(); + return connection.WriteAsync(message, cancellationToken).AsTask(); } /// @@ -193,7 +194,7 @@ namespace Microsoft.AspNetCore.SignalR // group might be modified inbetween checking and sending List tasks = null; SerializedHubMessage message = null; - SendToGroupConnections(methodName, args, group, null, ref tasks, ref message); + SendToGroupConnections(methodName, args, group, include: null, ref tasks, ref message, cancellationToken); if (tasks != null) { @@ -221,7 +222,7 @@ namespace Microsoft.AspNetCore.SignalR var group = _groups[groupName]; if (group != null) { - SendToGroupConnections(methodName, args, group, null, ref tasks, ref message); + SendToGroupConnections(methodName, args, group, include: null, ref tasks, ref message, cancellationToken); } } @@ -247,7 +248,7 @@ namespace Microsoft.AspNetCore.SignalR List tasks = null; SerializedHubMessage message = null; - SendToGroupConnections(methodName, args, group, connection => !excludedConnectionIds.Contains(connection.ConnectionId), ref tasks, ref message); + SendToGroupConnections(methodName, args, group, connection => !excludedConnectionIds.Contains(connection.ConnectionId), ref tasks, ref message, cancellationToken); if (tasks != null) { @@ -271,7 +272,7 @@ namespace Microsoft.AspNetCore.SignalR /// public override Task SendUserAsync(string userId, string methodName, object[] args, CancellationToken cancellationToken = default) { - return SendToAllConnections(methodName, args, connection => string.Equals(connection.UserIdentifier, userId, StringComparison.Ordinal)); + return SendToAllConnections(methodName, args, connection => string.Equals(connection.UserIdentifier, userId, StringComparison.Ordinal), cancellationToken); } /// @@ -292,19 +293,19 @@ namespace Microsoft.AspNetCore.SignalR /// public override Task SendAllExceptAsync(string methodName, object[] args, IReadOnlyList excludedConnectionIds, CancellationToken cancellationToken = default) { - return SendToAllConnections(methodName, args, connection => !excludedConnectionIds.Contains(connection.ConnectionId)); + return SendToAllConnections(methodName, args, connection => !excludedConnectionIds.Contains(connection.ConnectionId), cancellationToken); } /// public override Task SendConnectionsAsync(IReadOnlyList connectionIds, string methodName, object[] args, CancellationToken cancellationToken = default) { - return SendToAllConnections(methodName, args, connection => connectionIds.Contains(connection.ConnectionId)); + return SendToAllConnections(methodName, args, connection => connectionIds.Contains(connection.ConnectionId), cancellationToken); } /// public override Task SendUsersAsync(IReadOnlyList userIds, string methodName, object[] args, CancellationToken cancellationToken = default) { - return SendToAllConnections(methodName, args, connection => userIds.Contains(connection.UserIdentifier)); + return SendToAllConnections(methodName, args, connection => userIds.Contains(connection.UserIdentifier), cancellationToken); } } } diff --git a/src/SignalR/server/Core/src/HubConnectionContext.cs b/src/SignalR/server/Core/src/HubConnectionContext.cs index 5a1049e780..8ae6667175 100644 --- a/src/SignalR/server/Core/src/HubConnectionContext.cs +++ b/src/SignalR/server/Core/src/HubConnectionContext.cs @@ -33,6 +33,7 @@ namespace Microsoft.AspNetCore.SignalR private long _lastSendTimestamp = Stopwatch.GetTimestamp(); private ReadOnlyMemory _cachedPingMessage; + private volatile bool _connectionAborted; /// /// Initializes a new instance of the class. @@ -96,11 +97,17 @@ namespace Microsoft.AspNetCore.SignalR // Try to grab the lock synchronously, if we fail, go to the slower path if (!_writeLock.Wait(0)) { - return new ValueTask(WriteSlowAsync(message)); + return new ValueTask(WriteSlowAsync(message, cancellationToken)); + } + + if (_connectionAborted) + { + _writeLock.Release(); + return default; } // This method should never throw synchronously - var task = WriteCore(message); + var task = WriteCore(message, cancellationToken); // The write didn't complete synchronously so await completion if (!task.IsCompletedSuccessfully) @@ -126,11 +133,17 @@ namespace Microsoft.AspNetCore.SignalR // Try to grab the lock synchronously, if we fail, go to the slower path if (!_writeLock.Wait(0)) { - return new ValueTask(WriteSlowAsync(message)); + return new ValueTask(WriteSlowAsync(message, cancellationToken)); + } + + if (_connectionAborted) + { + _writeLock.Release(); + return default; } // This method should never throw synchronously - var task = WriteCore(message); + var task = WriteCore(message, cancellationToken); // The write didn't complete synchronously so await completion if (!task.IsCompletedSuccessfully) @@ -144,7 +157,7 @@ namespace Microsoft.AspNetCore.SignalR return default; } - private ValueTask WriteCore(HubMessage message) + private ValueTask WriteCore(HubMessage message, CancellationToken cancellationToken) { try { @@ -152,29 +165,33 @@ namespace Microsoft.AspNetCore.SignalR // write it without caching. Protocol.WriteMessage(message, _connectionContext.Transport.Output); - return _connectionContext.Transport.Output.FlushAsync(); + return _connectionContext.Transport.Output.FlushAsync(cancellationToken); } catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); + Abort(); + return new ValueTask(new FlushResult(isCanceled: false, isCompleted: true)); } } - private ValueTask WriteCore(SerializedHubMessage message) + private ValueTask WriteCore(SerializedHubMessage message, CancellationToken cancellationToken) { try { // Grab a preserialized buffer for this protocol. var buffer = message.GetSerializedMessage(Protocol); - return _connectionContext.Transport.Output.WriteAsync(buffer); + return _connectionContext.Transport.Output.WriteAsync(buffer, cancellationToken); } catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); + Abort(); + return new ValueTask(new FlushResult(isCanceled: false, isCompleted: true)); } } @@ -188,6 +205,8 @@ namespace Microsoft.AspNetCore.SignalR catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); + + Abort(); } finally { @@ -196,18 +215,25 @@ namespace Microsoft.AspNetCore.SignalR } } - private async Task WriteSlowAsync(HubMessage message) + private async Task WriteSlowAsync(HubMessage message, CancellationToken cancellationToken) { - await _writeLock.WaitAsync(); + // Failed to get the lock immediately when entering WriteAsync so await until it is available + await _writeLock.WaitAsync(cancellationToken); + try { - // Failed to get the lock immediately when entering WriteAsync so await until it is available + if (_connectionAborted) + { + return; + } - await WriteCore(message); + await WriteCore(message, cancellationToken); } catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); + + Abort(); } finally { @@ -215,18 +241,25 @@ namespace Microsoft.AspNetCore.SignalR } } - private async Task WriteSlowAsync(SerializedHubMessage message) + private async Task WriteSlowAsync(SerializedHubMessage message, CancellationToken cancellationToken) { + // Failed to get the lock immediately when entering WriteAsync so await until it is available + await _writeLock.WaitAsync(cancellationToken); + try { - // Failed to get the lock immediately when entering WriteAsync so await until it is available - await _writeLock.WaitAsync(); + if (_connectionAborted) + { + return; + } - await WriteCore(message); + await WriteCore(message, cancellationToken); } catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); + + Abort(); } finally { @@ -243,6 +276,7 @@ namespace Microsoft.AspNetCore.SignalR return default; } + // TODO: cancel? return new ValueTask(TryWritePingSlowAsync()); } @@ -250,6 +284,11 @@ namespace Microsoft.AspNetCore.SignalR { try { + if (_connectionAborted) + { + return; + } + await _connectionContext.Transport.Output.WriteAsync(_cachedPingMessage); Log.SentPing(_logger); @@ -257,6 +296,8 @@ namespace Microsoft.AspNetCore.SignalR catch (Exception ex) { Log.FailedWritingMessage(_logger, ex); + + Abort(); } finally { @@ -293,6 +334,12 @@ namespace Microsoft.AspNetCore.SignalR /// public virtual void Abort() { + _connectionAborted = true; + + // Cancel any current writes or writes that are about to happen and have already gone past the _connectionAborted bool + // We have to do this outside of the lock otherwise it could hang if the write is observing backpressure + _connectionContext.Transport.Output.CancelPendingFlush(); + // If we already triggered the token then noop, this isn't thread safe but it's good enough // to avoid spawning a new task in the most common cases if (_connectionAbortedTokenSource.IsCancellationRequested) @@ -423,9 +470,24 @@ namespace Microsoft.AspNetCore.SignalR internal Task AbortAsync() { Abort(); + + // Acquire lock to make sure all writes are completed + if (!_writeLock.Wait(0)) + { + return AbortAsyncSlow(); + } + + _writeLock.Release(); return _abortCompletedTcs.Task; } + private async Task AbortAsyncSlow() + { + await _writeLock.WaitAsync(); + _writeLock.Release(); + await _abortCompletedTcs.Task; + } + private void KeepAliveTick() { var timestamp = Stopwatch.GetTimestamp(); @@ -449,12 +511,10 @@ namespace Microsoft.AspNetCore.SignalR private static void AbortConnection(object state) { var connection = (HubConnectionContext)state; + try { connection._connectionAbortedTokenSource.Cancel(); - - // Communicate the fact that we're finished triggering abort callbacks - connection._abortCompletedTcs.TrySetResult(null); } catch (Exception ex) { @@ -462,6 +522,26 @@ namespace Microsoft.AspNetCore.SignalR // we don't end up with an unobserved task connection._abortCompletedTcs.TrySetException(ex); } + finally + { + _ = InnerAbortConnection(connection); + } + } + + private static async Task InnerAbortConnection(HubConnectionContext connection) + { + // We lock to make sure all writes are done before triggering the completion of the pipe + await connection._writeLock.WaitAsync(); + try + { + // Communicate the fact that we're finished triggering abort callbacks + // HubOnDisconnectedAsync is waiting on this to complete the Pipe + connection._abortCompletedTcs.TrySetResult(null); + } + finally + { + connection._writeLock.Release(); + } } private static class Log diff --git a/src/SignalR/server/Core/src/Internal/HubCallerClients.cs b/src/SignalR/server/Core/src/Internal/HubCallerClients.cs index d2694b17b3..1b60436874 100644 --- a/src/SignalR/server/Core/src/Internal/HubCallerClients.cs +++ b/src/SignalR/server/Core/src/Internal/HubCallerClients.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.Collections.Generic; diff --git a/src/SignalR/server/Core/src/Internal/Proxies.cs b/src/SignalR/server/Core/src/Internal/Proxies.cs index 9a3edd56bd..8a2beb26de 100644 --- a/src/SignalR/server/Core/src/Internal/Proxies.cs +++ b/src/SignalR/server/Core/src/Internal/Proxies.cs @@ -105,7 +105,7 @@ namespace Microsoft.AspNetCore.SignalR.Internal public Task SendCoreAsync(string method, object[] args, CancellationToken cancellationToken = default) { - return _lifetimeManager.SendAllAsync(method, args); + return _lifetimeManager.SendAllAsync(method, args, cancellationToken); } } diff --git a/src/SignalR/server/SignalR/test/DefaultHubLifetimeManagerTests.cs b/src/SignalR/server/SignalR/test/DefaultHubLifetimeManagerTests.cs index 6fcce1872d..f911ca1382 100644 --- a/src/SignalR/server/SignalR/test/DefaultHubLifetimeManagerTests.cs +++ b/src/SignalR/server/SignalR/test/DefaultHubLifetimeManagerTests.cs @@ -1,3 +1,8 @@ +// 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.Collections.Generic; +using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR.Protocol; @@ -155,6 +160,289 @@ namespace Microsoft.AspNetCore.SignalR.Tests await manager.RemoveFromGroupAsync("NotARealConnectionId", "MyGroup").OrTimeout(); } + [Fact] + public async Task SendAllAsyncWillCancelWithToken() + { + using (var client1 = new TestClient()) + using (var client2 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = new DefaultHubLifetimeManager(new Logger>(NullLoggerFactory.Instance)); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + var connection2 = HubConnectionContextUtils.Create(client2.Connection); + + await manager.OnConnectedAsync(connection1).OrTimeout(); + await manager.OnConnectedAsync(connection2).OrTimeout(); + + var cts = new CancellationTokenSource(); + var sendTask = manager.SendAllAsync("Hello", new object[] { "World" }, cts.Token).OrTimeout(); + + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + + var message = Assert.IsType(client1.TryRead()); + Assert.Equal("Hello", message.Target); + Assert.Single(message.Arguments); + Assert.Equal("World", (string)message.Arguments[0]); + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection2.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + + Assert.False(connection1.ConnectionAborted.IsCancellationRequested); + } + } + + [Fact] + public async Task SendAllExceptAsyncWillCancelWithToken() + { + using (var client1 = new TestClient()) + using (var client2 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = new DefaultHubLifetimeManager(new Logger>(NullLoggerFactory.Instance)); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + var connection2 = HubConnectionContextUtils.Create(client2.Connection); + + await manager.OnConnectedAsync(connection1).OrTimeout(); + await manager.OnConnectedAsync(connection2).OrTimeout(); + + var cts = new CancellationTokenSource(); + var sendTask = manager.SendAllExceptAsync("Hello", new object[] { "World" }, new List { connection1.ConnectionId }, cts.Token).OrTimeout(); + + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection2.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + + Assert.False(connection1.ConnectionAborted.IsCancellationRequested); + Assert.Null(client1.TryRead()); + } + } + + [Fact] + public async Task SendConnectionAsyncWillCancelWithToken() + { + using (var client1 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = new DefaultHubLifetimeManager(new Logger>(NullLoggerFactory.Instance)); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + + await manager.OnConnectedAsync(connection1).OrTimeout(); + + var cts = new CancellationTokenSource(); + var sendTask = manager.SendConnectionAsync(connection1.ConnectionId, "Hello", new object[] { "World" }, cts.Token).OrTimeout(); + + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection1.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + } + } + + [Fact] + public async Task SendConnectionsAsyncWillCancelWithToken() + { + using (var client1 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = new DefaultHubLifetimeManager(new Logger>(NullLoggerFactory.Instance)); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + + await manager.OnConnectedAsync(connection1).OrTimeout(); + + var cts = new CancellationTokenSource(); + var sendTask = manager.SendConnectionsAsync(new List { connection1.ConnectionId }, "Hello", new object[] { "World" }, cts.Token).OrTimeout(); + + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection1.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + } + } + + [Fact] + public async Task SendGroupAsyncWillCancelWithToken() + { + using (var client1 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = new DefaultHubLifetimeManager(new Logger>(NullLoggerFactory.Instance)); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + + await manager.OnConnectedAsync(connection1).OrTimeout(); + + await manager.AddToGroupAsync(connection1.ConnectionId, "group").OrTimeout(); + + var cts = new CancellationTokenSource(); + var sendTask = manager.SendGroupAsync("group", "Hello", new object[] { "World" }, cts.Token).OrTimeout(); + + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection1.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + } + } + + [Fact] + public async Task SendGroupExceptAsyncWillCancelWithToken() + { + using (var client1 = new TestClient()) + using (var client2 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = new DefaultHubLifetimeManager(new Logger>(NullLoggerFactory.Instance)); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + var connection2 = HubConnectionContextUtils.Create(client2.Connection); + + await manager.OnConnectedAsync(connection1).OrTimeout(); + await manager.OnConnectedAsync(connection2).OrTimeout(); + + await manager.AddToGroupAsync(connection1.ConnectionId, "group").OrTimeout(); + await manager.AddToGroupAsync(connection2.ConnectionId, "group").OrTimeout(); + + var cts = new CancellationTokenSource(); + var sendTask = manager.SendGroupExceptAsync("group", "Hello", new object[] { "World" }, new List { connection1.ConnectionId }, cts.Token).OrTimeout(); + + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection2.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + + Assert.False(connection1.ConnectionAborted.IsCancellationRequested); + Assert.Null(client1.TryRead()); + } + } + + [Fact] + public async Task SendGroupsAsyncWillCancelWithToken() + { + using (var client1 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = new DefaultHubLifetimeManager(new Logger>(NullLoggerFactory.Instance)); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + + await manager.OnConnectedAsync(connection1).OrTimeout(); + + await manager.AddToGroupAsync(connection1.ConnectionId, "group").OrTimeout(); + + var cts = new CancellationTokenSource(); + var sendTask = manager.SendGroupsAsync(new List { "group" }, "Hello", new object[] { "World" }, cts.Token).OrTimeout(); + + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection1.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + } + } + + [Fact] + public async Task SendUserAsyncWillCancelWithToken() + { + using (var client1 = new TestClient()) + using (var client2 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = new DefaultHubLifetimeManager(new Logger>(NullLoggerFactory.Instance)); + var connection1 = HubConnectionContextUtils.Create(client1.Connection, userIdentifier: "user"); + var connection2 = HubConnectionContextUtils.Create(client2.Connection, userIdentifier: "user"); + + await manager.OnConnectedAsync(connection1).OrTimeout(); + await manager.OnConnectedAsync(connection2).OrTimeout(); + + var cts = new CancellationTokenSource(); + var sendTask = manager.SendUserAsync("user", "Hello", new object[] { "World" }, cts.Token).OrTimeout(); + + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + + var message = Assert.IsType(client1.TryRead()); + Assert.Equal("Hello", message.Target); + Assert.Single(message.Arguments); + Assert.Equal("World", (string)message.Arguments[0]); + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection2.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + + Assert.False(connection1.ConnectionAborted.IsCancellationRequested); + } + } + + [Fact] + public async Task SendUsersAsyncWillCancelWithToken() + { + using (var client1 = new TestClient()) + using (var client2 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = new DefaultHubLifetimeManager(new Logger>(NullLoggerFactory.Instance)); + var connection1 = HubConnectionContextUtils.Create(client1.Connection, userIdentifier: "user1"); + var connection2 = HubConnectionContextUtils.Create(client2.Connection, userIdentifier: "user2"); + + await manager.OnConnectedAsync(connection1).OrTimeout(); + await manager.OnConnectedAsync(connection2).OrTimeout(); + + var cts = new CancellationTokenSource(); + var sendTask = manager.SendUsersAsync(new List { "user1", "user2" }, "Hello", new object[] { "World" }, cts.Token).OrTimeout(); + + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + + var message = Assert.IsType(client1.TryRead()); + Assert.Equal("Hello", message.Target); + Assert.Single(message.Arguments); + Assert.Equal("World", (string)message.Arguments[0]); + + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection2.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + + Assert.False(connection1.ConnectionAborted.IsCancellationRequested); + } + } + private class MyHub : Hub { diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs index 06fa3841eb..c310087095 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs @@ -79,9 +79,11 @@ namespace Microsoft.AspNetCore.SignalR.Tests { var connectionHandlerTask = await client.ConnectAsync(connectionHandler); - await client.InvokeAsync(nameof(AbortHub.Kill)); + await client.SendInvocationAsync(nameof(AbortHub.Kill)); await connectionHandlerTask.OrTimeout(); + + Assert.Null(client.TryRead()); } } From 3999eaffa4a829c771dd5225cf9bb227cd505c9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 07:26:35 -0800 Subject: [PATCH 021/116] [release/3.0] Update dependencies from 4 repositories (#17283) * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191120.3 - Microsoft.NET.Sdk.Razor - 3.0.2-servicing.19570.3 - Microsoft.CodeAnalysis.Razor - 3.0.2-servicing.19570.3 - Microsoft.AspNetCore.Razor.Language - 3.0.2-servicing.19570.3 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.2-servicing.19570.3 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191120.4 - Microsoft.EntityFrameworkCore.Tools - 3.0.2-servicing.19570.4 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.2-servicing.19570.4 - dotnet-ef - 3.0.2-servicing.19570.4 - Microsoft.EntityFrameworkCore - 3.0.2-servicing.19570.4 - Microsoft.EntityFrameworkCore.InMemory - 3.0.2-servicing.19570.4 - Microsoft.EntityFrameworkCore.Relational - 3.0.2-servicing.19570.4 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.2-servicing.19570.4 * Update dependencies from https://github.com/aspnet/Blazor build 20191121.1 - Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19571.1 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191121.6 - Microsoft.NET.Sdk.Razor - 3.0.2-servicing.19571.6 - Microsoft.CodeAnalysis.Razor - 3.0.2-servicing.19571.6 - Microsoft.AspNetCore.Razor.Language - 3.0.2-servicing.19571.6 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.2-servicing.19571.6 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191121.1 - Microsoft.EntityFrameworkCore.Tools - 3.0.2-servicing.19571.1 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.2-servicing.19571.1 - dotnet-ef - 3.0.2-servicing.19571.1 - Microsoft.EntityFrameworkCore - 3.0.2-servicing.19571.1 - Microsoft.EntityFrameworkCore.InMemory - 3.0.2-servicing.19571.1 - Microsoft.EntityFrameworkCore.Relational - 3.0.2-servicing.19571.1 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.2-servicing.19571.1 * Update dependencies from https://github.com/aspnet/Blazor build 20191121.3 - Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19571.3 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191121.8 - Microsoft.NET.Sdk.Razor - 3.0.2-servicing.19571.8 - Microsoft.CodeAnalysis.Razor - 3.0.2-servicing.19571.8 - Microsoft.AspNetCore.Razor.Language - 3.0.2-servicing.19571.8 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.2-servicing.19571.8 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191122.1 - Microsoft.NET.Sdk.Razor - 3.0.2-servicing.19572.1 - Microsoft.CodeAnalysis.Razor - 3.0.2-servicing.19572.1 - Microsoft.AspNetCore.Razor.Language - 3.0.2-servicing.19572.1 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.2-servicing.19572.1 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191122.1 - Microsoft.EntityFrameworkCore.Tools - 3.0.2-servicing.19572.1 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.2-servicing.19572.1 - dotnet-ef - 3.0.2-servicing.19572.1 - Microsoft.EntityFrameworkCore - 3.0.2-servicing.19572.1 - Microsoft.EntityFrameworkCore.InMemory - 3.0.2-servicing.19572.1 - Microsoft.EntityFrameworkCore.Relational - 3.0.2-servicing.19572.1 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.2-servicing.19572.1 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Internal.AspNetCore.Analyzers - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.2-servicing.19571.2 (parent: Microsoft.EntityFrameworkCore) * Update dependencies from https://github.com/dotnet/arcade build 20191122.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19572.3 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19572.3 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19572.3 * Update dependencies from https://github.com/aspnet/Blazor build 20191123.1 - Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19573.1 --- eng/Version.Details.xml | 300 +++++++++--------- eng/Versions.props | 146 ++++----- .../templates/post-build/common-variables.yml | 14 +- .../templates/post-build/post-build.yml | 80 ++++- global.json | 8 +- 5 files changed, 310 insertions(+), 238 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bf3c00bf7..8de03d7f3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,289 +9,289 @@ --> - + https://github.com/aspnet/Blazor - a10163f767cf263d593836c9249d8314e8948d89 + c4b0f964333255edca0856fc937735fef34b2d02 - + https://github.com/aspnet/AspNetCore-Tooling - d43b8b3266a08c871ff8ecabcdb7e7428d4148e4 + 3d6c6a7ea5db32db5fb510141b26e58138f79206 - + https://github.com/aspnet/AspNetCore-Tooling - d43b8b3266a08c871ff8ecabcdb7e7428d4148e4 + 3d6c6a7ea5db32db5fb510141b26e58138f79206 - + https://github.com/aspnet/AspNetCore-Tooling - d43b8b3266a08c871ff8ecabcdb7e7428d4148e4 + 3d6c6a7ea5db32db5fb510141b26e58138f79206 - + https://github.com/aspnet/AspNetCore-Tooling - d43b8b3266a08c871ff8ecabcdb7e7428d4148e4 + 3d6c6a7ea5db32db5fb510141b26e58138f79206 - + https://github.com/aspnet/EntityFrameworkCore - ecf6c80c547924b22ee6ec77787b3aca660d7cf3 + 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 - + https://github.com/aspnet/EntityFrameworkCore - ecf6c80c547924b22ee6ec77787b3aca660d7cf3 + 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 - + https://github.com/aspnet/EntityFrameworkCore - ecf6c80c547924b22ee6ec77787b3aca660d7cf3 + 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 - + https://github.com/aspnet/EntityFrameworkCore - ecf6c80c547924b22ee6ec77787b3aca660d7cf3 + 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 - + https://github.com/aspnet/EntityFrameworkCore - ecf6c80c547924b22ee6ec77787b3aca660d7cf3 + 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 - + https://github.com/aspnet/EntityFrameworkCore - ecf6c80c547924b22ee6ec77787b3aca660d7cf3 + 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 - + https://github.com/aspnet/EntityFrameworkCore - ecf6c80c547924b22ee6ec77787b3aca660d7cf3 + 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 https://github.com/aspnet/Extensions 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 https://github.com/dotnet/corefx @@ -413,25 +413,25 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 - + https://github.com/dotnet/arcade - e34d933e18ba1cd393bbafcb6018e0f858d3e89e + 0e0d227c57e69c03427d6e668716d62cf4ceb36e - + https://github.com/dotnet/arcade - e34d933e18ba1cd393bbafcb6018e0f858d3e89e + 0e0d227c57e69c03427d6e668716d62cf4ceb36e - + https://github.com/dotnet/arcade - e34d933e18ba1cd393bbafcb6018e0f858d3e89e + 0e0d227c57e69c03427d6e668716d62cf4ceb36e - + https://github.com/aspnet/Extensions - 17edae611c3bfaba25ccee79c4beeaded6f8e9c6 + 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a7c277cb2e..19f3a9d108 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ --> - 1.0.0-beta.19569.2 + 1.0.0-beta.19572.3 3.3.1-beta4-19462-11 @@ -100,82 +100,82 @@ 3.0.0 - 3.0.0-preview9.19570.2 + 3.0.0-preview9.19573.1 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 3.0.0-rc2.19463.5 - 3.0.2-servicing.19569.2 - 3.0.2-servicing.19569.2 + 3.0.2-servicing.19571.2 + 3.0.2-servicing.19571.2 - 3.0.2-servicing.19569.3 - 3.0.2-servicing.19569.3 - 3.0.2-servicing.19569.3 - 3.0.2-servicing.19569.3 - 3.0.2-servicing.19569.3 - 3.0.2-servicing.19569.3 - 3.0.2-servicing.19569.3 + 3.0.2-servicing.19572.1 + 3.0.2-servicing.19572.1 + 3.0.2-servicing.19572.1 + 3.0.2-servicing.19572.1 + 3.0.2-servicing.19572.1 + 3.0.2-servicing.19572.1 + 3.0.2-servicing.19572.1 - 3.0.2-servicing.19569.1 - 3.0.2-servicing.19569.1 - 3.0.2-servicing.19569.1 - 3.0.2-servicing.19569.1 + 3.0.2-servicing.19572.1 + 3.0.2-servicing.19572.1 + 3.0.2-servicing.19572.1 + 3.0.2-servicing.19572.1 @@ -35,7 +35,7 @@ - 3.0.0 + 3.0.1 @@ -407,14 +407,14 @@ - 3.0.0 + 3.0.1 - + - + @@ -635,19 +635,19 @@ - 3.0.0 + 3.0.1 - 3.0.0 + 3.0.1 - 3.0.0 + 3.0.1 - 3.0.0 + 3.0.1 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 52cbb358f4..638d42dd71 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -1,16 +1,15 @@  - - + - + @@ -53,7 +52,7 @@ Update this list when preparing for a new patch. - + @@ -78,10 +77,10 @@ Update this list when preparing for a new patch. - - - - + + + + diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs index dac620efa8..abf6b69524 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs @@ -31,6 +31,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal IHttpTransportFeature, IConnectionInherentKeepAliveFeature { + private static long _tenSeconds = TimeSpan.FromSeconds(10).Ticks; + private readonly object _stateLock = new object(); private readonly object _itemsLock = new object(); private readonly object _heartbeatLock = new object(); @@ -40,6 +42,12 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal private IDuplexPipe _application; private IDictionary _items; + private CancellationTokenSource _sendCts; + private bool _activeSend; + private long _startedSendTime; + private readonly object _sendingLock = new object(); + internal CancellationToken SendingToken { get; private set; } + // This tcs exists so that multiple calls to DisposeAsync all wait asynchronously // on the same task private readonly TaskCompletionSource _disposeTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -258,8 +266,26 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal } else { - // The other transports don't close their own output, so we can do it here safely - Application?.Output.Complete(); + // Normally it isn't safe to try and acquire this lock because the Send can hold onto it for a long time if there is backpressure + // It is safe to wait for this lock now because the Send will be in one of 4 states + // 1. In the middle of a write which is in the middle of being canceled by the CancelPendingFlush above, when it throws + // an OperationCanceledException it will complete the PipeWriter which will make any other Send waiting on the lock + // throw an InvalidOperationException if they call Write + // 2. About to write and see that there is a pending cancel from the CancelPendingFlush, go to 1 to see what happens + // 3. Enters the Send and sees the Dispose state from DisposeAndRemoveAsync and releases the lock + // 4. No Send in progress + await WriteLock.WaitAsync(); + try + { + // Complete the applications read loop + Application?.Output.Complete(); + } + finally + { + WriteLock.Release(); + } + + Application?.Input.CancelPendingRead(); } } @@ -401,7 +427,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal nonClonedContext.Response.RegisterForDispose(timeoutSource); nonClonedContext.Response.RegisterForDispose(tokenSource); - var longPolling = new LongPollingServerTransport(timeoutSource.Token, Application.Input, loggerFactory); + var longPolling = new LongPollingServerTransport(timeoutSource.Token, Application.Input, loggerFactory, this); // Start the transport TransportTask = longPolling.ProcessRequestAsync(nonClonedContext, tokenSource.Token); @@ -507,6 +533,40 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal await connectionDelegate(this); } + internal void StartSendCancellation() + { + lock (_sendingLock) + { + if (_sendCts == null || _sendCts.IsCancellationRequested) + { + _sendCts = new CancellationTokenSource(); + SendingToken = _sendCts.Token; + } + _startedSendTime = DateTime.UtcNow.Ticks; + _activeSend = true; + } + } + internal void TryCancelSend(long currentTicks) + { + lock (_sendingLock) + { + if (_activeSend) + { + if (currentTicks - _startedSendTime > _tenSeconds) + { + _sendCts.Cancel(); + } + } + } + } + internal void StopSendCancellation() + { + lock (_sendingLock) + { + _activeSend = false; + } + } + private static class Log { private static readonly Action _disposingConnection = diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs index 9da1ea0c18..c40a80b9ce 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs @@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal connection.SupportedFormats = TransferFormat.Text; // We only need to provide the Input channel since writing to the application is handled through /send. - var sse = new ServerSentEventsServerTransport(connection.Application.Input, connection.ConnectionId, _loggerFactory); + var sse = new ServerSentEventsServerTransport(connection.Application.Input, connection.ConnectionId, connection, _loggerFactory); await DoPersistentConnection(connectionDelegate, sse, context, connection); } @@ -216,7 +216,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal connection.Transport.Output.Complete(connection.ApplicationTask.Exception); // Wait for the transport to run - await connection.TransportTask; + // Ignore exceptions, it has been logged if there is one and the application has finished + // So there is no one to give the exception to + await connection.TransportTask.NoThrow(); // If the status code is a 204 it means the connection is done if (context.Response.StatusCode == StatusCodes.Status204NoContent) @@ -234,12 +236,12 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal connection.MarkInactive(); } } - else if (resultTask.IsFaulted) + else if (resultTask.IsFaulted || resultTask.IsCanceled) { // Cancel current request to release any waiting poll and let dispose acquire the lock currentRequestTcs.TrySetCanceled(); - - // transport task was faulted, we should remove the connection + // We should be able to safely dispose because there's no more data being written + // We don't need to wait for close here since we've already waited for both sides await _manager.DisposeAndRemoveAsync(connection, closeGracefully: false); } else @@ -434,6 +436,14 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal context.Response.StatusCode = StatusCodes.Status404NotFound; context.Response.ContentType = "text/plain"; + + // There are no writes anymore (since this is the write "loop") + // So it is safe to complete the writer + // We complete the writer here because we already have the WriteLock acquired + // and it's unsafe to complete outside of the lock + // Other code isn't guaranteed to be able to acquire the lock before another write + // even if CancelPendingFlush is called, and the other write could hang if there is backpressure + connection.Application.Output.Complete(); return; } catch (IOException ex) @@ -481,11 +491,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal Log.TerminatingConection(_logger); - // Complete the receiving end of the pipe - connection.Application.Output.Complete(); - - // Dispose the connection gracefully, but don't wait for it. We assign it here so we can wait in tests - connection.DisposeAndRemoveTask = _manager.DisposeAndRemoveAsync(connection, closeGracefully: true); + // Dispose the connection, but don't wait for it. We assign it here so we can wait in tests + connection.DisposeAndRemoveTask = _manager.DisposeAndRemoveAsync(connection, closeGracefully: false); context.Response.StatusCode = StatusCodes.Status202Accepted; context.Response.ContentType = "text/plain"; diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs index 4a97681fc0..b0f4b079fb 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs @@ -31,6 +31,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal private readonly TimerAwaitable _nextHeartbeat; private readonly ILogger _logger; private readonly ILogger _connectionLogger; + private readonly bool _useSendTimeout = true; private readonly TimeSpan _disconnectTimeout; public HttpConnectionManager(ILoggerFactory loggerFactory, IHostApplicationLifetime appLifetime) @@ -44,6 +45,11 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal _connectionLogger = loggerFactory.CreateLogger(); _nextHeartbeat = new TimerAwaitable(_heartbeatTickRate, _heartbeatTickRate); _disconnectTimeout = connectionOptions.Value.DisconnectTimeout ?? ConnectionOptionsSetup.DefaultDisconectTimeout; + if (AppContext.TryGetSwitch("Microsoft.AspNetCore.Http.Connections.DoNotUseSendTimeout", out var timeoutDisabled)) + { + _useSendTimeout = !timeoutDisabled; + } + // Register these last as the callbacks could run immediately appLifetime.ApplicationStarted.Register(() => Start()); appLifetime.ApplicationStopping.Register(() => CloseConnections()); @@ -155,20 +161,26 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal // Capture the connection state var lastSeenUtc = connection.LastSeenUtcIfInactive; + var utcNow = DateTimeOffset.UtcNow; // Once the decision has been made to dispose we don't check the status again // But don't clean up connections while the debugger is attached. - if (!Debugger.IsAttached && lastSeenUtc.HasValue && (DateTimeOffset.UtcNow - lastSeenUtc.Value).TotalSeconds > _disconnectTimeout.TotalSeconds) + if (!Debugger.IsAttached && lastSeenUtc.HasValue && (utcNow - lastSeenUtc.Value).TotalSeconds > _disconnectTimeout.TotalSeconds) { Log.ConnectionTimedOut(_logger, connection.ConnectionId); HttpConnectionsEventSource.Log.ConnectionTimedOut(connection.ConnectionId); // This is most likely a long polling connection. The transport here ends because - // a poll completed and has been inactive for > 5 seconds so we wait for the + // a poll completed and has been inactive for > 5 seconds so we wait for the // application to finish gracefully _ = DisposeAndRemoveAsync(connection, closeGracefully: true); } else { + if (!Debugger.IsAttached && _useSendTimeout) + { + connection.TryCancelSend(utcNow.Ticks); + } + // Tick the heartbeat, if the connection is still active connection.TickHeartbeat(); } diff --git a/src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs b/src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs new file mode 100644 index 0000000000..9608a67272 --- /dev/null +++ b/src/SignalR/common/Http.Connections/src/Internal/TaskExtensions.cs @@ -0,0 +1,24 @@ +// 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.Runtime.CompilerServices; +namespace System.Threading.Tasks +{ + internal static class TaskExtensions + { + public static async Task NoThrow(this Task task) + { + await new NoThrowAwaiter(task); + } + } + internal readonly struct NoThrowAwaiter : ICriticalNotifyCompletion + { + private readonly Task _task; + public NoThrowAwaiter(Task task) { _task = task; } + public NoThrowAwaiter GetAwaiter() => this; + public bool IsCompleted => _task.IsCompleted; + // Observe exception + public void GetResult() { _ = _task.Exception; } + public void OnCompleted(Action continuation) => _task.GetAwaiter().OnCompleted(continuation); + public void UnsafeOnCompleted(Action continuation) => OnCompleted(continuation); + } +} \ No newline at end of file diff --git a/src/SignalR/common/Http.Connections/src/Internal/Transports/LongPollingServerTransport.cs b/src/SignalR/common/Http.Connections/src/Internal/Transports/LongPollingServerTransport.cs index 02ff32ab8f..3432e37039 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/Transports/LongPollingServerTransport.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/Transports/LongPollingServerTransport.cs @@ -16,12 +16,19 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports private readonly PipeReader _application; private readonly ILogger _logger; private readonly CancellationToken _timeoutToken; + private readonly HttpConnectionContext _connection; public LongPollingServerTransport(CancellationToken timeoutToken, PipeReader application, ILoggerFactory loggerFactory) + : this(timeoutToken, application, loggerFactory, connection: null) + { } + + public LongPollingServerTransport(CancellationToken timeoutToken, PipeReader application, ILoggerFactory loggerFactory, HttpConnectionContext connection) { _timeoutToken = timeoutToken; _application = application; + _connection = connection; + // We create the logger with a string to preserve the logging namespace after the server side transport renames. _logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Connections.Internal.Transports.LongPollingTransport"); } @@ -33,7 +40,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports var result = await _application.ReadAsync(token); var buffer = result.Buffer; - if (buffer.IsEmpty && result.IsCompleted) + if (buffer.IsEmpty && (result.IsCompleted || result.IsCanceled)) { Log.LongPolling204(_logger); context.Response.ContentType = "text/plain"; @@ -51,19 +58,22 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports try { - await context.Response.Body.WriteAsync(buffer); + _connection?.StartSendCancellation(); + await context.Response.Body.WriteAsync(buffer, _connection?.SendingToken ?? default); } finally { + _connection?.StopSendCancellation(); _application.AdvanceTo(buffer.End); } } catch (OperationCanceledException) { - // 3 cases: + // 4 cases: // 1 - Request aborted, the client disconnected (no response) // 2 - The poll timeout is hit (200) - // 3 - A new request comes in and cancels this request (204) + // 3 - SendingToken was canceled, abort the connection + // 4 - A new request comes in and cancels this request (204) // Case 1 if (context.RequestAborted.IsCancellationRequested) @@ -81,9 +91,16 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports context.Response.ContentType = "text/plain"; context.Response.StatusCode = StatusCodes.Status200OK; } - else + else if (_connection?.SendingToken.IsCancellationRequested == true) { // Case 3 + context.Response.ContentType = "text/plain"; + context.Response.StatusCode = StatusCodes.Status204NoContent; + throw; + } + else + { + // Case 4 Log.LongPolling204(_logger); context.Response.ContentType = "text/plain"; context.Response.StatusCode = StatusCodes.Status204NoContent; diff --git a/src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsServerTransport.cs b/src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsServerTransport.cs index 54f2ed8f38..3d5e1f6f4b 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsServerTransport.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/Transports/ServerSentEventsServerTransport.cs @@ -16,11 +16,17 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports private readonly PipeReader _application; private readonly string _connectionId; private readonly ILogger _logger; + private readonly HttpConnectionContext _connection; public ServerSentEventsServerTransport(PipeReader application, string connectionId, ILoggerFactory loggerFactory) + : this(application, connectionId, connection: null, loggerFactory) + { } + + public ServerSentEventsServerTransport(PipeReader application, string connectionId, HttpConnectionContext connection, ILoggerFactory loggerFactory) { _application = application; _connectionId = connectionId; + _connection = connection; // We create the logger with a string to preserve the logging namespace after the server side transport renames. _logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Connections.Internal.Transports.ServerSentEventsTransport"); @@ -51,11 +57,17 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports try { + if (result.IsCanceled) + { + break; + } + if (!buffer.IsEmpty) { Log.SSEWritingMessage(_logger, buffer.Length); - await ServerSentEventsMessageFormatter.WriteMessageAsync(buffer, context.Response.Body); + _connection?.StartSendCancellation(); + await ServerSentEventsMessageFormatter.WriteMessageAsync(buffer, context.Response.Body, _connection?.SendingToken ?? default); } else if (result.IsCompleted) { @@ -64,6 +76,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports } finally { + _connection?.StopSendCancellation(); _application.AdvanceTo(buffer.End); } } diff --git a/src/SignalR/common/Http.Connections/src/Internal/Transports/WebSocketsServerTransport.cs b/src/SignalR/common/Http.Connections/src/Internal/Transports/WebSocketsServerTransport.cs index d5c2c1fefb..a95041c48a 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/Transports/WebSocketsServerTransport.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/Transports/WebSocketsServerTransport.cs @@ -231,7 +231,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports if (WebSocketCanSend(socket)) { - await socket.SendAsync(buffer, webSocketMessageType); + _connection.StartSendCancellation(); + await socket.SendAsync(buffer, webSocketMessageType, _connection.SendingToken); } else { @@ -254,6 +255,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports } finally { + _connection.StopSendCancellation(); _application.Input.AdvanceTo(buffer.End); } } diff --git a/src/SignalR/common/Http.Connections/src/ServerSentEventsMessageFormatter.cs b/src/SignalR/common/Http.Connections/src/ServerSentEventsMessageFormatter.cs index efd2e24f0f..6e723c5168 100644 --- a/src/SignalR/common/Http.Connections/src/ServerSentEventsMessageFormatter.cs +++ b/src/SignalR/common/Http.Connections/src/ServerSentEventsMessageFormatter.cs @@ -4,6 +4,7 @@ using System; using System.Buffers; using System.IO; +using System.Threading; using System.Threading.Tasks; namespace Microsoft.AspNetCore.Http.Connections @@ -15,19 +16,19 @@ namespace Microsoft.AspNetCore.Http.Connections private const byte LineFeed = (byte)'\n'; - public static async Task WriteMessageAsync(ReadOnlySequence payload, Stream output) + public static async Task WriteMessageAsync(ReadOnlySequence payload, Stream output, CancellationToken token) { // Payload does not contain a line feed so write it directly to output if (payload.PositionOf(LineFeed) == null) { if (payload.Length > 0) { - await output.WriteAsync(DataPrefix, 0, DataPrefix.Length); - await output.WriteAsync(payload); - await output.WriteAsync(Newline, 0, Newline.Length); + await output.WriteAsync(DataPrefix, 0, DataPrefix.Length, token); + await output.WriteAsync(payload, token); + await output.WriteAsync(Newline, 0, Newline.Length, token); } - await output.WriteAsync(Newline, 0, Newline.Length); + await output.WriteAsync(Newline, 0, Newline.Length, token); return; } @@ -37,7 +38,7 @@ namespace Microsoft.AspNetCore.Http.Connections await WriteMessageToMemory(ms, payload); ms.Position = 0; - await ms.CopyToAsync(output); + await ms.CopyToAsync(output, token); } /// diff --git a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs index d543cd4f9a..2dabe1adbc 100644 --- a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs +++ b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs @@ -1050,6 +1050,178 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests } } + private class BlockingStream : Stream + { + private readonly SyncPoint _sync; + private bool _isSSE; + public BlockingStream(SyncPoint sync, bool isSSE = false) + { + _sync = sync; + _isSSE = isSSE; + } + public override bool CanRead => throw new NotImplementedException(); + public override bool CanSeek => throw new NotImplementedException(); + public override bool CanWrite => throw new NotImplementedException(); + public override long Length => throw new NotImplementedException(); + public override long Position { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } + public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) + { + throw new NotImplementedException(); + } + public override void Flush() + { + } + public override int Read(byte[] buffer, int offset, int count) + { + throw new NotImplementedException(); + } + public override long Seek(long offset, SeekOrigin origin) + { + throw new NotImplementedException(); + } + public override void SetLength(long value) + { + throw new NotImplementedException(); + } + public override void Write(byte[] buffer, int offset, int count) + { + throw new NotImplementedException(); + } + public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) + { + if (_isSSE) + { + // SSE does an initial write of :\r\n that we want to ignore in testing + _isSSE = false; + return; + } + await _sync.WaitToContinue(); + cancellationToken.ThrowIfCancellationRequested(); + } +#if NETCOREAPP2_1 + public override async ValueTask WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default) + { + if (_isSSE) + { + // SSE does an initial write of :\r\n that we want to ignore in testing + _isSSE = false; + return; + } + await _sync.WaitToContinue(); + cancellationToken.ThrowIfCancellationRequested(); + } +#endif + } + + [Fact] + [LogLevel(LogLevel.Debug)] + public async Task LongPollingConnectionClosesWhenSendTimeoutReached() + { + bool ExpectedErrors(WriteContext writeContext) + { + return (writeContext.LoggerName == typeof(Internal.Transports.LongPollingServerTransport).FullName && + writeContext.EventId.Name == "LongPollingTerminated") || + (writeContext.LoggerName == typeof(HttpConnectionManager).FullName && writeContext.EventId.Name == "FailedDispose"); + } + + using (StartVerifiableLog(expectedErrorsFilter: ExpectedErrors)) + { + var manager = CreateConnectionManager(LoggerFactory); + var connection = manager.CreateConnection(); + connection.TransportType = HttpTransportType.LongPolling; + var dispatcher = new HttpConnectionDispatcher(manager, LoggerFactory); + var context = MakeRequest("/foo", connection); + var services = new ServiceCollection(); + services.AddSingleton(); + var builder = new ConnectionBuilder(services.BuildServiceProvider()); + builder.UseConnectionHandler(); + var app = builder.Build(); + var options = new HttpConnectionDispatcherOptions(); + // First poll completes immediately + await dispatcher.ExecuteAsync(context, options, app).OrTimeout(); + var sync = new SyncPoint(); + context.Response.Body = new BlockingStream(sync); + var dispatcherTask = dispatcher.ExecuteAsync(context, options, app); + await connection.Transport.Output.WriteAsync(new byte[] { 1 }).OrTimeout(); + await sync.WaitForSyncPoint().OrTimeout(); + // Cancel write to response body + connection.TryCancelSend(long.MaxValue); + sync.Continue(); + await dispatcherTask.OrTimeout(); + // Connection should be removed on canceled write + Assert.False(manager.TryGetConnection(connection.ConnectionId, out var _)); + } + } + + [Fact] + [LogLevel(LogLevel.Debug)] + public async Task SSEConnectionClosesWhenSendTimeoutReached() + { + using (StartVerifiableLog()) + { + var manager = CreateConnectionManager(LoggerFactory); + var connection = manager.CreateConnection(); + connection.TransportType = HttpTransportType.ServerSentEvents; + var dispatcher = new HttpConnectionDispatcher(manager, LoggerFactory); + var context = MakeRequest("/foo", connection); + SetTransport(context, connection.TransportType); + var services = new ServiceCollection(); + services.AddSingleton(); + var builder = new ConnectionBuilder(services.BuildServiceProvider()); + builder.UseConnectionHandler(); + var app = builder.Build(); + var sync = new SyncPoint(); + context.Response.Body = new BlockingStream(sync, isSSE: true); + var options = new HttpConnectionDispatcherOptions(); + var dispatcherTask = dispatcher.ExecuteAsync(context, options, app); + await connection.Transport.Output.WriteAsync(new byte[] { 1 }).OrTimeout(); + await sync.WaitForSyncPoint().OrTimeout(); + // Cancel write to response body + connection.TryCancelSend(long.MaxValue); + sync.Continue(); + await dispatcherTask.OrTimeout(); + // Connection should be removed on canceled write + Assert.False(manager.TryGetConnection(connection.ConnectionId, out var _)); + } + } + + [Fact] + [LogLevel(LogLevel.Debug)] + public async Task WebSocketConnectionClosesWhenSendTimeoutReached() + { + bool ExpectedErrors(WriteContext writeContext) + { + return writeContext.LoggerName == typeof(Internal.Transports.WebSocketsServerTransport).FullName && + writeContext.EventId.Name == "ErrorWritingFrame"; + } + using (StartVerifiableLog(expectedErrorsFilter: ExpectedErrors)) + { + var manager = CreateConnectionManager(LoggerFactory); + var connection = manager.CreateConnection(); + connection.TransportType = HttpTransportType.WebSockets; + var dispatcher = new HttpConnectionDispatcher(manager, LoggerFactory); + var sync = new SyncPoint(); + var context = MakeRequest("/foo", connection); + SetTransport(context, connection.TransportType, sync); + var services = new ServiceCollection(); + services.AddSingleton(); + var builder = new ConnectionBuilder(services.BuildServiceProvider()); + builder.UseConnectionHandler(); + var app = builder.Build(); + var options = new HttpConnectionDispatcherOptions(); + options.WebSockets.CloseTimeout = TimeSpan.FromSeconds(0); + var dispatcherTask = dispatcher.ExecuteAsync(context, options, app); + await connection.Transport.Output.WriteAsync(new byte[] { 1 }).OrTimeout(); + await sync.WaitForSyncPoint().OrTimeout(); + // Cancel write to response body + connection.TryCancelSend(long.MaxValue); + sync.Continue(); + await dispatcherTask.OrTimeout(); + // Connection should be removed on canceled write + Assert.False(manager.TryGetConnection(connection.ConnectionId, out var _)); + } + } + [Fact] [LogLevel(LogLevel.Trace)] public async Task WebSocketTransportTimesOutWhenCloseFrameNotReceived() @@ -1622,6 +1794,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests Assert.Equal(StatusCodes.Status202Accepted, deleteContext.Response.StatusCode); Assert.Equal("text/plain", deleteContext.Response.ContentType); + await connection.DisposeAndRemoveTask.OrTimeout(); + // Verify the connection was removed from the manager Assert.False(manager.TryGetConnection(connection.ConnectionToken, out _)); } @@ -1675,6 +1849,110 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests } } + [Fact] + public async Task DeleteEndpointTerminatesLongPollingWithHangingApplication() + { + using (StartVerifiableLog()) + { + var manager = CreateConnectionManager(LoggerFactory); + var pipeOptions = new PipeOptions(pauseWriterThreshold: 2, resumeWriterThreshold: 1); + var connection = manager.CreateConnection(pipeOptions, pipeOptions); + connection.TransportType = HttpTransportType.LongPolling; + + var dispatcher = new HttpConnectionDispatcher(manager, LoggerFactory); + + var context = MakeRequest("/foo", connection); + + var services = new ServiceCollection(); + services.AddSingleton(); + var builder = new ConnectionBuilder(services.BuildServiceProvider()); + builder.UseConnectionHandler(); + var app = builder.Build(); + var options = new HttpConnectionDispatcherOptions(); + + var pollTask = dispatcher.ExecuteAsync(context, options, app); + Assert.True(pollTask.IsCompleted); + + // Now send the second poll + pollTask = dispatcher.ExecuteAsync(context, options, app); + + // Issue the delete request and make sure the poll completes + var deleteContext = new DefaultHttpContext(); + deleteContext.Request.Path = "/foo"; + deleteContext.Request.QueryString = new QueryString($"?id={connection.ConnectionId}"); + deleteContext.Request.Method = "DELETE"; + + Assert.False(pollTask.IsCompleted); + + await dispatcher.ExecuteAsync(deleteContext, options, app).OrTimeout(); + + await pollTask.OrTimeout(); + + // Verify that transport shuts down + await connection.TransportTask.OrTimeout(); + + // Verify the response from the DELETE request + Assert.Equal(StatusCodes.Status202Accepted, deleteContext.Response.StatusCode); + Assert.Equal("text/plain", deleteContext.Response.ContentType); + Assert.Equal(HttpConnectionStatus.Disposed, connection.Status); + + // Verify the connection not removed because application is hanging + Assert.True(manager.TryGetConnection(connection.ConnectionId, out _)); + } + } + + [Fact] + public async Task PollCanReceiveFinalMessageAfterAppCompletes() + { + using (StartVerifiableLog()) + { + var transportType = HttpTransportType.LongPolling; + var manager = CreateConnectionManager(LoggerFactory); + var dispatcher = new HttpConnectionDispatcher(manager, LoggerFactory); + var connection = manager.CreateConnection(); + connection.TransportType = transportType; + + var waitForMessageTcs1 = new TaskCompletionSource(); + var messageTcs1 = new TaskCompletionSource(); + var waitForMessageTcs2 = new TaskCompletionSource(); + var messageTcs2 = new TaskCompletionSource(); + ConnectionDelegate connectionDelegate = async c => + { + await waitForMessageTcs1.Task.OrTimeout(); + await c.Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Message1")).OrTimeout(); + messageTcs1.TrySetResult(null); + await waitForMessageTcs2.Task.OrTimeout(); + await c.Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Message2")).OrTimeout(); + messageTcs2.TrySetResult(null); + }; + { + var options = new HttpConnectionDispatcherOptions(); + var context = MakeRequest("/foo", connection); + await dispatcher.ExecuteAsync(context, options, connectionDelegate).OrTimeout(); + + // second poll should have data + waitForMessageTcs1.SetResult(null); + await messageTcs1.Task.OrTimeout(); + + var ms = new MemoryStream(); + context.Response.Body = ms; + // Now send the second poll + await dispatcher.ExecuteAsync(context, options, connectionDelegate).OrTimeout(); + Assert.Equal("Message1", Encoding.UTF8.GetString(ms.ToArray())); + + waitForMessageTcs2.SetResult(null); + await messageTcs2.Task.OrTimeout(); + + context = MakeRequest("/foo", connection); + ms.Seek(0, SeekOrigin.Begin); + context.Response.Body = ms; + // This is the third poll which gets the final message after the app is complete + await dispatcher.ExecuteAsync(context, options, connectionDelegate).OrTimeout(); + Assert.Equal("Message2", Encoding.UTF8.GetString(ms.ToArray())); + } + } + } + [Fact] public async Task NegotiateDoesNotReturnWebSocketsWhenNotAvailable() { @@ -1987,12 +2265,12 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests return context; } - private static void SetTransport(HttpContext context, HttpTransportType transportType) + private static void SetTransport(HttpContext context, HttpTransportType transportType, SyncPoint sync = null) { switch (transportType) { case HttpTransportType.WebSockets: - context.Features.Set(new TestWebSocketConnectionFeature()); + context.Features.Set(new TestWebSocketConnectionFeature(sync)); break; case HttpTransportType.ServerSentEvents: context.Request.Headers["Accept"] = "text/event-stream"; diff --git a/src/SignalR/common/Http.Connections/test/HttpConnectionManagerTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionManagerTests.cs index ade605b08a..05a29f0e73 100644 --- a/src/SignalR/common/Http.Connections/test/HttpConnectionManagerTests.cs +++ b/src/SignalR/common/Http.Connections/test/HttpConnectionManagerTests.cs @@ -235,9 +235,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests try { Assert.True(result.IsCompleted); - - // We should be able to write - await connection.Transport.Output.WriteAsync(new byte[] { 1 }); } finally { @@ -248,13 +245,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests connection.TransportTask = Task.Run(async () => { var result = await connection.Application.Input.ReadAsync(); - Assert.Equal(new byte[] { 1 }, result.Buffer.ToArray()); - connection.Application.Input.AdvanceTo(result.Buffer.End); - - result = await connection.Application.Input.ReadAsync(); try { - Assert.True(result.IsCompleted); + Assert.True(result.IsCanceled); } finally { diff --git a/src/SignalR/common/Http.Connections/test/ServerSentEventsMessageFormatterTests.cs b/src/SignalR/common/Http.Connections/test/ServerSentEventsMessageFormatterTests.cs index 2a58e8d4dd..1640752056 100644 --- a/src/SignalR/common/Http.Connections/test/ServerSentEventsMessageFormatterTests.cs +++ b/src/SignalR/common/Http.Connections/test/ServerSentEventsMessageFormatterTests.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests var buffer = new ReadOnlySequence(Encoding.UTF8.GetBytes(payload)); var output = new MemoryStream(); - await ServerSentEventsMessageFormatter.WriteMessageAsync(buffer, output); + await ServerSentEventsMessageFormatter.WriteMessageAsync(buffer, output, default); Assert.Equal(encoded, Encoding.UTF8.GetString(output.ToArray())); } @@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests var buffer = ReadOnlySequenceFactory.SegmentPerByteFactory.CreateWithContent(Encoding.UTF8.GetBytes(payload)); var output = new MemoryStream(); - await ServerSentEventsMessageFormatter.WriteMessageAsync(buffer, output); + await ServerSentEventsMessageFormatter.WriteMessageAsync(buffer, output, default); Assert.Equal(encoded, Encoding.UTF8.GetString(output.ToArray())); } diff --git a/src/SignalR/common/Http.Connections/test/TestWebSocketConnectionFeature.cs b/src/SignalR/common/Http.Connections/test/TestWebSocketConnectionFeature.cs index f67dd94003..9bbb6894db 100644 --- a/src/SignalR/common/Http.Connections/test/TestWebSocketConnectionFeature.cs +++ b/src/SignalR/common/Http.Connections/test/TestWebSocketConnectionFeature.cs @@ -5,11 +5,21 @@ using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Internal; +using Microsoft.AspNetCore.SignalR.Tests; namespace Microsoft.AspNetCore.Http.Connections.Tests { internal class TestWebSocketConnectionFeature : IHttpWebSocketFeature, IDisposable { + public TestWebSocketConnectionFeature() + { } + public TestWebSocketConnectionFeature(SyncPoint sync) + { + _sync = sync; + } + + private readonly SyncPoint _sync; private readonly TaskCompletionSource _accepted = new TaskCompletionSource(); public bool IsWebSocketRequest => true; @@ -27,8 +37,8 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests var clientToServer = Channel.CreateUnbounded(); var serverToClient = Channel.CreateUnbounded(); - var clientSocket = new WebSocketChannel(serverToClient.Reader, clientToServer.Writer); - var serverSocket = new WebSocketChannel(clientToServer.Reader, serverToClient.Writer); + var clientSocket = new WebSocketChannel(serverToClient.Reader, clientToServer.Writer, _sync); + var serverSocket = new WebSocketChannel(clientToServer.Reader, serverToClient.Writer, _sync); Client = clientSocket; SubProtocol = context.SubProtocol; @@ -45,16 +55,18 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests { private readonly ChannelReader _input; private readonly ChannelWriter _output; + private readonly SyncPoint _sync; private WebSocketCloseStatus? _closeStatus; private string _closeStatusDescription; private WebSocketState _state; private WebSocketMessage _internalBuffer = new WebSocketMessage(); - public WebSocketChannel(ChannelReader input, ChannelWriter output) + public WebSocketChannel(ChannelReader input, ChannelWriter output, SyncPoint sync = null) { _input = input; _output = output; + _sync = sync; } public override WebSocketCloseStatus? CloseStatus => _closeStatus; @@ -173,11 +185,17 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests throw new InvalidOperationException("Unexpected close"); } - public override Task SendAsync(ArraySegment buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) + public override async Task SendAsync(ArraySegment buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) { + if (_sync != null) + { + await _sync.WaitToContinue(); + } + cancellationToken.ThrowIfCancellationRequested(); + var copy = new byte[buffer.Count]; Buffer.BlockCopy(buffer.Array, buffer.Offset, copy, 0, buffer.Count); - return SendMessageAsync(new WebSocketMessage + await SendMessageAsync(new WebSocketMessage { Buffer = copy, MessageType = messageType, diff --git a/src/SignalR/common/Shared/PipeWriterStream.cs b/src/SignalR/common/Shared/PipeWriterStream.cs index ddb7960b63..ee271aaf05 100644 --- a/src/SignalR/common/Shared/PipeWriterStream.cs +++ b/src/SignalR/common/Shared/PipeWriterStream.cs @@ -77,7 +77,16 @@ namespace System.IO.Pipelines _length += source.Length; var task = _pipeWriter.WriteAsync(source); - if (!task.IsCompletedSuccessfully) + + if (task.IsCompletedSuccessfully) + { + // Cancellation can be triggered by PipeWriter.CancelPendingFlush + if (task.Result.IsCanceled) + { + throw new OperationCanceledException(); + } + } + else { return WriteSlowAsync(task); } diff --git a/src/SignalR/common/testassets/Tests.Utils/TestClient.cs b/src/SignalR/common/testassets/Tests.Utils/TestClient.cs index 6183691ad4..ddb7dee201 100644 --- a/src/SignalR/common/testassets/Tests.Utils/TestClient.cs +++ b/src/SignalR/common/testassets/Tests.Utils/TestClient.cs @@ -37,9 +37,10 @@ namespace Microsoft.AspNetCore.SignalR.Tests public TransferFormat ActiveFormat { get; set; } - public TestClient(IHubProtocol protocol = null, IInvocationBinder invocationBinder = null, string userIdentifier = null) + public TestClient(IHubProtocol protocol = null, IInvocationBinder invocationBinder = null, string userIdentifier = null, long pauseWriterThreshold = 32768) { - var options = new PipeOptions(readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); + var options = new PipeOptions(readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false, + pauseWriterThreshold: pauseWriterThreshold, resumeWriterThreshold: pauseWriterThreshold / 2); var pair = DuplexPipe.CreateConnectionPair(options, options); Connection = new DefaultConnectionContext(Guid.NewGuid().ToString(), pair.Transport, pair.Application); @@ -70,16 +71,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests { if (sendHandshakeRequestMessage) { - var memoryBufferWriter = MemoryBufferWriter.Get(); - try - { - HandshakeProtocol.WriteRequestMessage(new HandshakeRequestMessage(_protocol.Name, _protocol.Version), memoryBufferWriter); - await Connection.Application.Output.WriteAsync(memoryBufferWriter.ToArray()); - } - finally - { - MemoryBufferWriter.Return(memoryBufferWriter); - } + await Connection.Application.Output.WriteAsync(GetHandshakeRequestMessage()); } var connection = handler.OnConnectedAsync(Connection); @@ -257,7 +249,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests } else { - // read first message out of the incoming data + // read first message out of the incoming data if (HandshakeProtocol.TryParseResponseMessage(ref buffer, out var responseMessage)) { return responseMessage; @@ -312,6 +304,20 @@ namespace Microsoft.AspNetCore.SignalR.Tests } } + public byte[] GetHandshakeRequestMessage() + { + var memoryBufferWriter = MemoryBufferWriter.Get(); + try + { + HandshakeProtocol.WriteRequestMessage(new HandshakeRequestMessage(_protocol.Name, _protocol.Version), memoryBufferWriter); + return memoryBufferWriter.ToArray(); + } + finally + { + MemoryBufferWriter.Return(memoryBufferWriter); + } + } + private class DefaultInvocationBinder : IInvocationBinder { public IReadOnlyList GetParameterTypes(string methodName) diff --git a/src/SignalR/perf/Microbenchmarks/ServerSentEventsBenchmark.cs b/src/SignalR/perf/Microbenchmarks/ServerSentEventsBenchmark.cs index fd4357c952..5b20e7209d 100644 --- a/src/SignalR/perf/Microbenchmarks/ServerSentEventsBenchmark.cs +++ b/src/SignalR/perf/Microbenchmarks/ServerSentEventsBenchmark.cs @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.SignalR.Microbenchmarks _parser = new ServerSentEventsMessageParser(); _rawData = new ReadOnlySequence(protocol.GetMessageBytes(hubMessage)); var ms = new MemoryStream(); - ServerSentEventsMessageFormatter.WriteMessageAsync(_rawData, ms).GetAwaiter().GetResult(); + ServerSentEventsMessageFormatter.WriteMessageAsync(_rawData, ms, default).GetAwaiter().GetResult(); _sseFormattedData = ms.ToArray(); } @@ -81,7 +81,7 @@ namespace Microsoft.AspNetCore.SignalR.Microbenchmarks [Benchmark] public Task WriteSingleMessage() { - return ServerSentEventsMessageFormatter.WriteMessageAsync(_rawData, Stream.Null); + return ServerSentEventsMessageFormatter.WriteMessageAsync(_rawData, Stream.Null, default); } public enum Message diff --git a/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs b/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs index 3c835ab933..02609bce1e 100644 --- a/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs +++ b/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs @@ -82,10 +82,10 @@ namespace Microsoft.AspNetCore.SignalR /// public override Task SendAllAsync(string methodName, object[] args, CancellationToken cancellationToken = default) { - return SendToAllConnections(methodName, args, null); + return SendToAllConnections(methodName, args, include: null, cancellationToken); } - private Task SendToAllConnections(string methodName, object[] args, Func include) + private Task SendToAllConnections(string methodName, object[] args, Func include, CancellationToken cancellationToken) { List tasks = null; SerializedHubMessage message = null; @@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.SignalR message = CreateSerializedInvocationMessage(methodName, args); } - var task = connection.WriteAsync(message); + var task = connection.WriteAsync(message, cancellationToken); if (!task.IsCompletedSuccessfully) { @@ -127,7 +127,8 @@ namespace Microsoft.AspNetCore.SignalR // Tasks and message are passed by ref so they can be lazily created inside the method post-filtering, // while still being re-usable when sending to multiple groups - private void SendToGroupConnections(string methodName, object[] args, ConcurrentDictionary connections, Func include, ref List tasks, ref SerializedHubMessage message) + private void SendToGroupConnections(string methodName, object[] args, ConcurrentDictionary connections, Func include, + ref List tasks, ref SerializedHubMessage message, CancellationToken cancellationToken) { // foreach over ConcurrentDictionary avoids allocating an enumerator foreach (var connection in connections) @@ -142,7 +143,7 @@ namespace Microsoft.AspNetCore.SignalR message = CreateSerializedInvocationMessage(methodName, args); } - var task = connection.Value.WriteAsync(message); + var task = connection.Value.WriteAsync(message, cancellationToken); if (!task.IsCompletedSuccessfully) { @@ -175,7 +176,7 @@ namespace Microsoft.AspNetCore.SignalR // Write message directly to connection without caching it in memory var message = CreateInvocationMessage(methodName, args); - return connection.WriteAsync(message).AsTask(); + return connection.WriteAsync(message, cancellationToken).AsTask(); } /// @@ -193,7 +194,7 @@ namespace Microsoft.AspNetCore.SignalR // group might be modified inbetween checking and sending List tasks = null; SerializedHubMessage message = null; - SendToGroupConnections(methodName, args, group, null, ref tasks, ref message); + SendToGroupConnections(methodName, args, group, null, ref tasks, ref message, cancellationToken); if (tasks != null) { @@ -221,7 +222,7 @@ namespace Microsoft.AspNetCore.SignalR var group = _groups[groupName]; if (group != null) { - SendToGroupConnections(methodName, args, group, null, ref tasks, ref message); + SendToGroupConnections(methodName, args, group, null, ref tasks, ref message, cancellationToken); } } @@ -247,7 +248,7 @@ namespace Microsoft.AspNetCore.SignalR List tasks = null; SerializedHubMessage message = null; - SendToGroupConnections(methodName, args, group, connection => !excludedConnectionIds.Contains(connection.ConnectionId), ref tasks, ref message); + SendToGroupConnections(methodName, args, group, connection => !excludedConnectionIds.Contains(connection.ConnectionId), ref tasks, ref message, cancellationToken); if (tasks != null) { @@ -271,7 +272,7 @@ namespace Microsoft.AspNetCore.SignalR /// public override Task SendUserAsync(string userId, string methodName, object[] args, CancellationToken cancellationToken = default) { - return SendToAllConnections(methodName, args, connection => string.Equals(connection.UserIdentifier, userId, StringComparison.Ordinal)); + return SendToAllConnections(methodName, args, connection => string.Equals(connection.UserIdentifier, userId, StringComparison.Ordinal), cancellationToken); } /// @@ -292,19 +293,19 @@ namespace Microsoft.AspNetCore.SignalR /// public override Task SendAllExceptAsync(string methodName, object[] args, IReadOnlyList excludedConnectionIds, CancellationToken cancellationToken = default) { - return SendToAllConnections(methodName, args, connection => !excludedConnectionIds.Contains(connection.ConnectionId)); + return SendToAllConnections(methodName, args, connection => !excludedConnectionIds.Contains(connection.ConnectionId), cancellationToken); } /// public override Task SendConnectionsAsync(IReadOnlyList connectionIds, string methodName, object[] args, CancellationToken cancellationToken = default) { - return SendToAllConnections(methodName, args, connection => connectionIds.Contains(connection.ConnectionId)); + return SendToAllConnections(methodName, args, connection => connectionIds.Contains(connection.ConnectionId), cancellationToken); } /// public override Task SendUsersAsync(IReadOnlyList userIds, string methodName, object[] args, CancellationToken cancellationToken = default) { - return SendToAllConnections(methodName, args, connection => userIds.Contains(connection.UserIdentifier)); + return SendToAllConnections(methodName, args, connection => userIds.Contains(connection.UserIdentifier), cancellationToken); } } } diff --git a/src/SignalR/server/Core/src/HubConnectionContext.cs b/src/SignalR/server/Core/src/HubConnectionContext.cs index 8e9216d35d..11e05c177c 100644 --- a/src/SignalR/server/Core/src/HubConnectionContext.cs +++ b/src/SignalR/server/Core/src/HubConnectionContext.cs @@ -34,6 +34,8 @@ namespace Microsoft.AspNetCore.SignalR private readonly long _keepAliveInterval; private readonly long _clientTimeoutInterval; private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1); + private readonly bool _useAbsoluteClientTimeout; + private readonly object _receiveMessageTimeoutLock = new object(); private StreamTracker _streamTracker; private long _lastSendTimeStamp = DateTime.UtcNow.Ticks; @@ -41,10 +43,13 @@ namespace Microsoft.AspNetCore.SignalR private bool _receivedMessageThisInterval = false; private ReadOnlyMemory _cachedPingMessage; private bool _clientTimeoutActive; - private bool _connectionAborted; + private volatile bool _connectionAborted; private volatile bool _allowReconnect = true; private int _streamBufferCapacity; private long? _maxMessageSize; + private bool _receivedMessageTimeoutEnabled = false; + private long _receivedMessageElapsedTicks = 0; + private long _receivedMessageTimestamp; /// /// Initializes a new instance of the class. @@ -64,6 +69,11 @@ namespace Microsoft.AspNetCore.SignalR ConnectionAborted = _connectionAbortedTokenSource.Token; HubCallerContext = new DefaultHubCallerContext(this); + + if (AppContext.TryGetSwitch("Microsoft.AspNetCore.SignalR.UseAbsoluteClientTimeout", out var useAbsoluteClientTimeout)) + { + _useAbsoluteClientTimeout = useAbsoluteClientTimeout; + } } internal StreamTracker StreamTracker @@ -131,7 +141,7 @@ namespace Microsoft.AspNetCore.SignalR // Try to grab the lock synchronously, if we fail, go to the slower path if (!_writeLock.Wait(0)) { - return new ValueTask(WriteSlowAsync(message)); + return new ValueTask(WriteSlowAsync(message, cancellationToken)); } if (_connectionAborted) @@ -141,7 +151,7 @@ namespace Microsoft.AspNetCore.SignalR } // This method should never throw synchronously - var task = WriteCore(message); + var task = WriteCore(message, cancellationToken); // The write didn't complete synchronously so await completion if (!task.IsCompletedSuccessfully) @@ -167,7 +177,7 @@ namespace Microsoft.AspNetCore.SignalR // Try to grab the lock synchronously, if we fail, go to the slower path if (!_writeLock.Wait(0)) { - return new ValueTask(WriteSlowAsync(message)); + return new ValueTask(WriteSlowAsync(message, cancellationToken)); } if (_connectionAborted) @@ -177,7 +187,7 @@ namespace Microsoft.AspNetCore.SignalR } // This method should never throw synchronously - var task = WriteCore(message); + var task = WriteCore(message, cancellationToken); // The write didn't complete synchronously so await completion if (!task.IsCompletedSuccessfully) @@ -191,7 +201,7 @@ namespace Microsoft.AspNetCore.SignalR return default; } - private ValueTask WriteCore(HubMessage message) + private ValueTask WriteCore(HubMessage message, CancellationToken cancellationToken) { try { @@ -199,7 +209,7 @@ namespace Microsoft.AspNetCore.SignalR // write it without caching. Protocol.WriteMessage(message, _connectionContext.Transport.Output); - return _connectionContext.Transport.Output.FlushAsync(); + return _connectionContext.Transport.Output.FlushAsync(cancellationToken); } catch (Exception ex) { @@ -211,14 +221,14 @@ namespace Microsoft.AspNetCore.SignalR } } - private ValueTask WriteCore(SerializedHubMessage message) + private ValueTask WriteCore(SerializedHubMessage message, CancellationToken cancellationToken) { try { // Grab a preserialized buffer for this protocol. var buffer = message.GetSerializedMessage(Protocol); - return _connectionContext.Transport.Output.WriteAsync(buffer); + return _connectionContext.Transport.Output.WriteAsync(buffer, cancellationToken); } catch (Exception ex) { @@ -249,10 +259,10 @@ namespace Microsoft.AspNetCore.SignalR } } - private async Task WriteSlowAsync(HubMessage message) + private async Task WriteSlowAsync(HubMessage message, CancellationToken cancellationToken) { // Failed to get the lock immediately when entering WriteAsync so await until it is available - await _writeLock.WaitAsync(); + await _writeLock.WaitAsync(cancellationToken); try { @@ -261,7 +271,7 @@ namespace Microsoft.AspNetCore.SignalR return; } - await WriteCore(message); + await WriteCore(message, cancellationToken); } catch (Exception ex) { @@ -274,7 +284,7 @@ namespace Microsoft.AspNetCore.SignalR } } - private async Task WriteSlowAsync(SerializedHubMessage message) + private async Task WriteSlowAsync(SerializedHubMessage message, CancellationToken cancellationToken) { // Failed to get the lock immediately when entering WriteAsync so await until it is available await _writeLock.WaitAsync(); @@ -286,7 +296,7 @@ namespace Microsoft.AspNetCore.SignalR return; } - await WriteCore(message); + await WriteCore(message, cancellationToken); } catch (Exception ex) { @@ -370,6 +380,9 @@ namespace Microsoft.AspNetCore.SignalR private void AbortAllowReconnect() { _connectionAborted = true; + // Cancel any current writes or writes that are about to happen and have already gone past the _connectionAborted bool + // We have to do this outside of the lock otherwise it could hang if the write is observing backpressure + _connectionContext.Transport.Output.CancelPendingFlush(); // If we already triggered the token then noop, this isn't thread safe but it's good enough // to avoid spawning a new task in the most common cases @@ -525,9 +538,23 @@ namespace Microsoft.AspNetCore.SignalR internal Task AbortAsync() { AbortAllowReconnect(); + + // Acquire lock to make sure all writes are completed + if (!_writeLock.Wait(0)) + { + return AbortAsyncSlow(); + } + _writeLock.Release(); return _abortCompletedTcs.Task; } + private async Task AbortAsyncSlow() + { + await _writeLock.WaitAsync(); + _writeLock.Release(); + await _abortCompletedTcs.Task; + } + private void KeepAliveTick() { var currentTime = DateTime.UtcNow.Ticks; @@ -564,17 +591,41 @@ namespace Microsoft.AspNetCore.SignalR private void CheckClientTimeout() { - // If it's been too long since we've heard from the client, then close this - if (DateTime.UtcNow.Ticks - Volatile.Read(ref _lastReceivedTimeStamp) > _clientTimeoutInterval) + if (Debugger.IsAttached) { - if (!_receivedMessageThisInterval) - { - Log.ClientTimeout(_logger, TimeSpan.FromTicks(_clientTimeoutInterval)); - AbortAllowReconnect(); - } + return; + } - _receivedMessageThisInterval = false; - Volatile.Write(ref _lastReceivedTimeStamp, DateTime.UtcNow.Ticks); + if (_useAbsoluteClientTimeout) + { + // If it's been too long since we've heard from the client, then close this + if (DateTime.UtcNow.Ticks - Volatile.Read(ref _lastReceivedTimeStamp) > _clientTimeoutInterval) + { + if (!_receivedMessageThisInterval) + { + Log.ClientTimeout(_logger, TimeSpan.FromTicks(_clientTimeoutInterval)); + AbortAllowReconnect(); + } + + _receivedMessageThisInterval = false; + Volatile.Write(ref _lastReceivedTimeStamp, DateTime.UtcNow.Ticks); + } + } + else + { + lock (_receiveMessageTimeoutLock) + { + if (_receivedMessageTimeoutEnabled) + { + _receivedMessageElapsedTicks = DateTime.UtcNow.Ticks - _receivedMessageTimestamp; + + if (_receivedMessageElapsedTicks >= _clientTimeoutInterval) + { + Log.ClientTimeout(_logger, TimeSpan.FromTicks(_clientTimeoutInterval)); + AbortAllowReconnect(); + } + } + } } } @@ -623,6 +674,35 @@ namespace Microsoft.AspNetCore.SignalR _receivedMessageThisInterval = true; } + internal void BeginClientTimeout() + { + // check if new timeout behavior is in use + if (!_useAbsoluteClientTimeout) + { + lock (_receiveMessageTimeoutLock) + { + _receivedMessageTimeoutEnabled = true; + _receivedMessageTimestamp = DateTime.UtcNow.Ticks; + } + } + } + + internal void StopClientTimeout() + { + // check if new timeout behavior is in use + if (!_useAbsoluteClientTimeout) + { + lock (_receiveMessageTimeoutLock) + { + // we received a message so stop the timer and reset it + // it will resume after the message has been processed + _receivedMessageElapsedTicks = 0; + _receivedMessageTimestamp = 0; + _receivedMessageTimeoutEnabled = false; + } + } + } + private static class Log { // Category: HubConnectionContext diff --git a/src/SignalR/server/Core/src/HubConnectionHandler.cs b/src/SignalR/server/Core/src/HubConnectionHandler.cs index 663864cbb9..0a8f3380f9 100644 --- a/src/SignalR/server/Core/src/HubConnectionHandler.cs +++ b/src/SignalR/server/Core/src/HubConnectionHandler.cs @@ -213,6 +213,8 @@ namespace Microsoft.AspNetCore.SignalR { var input = connection.Input; var protocol = connection.Protocol; + connection.BeginClientTimeout(); + var binder = new HubConnectionBinder(_dispatcher, connection); @@ -221,6 +223,8 @@ namespace Microsoft.AspNetCore.SignalR var result = await input.ReadAsync(); var buffer = result.Buffer; + connection.ResetClientTimeout(); + try { if (result.IsCanceled) @@ -230,15 +234,21 @@ namespace Microsoft.AspNetCore.SignalR if (!buffer.IsEmpty) { - connection.ResetClientTimeout(); - + bool messageReceived = false; // No message limit, just parse and dispatch if (_maximumMessageSize == null) { while (protocol.TryParseMessage(ref buffer, binder, out var message)) { + messageReceived = true; + connection.StopClientTimeout(); await _dispatcher.DispatchMessageAsync(connection, message); } + + if (messageReceived) + { + connection.BeginClientTimeout(); + } } else { @@ -258,6 +268,9 @@ namespace Microsoft.AspNetCore.SignalR if (protocol.TryParseMessage(ref segment, binder, out var message)) { + messageReceived = true; + connection.StopClientTimeout(); + await _dispatcher.DispatchMessageAsync(connection, message); } else if (overLength) @@ -273,6 +286,11 @@ namespace Microsoft.AspNetCore.SignalR // Update the buffer to the remaining segment buffer = buffer.Slice(segment.Start); } + + if (messageReceived) + { + connection.BeginClientTimeout(); + } } } diff --git a/src/SignalR/server/Core/src/Internal/Proxies.cs b/src/SignalR/server/Core/src/Internal/Proxies.cs index 9a3edd56bd..8a2beb26de 100644 --- a/src/SignalR/server/Core/src/Internal/Proxies.cs +++ b/src/SignalR/server/Core/src/Internal/Proxies.cs @@ -105,7 +105,7 @@ namespace Microsoft.AspNetCore.SignalR.Internal public Task SendCoreAsync(string method, object[] args, CancellationToken cancellationToken = default) { - return _lifetimeManager.SendAllAsync(method, args); + return _lifetimeManager.SendAllAsync(method, args, cancellationToken); } } diff --git a/src/SignalR/server/SignalR/test/DefaultHubLifetimeManagerTests.cs b/src/SignalR/server/SignalR/test/DefaultHubLifetimeManagerTests.cs index 0e00c9a9ab..ee312dbf3e 100644 --- a/src/SignalR/server/SignalR/test/DefaultHubLifetimeManagerTests.cs +++ b/src/SignalR/server/SignalR/test/DefaultHubLifetimeManagerTests.cs @@ -1,9 +1,14 @@ // 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.Collections.Generic; +using System.Threading.Tasks; +using System.Threading; +using Microsoft.AspNetCore.SignalR.Protocol; +using Microsoft.AspNetCore.SignalR.Specification.Tests; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.AspNetCore.SignalR.Specification.Tests; +using Xunit; namespace Microsoft.AspNetCore.SignalR.Tests { @@ -13,5 +18,241 @@ namespace Microsoft.AspNetCore.SignalR.Tests { return new DefaultHubLifetimeManager(new Logger>(NullLoggerFactory.Instance)); } + + [Fact] + public async Task SendAllAsyncWillCancelWithToken() + { + using (var client1 = new TestClient()) + using (var client2 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = CreateNewHubLifetimeManager(); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + var connection2 = HubConnectionContextUtils.Create(client2.Connection); + await manager.OnConnectedAsync(connection1).OrTimeout(); + await manager.OnConnectedAsync(connection2).OrTimeout(); + var cts = new CancellationTokenSource(); + var sendTask = manager.SendAllAsync("Hello", new object[] { "World" }, cts.Token).OrTimeout(); + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + var message = Assert.IsType(client1.TryRead()); + Assert.Equal("Hello", message.Target); + Assert.Single(message.Arguments); + Assert.Equal("World", (string)message.Arguments[0]); + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection2.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + Assert.False(connection1.ConnectionAborted.IsCancellationRequested); + } + } + + [Fact] + public async Task SendAllExceptAsyncWillCancelWithToken() + { + using (var client1 = new TestClient()) + using (var client2 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = CreateNewHubLifetimeManager(); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + var connection2 = HubConnectionContextUtils.Create(client2.Connection); + await manager.OnConnectedAsync(connection1).OrTimeout(); + await manager.OnConnectedAsync(connection2).OrTimeout(); + var cts = new CancellationTokenSource(); + var sendTask = manager.SendAllExceptAsync("Hello", new object[] { "World" }, new List { connection1.ConnectionId }, cts.Token).OrTimeout(); + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection2.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + Assert.False(connection1.ConnectionAborted.IsCancellationRequested); + Assert.Null(client1.TryRead()); + } + } + + [Fact] + public async Task SendConnectionAsyncWillCancelWithToken() + { + using (var client1 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = CreateNewHubLifetimeManager(); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + await manager.OnConnectedAsync(connection1).OrTimeout(); + var cts = new CancellationTokenSource(); + var sendTask = manager.SendConnectionAsync(connection1.ConnectionId, "Hello", new object[] { "World" }, cts.Token).OrTimeout(); + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection1.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + } + } + + [Fact] + public async Task SendConnectionsAsyncWillCancelWithToken() + { + using (var client1 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = CreateNewHubLifetimeManager(); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + await manager.OnConnectedAsync(connection1).OrTimeout(); + var cts = new CancellationTokenSource(); + var sendTask = manager.SendConnectionsAsync(new List { connection1.ConnectionId }, "Hello", new object[] { "World" }, cts.Token).OrTimeout(); + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection1.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + } + } + + [Fact] + public async Task SendGroupAsyncWillCancelWithToken() + { + using (var client1 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = CreateNewHubLifetimeManager(); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + await manager.OnConnectedAsync(connection1).OrTimeout(); + await manager.AddToGroupAsync(connection1.ConnectionId, "group").OrTimeout(); + var cts = new CancellationTokenSource(); + var sendTask = manager.SendGroupAsync("group", "Hello", new object[] { "World" }, cts.Token).OrTimeout(); + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection1.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + } + } + + [Fact] + public async Task SendGroupExceptAsyncWillCancelWithToken() + { + using (var client1 = new TestClient()) + using (var client2 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = CreateNewHubLifetimeManager(); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + var connection2 = HubConnectionContextUtils.Create(client2.Connection); + await manager.OnConnectedAsync(connection1).OrTimeout(); + await manager.OnConnectedAsync(connection2).OrTimeout(); + await manager.AddToGroupAsync(connection1.ConnectionId, "group").OrTimeout(); + await manager.AddToGroupAsync(connection2.ConnectionId, "group").OrTimeout(); + var cts = new CancellationTokenSource(); + var sendTask = manager.SendGroupExceptAsync("group", "Hello", new object[] { "World" }, new List { connection1.ConnectionId }, cts.Token).OrTimeout(); + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection2.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + Assert.False(connection1.ConnectionAborted.IsCancellationRequested); + Assert.Null(client1.TryRead()); + } + } + + [Fact] + public async Task SendGroupsAsyncWillCancelWithToken() + { + using (var client1 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = CreateNewHubLifetimeManager(); + var connection1 = HubConnectionContextUtils.Create(client1.Connection); + await manager.OnConnectedAsync(connection1).OrTimeout(); + await manager.AddToGroupAsync(connection1.ConnectionId, "group").OrTimeout(); + var cts = new CancellationTokenSource(); + var sendTask = manager.SendGroupsAsync(new List { "group" }, "Hello", new object[] { "World" }, cts.Token).OrTimeout(); + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection1.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + } + } + + [Fact] + public async Task SendUserAsyncWillCancelWithToken() + { + using (var client1 = new TestClient()) + using (var client2 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = CreateNewHubLifetimeManager(); + var connection1 = HubConnectionContextUtils.Create(client1.Connection, userIdentifier: "user"); + var connection2 = HubConnectionContextUtils.Create(client2.Connection, userIdentifier: "user"); + await manager.OnConnectedAsync(connection1).OrTimeout(); + await manager.OnConnectedAsync(connection2).OrTimeout(); + var cts = new CancellationTokenSource(); + var sendTask = manager.SendUserAsync("user", "Hello", new object[] { "World" }, cts.Token).OrTimeout(); + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + var message = Assert.IsType(client1.TryRead()); + Assert.Equal("Hello", message.Target); + Assert.Single(message.Arguments); + Assert.Equal("World", (string)message.Arguments[0]); + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection2.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + Assert.False(connection1.ConnectionAborted.IsCancellationRequested); + } + } + + [Fact] + public async Task SendUsersAsyncWillCancelWithToken() + { + using (var client1 = new TestClient()) + using (var client2 = new TestClient(pauseWriterThreshold: 2)) + { + var manager = CreateNewHubLifetimeManager(); + var connection1 = HubConnectionContextUtils.Create(client1.Connection, userIdentifier: "user1"); + var connection2 = HubConnectionContextUtils.Create(client2.Connection, userIdentifier: "user2"); + await manager.OnConnectedAsync(connection1).OrTimeout(); + await manager.OnConnectedAsync(connection2).OrTimeout(); + var cts = new CancellationTokenSource(); + var sendTask = manager.SendUsersAsync(new List { "user1", "user2" }, "Hello", new object[] { "World" }, cts.Token).OrTimeout(); + Assert.False(sendTask.IsCompleted); + cts.Cancel(); + await sendTask.OrTimeout(); + var message = Assert.IsType(client1.TryRead()); + Assert.Equal("Hello", message.Target); + Assert.Single(message.Arguments); + Assert.Equal("World", (string)message.Arguments[0]); + var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + connection2.ConnectionAborted.Register(t => + { + ((TaskCompletionSource)t).SetResult(null); + }, tcs); + await tcs.Task.OrTimeout(); + Assert.False(connection1.ConnectionAborted.IsCancellationRequested); + } + } } } diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs index 9f727d6523..79f2122d3c 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs @@ -2798,6 +2798,47 @@ namespace Microsoft.AspNetCore.SignalR.Tests } } + [Fact] + public async Task HubMethodInvokeDoesNotCountTowardsClientTimeout() + { + using (StartVerifiableLog()) + { + var tcsService = new TcsService(); + var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(services => + { + services.Configure(options => + options.ClientTimeoutInterval = TimeSpan.FromMilliseconds(0)); + services.AddSingleton(tcsService); + }, LoggerFactory); + var connectionHandler = serviceProvider.GetService>(); + + using (var client = new TestClient(new JsonHubProtocol())) + { + var connectionHandlerTask = await client.ConnectAsync(connectionHandler); + // This starts the timeout logic + await client.SendHubMessageAsync(PingMessage.Instance); + + // Call long running hub method + var hubMethodTask = client.InvokeAsync(nameof(LongRunningHub.LongRunningMethod)); + await tcsService.StartedMethod.Task.OrTimeout(); + + // Tick heartbeat while hub method is running to show that close isn't triggered + client.TickHeartbeat(); + + // Unblock long running hub method + tcsService.EndMethod.SetResult(null); + + await hubMethodTask.OrTimeout(); + + // Tick heartbeat again now that we're outside of the hub method + client.TickHeartbeat(); + + // Connection is closed + await connectionHandlerTask.OrTimeout(); + } + } + } + [Fact] public async Task EndingConnectionSendsCloseMessageWithNoError() { From 05d579cbbdf23809c974581059134d4fa7458e09 Mon Sep 17 00:00:00 2001 From: Brennan Date: Mon, 25 Nov 2019 14:23:18 -0800 Subject: [PATCH 023/116] Update ci.yml (#17359) --- .azure/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index cb6efa8aa4..4371e6ae00 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -62,7 +62,7 @@ variables: - name: _BuildArgs value: '' - name: _SignType - valule: test + value: test - name: _PublishArgs value: '' From 8ad86eefedb5be22165be6d8868e2e116b2dbdb9 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 25 Nov 2019 14:26:35 -0800 Subject: [PATCH 024/116] Remove unused nuget feeds (#16878) * Remove unused nuget feeds * Add dotnet-core back * dotnet-tools -> dotnet-eng --- NuGet.config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index beff41b791..805d946fd2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,10 +8,9 @@ - + - From 15c20827a533088479fc1c9e13aae575acdf3659 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 16:45:30 -0800 Subject: [PATCH 025/116] [release/3.0] Update dependencies from aspnet/EntityFrameworkCore (#17380) * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191125.1 - Microsoft.EntityFrameworkCore.Tools - 3.0.2-servicing.19575.1 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.2-servicing.19575.1 - dotnet-ef - 3.0.2-servicing.19575.1 - Microsoft.EntityFrameworkCore - 3.0.2-servicing.19575.1 - Microsoft.EntityFrameworkCore.InMemory - 3.0.2-servicing.19575.1 - Microsoft.EntityFrameworkCore.Relational - 3.0.2-servicing.19575.1 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.2-servicing.19575.1 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-01 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19572-01 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.2-servicing.19572.5 (parent: Microsoft.EntityFrameworkCore) * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191125.6 - Microsoft.EntityFrameworkCore.Tools - 3.0.2-servicing.19575.6 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.2-servicing.19575.6 - dotnet-ef - 3.0.2-servicing.19575.6 - Microsoft.EntityFrameworkCore - 3.0.2-servicing.19575.6 - Microsoft.EntityFrameworkCore.InMemory - 3.0.2-servicing.19575.6 - Microsoft.EntityFrameworkCore.Relational - 3.0.2-servicing.19575.6 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.2-servicing.19575.6 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19572-09 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - System.Drawing.Common - 4.6.2-servicing.19572.6 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19572-09 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.0.1-servicing.19572.6 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Internal.AspNetCore.Analyzers - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.2-servicing.19575.2 (parent: Microsoft.EntityFrameworkCore) --- NuGet.config | 1 - eng/Version.Details.xml | 284 ++++++++++++++++++++-------------------- eng/Versions.props | 142 ++++++++++---------- 3 files changed, 213 insertions(+), 214 deletions(-) diff --git a/NuGet.config b/NuGet.config index 805d946fd2..f1ca59b9ac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8de03d7f3b..2190c82d2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,269 +29,269 @@ https://github.com/aspnet/AspNetCore-Tooling 3d6c6a7ea5db32db5fb510141b26e58138f79206 - + https://github.com/aspnet/EntityFrameworkCore - 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 + a33930a1cad986209e7cb4bb97daa6d3b15f8f66 - + https://github.com/aspnet/EntityFrameworkCore - 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 + a33930a1cad986209e7cb4bb97daa6d3b15f8f66 - + https://github.com/aspnet/EntityFrameworkCore - 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 + a33930a1cad986209e7cb4bb97daa6d3b15f8f66 - + https://github.com/aspnet/EntityFrameworkCore - 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 + a33930a1cad986209e7cb4bb97daa6d3b15f8f66 - + https://github.com/aspnet/EntityFrameworkCore - 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 + a33930a1cad986209e7cb4bb97daa6d3b15f8f66 - + https://github.com/aspnet/EntityFrameworkCore - 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 + a33930a1cad986209e7cb4bb97daa6d3b15f8f66 - + https://github.com/aspnet/EntityFrameworkCore - 8b9e4cb61e6df022e0269e7b351a015f2bb50ea5 + a33930a1cad986209e7cb4bb97daa6d3b15f8f66 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 https://github.com/aspnet/Extensions 40c00020ac632006c9db91383de246226f9cb44a - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 https://github.com/dotnet/corefx @@ -317,9 +317,9 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/dotnet/corefx - 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea + a2b312cfb6b50fa9c224c1954a6ba2fe3095796b https://github.com/dotnet/corefx @@ -381,17 +381,17 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 626c14488261f91192e39a4c6c2d9480a7cd1f37 - + https://github.com/dotnet/core-setup - 32085cbc728e1016c9d6a7bc105845f0f9eb6b47 + 626c14488261f91192e39a4c6c2d9480a7cd1f37 https://github.com/dotnet/core-setup @@ -409,13 +409,13 @@ - + https://github.com/dotnet/corefx - 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea + a2b312cfb6b50fa9c224c1954a6ba2fe3095796b - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 https://github.com/dotnet/arcade @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 0e0d227c57e69c03427d6e668716d62cf4ceb36e - + https://github.com/aspnet/Extensions - 9e4580f93ba719e2c880c49a96b9b3baa010cdf9 + dcdecd07e6059a4b3041ea14baa36e7794343ce3 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 19f3a9d108..c3c574cab9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,9 +70,9 @@ 3.3.1-beta4-19462-11 - 3.0.1 + 3.0.2-servicing-19572-09 3.0.0 - 3.0.1 + 3.0.2-servicing-19572-09 2.1.0 1.0.0 @@ -81,7 +81,7 @@ 4.6.0 4.6.0 4.6.0 - 4.6.0 + 4.6.2-servicing.19572.6 4.6.0 4.6.0 4.6.0 @@ -98,79 +98,79 @@ 4.6.0 4.6.0 - 3.0.0 + 3.0.1-servicing.19572.6 3.0.0-preview9.19573.1 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 3.0.0-rc2.19463.5 - 3.0.2-servicing.19571.2 - 3.0.2-servicing.19571.2 + 3.0.2-servicing.19575.2 + 3.0.2-servicing.19575.2 - 3.0.2-servicing.19572.1 - 3.0.2-servicing.19572.1 - 3.0.2-servicing.19572.1 - 3.0.2-servicing.19572.1 - 3.0.2-servicing.19572.1 - 3.0.2-servicing.19572.1 - 3.0.2-servicing.19572.1 + 3.0.2-servicing.19575.6 + 3.0.2-servicing.19575.6 + 3.0.2-servicing.19575.6 + 3.0.2-servicing.19575.6 + 3.0.2-servicing.19575.6 + 3.0.2-servicing.19575.6 + 3.0.2-servicing.19575.6 3.0.2-servicing.19572.1 3.0.2-servicing.19572.1 From e085de41ca82f9ceb521f05c7c20c537807c0093 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 26 Nov 2019 09:13:29 -0800 Subject: [PATCH 026/116] Remove accidentally duplicated Microsoft.Internal.Extensions.Refs (#16848) The second one is correct, the first one is an older build. Both build numbers are the name so this doesn't affect anything but the drop gathering. --- eng/Version.Details.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2190c82d2e..0e73d66ca0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -281,10 +281,6 @@ https://github.com/aspnet/Extensions dcdecd07e6059a4b3041ea14baa36e7794343ce3 - - https://github.com/aspnet/Extensions - 40c00020ac632006c9db91383de246226f9cb44a - https://github.com/aspnet/Extensions dcdecd07e6059a4b3041ea14baa36e7794343ce3 From f495589daf01b1a8cc561f9f0934b4521ec12c61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2019 10:49:46 -0800 Subject: [PATCH 027/116] Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191126.4 (#17455) - Microsoft.EntityFrameworkCore.Tools - 3.0.2-servicing.19576.4 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.2-servicing.19576.4 - dotnet-ef - 3.0.2-servicing.19576.4 - Microsoft.EntityFrameworkCore - 3.0.2-servicing.19576.4 - Microsoft.EntityFrameworkCore.InMemory - 3.0.2-servicing.19576.4 - Microsoft.EntityFrameworkCore.Relational - 3.0.2-servicing.19576.4 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.2-servicing.19576.4 Dependency coherency updates - System.Drawing.Common - 4.6.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.Platforms - 3.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e73d66ca0..4ebcaddcd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,33 +29,33 @@ https://github.com/aspnet/AspNetCore-Tooling 3d6c6a7ea5db32db5fb510141b26e58138f79206 - + https://github.com/aspnet/EntityFrameworkCore - a33930a1cad986209e7cb4bb97daa6d3b15f8f66 + 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 - + https://github.com/aspnet/EntityFrameworkCore - a33930a1cad986209e7cb4bb97daa6d3b15f8f66 + 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 - + https://github.com/aspnet/EntityFrameworkCore - a33930a1cad986209e7cb4bb97daa6d3b15f8f66 + 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 - + https://github.com/aspnet/EntityFrameworkCore - a33930a1cad986209e7cb4bb97daa6d3b15f8f66 + 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 - + https://github.com/aspnet/EntityFrameworkCore - a33930a1cad986209e7cb4bb97daa6d3b15f8f66 + 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 - + https://github.com/aspnet/EntityFrameworkCore - a33930a1cad986209e7cb4bb97daa6d3b15f8f66 + 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 - + https://github.com/aspnet/EntityFrameworkCore - a33930a1cad986209e7cb4bb97daa6d3b15f8f66 + 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 https://github.com/aspnet/Extensions @@ -313,9 +313,9 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/dotnet/corefx - a2b312cfb6b50fa9c224c1954a6ba2fe3095796b + 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea https://github.com/dotnet/corefx @@ -405,9 +405,9 @@ - + https://github.com/dotnet/corefx - a2b312cfb6b50fa9c224c1954a6ba2fe3095796b + 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index c3c574cab9..f94d546634 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,7 +81,7 @@ 4.6.0 4.6.0 4.6.0 - 4.6.2-servicing.19572.6 + 4.6.0 4.6.0 4.6.0 4.6.0 @@ -98,7 +98,7 @@ 4.6.0 4.6.0 - 3.0.1-servicing.19572.6 + 3.0.0 3.0.0-preview9.19573.1 @@ -164,13 +164,13 @@ 3.0.2-servicing.19575.2 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.6 - 3.0.2-servicing.19575.6 - 3.0.2-servicing.19575.6 - 3.0.2-servicing.19575.6 - 3.0.2-servicing.19575.6 - 3.0.2-servicing.19575.6 - 3.0.2-servicing.19575.6 + 3.0.2-servicing.19576.4 + 3.0.2-servicing.19576.4 + 3.0.2-servicing.19576.4 + 3.0.2-servicing.19576.4 + 3.0.2-servicing.19576.4 + 3.0.2-servicing.19576.4 + 3.0.2-servicing.19576.4 3.0.2-servicing.19572.1 3.0.2-servicing.19572.1 From 21831b5be7798d5cbf6fb49f99ea870d79083527 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2019 18:13:17 -0800 Subject: [PATCH 028/116] Update dependencies from https://github.com/dotnet/arcade build 20191127.5 (#17470) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19577.5 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19577.5 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19577.5 --- eng/Version.Details.xml | 12 +-- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 127 +++++++++++++++++++++++++++++++ eng/common/SetupNugetSources.sh | 117 ++++++++++++++++++++++++++++ global.json | 4 +- 5 files changed, 253 insertions(+), 9 deletions(-) create mode 100644 eng/common/SetupNugetSources.ps1 create mode 100644 eng/common/SetupNugetSources.sh diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ebcaddcd3..f72a2cc159 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -413,17 +413,17 @@ https://github.com/aspnet/Extensions dcdecd07e6059a4b3041ea14baa36e7794343ce3 - + https://github.com/dotnet/arcade - 0e0d227c57e69c03427d6e668716d62cf4ceb36e + 99c6b59a8afff97fe891341b39abe985f1d3c565 - + https://github.com/dotnet/arcade - 0e0d227c57e69c03427d6e668716d62cf4ceb36e + 99c6b59a8afff97fe891341b39abe985f1d3c565 - + https://github.com/dotnet/arcade - 0e0d227c57e69c03427d6e668716d62cf4ceb36e + 99c6b59a8afff97fe891341b39abe985f1d3c565 https://github.com/aspnet/Extensions diff --git a/eng/Versions.props b/eng/Versions.props index f94d546634..aa9a8cb4e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,7 +66,7 @@ --> - 1.0.0-beta.19572.3 + 1.0.0-beta.19577.5 3.3.1-beta4-19462-11 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 new file mode 100644 index 0000000000..2cb40c2947 --- /dev/null +++ b/eng/common/SetupNugetSources.ps1 @@ -0,0 +1,127 @@ +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: PowerShell@2 +# displayName: Setup Private Feeds Credentials +# condition: eq(variables['Agent.OS'], 'Windows_NT') +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile ${Env:BUILD_SOURCESDIRECTORY}/NuGet.config -Password $Env:Token +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +[CmdletBinding()] +param ( + [Parameter(Mandatory = $true)][string]$ConfigFile, + [Parameter(Mandatory = $true)][string]$Password +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +. $PSScriptRoot\tools.ps1 + +# Add source entry to PackageSources +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { + $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") + + if ($packageSource -eq $null) + { + $packageSource = $doc.CreateElement("add") + $packageSource.SetAttribute("key", $SourceName) + $packageSource.SetAttribute("value", $SourceEndPoint) + $sources.AppendChild($packageSource) | Out-Null + } + else { + Write-Host "Package source $SourceName already present." + } + + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password +} + +# Add a credential node for the specified source +function AddCredential($creds, $source, $username, $password) { + # Looks for credential configuration for the given SourceName. Create it if none is found. + $sourceElement = $creds.SelectSingleNode($Source) + if ($sourceElement -eq $null) + { + $sourceElement = $doc.CreateElement($Source) + $creds.AppendChild($sourceElement) | Out-Null + } + + # Add the node to the credential if none is found. + $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") + if ($usernameElement -eq $null) + { + $usernameElement = $doc.CreateElement("add") + $usernameElement.SetAttribute("key", "Username") + $sourceElement.AppendChild($usernameElement) | Out-Null + } + $usernameElement.SetAttribute("value", $Username) + + # Add the to the credential if none is found. + # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. + # -> https://github.com/NuGet/Home/issues/5526 + $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") + if ($passwordElement -eq $null) + { + $passwordElement = $doc.CreateElement("add") + $passwordElement.SetAttribute("key", "ClearTextPassword") + $sourceElement.AppendChild($passwordElement) | Out-Null + } + $passwordElement.SetAttribute("value", $Password) +} + +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") + + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + } +} + +if (!(Test-Path $ConfigFile -PathType Leaf)) { + Write-Host "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +} + +# Load NuGet.config +$doc = New-Object System.Xml.XmlDocument +$filename = (Get-Item $ConfigFile).FullName +$doc.Load($filename) + +# Get reference to or create one if none exist already +$sources = $doc.DocumentElement.SelectSingleNode("packageSources") +if ($sources -eq $null) { + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null +} + +# Looks for a node. Create it if none is found. +$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") +if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null +} + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password + +AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password +AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password + +$doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh new file mode 100644 index 0000000000..1264521317 --- /dev/null +++ b/eng/common/SetupNugetSources.sh @@ -0,0 +1,117 @@ +#!/usr/bin/env bash + +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro's managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: Bash@3 +# displayName: Setup Private Feeds Credentials +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh +# arguments: $BUILD_SOURCESDIRECTORY/NuGet.config $Token +# condition: ne(variables['Agent.OS'], 'Windows_NT') +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +ConfigFile=$1 +CredToken=$2 +NL='\n' +TB=' ' + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. "$scriptroot/tools.sh" + +if [ ! -f "$ConfigFile" ]; then + echo "Couldn't find the file NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [[ `uname -s` == "Darwin" ]]; then + NL=$'\\\n' + TB='' +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + ConfigNodeHeader="" + PackageSourcesTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + + PackageSourcesNodeFooter="" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# Ensure dotnet3-internal and dotnet3-internal-transport is in the packageSources +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal-transport to the packageSources." + + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" NuGet.config +fi + +# I want things split line by line +PrevIFS=$IFS +IFS=$'\n' +PackageSources=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +IFS=$PrevIFS + +PackageSources+=('dotnet3-internal') +PackageSources+=('dotnet3-internal-transport') + +for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." + + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" NuGet.config + fi +done diff --git a/global.json b/global.json index 548f30e8c3..62fcedb06a 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19572.3", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19572.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19577.5", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19577.5" } } From 049cdec742ac8a582d6a5d85ed4ae590b42db681 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 2 Dec 2019 21:30:51 -0800 Subject: [PATCH 029/116] Unpin package (#17536) --- build/dependencies.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index a9edc6f2b9..405c2e1ec2 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,7 +4,7 @@ 2.1.12 2.1.12 - + 4.5.0 @@ -199,7 +199,6 @@ 1.6.0 4.5.2 4.3.0 - 4.5.0 4.5.0 4.5.0 4.5.1 From f992759332a1b85aad5f51d78af96961a5999ab3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Nov 2019 02:30:15 +0000 Subject: [PATCH 030/116] Update dependencies from https://github.com/aspnet/Blazor build 20191127.2 - Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19577.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f72a2cc159..8fe01b3cb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ --> - + https://github.com/aspnet/Blazor - c4b0f964333255edca0856fc937735fef34b2d02 + 23338158154b064321d9d5c418d0fb71264d7bf9 https://github.com/aspnet/AspNetCore-Tooling diff --git a/eng/Versions.props b/eng/Versions.props index aa9a8cb4e9..b320bf695f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -100,7 +100,7 @@ 3.0.0 - 3.0.0-preview9.19573.1 + 3.0.0-preview9.19577.2 3.0.2-servicing.19575.2 3.0.2-servicing.19575.2 From 89aae45d6dcecb6246569f7bf5900362e4494265 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 4 Dec 2019 16:31:45 -0800 Subject: [PATCH 031/116] Download runtime from suffixed location in dotnetcli blob storage (#17593) --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + src/Installers/Windows/WindowsHostingBundle/Product.targets | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fe01b3cb0..f41fa2f98d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -389,6 +389,10 @@ https://github.com/dotnet/core-setup 626c14488261f91192e39a4c6c2d9480a7cd1f37 + + https://github.com/dotnet/core-setup + 626c14488261f91192e39a4c6c2d9480a7cd1f37 + https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 diff --git a/eng/Versions.props b/eng/Versions.props index b320bf695f..d6e50bee78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,6 +71,7 @@ 3.3.1-beta4-19462-11 3.0.2-servicing-19572-09 + 3.0.2-servicing-19572-09 3.0.0 3.0.2-servicing-19572-09 2.1.0 diff --git a/src/Installers/Windows/WindowsHostingBundle/Product.targets b/src/Installers/Windows/WindowsHostingBundle/Product.targets index dd2b113f35..ea34ff172d 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Product.targets +++ b/src/Installers/Windows/WindowsHostingBundle/Product.targets @@ -26,10 +26,10 @@ - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe From 90aa91ab8c09d8f60d7cd505fcbf8b21620ceb85 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 5 Dec 2019 02:27:14 +0000 Subject: [PATCH 032/116] Merged PR 4684: Merge 'release/3.1' into internal branch Fixed a merge conflict in the code mirror from github into 'internal/release/3.1' --- .azure/pipelines/ci.yml | 1 + eng/Baseline.Designer.props | 574 +++++++++--------- eng/Baseline.xml | 153 +++-- eng/Versions.props | 10 +- .../BaselineGenerator.csproj | 1 - src/Framework/test/TargetingPackTests.cs | 4 +- 6 files changed, 371 insertions(+), 372 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 9b6bb325f4..f3e41d5e0a 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -9,6 +9,7 @@ trigger: include: - master - release/* + - internal/release/3.* # Run PR validation on all branches pr: diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index aeb0b64b50..b5c8196535 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 3.0.1 + 3.1.0 @@ -16,132 +16,132 @@ - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - - - - + + + + - + - 3.0.1 + 3.1.0 - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - - - + + + + - - - + + + - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - + + @@ -186,510 +186,510 @@ - 3.0.0 + 3.1.0 - - - - + + + + - - - - + + + + - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - - - + + + - - + + - 3.0.0 + 3.1.0 - - + + - - + + - 3.0.0 + 3.1.0 - - - - - + + + + + - - - - + + + + - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - - - + + + - - - + + + - - + + - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - + - + - 3.0.0 + 3.1.0 - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - - + + + - - + + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - - + + + - - - + + + - 3.0.0 + 3.1.0 - - + + - - + + - 3.0.1 + 3.1.0 - - - + + + - - + + - 3.0.0 + 3.1.0 - - - + + + - - + + - 3.0.0 + 3.1.0 - - - - - + + + + + - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - - - + + + + - 3.0.0 + 3.1.0 - - - - + + + + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - + + - - + + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - - - - - + + + + + + - - - - - + + + + + - 3.0.0 + 3.1.0 - - - + + + - - - + + + - 3.0.0 + 3.1.0 - - + + - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - + - 3.0.0 + 3.1.0 - - - - - + + + + + - 3.0.0 + 3.1.0 - + - + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - - + + - 3.0.0 + 3.1.0 - 3.0.1 + 3.1.0 - 3.0.1 + 3.1.0 - - - 3.0.1 + + + 3.1.0 - - - 3.0.1 + + + 3.1.0 - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - 3.0.0 + 3.1.0 - - - + + + - 3.0.0 + 3.1.0 - - - - + + + + - - - + + + - 3.0.0 + 3.1.0 - - - + + + - - + + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 638d42dd71..bdcbf3e91d 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -1,90 +1,89 @@  - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index 047f31a3e2..943d24efe0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,17 +8,17 @@ 3 1 - 0 - 3 + 1 + 0 - true + false release true false - rtm - RTM + servicing + Servicing 4 preview$(BlazorClientPreReleasePreviewNumber) diff --git a/eng/tools/BaselineGenerator/BaselineGenerator.csproj b/eng/tools/BaselineGenerator/BaselineGenerator.csproj index df9cc7220a..775e7523c8 100644 --- a/eng/tools/BaselineGenerator/BaselineGenerator.csproj +++ b/eng/tools/BaselineGenerator/BaselineGenerator.csproj @@ -3,7 +3,6 @@ Exe $(DefaultNetCoreTargetFramework) - -s https://api.nuget.org/v3/index.json $(MSBuildThisFileDirectory)../../ diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs index 8a2625b99d..ec8a646f48 100644 --- a/src/Framework/test/TargetingPackTests.cs +++ b/src/Framework/test/TargetingPackTests.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore _targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion")); } - [Fact] + [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")] public void AssembliesAreReferenceAssemblies() { IEnumerable dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories); @@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore }); } - [Fact] + [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")] public void PlatformManifestListsAllFiles() { var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt"); From 30be2bdf76d32683ad3a29d4834cb11199faecb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2019 07:47:36 -0800 Subject: [PATCH 033/116] [release/3.0] Update dependencies from 2 repositories (#17601) * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20191204.2 - Microsoft.EntityFrameworkCore.Tools - 3.0.2-servicing.19604.2 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.2-servicing.19604.2 - dotnet-ef - 3.0.2-servicing.19604.2 - Microsoft.EntityFrameworkCore - 3.0.2-servicing.19604.2 - Microsoft.EntityFrameworkCore.InMemory - 3.0.2-servicing.19604.2 - Microsoft.EntityFrameworkCore.Relational - 3.0.2-servicing.19604.2 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.2-servicing.19604.2 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.0.2-servicing-19576-08 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - System.Drawing.Common - 4.6.2-servicing.19576.7 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Extensions.DependencyModel - 3.0.2-servicing-19576-08 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Internal - 3.0.2-servicing-19576-08 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.Platforms - 3.0.1-servicing.19576.7 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Internal.AspNetCore.Analyzers - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.2-servicing.19604.3 (parent: Microsoft.EntityFrameworkCore) * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20191204.5 - Microsoft.NET.Sdk.Razor - 3.0.2-servicing.19604.5 - Microsoft.CodeAnalysis.Razor - 3.0.2-servicing.19604.5 - Microsoft.AspNetCore.Razor.Language - 3.0.2-servicing.19604.5 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.2-servicing.19604.5 --- eng/Version.Details.xml | 304 ++++++++++++++++++++-------------------- eng/Versions.props | 152 ++++++++++---------- 2 files changed, 228 insertions(+), 228 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f41fa2f98d..76ce8eeaee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,281 +13,281 @@ https://github.com/aspnet/Blazor 23338158154b064321d9d5c418d0fb71264d7bf9 - + https://github.com/aspnet/AspNetCore-Tooling - 3d6c6a7ea5db32db5fb510141b26e58138f79206 + cd54de885d24453291d091012405187d8e52aaed - + https://github.com/aspnet/AspNetCore-Tooling - 3d6c6a7ea5db32db5fb510141b26e58138f79206 + cd54de885d24453291d091012405187d8e52aaed - + https://github.com/aspnet/AspNetCore-Tooling - 3d6c6a7ea5db32db5fb510141b26e58138f79206 + cd54de885d24453291d091012405187d8e52aaed - + https://github.com/aspnet/AspNetCore-Tooling - 3d6c6a7ea5db32db5fb510141b26e58138f79206 + cd54de885d24453291d091012405187d8e52aaed - + https://github.com/aspnet/EntityFrameworkCore - 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 + 24aee2b39dad1caee24afb93355f26a35c380dbc - + https://github.com/aspnet/EntityFrameworkCore - 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 + 24aee2b39dad1caee24afb93355f26a35c380dbc - + https://github.com/aspnet/EntityFrameworkCore - 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 + 24aee2b39dad1caee24afb93355f26a35c380dbc - + https://github.com/aspnet/EntityFrameworkCore - 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 + 24aee2b39dad1caee24afb93355f26a35c380dbc - + https://github.com/aspnet/EntityFrameworkCore - 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 + 24aee2b39dad1caee24afb93355f26a35c380dbc - + https://github.com/aspnet/EntityFrameworkCore - 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 + 24aee2b39dad1caee24afb93355f26a35c380dbc - + https://github.com/aspnet/EntityFrameworkCore - 6c28bb4d6b80f29efb81e9bf3262f53f9f937ee9 + 24aee2b39dad1caee24afb93355f26a35c380dbc - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 https://github.com/dotnet/corefx @@ -313,9 +313,9 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/dotnet/corefx - 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea + 552078bd73ff238b312f8b92ad49f535c3445f25 https://github.com/dotnet/corefx @@ -377,21 +377,21 @@ https://github.com/dotnet/corefx 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 547ae1f5f072d130b32ec3089876711070b2dc4f - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 547ae1f5f072d130b32ec3089876711070b2dc4f - + https://github.com/dotnet/core-setup - 626c14488261f91192e39a4c6c2d9480a7cd1f37 + 547ae1f5f072d130b32ec3089876711070b2dc4f https://github.com/dotnet/core-setup @@ -409,13 +409,13 @@ - + https://github.com/dotnet/corefx - 4ac4c0367003fe3973a3648eb0715ddb0e3bbcea + 552078bd73ff238b312f8b92ad49f535c3445f25 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 https://github.com/dotnet/arcade @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 99c6b59a8afff97fe891341b39abe985f1d3c565 - + https://github.com/aspnet/Extensions - dcdecd07e6059a4b3041ea14baa36e7794343ce3 + 6a3428047e05c1db442a0320b788dd8415144393 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index d6e50bee78..02045d7d46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,10 +70,10 @@ 3.3.1-beta4-19462-11 - 3.0.2-servicing-19572-09 - 3.0.2-servicing-19572-09 + 3.0.2-servicing-19576-08 + 3.0.2-servicing-19576-08 3.0.0 - 3.0.2-servicing-19572-09 + 3.0.2-servicing-19576-08 2.1.0 1.0.0 @@ -82,7 +82,7 @@ 4.6.0 4.6.0 4.6.0 - 4.6.0 + 4.6.2-servicing.19576.7 4.6.0 4.6.0 4.6.0 @@ -99,84 +99,84 @@ 4.6.0 4.6.0 - 3.0.0 + 3.0.1-servicing.19576.7 3.0.0-preview9.19577.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 3.0.0-rc2.19463.5 - 3.0.2-servicing.19575.2 - 3.0.2-servicing.19575.2 + 3.0.2-servicing.19604.3 + 3.0.2-servicing.19604.3 - 3.0.2-servicing.19576.4 - 3.0.2-servicing.19576.4 - 3.0.2-servicing.19576.4 - 3.0.2-servicing.19576.4 - 3.0.2-servicing.19576.4 - 3.0.2-servicing.19576.4 - 3.0.2-servicing.19576.4 + 3.0.2-servicing.19604.2 + 3.0.2-servicing.19604.2 + 3.0.2-servicing.19604.2 + 3.0.2-servicing.19604.2 + 3.0.2-servicing.19604.2 + 3.0.2-servicing.19604.2 + 3.0.2-servicing.19604.2 - 3.0.2-servicing.19572.1 - 3.0.2-servicing.19572.1 - 3.0.2-servicing.19572.1 - 3.0.2-servicing.19572.1 + 3.0.2-servicing.19604.5 + 3.0.2-servicing.19604.5 + 3.0.2-servicing.19604.5 + 3.0.2-servicing.19604.5 - 1.0.0-beta.19517.3 + 1.0.0-beta.19607.3 3.4.0-beta4-19569-03 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 new file mode 100644 index 0000000000..a8b5280d9d --- /dev/null +++ b/eng/common/SetupNugetSources.ps1 @@ -0,0 +1,143 @@ +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: PowerShell@2 +# displayName: Setup Private Feeds Credentials +# condition: eq(variables['Agent.OS'], 'Windows_NT') +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +[CmdletBinding()] +param ( + [Parameter(Mandatory = $true)][string]$ConfigFile, + [Parameter(Mandatory = $true)][string]$Password +) + +$ErrorActionPreference = "Stop" +Set-StrictMode -Version 2.0 +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + +. $PSScriptRoot\tools.ps1 + +# Add source entry to PackageSources +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { + $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") + + if ($packageSource -eq $null) + { + $packageSource = $doc.CreateElement("add") + $packageSource.SetAttribute("key", $SourceName) + $packageSource.SetAttribute("value", $SourceEndPoint) + $sources.AppendChild($packageSource) | Out-Null + } + else { + Write-Host "Package source $SourceName already present." + } + + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password +} + +# Add a credential node for the specified source +function AddCredential($creds, $source, $username, $password) { + # Looks for credential configuration for the given SourceName. Create it if none is found. + $sourceElement = $creds.SelectSingleNode($Source) + if ($sourceElement -eq $null) + { + $sourceElement = $doc.CreateElement($Source) + $creds.AppendChild($sourceElement) | Out-Null + } + + # Add the node to the credential if none is found. + $usernameElement = $sourceElement.SelectSingleNode("add[@key='Username']") + if ($usernameElement -eq $null) + { + $usernameElement = $doc.CreateElement("add") + $usernameElement.SetAttribute("key", "Username") + $sourceElement.AppendChild($usernameElement) | Out-Null + } + $usernameElement.SetAttribute("value", $Username) + + # Add the to the credential if none is found. + # Add it as a clear text because there is no support for encrypted ones in non-windows .Net SDKs. + # -> https://github.com/NuGet/Home/issues/5526 + $passwordElement = $sourceElement.SelectSingleNode("add[@key='ClearTextPassword']") + if ($passwordElement -eq $null) + { + $passwordElement = $doc.CreateElement("add") + $passwordElement.SetAttribute("key", "ClearTextPassword") + $sourceElement.AppendChild($passwordElement) | Out-Null + } + $passwordElement.SetAttribute("value", $Password) +} + +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { + $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") + + Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." + + ForEach ($PackageSource in $maestroPrivateSources) { + Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + } +} + +if (!(Test-Path $ConfigFile -PathType Leaf)) { + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" + ExitWithExitCode 1 +} + +if (!$Password) { + Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT' + ExitWithExitCode 1 +} + +# Load NuGet.config +$doc = New-Object System.Xml.XmlDocument +$filename = (Get-Item $ConfigFile).FullName +$doc.Load($filename) + +# Get reference to or create one if none exist already +$sources = $doc.DocumentElement.SelectSingleNode("packageSources") +if ($sources -eq $null) { + $sources = $doc.CreateElement("packageSources") + $doc.DocumentElement.AppendChild($sources) | Out-Null +} + +# Looks for a node. Create it if none is found. +$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") +if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null +} + +$userName = "dn-bot" + +# Insert credential nodes for Maestro's private feeds +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password + +$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']") +if ($dotnet3Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password +} + +$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") +if ($dotnet31Source -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password +} + +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh new file mode 100644 index 0000000000..4ebb1e5a44 --- /dev/null +++ b/eng/common/SetupNugetSources.sh @@ -0,0 +1,149 @@ +#!/usr/bin/env bash + +# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. +# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# +# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry +# under for each Maestro's managed private feed. Two additional credential +# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# +# This script needs to be called in every job that will restore packages and which the base repo has +# private AzDO feeds in the NuGet.config. +# +# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` +# from the AzureDevOps-Artifact-Feeds-Pats variable group. +# +# - task: Bash@3 +# displayName: Setup Private Feeds Credentials +# inputs: +# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(Build.SourcesDirectory)/NuGet.config $Token +# condition: ne(variables['Agent.OS'], 'Windows_NT') +# env: +# Token: $(dn-bot-dnceng-artifact-feeds-rw) + +ConfigFile=$1 +CredToken=$2 +NL='\n' +TB=' ' + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +. "$scriptroot/tools.sh" + +if [ ! -f "$ConfigFile" ]; then + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile" + ExitWithExitCode 1 +fi + +if [ -z "$CredToken" ]; then + Write-PipelineTelemetryError -category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Please supply a valid PAT" + ExitWithExitCode 1 +fi + +if [[ `uname -s` == "Darwin" ]]; then + NL=$'\\\n' + TB='' +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + ConfigNodeHeader="" + PackageSourcesTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config +fi + +# Ensure there is a ... section. +grep -i "" $ConfigFile +if [ "$?" != "0" ]; then + echo "Adding ... section." + + PackageSourcesNodeFooter="" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config +fi + +PackageSources=() + +# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present +grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3-internal to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal') + + grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3-internal-transport') +fi + +# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present +grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal') + + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet3.1-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet3.1-internal-transport') +fi + +# I want things split line by line +PrevIFS=$IFS +IFS=$'\n' +PackageSources+="$IFS" +PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') +IFS=$PrevIFS + +for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." + + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + + sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile + fi +done \ No newline at end of file diff --git a/eng/common/dotnet-install.ps1 b/eng/common/dotnet-install.ps1 index 0b629b8301..ec3e739fe8 100644 --- a/eng/common/dotnet-install.ps1 +++ b/eng/common/dotnet-install.ps1 @@ -3,7 +3,9 @@ Param( [string] $verbosity = "minimal", [string] $architecture = "", [string] $version = "Latest", - [string] $runtime = "dotnet" + [string] $runtime = "dotnet", + [string] $RuntimeSourceFeed = "", + [string] $RuntimeSourceFeedKey = "" ) . $PSScriptRoot\tools.ps1 @@ -15,7 +17,7 @@ try { if ($architecture -and $architecture.Trim() -eq "x86") { $installdir = Join-Path $installdir "x86" } - InstallDotNet $installdir $version $architecture $runtime $true + InstallDotNet $installdir $version $architecture $runtime $true -RuntimeSourceFeed $RuntimeSourceFeed -RuntimeSourceFeedKey $RuntimeSourceFeedKey } catch { Write-Host $_ diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index c3072c958a..d259a274c7 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -14,6 +14,8 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" version='Latest' architecture='' runtime='dotnet' +runtimeSourceFeed='' +runtimeSourceFeedKey='' while [[ $# > 0 ]]; do opt="$(echo "$1" | awk '{print tolower($0)}')" case "$opt" in @@ -29,9 +31,16 @@ while [[ $# > 0 ]]; do shift runtime="$1" ;; + -runtimesourcefeed) + shift + runtimeSourceFeed="$1" + ;; + -runtimesourcefeedkey) + shift + runtimeSourceFeedKey="$1" + ;; *) echo "Invalid argument: $1" - usage exit 1 ;; esac @@ -40,7 +49,7 @@ done . "$scriptroot/tools.sh" dotnetRoot="$repo_root/.dotnet" -InstallDotNet $dotnetRoot $version "$architecture" $runtime true || { +InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { local exit_code=$? echo "dotnet-install.sh failed (exit code '$exit_code')." >&2 ExitWithExitCode $exit_code diff --git a/eng/common/post-build/setup-maestro-vars.ps1 b/eng/common/post-build/setup-maestro-vars.ps1 index 5668ef091a..d7f64dc63c 100644 --- a/eng/common/post-build/setup-maestro-vars.ps1 +++ b/eng/common/post-build/setup-maestro-vars.ps1 @@ -6,12 +6,12 @@ param( try { $Content = Get-Content $ReleaseConfigsPath - + $BarId = $Content | Select -Index 0 - + $Channels = "" $Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," } - + $IsStableBuild = $Content | Select -Index 2 Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId @@ -23,4 +23,4 @@ catch { Write-Host $_.Exception Write-Host $_.ScriptStackTrace ExitWithExitCode 1 -} \ No newline at end of file +} diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index a7f9964195..52e2ff021d 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -6,6 +6,11 @@ parameters: # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; dependsOn: '' # Optional: dependencies of the job + artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts + # Usage: + # artifactNames: + # - 'BlobArtifacts' + # - 'Artifacts_Windows_NT_Release' jobs: - job: Run_SDL @@ -18,13 +23,22 @@ jobs: steps: - checkout: self clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download Build Artifacts - inputs: - buildType: current - downloadType: specific files - matchingPattern: "**" - downloadPath: $(Build.SourcesDirectory)\artifacts + - ${{ if ne(parameters.artifactNames, '') }}: + - ${{ each artifactName in parameters.artifactNames }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + artifactName: ${{ artifactName }} + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts + - ${{ if eq(parameters.artifactNames, '') }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Build Artifacts + inputs: + buildType: current + downloadType: specific files + itemPattern: "**" + downloadPath: $(Build.ArtifactStagingDirectory)\artifacts - powershell: eng/common/sdl/extract-artifact-packages.ps1 -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml similarity index 84% rename from eng/common/templates/post-build/channels/netcore-internal-30.yml rename to eng/common/templates/post-build/channels/generic-internal-channel.yml index 177b38df35..ad9375f5e5 100644 --- a/eng/common/templates/post-build/channels/netcore-internal-30.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -1,25 +1,35 @@ parameters: + publishInstallersAndChecksums: false symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_30_Internal_Servicing_Publishing +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.0 Internal Servicing Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: @@ -55,7 +65,7 @@ stages: value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.InternalServicing_30_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -115,14 +125,15 @@ stages: /p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl) /p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' + /p:PublishToMSDL=false ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.InternalServicing_30_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-release-31.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml similarity index 79% rename from eng/common/templates/post-build/channels/netcore-release-31.yml rename to eng/common/templates/post-build/channels/generic-public-channel.yml index 01d56410c7..c4bc1897d8 100644 --- a/eng/common/templates/post-build/channels/netcore-release-31.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -1,21 +1,27 @@ parameters: - symbolPublishingAdditionalParameters: '' artifactsPublishingAdditionalParameters: '' publishInstallersAndChecksums: false + symbolPublishingAdditionalParameters: '' + stageName: '' + channelName: '' + channelId: '' + transportFeed: '' + shippingFeed: '' + symbolsFeed: '' stages: -- stage: NetCore_Release31_Publish +- stage: ${{ parameters.stageName }} dependsOn: validate variables: - template: ../common-variables.yml - displayName: .NET Core 3.1 Release Publishing + displayName: ${{ parameters.channelName }} Publishing jobs: - template: ../setup-maestro-vars.yml - job: displayName: Symbol Publishing dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }} )) variables: - group: DotNet-Symbol-Server-Pats pool: @@ -33,6 +39,18 @@ stages: artifactName: 'PDBArtifacts' continueOnError: true + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + + - task: PowerShell@2 + displayName: Enable cross-org publishing + inputs: + filePath: eng\common\enable-cross-org-publishing.ps1 + arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) + - task: PowerShell@2 displayName: Publish inputs: @@ -50,13 +68,11 @@ stages: displayName: Publish Assets dependsOn: setupMaestroVars variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - name: IsStableBuild value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_31_Channel_Id)) + condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', ${{ parameters.channelId }})) pool: vmImage: 'windows-2019' steps: @@ -65,12 +81,14 @@ stages: inputs: buildType: current artifactName: PackageArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Blob Artifacts inputs: buildType: current artifactName: BlobArtifacts + continueOnError: true - task: DownloadBuildArtifacts@0 displayName: Download Asset Manifests @@ -117,14 +135,14 @@ stages: /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + /p:AzureDevOpsStaticShippingFeed='${{ parameters.shippingFeed }}' /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + /p:AzureDevOpsStaticTransportFeed='${{ parameters.transportFeed }}' /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + /p:AzureDevOpsStaticSymbolsFeed='${{ parameters.symbolsFeed }}' /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' ${{ parameters.artifactsPublishingAdditionalParameters }} - template: ../../steps/promote-build.yml parameters: - ChannelId: ${{ variables.PublicRelease_31_Channel_Id }} + ChannelId: ${{ parameters.channelId }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml deleted file mode 100644 index cdb74031fc..0000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Validation_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NETCore_3_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NETCore_3_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-3-tools.yml b/eng/common/templates/post-build/channels/netcore-3-tools.yml deleted file mode 100644 index 70eec773e7..0000000000 --- a/eng/common/templates/post-build/channels/netcore-3-tools.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_3_Tools_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET 3 Tools Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_3_Tools_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_3_Tools_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-dev-31.yml b/eng/common/templates/post-build/channels/netcore-dev-31.yml deleted file mode 100644 index db21254187..0000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-31.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev31_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.1 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicDevRelease_31_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicDevRelease_31_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-dev-5.yml b/eng/common/templates/post-build/channels/netcore-dev-5.yml deleted file mode 100644 index c4f5a16acb..0000000000 --- a/eng/common/templates/post-build/channels/netcore-dev-5.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Dev5_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 5 Dev Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_5_Dev_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_5_Dev_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-release-30.yml b/eng/common/templates/post-build/channels/netcore-release-30.yml deleted file mode 100644 index 16ade0db29..0000000000 --- a/eng/common/templates/post-build/channels/netcore-release-30.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Release30_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Core 3.0 Release Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.PublicRelease_30_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.PublicRelease_30_Channel_Id }} diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-tools-latest.yml deleted file mode 100644 index 157d2d4b97..0000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml +++ /dev/null @@ -1,130 +0,0 @@ -parameters: - symbolPublishingAdditionalParameters: '' - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: NetCore_Tools_Latest_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Latest Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: - displayName: Symbol Publishing - dependsOn: setupMaestroVars - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - variables: - - group: DotNet-Symbol-Server-Pats - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - artifactName: 'BlobArtifacts' - continueOnError: true - - - task: DownloadBuildArtifacts@0 - displayName: Download PDB Artifacts - inputs: - artifactName: 'PDBArtifacts' - continueOnError: true - - - task: PowerShell@2 - displayName: Publish - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet - /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat) - /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat) - /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' - /p:Configuration=Release - ${{ parameters.symbolPublishingAdditionalParameters }} - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Latest_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Latest_Channel_Id }} \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/netcore-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-tools-validation.yml deleted file mode 100644 index d8447e49af..0000000000 --- a/eng/common/templates/post-build/channels/netcore-tools-validation.yml +++ /dev/null @@ -1,95 +0,0 @@ -parameters: - artifactsPublishingAdditionalParameters: '' - publishInstallersAndChecksums: false - -stages: -- stage: PVR_Publish - dependsOn: validate - variables: - - template: ../common-variables.yml - displayName: .NET Tools - Validation Publishing - jobs: - - template: ../setup-maestro-vars.yml - - - job: publish_assets - displayName: Publish Assets - dependsOn: setupMaestroVars - variables: - - group: DotNet-Blob-Feed - - group: AzureDevOps-Artifact-Feeds-Pats - - name: BARBuildId - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] - - name: IsStableBuild - value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ] - condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_Tools_Validation_Channel_Id)) - pool: - vmImage: 'windows-2019' - steps: - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: current - artifactName: PackageArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: current - artifactName: BlobArtifacts - - - task: DownloadBuildArtifacts@0 - displayName: Download Asset Manifests - inputs: - buildType: current - artifactName: AssetManifests - - - task: NuGetToolInstaller@1 - displayName: 'Install NuGet.exe' - - # This is necessary whenever we want to publish/restore to an AzDO private feed - - task: NuGetAuthenticate@0 - displayName: 'Authenticate to AzDO Feeds' - - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - - - task: PowerShell@2 - displayName: Publish Assets - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet - /p:ArtifactsCategory=$(_DotNetValidationArtifactsCategory) - /p:IsStableBuild=$(IsStableBuild) - /p:IsInternalBuild=$(IsInternalBuild) - /p:RepositoryName=$(Build.Repository.Name) - /p:CommitSha=$(Build.SourceVersion) - /p:NugetPath=$(NuGetExeToolPath) - /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)' - /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)' - /p:BARBuildId=$(BARBuildId) - /p:MaestroApiEndpoint='$(MaestroApiEndPoint)' - /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)' - /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/' - /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/' - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/' - /p:Configuration=Release - /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }} - /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl) - /p:InstallersAzureAccountKey=$(dotnetcli-storage-key) - /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl) - /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key) - /p:PublishToAzureDevOpsNuGetFeeds=true - /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' - /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' - /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)' - ${{ parameters.artifactsPublishingAdditionalParameters }} - - - template: ../../steps/promote-build.yml - parameters: - ChannelId: ${{ variables.NetCore_Tools_Validation_Channel_Id }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index b4eed6f186..216d043e4e 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,7 +1,9 @@ variables: - - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage + - group: Publish-Build-Assets # .NET Core 3.1 Dev - name: PublicDevRelease_31_Channel_Id @@ -11,19 +13,19 @@ variables: - name: NetCore_5_Dev_Channel_Id value: 131 - # .NET Tools - Validation - - name: NetCore_Tools_Validation_Channel_Id + # .NET Eng - Validation + - name: Net_Eng_Validation_Channel_Id value: 9 - # .NET Tools - Latest - - name: NetCore_Tools_Latest_Channel_Id + # .NET Eng - Latest + - name: Net_Eng_Latest_Channel_Id value: 2 - # .NET 3 Tools - Validation - - name: NETCore_3_Tools_Validation_Channel_Id + # .NET 3 Eng - Validation + - name: NET_3_Eng_Validation_Channel_Id value: 390 - # .NET 3 Tools - Latest + # .NET 3 Eng - name: NetCore_3_Tools_Channel_Id value: 344 @@ -39,6 +41,14 @@ variables: - name: PublicRelease_31_Channel_Id value: 129 + # General Testing + - name: GeneralTesting_Channel_Id + value: 529 + + # .NET Core 3.1 Blazor Features + - name: NetCore_31_Blazor_Features_Channel_Id + value: 531 + # Whether the build is internal or not - name: IsInternalBuild value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 7ee82d9ff1..b121d77e07 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -8,6 +8,7 @@ parameters: enable: false continueOnError: false params: '' + artifactNames: '' # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation @@ -48,6 +49,12 @@ stages: pool: vmImage: 'windows-2019' steps: + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@0 + displayName: 'Authenticate to AzDO Feeds' + - task: DownloadBuildArtifacts@0 displayName: Download Package Artifacts inputs: @@ -94,54 +101,244 @@ stages: parameters: additionalParameters: ${{ parameters.SDLValidationParameters.params }} continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} + artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} -- template: \eng\common\templates\post-build\channels\netcore-dev-5.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev5_Publish' + channelName: '.NET Core 5 Dev' + channelId: 131 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-dev-31.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Dev31_Publish' + channelName: '.NET Core 3.1 Dev' + channelId: 128 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + stageName: 'Net_Eng_Latest_Publish' + channelName: '.NET Eng - Latest' + channelId: 2 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' -- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml - parameters: - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'Net_Eng_Validation_Publish' + channelName: '.NET Eng - Validation' + channelId: 9 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-release-30.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Validation_Publish' + channelName: '.NET 3 Tools - Validation' + channelId: 390 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-release-31.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_3_Tools_Publish' + channelName: '.NET 3 Tools' + channelId: 344 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} - -- template: \eng\common\templates\post-build\channels\netcore-internal-30.yml - parameters: symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release30_Publish' + channelName: '.NET Core 3.0 Release' + channelId: 19 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Release31_Publish' + channelName: '.NET Core 3.1 Release' + channelId: 129 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_Blazor31_Features_Publish' + channelName: '.NET Core 3.1 Blazor Features' + channelId: 531 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_30_Internal_Servicing_Publishing' + channelName: '.NET Core 3.0 Internal Servicing' + channelId: 184 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NetCore_31_Internal_Servicing_Publishing' + channelName: '.NET Core 3.1 Internal Servicing' + channelId: 550 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'General_Testing_Publish' + channelName: 'General Testing' + channelId: 529 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Dev_Publishing' + channelName: '.NET Core Tooling Dev' + channelId: 548 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_Tooling_Release_Publishing' + channelName: '.NET Core Tooling Release' + channelId: 549 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Publishing' + channelName: '.NET Core SDK 3.0.1xx' + channelId: 556 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_301xx_Internal_Publishing' + channelName: '.NET Core SDK 3.0.1xx Internal' + channelId: 555 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Publishing' + channelName: '.NET Core SDK 3.1.1xx' + channelId: 560 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_311xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.1xx Internal' + channelId: 559 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Publishing' + channelName: '.NET Core SDK 3.1.2xx' + channelId: 558 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_312xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.2xx Internal' + channelId: 557 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 91efea9405..92a053bd16 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -184,7 +184,14 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc InstallDotNet $dotnetRoot $version $architecture } -function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { +function InstallDotNet([string] $dotnetRoot, + [string] $version, + [string] $architecture = "", + [string] $runtime = "", + [bool] $skipNonVersionedFiles = $false, + [string] $runtimeSourceFeed = "", + [string] $runtimeSourceFeedKey = "") { + $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ Version = $version @@ -195,10 +202,32 @@ function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $archit if ($runtime) { $installParameters.Runtime = $runtime } if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } - & $installScript @installParameters - if ($lastExitCode -ne 0) { - Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet cli (exit code '$lastExitCode')." - ExitWithExitCode $lastExitCode + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from public location." + + # Only the runtime can be installed from a custom [private] location. + if ($runtime -and ($runtimeSourceFeed -or $runtimeSourceFeedKey)) { + if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed } + + if ($runtimeSourceFeedKey) { + $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) + $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) + $installParameters.FeedCredential = $decodedString + } + + try { + & $installScript @installParameters + } + catch { + Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Failed to install dotnet runtime '$runtime' from custom location '$runtimeSourceFeed'." + ExitWithExitCode 1 + } + } else { + ExitWithExitCode 1 + } } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 757d5b9ea4..94965a8fd2 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -200,8 +200,30 @@ function InstallDotNet { fi bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || { local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK (exit code '$exit_code')." - ExitWithExitCode $exit_code + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')." + + if [[ -n "$runtimeArg" ]]; then + local runtimeSourceFeed='' + if [[ -n "${6:-}" ]]; then + runtimeSourceFeed="--azure-feed $6" + fi + + local runtimeSourceFeedKey='' + if [[ -n "${7:-}" ]]; then + decodedFeedKey=`echo $7 | base64 --decode` + runtimeSourceFeedKey="--feed-credential $decodedFeedKey" + fi + + if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then + bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." + ExitWithExitCode $exit_code + } + else + ExitWithExitCode $exit_code + fi + fi } } diff --git a/global.json b/global.json index 49caef6338..f4a9f0933c 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19517.3", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19517.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19607.3" } } From 6cdd41aecd992a99c6aafa88aae415e2811afbca Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 9 Dec 2019 12:23:40 -0800 Subject: [PATCH 036/116] Update to 3.1.100 rtm sdk (#17626) --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index f4a9f0933c..3070303dd9 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "3.1.100-preview1-014400" + "version": "3.1.100" }, "tools": { - "dotnet": "3.1.100-preview1-014400", + "dotnet": "3.1.100", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" From cf6b5028c37a93fd47de36aca7a43dc0818a6aac Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 11 Dec 2019 07:36:59 -0800 Subject: [PATCH 037/116] Improve generation and use of ref/ projects (#17311) * Remove useless src/PackageArchive files - not used outside 2.x branches * Improve use of ref/ assemblies - compile against ref/ assemblies but do not change package metadata - update the metadata of implementation projects to include the ref/ assembly path - update `@(ReferenceAssembly)` metadata for Extensions packages, not `@(PackageReference)` - can be disabled using `$(CompileUsingReferenceAssemblies)` e.g. when generating ref/ projects - include ref/ projects in source build by default - remove `$(ExcludeFromSourceBuild)` overrides from ref/ project files - use latest package references and use project references even when _not_ building the targeting packs - restore previous `@(Reference)` -> `@(PackageReference)` logic - add build-only Microsoft.Internal.Extensions.Refs package reference in most cases - remove IndirectReferences.props and `@(_ExtensionInternalRefAssemblies)`; no longer needed * Improve ref/ project generation - use ../src/**/AssemblyInfo.cs files instead of including attributes in *.Manual.cs files - for same reason, copy `@(InternalsVisibleto)` items from src/ to ref/ projects - use eng/targets/CSharp.ReferenceAssembly.props instead of ref/Directory.Build.props files - use TFM-specific *.Manual.cs files in ref/ project files instead of ref/Directory.Build.props files optimizations and usability improvements: - add `$(BuildMainlyReferenceProviders)` property to focus on reference providers when generating ref/ projects - disable `$(UseReferenceAssemblyInImplementation)` to avoid using ref/ projects while generating them nits: - clean up whitespace and remove blank lines in ref/ project files * Perform smaller cleanup - remove `$(IsTargetingPackPatching)`; use only `$(IsTargetingPackBuilding)` - remove `$(DisableServicingFeatures)`; enable the servicing features we need - suppress baseline references even in servicing builds - restore `$(AdditionalGenApiCmdOptions)`; useful when updating *.Manual.cs files nits: - simplify conditions using `$(HasReferenceAssembly)` - correct spelling in comments - shorten long lines * Use a response file for GenAPI commands - work around dotnet/arcade#4021 and help with additional ref assemblies - mimic 111462e0c24f and integrate w/ other changes here * Undo some manual ref/ project changes - now done automatically or centrally - remove manual `[TypeForwardedTo]` and `[InternalsVisibleTo]` attributes - fully qualify a type now that `using` is gone - remove dupe `@(Compile)` items for *.Manual.cs files; included in the ref/ project files - remove redundant `$(AllowUnsafeBlocks)` and `$(NoWarn)` settings nits: - rename a *.Manual.cs file that's not TFM-specific - remove `private` members * Correct use of `@(ProjectReference)` items for reference providers - use `@(Reference)` instead * Remove recently-added `@(Compile)` and `@(Reference)` items - were added due to missing `[InternalsVisibleTo]` attributes in ref/ assemblies or as early workarounds - plus, now transitive references **Just Work:tm:** - expose `ClosedGenericMatcher` in the usual (*.Manual.cs) way - also undo Microsoft.Extensions.ApiDescription.Server workaround * Remove `private` members from ref/ *.Manual.cs files - not useful and bloat the ref/ assemblies * Cleanup warnings - avoid "CSC warning CS2008: No source files specified." building site extensions - correct warnings (as errors) about `RenderToStringResult` being obsolete - add Microsoft.AspNetCore.SpaServices.Tests to Middleware solution * Remove `@(RuntimeHostConfigurationOption)` workarounds - deps files are unaffected by new ref/ assembly handling and test projects aren't special-cased - also execute a test previously skipped due to deps file problems * Regenerate ref/ projects - pick up the latest generation changes (unclear why Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs changed but works) * Fill in missing `internal` types 1 of n - rename Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs; need `RenderTreeFrame` type everywhere - add types needed in unit and perf tests to *.Manual.cs files * Clean up recent commits - remove recently-added `private` members - restore `_dummyPrimitive` fields in Microsoft.AspNetCore.Server.HttpSys.Manual.cs * Add *.Manual.cs files for more projects * !fixup! fields in *.Manual.cs `struct`s - GenAPI sometimes generates `_dummy` and `_dummyPrimitive` fields _instead of_ visible members - what GenAPI generates sometimes have the right length but actual fields don't hurt - that is, using the real fields corrects both the visible API and `struct`s' sizes nits: - consolidate `namespace`s in Microsoft.AspNetCore.Mvc.Core.Manual.cs * Remove special case for generating ref/ projects on non-Windows - referenced issue was closed with no action but workaround still not required - no tabs in generated content * Only create ref/ projects for assemblies in the shared framework - restrict when `$(HasReferenceAssembly)` is `true` by default - add warnings when `$(IsAspNetCoreApp)` or `$(HasReferenceAssembly)` have unexpected values * Remove "extra" ref/ projects - associated implementation projects no longer have `$(HasReferenceAssembly)` set to `true` * Add a few GenAPI exclusions - see dotnet/arcade#4488 - generation for these members leads to NREs * Add more `internal` types and members - Identity/Core - Identity/Extensions.Core - Mvc/Mvc.ViewFeatures * Add direct dependencies to work around CS1705 errors - add direct references to some test and sample projects to make intent clear i.e. address CS1705 root cause - these projects must use implementation assemblies for those direct references - requirement also applies to anything depending on them e.g. functional tests - for simplicity, use `$(CompileUsingReferenceAssemblies)` instead of targeted `@(Reference)` metadata - leads to ~40 projects that do not themselves add ref/ metadata - this is _not_ transitive i.e. it applies only to projects that override `$(CompileUsingReferenceAssemblies)` * nits: Remove a few more `private` members in *.Manual.cs files * !fixup! correct namespaces of a few types in *.Manual.cs files * Try another way to fix Microsoft.AspNetCore.Blazor.Build.Tests * Try another way to fix missing targets in Web.JS.npmproj --- Directory.Build.props | 16 +- Directory.Build.targets | 21 +- eng/Build.props | 30 +- eng/CodeGen.proj | 2 +- eng/GenAPI.exclusions.txt | 46 +- eng/IndirectReferences.props | 10911 ---------------- eng/ProjectReferences.props | 88 +- eng/Versions.props | 9 +- eng/targets/ReferenceAssembly.targets | 81 +- eng/targets/ResolveReferences.targets | 316 +- ...Microsoft.AspNetCore.Antiforgery.Manual.cs | 147 + .../Microsoft.AspNetCore.Antiforgery.csproj | 14 +- ...spNetCore.Authentication.AzureAD.UI.csproj | 13 - ...Authentication.AzureAD.UI.netcoreapp3.0.cs | 64 - ...etCore.Authentication.AzureADB2C.UI.csproj | 13 - ...hentication.AzureADB2C.UI.netcoreapp3.0.cs | 68 - ...ore.AzureAppServices.HostingStartup.csproj | 11 - ...ppServices.HostingStartup.netcoreapp3.0.cs | 11 - ...NetCore.AzureAppServicesIntegration.csproj | 11 - ...ureAppServicesIntegration.netcoreapp3.0.cs | 10 - ...AspNetCore.Components.Authorization.csproj | 10 +- .../ref/Microsoft.AspNetCore.Blazor.csproj | 12 - ...rosoft.AspNetCore.Blazor.netstandard2.0.cs | 85 - .../Microsoft.AspNetCore.Blazor.Tests.csproj | 4 + ...osoft.AspNetCore.Blazor.Build.Tests.csproj | 4 + ...rosoft.AspNetCore.Blazor.HttpClient.csproj | 10 - ...etCore.Blazor.HttpClient.netstandard2.0.cs | 18 - .../Microsoft.AspNetCore.Blazor.Server.csproj | 16 - ....AspNetCore.Blazor.Server.netcoreapp3.0.cs | 22 - .../Blazor/testassets/Directory.Build.props | 10 - .../Components/ref/Directory.Build.props | 9 - .../Microsoft.AspNetCore.Components.Manual.cs | 360 + .../Microsoft.AspNetCore.Components.csproj | 20 +- ...oft.AspNetCore.Components.netcoreapp3.0.cs | 50 - ...etCore.Components.netstandard2.0.Manual.cs | 58 - ...ft.AspNetCore.Components.netstandard2.0.cs | 50 - ...crosoft.AspNetCore.Components.Forms.csproj | 8 +- ...oft.AspNetCore.Components.Server.Manual.cs | 298 + ...rosoft.AspNetCore.Components.Server.csproj | 22 +- ...osoft.AspNetCore.Components.Web.JS.npmproj | 4 + ...Microsoft.AspNetCore.Components.Web.csproj | 20 +- ...soft.AspNetCore.Components.E2ETests.csproj | 4 +- .../test/Ignitor.Test/Ignitor.Test.csproj | 2 + .../ComponentsApp.App.csproj | 4 +- .../test/testassets/Directory.Build.props | 10 - .../test/testassets/Ignitor/Ignitor.csproj | 4 + ...Core.DataProtection.Abstractions.Manual.cs | 24 + ...NetCore.DataProtection.Abstractions.csproj | 5 +- ...etCore.DataProtection.AzureKeyVault.csproj | 12 - ...Protection.AzureKeyVault.netstandard2.0.cs | 12 - ....DataProtection.AzureKeyVault.Tests.csproj | 4 + ...NetCore.DataProtection.AzureStorage.csproj | 12 - ...aProtection.AzureStorage.netstandard2.0.cs | 22 - ...e.DataProtection.AzureStorage.Tests.csproj | 4 + .../ref/Directory.Build.props | 8 - ...AspNetCore.Cryptography.Internal.Manual.cs | 78 +- ...ft.AspNetCore.Cryptography.Internal.csproj | 4 +- ...tCore.Cryptography.KeyDerivation.Manual.cs | 28 + ...pNetCore.Cryptography.KeyDerivation.csproj | 11 +- ...aphy.KeyDerivation.netcoreapp2.0.Manual.cs | 11 + ...rosoft.AspNetCore.DataProtection.Manual.cs | 385 + ...Microsoft.AspNetCore.DataProtection.csproj | 40 +- ....DataProtection.EntityFrameworkCore.csproj | 11 - ...tion.EntityFrameworkCore.netstandard2.1.cs | 30 - ...Protection.EntityFrameworkCore.Test.csproj | 4 + ...etCore.DataProtection.Extensions.Manual.cs | 34 + ...spNetCore.DataProtection.Extensions.csproj | 14 +- ...e.DataProtection.StackExchangeRedis.csproj | 11 - ...ction.StackExchangeRedis.netstandard2.0.cs | 21 - ...Protection.StackExchangeRedis.Tests.csproj | 4 + .../samples/AzureBlob/AzureBlob.csproj | 4 + .../AzureKeyVault/AzureKeyVault.csproj | 4 + .../EntityFrameworkCoreSample.csproj | 4 + src/DataProtection/samples/Redis/Redis.csproj | 4 + .../ref/Microsoft.AspNetCore.csproj | 38 +- .../testassets/Directory.Build.props | 7 - .../ref/Microsoft.AspNetCore.JsonPatch.csproj | 11 - ...oft.AspNetCore.JsonPatch.netstandard2.0.cs | 309 - .../ref/Microsoft.AspNetCore.App.Ref.csproj | 10 +- ...oft.AspNetCore.Hosting.Abstractions.csproj | 8 +- .../Microsoft.AspNetCore.Hosting.Manual.cs | 218 + .../ref/Microsoft.AspNetCore.Hosting.csproj | 30 +- ...NetCore.Hosting.Server.Abstractions.csproj | 6 +- ...spNetCore.Server.IntegrationTesting.csproj | 18 - ...Server.IntegrationTesting.netcoreapp3.0.cs | 275 - .../ref/Microsoft.AspNetCore.TestHost.csproj | 12 - ...osoft.AspNetCore.TestHost.netcoreapp3.0.cs | 77 - ....AspNetCore.Hosting.WindowsServices.csproj | 11 - ...e.Hosting.WindowsServices.netcoreapp3.0.cs | 21 - .../IStartupInjectionAssemblyName.csproj | 5 - ...oft.AspNetCore.Html.Abstractions.Manual.cs | 13 + ...rosoft.AspNetCore.Html.Abstractions.csproj | 5 +- ...NetCore.Authentication.Abstractions.csproj | 8 +- ...soft.AspNetCore.Authentication.Core.csproj | 8 +- .../ref/Microsoft.Net.Http.Headers.Manual.cs | 10 + .../ref/Microsoft.Net.Http.Headers.csproj | 6 +- ...oft.AspNetCore.Http.Abstractions.Manual.cs | 101 + ...rosoft.AspNetCore.Http.Abstractions.csproj | 11 +- ...icrosoft.AspNetCore.Http.Extensions.csproj | 8 +- .../Microsoft.AspNetCore.Http.Features.csproj | 10 +- .../ref/Microsoft.AspNetCore.Http.Manual.cs | 40 + .../Http/ref/Microsoft.AspNetCore.Http.csproj | 14 +- .../ref/Microsoft.AspNetCore.Metadata.csproj | 3 - .../Owin/ref/Microsoft.AspNetCore.Owin.csproj | 10 - ...Microsoft.AspNetCore.Owin.netcoreapp3.0.cs | 155 - ....AspNetCore.Routing.Abstractions.Manual.cs | 13 - ...oft.AspNetCore.Routing.Abstractions.csproj | 6 +- .../Microsoft.AspNetCore.Routing.Manual.cs | 574 + .../ref/Microsoft.AspNetCore.Routing.csproj | 18 +- ...rosoft.AspNetCore.Routing.netcoreapp3.0.cs | 1 - ...icrosoft.AspNetCore.WebUtilities.Manual.cs | 49 + .../Microsoft.AspNetCore.WebUtilities.csproj | 8 +- .../ApiAuthSample/ApiAuthSample.csproj | 4 + .../Microsoft.AspNetCore.Identity.Manual.cs | 18 + .../ref/Microsoft.AspNetCore.Identity.csproj | 8 +- ...etCore.Identity.EntityFrameworkCore.csproj | 16 - ...ntity.EntityFrameworkCore.netcoreapp3.0.cs | 222 - ...tity.EntityFrameworkCore.netstandard2.1.cs | 222 - ...y.EntityFrameworkCore.InMemory.Test.csproj | 4 + ...e.Identity.EntityFrameworkCore.Test.csproj | 4 + ...crosoft.Extensions.Identity.Core.Manual.cs | 83 + .../Microsoft.Extensions.Identity.Core.csproj | 18 +- ...soft.Extensions.Identity.Stores.Manual.cs} | 7 +- ...icrosoft.Extensions.Identity.Stores.csproj | 14 +- ...icrosoft.Extensions.Identity.Stores.csproj | 1 + .../Microsoft.AspNetCore.Identity.UI.csproj | 15 - ...ft.AspNetCore.Identity.UI.netcoreapp3.0.cs | 935 -- .../IdentitySample.DefaultUI.csproj | 4 + .../IdentitySample.Mvc.csproj | 4 + ...AspNetCore.Identity.FunctionalTests.csproj | 2 + .../Identity.DefaultUI.WebSite.csproj | 4 + .../ref/Microsoft.AspNetCore.Cors.Manual.cs | 30 + .../CORS/ref/Microsoft.AspNetCore.Cors.csproj | 16 +- .../test/testassets/Directory.Build.props | 7 - ...osoft.AspNetCore.ConcurrencyLimiter.csproj | 13 - ...etCore.ConcurrencyLimiter.netcoreapp3.0.cs | 43 - ...AspNetCore.Diagnostics.Abstractions.csproj | 4 +- ...ore.Diagnostics.EntityFrameworkCore.csproj | 11 - ...stics.EntityFrameworkCore.netcoreapp3.0.cs | 48 - .../Diagnostics.EFCore.FunctionalTests.csproj | 5 + ...agnostics.EntityFrameworkCore.Tests.csproj | 4 + ...Microsoft.AspNetCore.Diagnostics.Manual.cs | 32 + .../Microsoft.AspNetCore.Diagnostics.csproj | 22 +- .../DatabaseErrorPageSample.csproj | 4 + ...rosoft.AspNetCore.HeaderPropagation.csproj | 12 - ...NetCore.HeaderPropagation.netcoreapp3.0.cs | 87 - ...cs.HealthChecks.EntityFrameworkCore.csproj | 12 - ...ecks.EntityFrameworkCore.netstandard2.1.cs | 10 - ...lthChecks.EntityFrameworkCore.Tests.csproj | 6 + ...AspNetCore.Diagnostics.HealthChecks.csproj | 12 +- .../HealthChecksSample.csproj | 11 +- .../Microsoft.AspNetCore.HostFiltering.csproj | 10 +- .../Microsoft.AspNetCore.HttpOverrides.csproj | 8 +- ...soft.AspNetCore.HttpOverrides.Tests.csproj | 5 - .../Microsoft.AspNetCore.HttpsPolicy.csproj | 12 +- ...oft.AspNetCore.Localization.Routing.csproj | 6 +- .../Microsoft.AspNetCore.Localization.csproj | 10 +- src/Middleware/Middleware.sln | 15 + ...osoft.AspNetCore.MiddlewareAnalysis.csproj | 11 - ...etCore.MiddlewareAnalysis.netcoreapp3.0.cs | 34 - .../Microsoft.AspNetCore.NodeServices.csproj | 12 - ...t.AspNetCore.NodeServices.netcoreapp3.0.cs | 104 - ...etCore.ResponseCaching.Abstractions.csproj | 4 +- ...osoft.AspNetCore.ResponseCaching.Manual.cs | 189 + ...icrosoft.AspNetCore.ResponseCaching.csproj | 14 +- ...t.AspNetCore.ResponseCompression.Manual.cs | 35 + ...soft.AspNetCore.ResponseCompression.csproj | 12 +- .../Microsoft.AspNetCore.Rewrite.Manual.cs | 587 + .../ref/Microsoft.AspNetCore.Rewrite.csproj | 16 +- .../ref/Microsoft.AspNetCore.Session.csproj | 12 +- ...t.AspNetCore.SpaServices.Extensions.csproj | 13 - ...re.SpaServices.Extensions.netcoreapp3.0.cs | 97 - .../Microsoft.AspNetCore.SpaServices.csproj | 12 - ...ft.AspNetCore.SpaServices.netcoreapp3.0.cs | 94 - .../test/RenderToStringResultTests.cs | 6 + ...Microsoft.AspNetCore.StaticFiles.Manual.cs | 77 + .../Microsoft.AspNetCore.StaticFiles.csproj | 16 +- ...NetCore.StaticFiles.FunctionalTests.csproj | 6 - .../Microsoft.AspNetCore.WebSockets.csproj | 8 +- .../samples/MusicStore/MusicStore.csproj | 4 + .../MusicStore.Test/MusicStore.Test.csproj | 2 + ...soft.AspNetCore.Mvc.Abstractions.Manual.cs | 10 + ...crosoft.AspNetCore.Mvc.Abstractions.csproj | 10 +- .../test/Mvc.Analyzers.Test.csproj | 2 +- .../test/Mvc.Api.Analyzers.Test.csproj | 2 +- ...osoft.AspNetCore.Mvc.ApiExplorer.Manual.cs | 31 +- ...icrosoft.AspNetCore.Mvc.ApiExplorer.csproj | 5 +- src/Mvc/Mvc.Core/ref/Directory.Build.props | 7 - .../Microsoft.AspNetCore.Mvc.Core.Manual.cs | 1619 ++- .../ref/Microsoft.AspNetCore.Mvc.Core.csproj | 34 +- .../src/Microsoft.AspNetCore.Mvc.Core.csproj | 2 - .../Microsoft.AspNetCore.Mvc.Cors.Manual.cs | 34 + .../ref/Microsoft.AspNetCore.Mvc.Cors.csproj | 8 +- .../ref/Directory.Build.props | 8 - ...t.AspNetCore.Mvc.DataAnnotations.Manual.cs | 82 +- ...soft.AspNetCore.Mvc.DataAnnotations.csproj | 7 +- ...soft.AspNetCore.Mvc.Formatters.Json.csproj | 6 +- ...ft.AspNetCore.Mvc.Formatters.Xml.Manual.cs | 40 + ...osoft.AspNetCore.Mvc.Formatters.Xml.csproj | 6 +- ...osoft.AspNetCore.Mvc.Formatters.Xml.csproj | 2 - ...soft.AspNetCore.Mvc.Localization.Manual.cs | 11 + ...crosoft.AspNetCore.Mvc.Localization.csproj | 12 +- ...osoft.AspNetCore.Mvc.NewtonsoftJson.csproj | 13 - ...etCore.Mvc.NewtonsoftJson.netcoreapp3.0.cs | 97 - ...etCore.Mvc.Razor.RuntimeCompilation.csproj | 14 - ....Razor.RuntimeCompilation.netcoreapp3.0.cs | 45 - .../test/AssemblyPartExtensionTest.cs | 2 +- src/Mvc/Mvc.Razor/ref/Directory.Build.props | 7 - .../Microsoft.AspNetCore.Mvc.Razor.Manual.cs | 74 +- .../ref/Microsoft.AspNetCore.Mvc.Razor.csproj | 11 +- .../Mvc.RazorPages/ref/Directory.Build.props | 13 - ...osoft.AspNetCore.Mvc.RazorPages.Manual.cs} | 368 +- ...Microsoft.AspNetCore.Mvc.RazorPages.csproj | 6 +- ...AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs | 3 +- ...Microsoft.AspNetCore.Mvc.RazorPages.csproj | 2 - ...rosoft.AspNetCore.Mvc.TagHelpers.Manual.cs | 114 + ...Microsoft.AspNetCore.Mvc.TagHelpers.csproj | 16 +- .../Microsoft.AspNetCore.Mvc.Testing.csproj | 14 - ...ft.AspNetCore.Mvc.Testing.netcoreapp3.0.cs | 65 - .../ref/Directory.Build.props | 7 - ...soft.AspNetCore.Mvc.ViewFeatures.Manual.cs | 477 +- ...crosoft.AspNetCore.Mvc.ViewFeatures.csproj | 21 +- ...crosoft.AspNetCore.Mvc.ViewFeatures.csproj | 1 - .../Mvc/ref/Microsoft.AspNetCore.Mvc.csproj | 23 +- src/Mvc/test/WebSites/Directory.Build.props | 7 - .../Infrastructure/GenerateTestProps.targets | 2 +- ...crosoft.AspNetCore.Razor.Runtime.Manual.cs | 29 +- .../Microsoft.AspNetCore.Razor.Runtime.csproj | 7 +- .../ref/Microsoft.AspNetCore.Razor.Manual.cs | 10 + .../ref/Microsoft.AspNetCore.Razor.csproj | 8 +- ...pNetCore.Authentication.Certificate.csproj | 10 - ...uthentication.Certificate.netcoreapp3.0.cs | 59 - ...t.AspNetCore.Authentication.Cookies.csproj | 4 +- ...Microsoft.AspNetCore.Authentication.csproj | 16 +- ....AspNetCore.Authentication.Facebook.csproj | 10 - ...e.Authentication.Facebook.netcoreapp3.0.cs | 41 - ...ft.AspNetCore.Authentication.Google.csproj | 10 - ...ore.Authentication.Google.netcoreapp3.0.cs | 52 - ...AspNetCore.Authentication.JwtBearer.csproj | 11 - ....Authentication.JwtBearer.netcoreapp3.0.cs | 98 - ...ore.Authentication.MicrosoftAccount.csproj | 10 - ...tication.MicrosoftAccount.netcoreapp3.0.cs | 49 - ...AspNetCore.Authentication.Negotiate.csproj | 12 - ....Authentication.Negotiate.netcoreapp3.0.cs | 69 - ...oft.AspNetCore.Authentication.OAuth.csproj | 4 +- ...etCore.Authentication.OpenIdConnect.csproj | 11 - ...hentication.OpenIdConnect.netcoreapp3.0.cs | 202 - ...t.AspNetCore.Authentication.Twitter.csproj | 10 - ...re.Authentication.Twitter.netcoreapp3.0.cs | 89 - ...NetCore.Authentication.WsFederation.csproj | 12 - ...thentication.WsFederation.netcoreapp3.0.cs | 116 - ...crosoft.AspNetCore.Authorization.Manual.cs | 10 - .../Microsoft.AspNetCore.Authorization.csproj | 18 +- ...oft.AspNetCore.Authorization.Policy.csproj | 10 +- .../Microsoft.AspNetCore.CookiePolicy.csproj | 8 +- .../Identity.ExternalClaims.csproj | 4 + .../AuthSamples.FunctionalTests.csproj | 5 - ...AspNetCore.Connections.Abstractions.csproj | 22 +- ...rosoft.AspNetCore.Server.HttpSys.Manual.cs | 1005 ++ ...Microsoft.AspNetCore.Server.HttpSys.csproj | 16 +- .../Microsoft.AspNetCore.Server.IIS.Manual.cs | 30 +- .../Microsoft.AspNetCore.Server.IIS.csproj | 21 +- .../InProcessWebSite/InProcessWebSite.csproj | 5 - ...AspNetCore.Server.IISIntegration.Manual.cs | 18 + ...ft.AspNetCore.Server.IISIntegration.csproj | 24 +- .../Kestrel/Core/ref/Directory.Build.props | 7 - ...t.AspNetCore.Server.Kestrel.Core.Manual.cs | 1944 ++- ...soft.AspNetCore.Server.Kestrel.Core.csproj | 21 +- ...tCore.Server.Kestrel.Core.netcoreapp3.0.cs | 1 - ...Microsoft.AspNetCore.Server.Kestrel.csproj | 8 +- ...Core.Server.Kestrel.Transport.Libuv.csproj | 14 - ...r.Kestrel.Transport.Libuv.netcoreapp3.0.cs | 22 - ...Server.Kestrel.Transport.Sockets.Manual.cs | 94 + ...re.Server.Kestrel.Transport.Sockets.csproj | 10 +- .../ServerComparison.TestSites.csproj | 5 - ...soft.AspNetCore.SignalR.Client.Core.csproj | 23 - ...tCore.SignalR.Client.Core.netcoreapp3.0.cs | 168 - ...Core.SignalR.Client.Core.netstandard2.0.cs | 162 - ...Core.SignalR.Client.Core.netstandard2.1.cs | 162 - ...Microsoft.AspNetCore.SignalR.Client.csproj | 11 - ...spNetCore.SignalR.Client.netstandard2.0.cs | 17 - ...Core.SignalR.Client.FunctionalTests.csproj | 2 + ...oft.AspNetCore.SignalR.Client.Tests.csproj | 2 + ....AspNetCore.Http.Connections.Client.csproj | 18 - ....Http.Connections.Client.netstandard2.0.cs | 56 - ....Http.Connections.Client.netstandard2.1.cs | 56 - .../SignalR.Client.FunctionalTestApp.csproj | 11 +- ....AspNetCore.Http.Connections.Common.csproj | 8 +- ...crosoft.AspNetCore.Http.Connections.csproj | 19 +- ...t.AspNetCore.Http.Connections.Tests.csproj | 2 + ...t.AspNetCore.SignalR.Protocols.Json.csproj | 6 +- ...tCore.SignalR.Protocols.MessagePack.csproj | 11 - ...lR.Protocols.MessagePack.netstandard2.0.cs | 34 - ...re.SignalR.Protocols.NewtonsoftJson.csproj | 11 - ...Protocols.NewtonsoftJson.netstandard2.0.cs | 35 - ...Microsoft.AspNetCore.SignalR.Common.csproj | 16 +- ...oft.AspNetCore.SignalR.Common.Tests.csproj | 2 + ...soft.AspNetCore.SignalR.Tests.Utils.csproj | 4 + ....AspNetCore.SignalR.Microbenchmarks.csproj | 2 + .../samples/ClientSample/ClientSample.csproj | 4 + .../JwtClientSample/JwtClientSample.csproj | 4 + .../SignalRSamples/SignalRSamples.csproj | 4 + .../Microsoft.AspNetCore.SignalR.Core.csproj | 16 +- .../ref/Microsoft.AspNetCore.SignalR.csproj | 6 +- .../Microsoft.AspNetCore.SignalR.Tests.csproj | 4 +- ...NetCore.SignalR.Specification.Tests.csproj | 4 + ...pNetCore.SignalR.StackExchangeRedis.csproj | 13 - ...ignalR.StackExchangeRedis.netcoreapp3.0.cs | 41 - ...re.SignalR.StackExchangeRedis.Tests.csproj | 2 + src/SiteExtensions/LoggingBranch/LB.csproj | 3 + ...ft.Extensions.ApiDescription.Server.csproj | 3 - 311 files changed, 9352 insertions(+), 18534 deletions(-) delete mode 100644 eng/IndirectReferences.props create mode 100644 src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.Manual.cs delete mode 100644 src/Azure/AzureAD/Authentication.AzureAD.UI/ref/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj delete mode 100644 src/Azure/AzureAD/Authentication.AzureAD.UI/ref/Microsoft.AspNetCore.Authentication.AzureAD.UI.netcoreapp3.0.cs delete mode 100644 src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj delete mode 100644 src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp3.0.cs delete mode 100644 src/Azure/AzureAppServices.HostingStartup/ref/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj delete mode 100644 src/Azure/AzureAppServices.HostingStartup/ref/Microsoft.AspNetCore.AzureAppServices.HostingStartup.netcoreapp3.0.cs delete mode 100644 src/Azure/AzureAppServicesIntegration/ref/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj delete mode 100644 src/Azure/AzureAppServicesIntegration/ref/Microsoft.AspNetCore.AzureAppServicesIntegration.netcoreapp3.0.cs delete mode 100644 src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.csproj delete mode 100644 src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs delete mode 100644 src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.csproj delete mode 100644 src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.netstandard2.0.cs delete mode 100644 src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.csproj delete mode 100644 src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.netcoreapp3.0.cs delete mode 100644 src/Components/Blazor/testassets/Directory.Build.props delete mode 100644 src/Components/Components/ref/Directory.Build.props create mode 100644 src/Components/Components/ref/Microsoft.AspNetCore.Components.Manual.cs delete mode 100644 src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs create mode 100644 src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.Manual.cs delete mode 100644 src/Components/test/testassets/Directory.Build.props create mode 100644 src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.Manual.cs delete mode 100644 src/DataProtection/AzureKeyVault/ref/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj delete mode 100644 src/DataProtection/AzureKeyVault/ref/Microsoft.AspNetCore.DataProtection.AzureKeyVault.netstandard2.0.cs delete mode 100644 src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj delete mode 100644 src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.netstandard2.0.cs delete mode 100644 src/DataProtection/Cryptography.Internal/ref/Directory.Build.props create mode 100644 src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.Manual.cs create mode 100644 src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.netcoreapp2.0.Manual.cs create mode 100644 src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.Manual.cs delete mode 100644 src/DataProtection/EntityFrameworkCore/ref/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj delete mode 100644 src/DataProtection/EntityFrameworkCore/ref/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.netstandard2.1.cs create mode 100644 src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.Manual.cs delete mode 100644 src/DataProtection/StackExchangeRedis/ref/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj delete mode 100644 src/DataProtection/StackExchangeRedis/ref/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.netstandard2.0.cs delete mode 100644 src/Features/JsonPatch/ref/Microsoft.AspNetCore.JsonPatch.csproj delete mode 100644 src/Features/JsonPatch/ref/Microsoft.AspNetCore.JsonPatch.netstandard2.0.cs create mode 100644 src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.Manual.cs delete mode 100644 src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.csproj delete mode 100644 src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp3.0.cs delete mode 100644 src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.csproj delete mode 100644 src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.netcoreapp3.0.cs delete mode 100644 src/Hosting/WindowsServices/ref/Microsoft.AspNetCore.Hosting.WindowsServices.csproj delete mode 100644 src/Hosting/WindowsServices/ref/Microsoft.AspNetCore.Hosting.WindowsServices.netcoreapp3.0.cs create mode 100644 src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.Manual.cs create mode 100644 src/Http/Headers/ref/Microsoft.Net.Http.Headers.Manual.cs create mode 100644 src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.Manual.cs create mode 100644 src/Http/Http/ref/Microsoft.AspNetCore.Http.Manual.cs delete mode 100644 src/Http/Owin/ref/Microsoft.AspNetCore.Owin.csproj delete mode 100644 src/Http/Owin/ref/Microsoft.AspNetCore.Owin.netcoreapp3.0.cs delete mode 100644 src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.Manual.cs create mode 100644 src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs create mode 100644 src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.Manual.cs create mode 100644 src/Identity/Core/ref/Microsoft.AspNetCore.Identity.Manual.cs delete mode 100644 src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj delete mode 100644 src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netcoreapp3.0.cs delete mode 100644 src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netstandard2.1.cs create mode 100644 src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.Manual.cs rename src/{Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.Manual.cs => Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.Manual.cs} (58%) delete mode 100644 src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.csproj delete mode 100644 src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.netcoreapp3.0.cs create mode 100644 src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.Manual.cs delete mode 100644 src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.csproj delete mode 100644 src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.netcoreapp3.0.cs delete mode 100644 src/Middleware/Diagnostics.EntityFrameworkCore/ref/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj delete mode 100644 src/Middleware/Diagnostics.EntityFrameworkCore/ref/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.netcoreapp3.0.cs create mode 100644 src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.Manual.cs delete mode 100644 src/Middleware/HeaderPropagation/ref/Microsoft.AspNetCore.HeaderPropagation.csproj delete mode 100644 src/Middleware/HeaderPropagation/ref/Microsoft.AspNetCore.HeaderPropagation.netcoreapp3.0.cs delete mode 100644 src/Middleware/HealthChecks.EntityFrameworkCore/ref/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj delete mode 100644 src/Middleware/HealthChecks.EntityFrameworkCore/ref/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.netstandard2.1.cs delete mode 100644 src/Middleware/MiddlewareAnalysis/ref/Microsoft.AspNetCore.MiddlewareAnalysis.csproj delete mode 100644 src/Middleware/MiddlewareAnalysis/ref/Microsoft.AspNetCore.MiddlewareAnalysis.netcoreapp3.0.cs delete mode 100644 src/Middleware/NodeServices/ref/Microsoft.AspNetCore.NodeServices.csproj delete mode 100644 src/Middleware/NodeServices/ref/Microsoft.AspNetCore.NodeServices.netcoreapp3.0.cs create mode 100644 src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.Manual.cs create mode 100644 src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.Manual.cs create mode 100644 src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.Manual.cs delete mode 100644 src/Middleware/SpaServices.Extensions/ref/Microsoft.AspNetCore.SpaServices.Extensions.csproj delete mode 100644 src/Middleware/SpaServices.Extensions/ref/Microsoft.AspNetCore.SpaServices.Extensions.netcoreapp3.0.cs delete mode 100644 src/Middleware/SpaServices/ref/Microsoft.AspNetCore.SpaServices.csproj delete mode 100644 src/Middleware/SpaServices/ref/Microsoft.AspNetCore.SpaServices.netcoreapp3.0.cs create mode 100644 src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.Manual.cs create mode 100644 src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.Manual.cs delete mode 100644 src/Mvc/Mvc.Core/ref/Directory.Build.props create mode 100644 src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.Manual.cs delete mode 100644 src/Mvc/Mvc.DataAnnotations/ref/Directory.Build.props create mode 100644 src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.Manual.cs create mode 100644 src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.Manual.cs delete mode 100644 src/Mvc/Mvc.NewtonsoftJson/ref/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj delete mode 100644 src/Mvc/Mvc.NewtonsoftJson/ref/Microsoft.AspNetCore.Mvc.NewtonsoftJson.netcoreapp3.0.cs delete mode 100644 src/Mvc/Mvc.Razor.RuntimeCompilation/ref/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj delete mode 100644 src/Mvc/Mvc.Razor.RuntimeCompilation/ref/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.netcoreapp3.0.cs delete mode 100644 src/Mvc/Mvc.Razor/ref/Directory.Build.props delete mode 100644 src/Mvc/Mvc.RazorPages/ref/Directory.Build.props rename src/Mvc/Mvc.RazorPages/ref/{Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs => Microsoft.AspNetCore.Mvc.RazorPages.Manual.cs} (55%) create mode 100644 src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.Manual.cs delete mode 100644 src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.csproj delete mode 100644 src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.netcoreapp3.0.cs delete mode 100644 src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props create mode 100644 src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.Manual.cs delete mode 100644 src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.csproj delete mode 100644 src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.netcoreapp3.0.cs delete mode 100644 src/Security/Authentication/Facebook/ref/Microsoft.AspNetCore.Authentication.Facebook.csproj delete mode 100644 src/Security/Authentication/Facebook/ref/Microsoft.AspNetCore.Authentication.Facebook.netcoreapp3.0.cs delete mode 100644 src/Security/Authentication/Google/ref/Microsoft.AspNetCore.Authentication.Google.csproj delete mode 100644 src/Security/Authentication/Google/ref/Microsoft.AspNetCore.Authentication.Google.netcoreapp3.0.cs delete mode 100644 src/Security/Authentication/JwtBearer/ref/Microsoft.AspNetCore.Authentication.JwtBearer.csproj delete mode 100644 src/Security/Authentication/JwtBearer/ref/Microsoft.AspNetCore.Authentication.JwtBearer.netcoreapp3.0.cs delete mode 100644 src/Security/Authentication/MicrosoftAccount/ref/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj delete mode 100644 src/Security/Authentication/MicrosoftAccount/ref/Microsoft.AspNetCore.Authentication.MicrosoftAccount.netcoreapp3.0.cs delete mode 100644 src/Security/Authentication/Negotiate/ref/Microsoft.AspNetCore.Authentication.Negotiate.csproj delete mode 100644 src/Security/Authentication/Negotiate/ref/Microsoft.AspNetCore.Authentication.Negotiate.netcoreapp3.0.cs delete mode 100644 src/Security/Authentication/OpenIdConnect/ref/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj delete mode 100644 src/Security/Authentication/OpenIdConnect/ref/Microsoft.AspNetCore.Authentication.OpenIdConnect.netcoreapp3.0.cs delete mode 100644 src/Security/Authentication/Twitter/ref/Microsoft.AspNetCore.Authentication.Twitter.csproj delete mode 100644 src/Security/Authentication/Twitter/ref/Microsoft.AspNetCore.Authentication.Twitter.netcoreapp3.0.cs delete mode 100644 src/Security/Authentication/WsFederation/ref/Microsoft.AspNetCore.Authentication.WsFederation.csproj delete mode 100644 src/Security/Authentication/WsFederation/ref/Microsoft.AspNetCore.Authentication.WsFederation.netcoreapp3.0.cs delete mode 100644 src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.Manual.cs create mode 100644 src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.Manual.cs create mode 100644 src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.Manual.cs delete mode 100644 src/Servers/Kestrel/Core/ref/Directory.Build.props delete mode 100644 src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj delete mode 100644 src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.netcoreapp3.0.cs create mode 100644 src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Manual.cs delete mode 100644 src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.csproj delete mode 100644 src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.netcoreapp3.0.cs delete mode 100644 src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.netstandard2.0.cs delete mode 100644 src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.netstandard2.1.cs delete mode 100644 src/SignalR/clients/csharp/Client/ref/Microsoft.AspNetCore.SignalR.Client.csproj delete mode 100644 src/SignalR/clients/csharp/Client/ref/Microsoft.AspNetCore.SignalR.Client.netstandard2.0.cs delete mode 100644 src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.csproj delete mode 100644 src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netstandard2.0.cs delete mode 100644 src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netstandard2.1.cs delete mode 100644 src/SignalR/common/Protocols.MessagePack/ref/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj delete mode 100644 src/SignalR/common/Protocols.MessagePack/ref/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.netstandard2.0.cs delete mode 100644 src/SignalR/common/Protocols.NewtonsoftJson/ref/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj delete mode 100644 src/SignalR/common/Protocols.NewtonsoftJson/ref/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.netstandard2.0.cs delete mode 100644 src/SignalR/server/StackExchangeRedis/ref/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj delete mode 100644 src/SignalR/server/StackExchangeRedis/ref/Microsoft.AspNetCore.SignalR.StackExchangeRedis.netcoreapp3.0.cs diff --git a/Directory.Build.props b/Directory.Build.props index 77df19d4c3..2ced5ff212 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -84,14 +84,14 @@ aspnetcore-runtime aspnetcore-targeting-pack - - true - - - false - - - true + + + false + true + false + true false - + - true + true @@ -58,15 +59,11 @@ - - true - - + true true - + false @@ -88,7 +85,7 @@ $(BaselinePackageVersion) $(BaselinePackageVersion) - + $(BaselinePackageVersion) @@ -99,7 +96,8 @@ true - true + true false true @@ -161,13 +159,12 @@ - - + diff --git a/eng/Build.props b/eng/Build.props index fa5e1d21d6..a118a30f20 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -157,7 +157,35 @@ @(ProjectToExclude); $(RepoRoot)**\node_modules\**\*; $(RepoRoot)**\bin\**\*; - $(RepoRoot)**\obj\**\*;" /> + $(RepoRoot)**\obj\**\*;" + Condition=" '$(BuildMainlyReferenceProviders)' != 'true' " /> + diff --git a/eng/CodeGen.proj b/eng/CodeGen.proj index d16f2875e5..9f6ede2cfe 100644 --- a/eng/CodeGen.proj +++ b/eng/CodeGen.proj @@ -3,6 +3,7 @@ true $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..')) + true @@ -15,7 +16,6 @@ BuildInParallel="true" SkipNonexistentTargets="true" SkipNonexistentProjects="true" > - diff --git a/eng/GenAPI.exclusions.txt b/eng/GenAPI.exclusions.txt index 0c4ce95fc2..5c90c6c4db 100644 --- a/eng/GenAPI.exclusions.txt +++ b/eng/GenAPI.exclusions.txt @@ -9,4 +9,48 @@ F:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.{Ca M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.#ctor P:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.Cache M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.get_Cache -M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.set_Cache(Microsoft.Extensions.Caching.Memory.IMemoryCache) \ No newline at end of file +M:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.set_Cache(Microsoft.Extensions.Caching.Memory.IMemoryCache) +# Manually implemented - Need to include internal setter +P:Microsoft.AspNetCore.Routing.Matching.CandidateState.Values +# Manually implemented - Need to include internal setter +P:Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions.KestrelServerOptions +# Manually implemented - Need to include private fields in struct with sequential layout +T:Microsoft.AspNetCore.Components.RenderHandle +P:Microsoft.AspNetCore.Components.RenderHandle.Dispatcher +P:Microsoft.AspNetCore.Components.RenderHandle.IsInitialized +M:Microsoft.AspNetCore.Components.RenderHandle.get_Dispatcher +M:Microsoft.AspNetCore.Components.RenderHandle.get_IsInitialized +M:Microsoft.AspNetCore.Components.RenderHandle.Render(Microsoft.AspNetCore.Components.RenderFragment) +T:Microsoft.AspNetCore.Components.ParameterView +P:Microsoft.AspNetCore.Components.ParameterView.Empty +M:Microsoft.AspNetCore.Components.ParameterView.FromDictionary(System.Collections.Generic.IDictionary{System.String,System.Object}) +M:Microsoft.AspNetCore.Components.ParameterView.GetEnumerator +M:Microsoft.AspNetCore.Components.ParameterView.GetValueOrDefault``1(System.String) +M:Microsoft.AspNetCore.Components.ParameterView.GetValueOrDefault``1(System.String,``0) +M:Microsoft.AspNetCore.Components.ParameterView.get_Empty +M:Microsoft.AspNetCore.Components.ParameterView.SetParameterProperties(System.Object) +M:Microsoft.AspNetCore.Components.ParameterView.ToDictionary +M:Microsoft.AspNetCore.Components.ParameterView.TryGetValue``1(System.String,``0@) +T:Microsoft.AspNetCore.Components.ParameterView.Enumerator +P:Microsoft.AspNetCore.Components.ParameterView.Enumerator.Current +M:Microsoft.AspNetCore.Components.ParameterView.Enumerator.get_Current +M:Microsoft.AspNetCore.Components.ParameterView.Enumerator.MoveNext +T:Microsoft.AspNetCore.Components.EventCallback +F:Microsoft.AspNetCore.Components.EventCallback.Empty +F:Microsoft.AspNetCore.Components.EventCallback.Factory +M:Microsoft.AspNetCore.Components.EventCallback.#ctor(Microsoft.AspNetCore.Components.IHandleEvent,System.MulticastDelegate) +P:Microsoft.AspNetCore.Components.EventCallback.HasDelegate +M:Microsoft.AspNetCore.Components.EventCallback.get_HasDelegate +M:Microsoft.AspNetCore.Components.EventCallback.InvokeAsync(System.Object) +T:Microsoft.AspNetCore.Components.EventCallback`1 +F:Microsoft.AspNetCore.Components.EventCallback`1.Empty +M:Microsoft.AspNetCore.Components.EventCallback`1.#ctor(Microsoft.AspNetCore.Components.IHandleEvent,System.MulticastDelegate) +P:Microsoft.AspNetCore.Components.EventCallback`1.HasDelegate +M:Microsoft.AspNetCore.Components.EventCallback`1.get_HasDelegate +M:Microsoft.AspNetCore.Components.EventCallback`1.InvokeAsync(`0) +# Manually implemented - Need to include internal setter +P:Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions.Conventions +# Break GenAPI - https://github.com/dotnet/arcade/issues/4488 +T:Microsoft.AspNetCore.Mvc.ApplicationModels.ActionAttributeRouteModel.d__3 +T:Microsoft.AspNetCore.Components.Rendering.HtmlRenderer.d__17 +T:Microsoft.AspNetCore.Components.Rendering.HtmlRenderer.d__8 diff --git a/eng/IndirectReferences.props b/eng/IndirectReferences.props deleted file mode 100644 index c57e61024d..0000000000 --- a/eng/IndirectReferences.props +++ /dev/null @@ -1,10911 +0,0 @@ - - - - <_RefsToCheck Include="@(Reference->'%(Identity)')"/> - <_ProjectRefsToCheck Include="@(ProjectReference)" Exclude="@(ProjectReference->WithMetadataValue('ReferenceOutputAssembly', 'false'))" /> - <_RefsToCheck Include="@(ProjectReference->'%(Filename)')"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index d1d79ea73f..38fcb92ba2 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -5,33 +5,70 @@ --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - @@ -40,61 +77,40 @@ - - - - - - - - - - - - - - - - - - - - - @@ -107,34 +123,18 @@ - - - - - - - - - - - - - - - - diff --git a/eng/Versions.props b/eng/Versions.props index 02045d7d46..275a6b3b74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,13 +26,8 @@ 3.0.0 false - - true - - true + + true $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) $(VersionPrefix) diff --git a/eng/targets/ReferenceAssembly.targets b/eng/targets/ReferenceAssembly.targets index 5f4345e0c4..9893049ed3 100644 --- a/eng/targets/ReferenceAssembly.targets +++ b/eng/targets/ReferenceAssembly.targets @@ -1,6 +1,6 @@ - + <_RefSourceOutputPath>$([System.IO.Directory]::GetParent('$(MSBuildProjectDirectory)'))/ref/ <_RefProjectFileOutputPath>$(_RefSourceOutputPath)$(AssemblyName).csproj @@ -13,8 +13,8 @@ + Targets="_GenerateProjectSourceInner" + Properties="TargetFramework=%(_DeduplicatedTargetFramework.Identity);CompileUsingReferenceAssemblies=false"> @@ -23,35 +23,33 @@ - <_ExcludeFromSourceBuild Condition="'$(IsAspNetCoreApp)' == 'true' OR '$(IsAnalyzersProject)' == 'true'">false -]]> - - @(_ResultTargetFramework)$(_ExcludeFromSourceBuild) + @(_ResultTargetFramework) @(ProjectListContentItem->'%(Identity)', '%0A') ]]> - - - + - + <_RefSourceOutputPath>$([System.IO.Directory]::GetParent('$(MSBuildProjectDirectory)'))/ref/ <_RefSourceFileName>$(AssemblyName).$(TargetFramework).cs <_ManualRefSourceFileName>$(AssemblyName).Manual.cs + <_PerTFMManualRefSourceFileName>$(AssemblyName).$(TargetFramework).Manual.cs <_RefSourceFileOutputPath>$(_RefSourceOutputPath)$(_RefSourceFileName) @@ -61,37 +59,58 @@ - <_GenAPICommand Condition="'$(MSBuildRuntimeType)' == 'core'">"$(DotNetTool)" --roll-forward-on-no-candidate-fx 2 "$(_GenAPIPath)" + <_GenApiFile>$([MSBuild]::NormalizePath('$(ArtifactsDir)', 'log', 'GenAPI.rsp')) + <_GenAPICommand + Condition="'$(MSBuildRuntimeType)' == 'core'">"$(DotNetTool)" --roll-forward-on-no-candidate-fx 2 "$(_GenAPIPath)" <_GenAPICmd>$(_GenAPICommand) - <_GenAPICmd>$(_GenAPICmd) "$(TargetPath)" - <_GenAPICmd>$(_GenAPICmd) --lib-path "@(_ReferencePathDirectories)" - <_GenAPICmd>$(_GenAPICmd) --out "$(_RefSourceFileOutputPath)" - <_GenAPICmd>$(_GenAPICmd) --header-file "$(RepoRoot)/eng/LicenseHeader.txt" - <_GenAPICmd>$(_GenAPICmd) --exclude-api-list "$(RepoRoot)/eng/GenAPI.exclusions.txt" + <_GenAPICmd>$(_GenAPICommand) @"$(_GenApiFile)" + <_GenAPICmd + Condition=" '$(AdditionalGenApiCmdOptions)' != '' ">$(_GenAPICmd) $(AdditionalGenApiCmdOptions) + <_GenApiArguments> + + + - + <_ReferenceAssemblyCompileItems Include="$(_RefSourceFileName)" /> + <_ReferenceAssemblyCompileItems Include="$(_ManualRefSourceFileName)" + Condition="Exists('$(_RefSourceOutputPath)$(_ManualRefSourceFileName)')" /> + <_ReferenceAssemblyCompileItems Include="$(_PerTFMManualRefSourceFileName)" + Condition="Exists('$(_RefSourceOutputPath)$(_PerTFMManualRefSourceFileName)')" /> + <_ReferenceAssemblyCompileItems Include="../src/AssemblyInfo.cs" + Condition="Exists('$(MSBuildProjectDirectory)/AssemblyInfo.cs')" /> + <_ReferenceAssemblyCompileItems Include="../src/Properties/AssemblyInfo.cs" + Condition="Exists('$(MSBuildProjectDirectory)/Properties/AssemblyInfo.cs')" /> + + + <_ReferenceAssemblyItems + Include="@(_ReferenceAssemblyCompileItems->'<Compile Include="%(Identity)" />')" /> + <_ReferenceAssemblyItems + Include="@(FilteredOriginalReferences->'<Reference Include="%(Identity)" />')" + Condition=" '@(FilteredOriginalReferences)' != '' " /> + + <_ReferenceAssemblyItems + Include="@(InternalsVisibleTo->'<InternalsVisibleTo Include="%(Identity)" Key="%(Key)" />')" + Condition=" '@(InternalsVisibleTo)' != '' " /> - <_ManualReferenceAssemblyContent /> - <_ManualReferenceAssemblyContent Condition="Exists('$(_RefSourceOutputPath)$(_ManualRefSourceFileName)')"> - ]]> - - - ]]>$(_ManualReferenceAssemblyContent)'', '%0A ') + @(_ReferenceAssemblyItems, '%0A ') ]]> diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index dfac85df6f..df2ca08bed 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -11,11 +11,12 @@ Items used by the resolution strategy: - * BaselinePackageReference = a list of packages that were reference in the last release of the project currently building + * BaselinePackageReference = a list of packages that were referenced in the last release of the project currently building + - mainly used to ensure references do not change in servicing builds unless $(UseLatestPackageReferences) is not true. * LatestPackageReference = a list of the latest versions of packages * Reference = a list of the references which are needed for compilation or runtime * ProjectReferenceProvider = a list which maps of assembly names to the project file that produces it - --> +--> @@ -29,47 +30,49 @@ - true - true - true true + Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsServicingBuild)' != 'true' ">true + true + true false - true - true - true - false + true - true - false + true + false - true - false + true + false - + - true + true @@ -77,35 +80,40 @@ <_AllowedExplicitPackageReference Include="@(PackageReference->WithMetadataValue('AllowExplicitReference', 'true'))" /> <_AllowedExplicitPackageReference Include="FSharp.Core" Condition="'$(MSBuildProjectExtension)' == '.fsproj'" /> - <_ExplicitPackageReference Include="@(PackageReference)" Exclude="@(_ImplicitPackageReference);@(_AllowedExplicitPackageReference)" /> + <_ExplicitPackageReference Include="@(PackageReference)" + Exclude="@(_ImplicitPackageReference);@(_AllowedExplicitPackageReference)" /> <_UnusedProjectReferenceProvider Include="@(ProjectReferenceProvider)" Exclude="@(Reference)" /> - <_CompilationOnlyReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="@(Reference->WithMetadataValue('NuGetPackageId','NETStandard.Library'))" /> + <_CompilationOnlyReference Include="@(Reference->WithMetadataValue('NuGetPackageId','NETStandard.Library'))" + Condition="'$(TargetFramework)' == 'netstandard2.0'" /> <_InvalidReferenceToNonSharedFxAssembly Condition="'$(IsAspNetCoreApp)' == 'true'" - Include="@(Reference)" - Exclude=" - @(AspNetCoreAppReference); - @(AspNetCoreAppReferenceAndPackage); - @(ExternalAspNetCoreAppReference); - @(_CompilationOnlyReference); - @(Reference->WithMetadataValue('IsSharedSource', 'true'))" /> + Include="@(Reference)" + Exclude=" + @(AspNetCoreAppReference); + @(AspNetCoreAppReferenceAndPackage); + @(ExternalAspNetCoreAppReference); + @(_CompilationOnlyReference); + @(Reference->WithMetadataValue('IsSharedSource', 'true'))" /> <_OriginalReferences Include="@(Reference)" /> + <_ProjectReferenceByAssemblyName Condition="'$(UseProjectReferences)' == 'true'" - Include="@(ProjectReferenceProvider)" - Exclude="@(_UnusedProjectReferenceProvider)" /> + Include="@(ProjectReferenceProvider)" + Exclude="@(_UnusedProjectReferenceProvider)" /> - + false - + true @@ -113,30 +121,31 @@ - + Text="Cannot reference "%(_InvalidReferenceToSharedFxOnlyAssembly.Identity)" directly because it is part of the shared framework and this project is not. Use <FrameworkReference Include="Microsoft.AspNetCore.App" /> instead." /> + Text="Cannot reference "%(_InvalidReferenceToNonSharedFxAssembly.Identity)". This dependency is not in the shared framework. See docs/SharedFramework.md for instructions on how to modify what is in the shared framework." /> - + - + @@ -145,9 +154,15 @@ - - - + + + + + - + - - - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Memory" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.SqlServer" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.StackExchangeRedis" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.AzureKeyVault" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Binder" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.CommandLine" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.EnvironmentVariables" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.FileExtensions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Ini" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.Json" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.KeyPerFile" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.NewtonsoftJson" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Configuration.UserSecrets" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DependencyInjection.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DependencyInjection" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.DiagnosticAdapter" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Diagnostics.HealthChecks" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Composite" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Embedded" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileProviders.Physical" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.FileSystemGlobbing" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.Systemd" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Hosting.WindowsServices" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Http" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Http.Polly" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Localization.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Localization" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Abstractions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.AzureAppServices" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Configuration" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Console" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.Debug" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.EventLog" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.EventSource" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Logging.TraceSource" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.ObjectPool" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options.ConfigurationExtensions" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options.DataAnnotations" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Options" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Primitives" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.WebEncoders" /> - <_ExtensionInternalRefAssemblies Include="Microsoft.JSInterop" /> - <_ExtensionInternalRefAssemblies Include="Mono.WebAssembly.Interop" /> - - - <_NonExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Exclude="@(_ExtensionInternalRefAssemblies)" /> - <_ExtensionPackageReferences Include="@(_LatestPackageReferenceWithVersion)" Exclude="@(_NonExtensionPackageReferences)" /> - - - <_LatestPackageReferenceWithVersion Remove="@(_ExtensionPackageReferences)" /> - - - - - - - - - true - - - - <_BaselinePackageReferenceWithVersion Include="@(Reference)" Condition=" '$(IsServicingBuild)' == 'true' OR '$(UseLatestPackageReferences)' != 'true' "> + + <_BaselinePackageReferenceWithVersion Include="@(Reference)" + Condition=" '$(IsServicingBuild)' == 'true' OR '$(UseLatestPackageReferences)' != 'true' "> %(BaselinePackageReference.Identity) %(BaselinePackageReference.Version) - - <_BaselinePackageReferenceWithVersion Remove="@(_BaselinePackageReferenceWithVersion)" Condition="'%(Id)' != '%(Identity)' " /> + <_BaselinePackageReferenceWithVersion Remove="@(_BaselinePackageReferenceWithVersion)" + Condition="'%(Id)' != '%(Identity)' " /> @@ -251,10 +197,10 @@ %(LatestPackageReference.Identity) %(LatestPackageReference.Version) + <_PrivatePackageReferenceWithVersion Remove="@(_PrivatePackageReferenceWithVersion)" + Condition="'%(Id)' != '%(Identity)' " /> - <_PrivatePackageReferenceWithVersion Remove="@(_PrivatePackageReferenceWithVersion)" Condition="'%(Id)' != '%(Identity)' " /> - - + @@ -265,24 +211,92 @@ <_ImplicitPackageReference Remove="@(_ImplicitPackageReference)" /> - + <_ExplicitPackageReference Remove="@(_ExplicitPackageReference)" /> - + - + - + + + + + + <_CompileTfmUsingReferenceAssemblies>false + <_CompileTfmUsingReferenceAssemblies + Condition=" '$(CompileUsingReferenceAssemblies)' != false AND '$(TargetFramework)' == 'netcoreapp3.0' ">true + + + <_ReferenceProjectFile>$(MSBuildProjectDirectory)/../ref/$(MSBuildProjectFile) + + + $(GetTargetPathWithTargetPlatformMonikerDependsOn);AddReferenceProjectMetadata + RemoveReferenceProjectMetadata;$(PrepareForRunDependsOn) + + + + + ReferenceProjectMetadata + false + + + + + true + @(ReferenceProjectMetadata) + + + + + + + + + + + + + + + + + $(MicrosoftInternalExtensionsRefsPath)%(FileName).dll + + @@ -306,24 +320,36 @@ $([MSBuild]::MakeRelative($(RepoRoot), '$(ReferenceAssemblyDirectory)$(MSBuildProjectFile)')) - - + + + + $([MSBuild]::ValueOrDefault($(IsAspNetCoreApp),'false')) $([MSBuild]::ValueOrDefault($(IsShippingPackage),'false')) $([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectFullPath))) - $(ReferenceAssemblyProjectFileRelativePath) + $(ReferenceAssemblyProjectFileRelativePath) - <_CustomCollectProjectReferenceDependsOn Condition="'$(TargetFramework)' != ''">ResolveProjectReferences + <_CustomCollectProjectReferenceDependsOn + Condition="'$(TargetFramework)' != ''">ResolveProjectReferences - + <_TargetFrameworks Include="$(TargetFrameworks)" /> diff --git a/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.Manual.cs b/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.Manual.cs new file mode 100644 index 0000000000..10c1b0e282 --- /dev/null +++ b/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.Manual.cs @@ -0,0 +1,147 @@ +// 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. + +namespace Microsoft.AspNetCore.Antiforgery +{ + internal partial class AntiforgeryFeature : Microsoft.AspNetCore.Antiforgery.IAntiforgeryFeature + { + public AntiforgeryFeature() { } + public Microsoft.AspNetCore.Antiforgery.AntiforgeryToken CookieToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool HaveDeserializedCookieToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool HaveDeserializedRequestToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool HaveGeneratedNewCookieToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool HaveStoredNewCookieToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Antiforgery.AntiforgeryToken NewCookieToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string NewCookieTokenString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Antiforgery.AntiforgeryToken NewRequestToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string NewRequestTokenString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Antiforgery.AntiforgeryToken RequestToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + + internal partial class AntiforgerySerializationContext + { + public AntiforgerySerializationContext() { } + public System.IO.BinaryReader Reader { get { throw null; } } + public System.Security.Cryptography.SHA256 Sha256 { get { throw null; } } + public System.IO.MemoryStream Stream { get { throw null; } } + public System.IO.BinaryWriter Writer { get { throw null; } } + public char[] GetChars(int count) { throw null; } + public void Reset() { } + } + + internal partial class AntiforgerySerializationContextPooledObjectPolicy : Microsoft.Extensions.ObjectPool.IPooledObjectPolicy + { + public AntiforgerySerializationContextPooledObjectPolicy() { } + public Microsoft.AspNetCore.Antiforgery.AntiforgerySerializationContext Create() { throw null; } + public bool Return(Microsoft.AspNetCore.Antiforgery.AntiforgerySerializationContext obj) { throw null; } + } + + internal sealed partial class AntiforgeryToken + { + internal const int ClaimUidBitLength = 256; + internal const int SecurityTokenBitLength = 128; + public AntiforgeryToken() { } + public string AdditionalData { get { throw null; } set { } } + public Microsoft.AspNetCore.Antiforgery.BinaryBlob ClaimUid { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool IsCookieToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Antiforgery.BinaryBlob SecurityToken { get { throw null; } set { } } + public string Username { get { throw null; } set { } } + } + + [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerString}")] + internal sealed partial class BinaryBlob : System.IEquatable + { + public BinaryBlob(int bitLength) { } + public BinaryBlob(int bitLength, byte[] data) { } + public int BitLength { get { throw null; } } + public bool Equals(Microsoft.AspNetCore.Antiforgery.BinaryBlob other) { throw null; } + public override bool Equals(object obj) { throw null; } + public byte[] GetData() { throw null; } + public override int GetHashCode() { throw null; } + } + + internal partial class DefaultAntiforgery : Microsoft.AspNetCore.Antiforgery.IAntiforgery + { + public DefaultAntiforgery(Microsoft.Extensions.Options.IOptions antiforgeryOptionsAccessor, Microsoft.AspNetCore.Antiforgery.IAntiforgeryTokenGenerator tokenGenerator, Microsoft.AspNetCore.Antiforgery.IAntiforgeryTokenSerializer tokenSerializer, Microsoft.AspNetCore.Antiforgery.IAntiforgeryTokenStore tokenStore, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet GetAndStoreTokens(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } + public Microsoft.AspNetCore.Antiforgery.AntiforgeryTokenSet GetTokens(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task IsRequestValidAsync(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } + public void SetCookieTokenAndHeader(Microsoft.AspNetCore.Http.HttpContext httpContext) { } + protected virtual void SetDoNotCacheHeaders(Microsoft.AspNetCore.Http.HttpContext httpContext) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task ValidateRequestAsync(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } + } + + internal partial class DefaultAntiforgeryTokenGenerator : Microsoft.AspNetCore.Antiforgery.IAntiforgeryTokenGenerator + { + public DefaultAntiforgeryTokenGenerator(Microsoft.AspNetCore.Antiforgery.IClaimUidExtractor claimUidExtractor, Microsoft.AspNetCore.Antiforgery.IAntiforgeryAdditionalDataProvider additionalDataProvider) { } + public Microsoft.AspNetCore.Antiforgery.AntiforgeryToken GenerateCookieToken() { throw null; } + public Microsoft.AspNetCore.Antiforgery.AntiforgeryToken GenerateRequestToken(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Antiforgery.AntiforgeryToken cookieToken) { throw null; } + public bool IsCookieTokenValid(Microsoft.AspNetCore.Antiforgery.AntiforgeryToken cookieToken) { throw null; } + public bool TryValidateTokenSet(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Antiforgery.AntiforgeryToken cookieToken, Microsoft.AspNetCore.Antiforgery.AntiforgeryToken requestToken, out string message) { throw null; } + } + + internal partial class DefaultAntiforgeryTokenSerializer : Microsoft.AspNetCore.Antiforgery.IAntiforgeryTokenSerializer + { + public DefaultAntiforgeryTokenSerializer(Microsoft.AspNetCore.DataProtection.IDataProtectionProvider provider, Microsoft.Extensions.ObjectPool.ObjectPool pool) { } + public Microsoft.AspNetCore.Antiforgery.AntiforgeryToken Deserialize(string serializedToken) { throw null; } + public string Serialize(Microsoft.AspNetCore.Antiforgery.AntiforgeryToken token) { throw null; } + } + + internal partial class DefaultAntiforgeryTokenStore : Microsoft.AspNetCore.Antiforgery.IAntiforgeryTokenStore + { + public DefaultAntiforgeryTokenStore(Microsoft.Extensions.Options.IOptions optionsAccessor) { } + public string GetCookieToken(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task GetRequestTokensAsync(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } + public void SaveCookieToken(Microsoft.AspNetCore.Http.HttpContext httpContext, string token) { } + } + + internal partial class DefaultClaimUidExtractor : Microsoft.AspNetCore.Antiforgery.IClaimUidExtractor + { + public DefaultClaimUidExtractor(Microsoft.Extensions.ObjectPool.ObjectPool pool) { } + public string ExtractClaimUid(System.Security.Claims.ClaimsPrincipal claimsPrincipal) { throw null; } + public static System.Collections.Generic.IList GetUniqueIdentifierParameters(System.Collections.Generic.IEnumerable claimsIdentities) { throw null; } + } + + internal partial interface IAntiforgeryFeature + { + Microsoft.AspNetCore.Antiforgery.AntiforgeryToken CookieToken { get; set; } + bool HaveDeserializedCookieToken { get; set; } + bool HaveDeserializedRequestToken { get; set; } + bool HaveGeneratedNewCookieToken { get; set; } + bool HaveStoredNewCookieToken { get; set; } + Microsoft.AspNetCore.Antiforgery.AntiforgeryToken NewCookieToken { get; set; } + string NewCookieTokenString { get; set; } + Microsoft.AspNetCore.Antiforgery.AntiforgeryToken NewRequestToken { get; set; } + string NewRequestTokenString { get; set; } + Microsoft.AspNetCore.Antiforgery.AntiforgeryToken RequestToken { get; set; } + } + + internal partial interface IAntiforgeryTokenGenerator + { + Microsoft.AspNetCore.Antiforgery.AntiforgeryToken GenerateCookieToken(); + Microsoft.AspNetCore.Antiforgery.AntiforgeryToken GenerateRequestToken(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Antiforgery.AntiforgeryToken cookieToken); + bool IsCookieTokenValid(Microsoft.AspNetCore.Antiforgery.AntiforgeryToken cookieToken); + bool TryValidateTokenSet(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Antiforgery.AntiforgeryToken cookieToken, Microsoft.AspNetCore.Antiforgery.AntiforgeryToken requestToken, out string message); + } + + internal partial interface IAntiforgeryTokenSerializer + { + Microsoft.AspNetCore.Antiforgery.AntiforgeryToken Deserialize(string serializedToken); + string Serialize(Microsoft.AspNetCore.Antiforgery.AntiforgeryToken token); + } + + internal partial interface IAntiforgeryTokenStore + { + string GetCookieToken(Microsoft.AspNetCore.Http.HttpContext httpContext); + System.Threading.Tasks.Task GetRequestTokensAsync(Microsoft.AspNetCore.Http.HttpContext httpContext); + void SaveCookieToken(Microsoft.AspNetCore.Http.HttpContext httpContext, string token); + } + + internal partial interface IClaimUidExtractor + { + string ExtractClaimUid(System.Security.Claims.ClaimsPrincipal claimsPrincipal); + } +} diff --git a/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj b/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj index 2a99290b34..cc1f4bec2a 100644 --- a/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj +++ b/src/Antiforgery/ref/Microsoft.AspNetCore.Antiforgery.csproj @@ -2,15 +2,15 @@ netcoreapp3.0 - false - - - - - - + + + + + + + diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/ref/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj b/src/Azure/AzureAD/Authentication.AzureAD.UI/ref/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj deleted file mode 100644 index f320adac86..0000000000 --- a/src/Azure/AzureAD/Authentication.AzureAD.UI/ref/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/ref/Microsoft.AspNetCore.Authentication.AzureAD.UI.netcoreapp3.0.cs b/src/Azure/AzureAD/Authentication.AzureAD.UI/ref/Microsoft.AspNetCore.Authentication.AzureAD.UI.netcoreapp3.0.cs deleted file mode 100644 index 2e7a9b87f9..0000000000 --- a/src/Azure/AzureAD/Authentication.AzureAD.UI/ref/Microsoft.AspNetCore.Authentication.AzureAD.UI.netcoreapp3.0.cs +++ /dev/null @@ -1,64 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Authentication -{ - public static partial class AzureADAuthenticationBuilderExtensions - { - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddAzureAD(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddAzureAD(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string scheme, string openIdConnectScheme, string cookieScheme, string displayName, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddAzureADBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddAzureADBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string scheme, string jwtBearerScheme, System.Action configureOptions) { throw null; } - } -} -namespace Microsoft.AspNetCore.Authentication.AzureAD.UI -{ - public static partial class AzureADDefaults - { - public const string AuthenticationScheme = "AzureAD"; - public const string BearerAuthenticationScheme = "AzureADBearer"; - public const string CookieScheme = "AzureADCookie"; - public static readonly string DisplayName; - public const string JwtBearerAuthenticationScheme = "AzureADJwtBearer"; - public const string OpenIdScheme = "AzureADOpenID"; - } - public partial class AzureADOptions - { - public AzureADOptions() { } - public string[] AllSchemes { get { throw null; } } - public string CallbackPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ClientId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ClientSecret { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string CookieSchemeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Domain { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Instance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string JwtBearerSchemeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string OpenIdConnectSchemeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string SignedOutCallbackPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string TenantId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal -{ - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class AccessDeniedModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public AccessDeniedModel() { } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - [Microsoft.AspNetCore.Mvc.ResponseCacheAttribute(Duration=0, Location=Microsoft.AspNetCore.Mvc.ResponseCacheLocation.None, NoStore=true)] - public partial class ErrorModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ErrorModel() { } - public string RequestId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ShowRequestId { get { throw null; } } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class SignedOutModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public SignedOutModel() { } - public Microsoft.AspNetCore.Mvc.IActionResult OnGet() { throw null; } - } -} diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj deleted file mode 100644 index 8354ceaa59..0000000000 --- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp3.0.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp3.0.cs deleted file mode 100644 index 5cd9f38724..0000000000 --- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp3.0.cs +++ /dev/null @@ -1,68 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Authentication -{ - public static partial class AzureADB2CAuthenticationBuilderExtensions - { - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddAzureADB2C(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddAzureADB2C(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string scheme, string openIdConnectScheme, string cookieScheme, string displayName, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddAzureADB2CBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddAzureADB2CBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string scheme, string jwtBearerScheme, System.Action configureOptions) { throw null; } - } -} -namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI -{ - public static partial class AzureADB2CDefaults - { - public const string AuthenticationScheme = "AzureADB2C"; - public const string BearerAuthenticationScheme = "AzureADB2CBearer"; - public const string CookieScheme = "AzureADB2CCookie"; - public static readonly string DisplayName; - public const string JwtBearerAuthenticationScheme = "AzureADB2CJwtBearer"; - public const string OpenIdScheme = "AzureADB2COpenID"; - public static readonly string PolicyKey; - } - public partial class AzureADB2COptions - { - public AzureADB2COptions() { } - public string[] AllSchemes { get { throw null; } } - public string CallbackPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ClientId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ClientSecret { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string CookieSchemeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string DefaultPolicy { get { throw null; } } - public string Domain { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string EditProfilePolicyId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Instance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string JwtBearerSchemeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string OpenIdConnectSchemeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ResetPasswordPolicyId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string SignedOutCallbackPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string SignUpSignInPolicyId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal -{ - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class AccessDeniedModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public AccessDeniedModel() { } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - [Microsoft.AspNetCore.Mvc.ResponseCacheAttribute(Duration=0, Location=Microsoft.AspNetCore.Mvc.ResponseCacheLocation.None, NoStore=true)] - public partial class ErrorModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ErrorModel() { } - public string RequestId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ShowRequestId { get { throw null; } } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class SignedOutModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public SignedOutModel() { } - public Microsoft.AspNetCore.Mvc.IActionResult OnGet() { throw null; } - } -} diff --git a/src/Azure/AzureAppServices.HostingStartup/ref/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/Azure/AzureAppServices.HostingStartup/ref/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj deleted file mode 100644 index 3984939846..0000000000 --- a/src/Azure/AzureAppServices.HostingStartup/ref/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - diff --git a/src/Azure/AzureAppServices.HostingStartup/ref/Microsoft.AspNetCore.AzureAppServices.HostingStartup.netcoreapp3.0.cs b/src/Azure/AzureAppServices.HostingStartup/ref/Microsoft.AspNetCore.AzureAppServices.HostingStartup.netcoreapp3.0.cs deleted file mode 100644 index 5b449024e0..0000000000 --- a/src/Azure/AzureAppServices.HostingStartup/ref/Microsoft.AspNetCore.AzureAppServices.HostingStartup.netcoreapp3.0.cs +++ /dev/null @@ -1,11 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.AzureAppServices.HostingStartup -{ - public partial class AzureAppServicesHostingStartup : Microsoft.AspNetCore.Hosting.IHostingStartup - { - public AzureAppServicesHostingStartup() { } - public void Configure(Microsoft.AspNetCore.Hosting.IWebHostBuilder builder) { } - } -} diff --git a/src/Azure/AzureAppServicesIntegration/ref/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj b/src/Azure/AzureAppServicesIntegration/ref/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj deleted file mode 100644 index 10dbbbeb46..0000000000 --- a/src/Azure/AzureAppServicesIntegration/ref/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - diff --git a/src/Azure/AzureAppServicesIntegration/ref/Microsoft.AspNetCore.AzureAppServicesIntegration.netcoreapp3.0.cs b/src/Azure/AzureAppServicesIntegration/ref/Microsoft.AspNetCore.AzureAppServicesIntegration.netcoreapp3.0.cs deleted file mode 100644 index 55a333c151..0000000000 --- a/src/Azure/AzureAppServicesIntegration/ref/Microsoft.AspNetCore.AzureAppServicesIntegration.netcoreapp3.0.cs +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Hosting -{ - public static partial class AppServicesWebHostBuilderExtensions - { - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseAzureAppServices(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder) { throw null; } - } -} diff --git a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj index 8776ab9fef..8418940274 100644 --- a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj +++ b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj @@ -2,17 +2,15 @@ netstandard2.0;netcoreapp3.0 - false - - - + + - - + + diff --git a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.csproj b/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.csproj deleted file mode 100644 index d750edc189..0000000000 --- a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.0 - - - - - - - - diff --git a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs b/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs deleted file mode 100644 index 375c6d09a6..0000000000 --- a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs +++ /dev/null @@ -1,85 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Blazor -{ - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public static partial class JSInteropMethods - { - [Microsoft.JSInterop.JSInvokableAttribute("NotifyLocationChanged")] - public static void NotifyLocationChanged(string uri, bool isInterceptedLink) { } - } -} -namespace Microsoft.AspNetCore.Blazor.Hosting -{ - public static partial class BlazorWebAssemblyHost - { - public static Microsoft.AspNetCore.Blazor.Hosting.IWebAssemblyHostBuilder CreateDefaultBuilder() { throw null; } - } - public partial interface IWebAssemblyHost : System.IDisposable - { - System.IServiceProvider Services { get; } - System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); - System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); - } - public partial interface IWebAssemblyHostBuilder - { - System.Collections.Generic.IDictionary Properties { get; } - Microsoft.AspNetCore.Blazor.Hosting.IWebAssemblyHost Build(); - Microsoft.AspNetCore.Blazor.Hosting.IWebAssemblyHostBuilder ConfigureServices(System.Action configureDelegate); - Microsoft.AspNetCore.Blazor.Hosting.IWebAssemblyHostBuilder UseServiceProviderFactory(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory factory); - Microsoft.AspNetCore.Blazor.Hosting.IWebAssemblyHostBuilder UseServiceProviderFactory(System.Func> factory); - } - public sealed partial class WebAssemblyHostBuilderContext - { - public WebAssemblyHostBuilderContext(System.Collections.Generic.IDictionary properties) { } - public System.Collections.Generic.IDictionary Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - public static partial class WebAssemblyHostBuilderExtensions - { - public static Microsoft.AspNetCore.Blazor.Hosting.IWebAssemblyHostBuilder ConfigureServices(this Microsoft.AspNetCore.Blazor.Hosting.IWebAssemblyHostBuilder hostBuilder, System.Action configureDelegate) { throw null; } - public static Microsoft.AspNetCore.Blazor.Hosting.IWebAssemblyHostBuilder UseBlazorStartup(this Microsoft.AspNetCore.Blazor.Hosting.IWebAssemblyHostBuilder builder, System.Type startupType) { throw null; } - public static Microsoft.AspNetCore.Blazor.Hosting.IWebAssemblyHostBuilder UseBlazorStartup(this Microsoft.AspNetCore.Blazor.Hosting.IWebAssemblyHostBuilder builder) { throw null; } - } - public static partial class WebAssemblyHostExtensions - { - public static void Run(this Microsoft.AspNetCore.Blazor.Hosting.IWebAssemblyHost host) { } - } -} -namespace Microsoft.AspNetCore.Blazor.Http -{ - public enum FetchCredentialsOption - { - Omit = 0, - SameOrigin = 1, - Include = 2, - } - public partial class WebAssemblyHttpMessageHandler : System.Net.Http.HttpMessageHandler - { - public const string FetchArgs = "WebAssemblyHttpMessageHandler.FetchArgs"; - public WebAssemblyHttpMessageHandler() { } - public static Microsoft.AspNetCore.Blazor.Http.FetchCredentialsOption DefaultCredentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task SendAsync(System.Net.Http.HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { throw null; } - } -} -namespace Microsoft.AspNetCore.Blazor.Rendering -{ - public static partial class WebAssemblyEventDispatcher - { - [Microsoft.JSInterop.JSInvokableAttribute("DispatchEvent")] - public static System.Threading.Tasks.Task DispatchEvent(Microsoft.AspNetCore.Components.RenderTree.WebEventDescriptor eventDescriptor, string eventArgsJson) { throw null; } - } -} -namespace Microsoft.AspNetCore.Components.Builder -{ - public static partial class ComponentsApplicationBuilderExtensions - { - public static void AddComponent(this Microsoft.AspNetCore.Components.Builder.IComponentsApplicationBuilder app, string domElementSelector) where TComponent : Microsoft.AspNetCore.Components.IComponent { } - } - public partial interface IComponentsApplicationBuilder - { - System.IServiceProvider Services { get; } - void AddComponent(System.Type componentType, string domElementSelector); - } -} diff --git a/src/Components/Blazor/Blazor/test/Microsoft.AspNetCore.Blazor.Tests.csproj b/src/Components/Blazor/Blazor/test/Microsoft.AspNetCore.Blazor.Tests.csproj index 43c8df3786..ee1803cfa5 100644 --- a/src/Components/Blazor/Blazor/test/Microsoft.AspNetCore.Blazor.Tests.csproj +++ b/src/Components/Blazor/Blazor/test/Microsoft.AspNetCore.Blazor.Tests.csproj @@ -2,10 +2,14 @@ netcoreapp3.0 + + false + + diff --git a/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj b/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj index 0263c9f800..7128c42e32 100644 --- a/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj +++ b/src/Components/Blazor/Build/test/Microsoft.AspNetCore.Blazor.Build.Tests.csproj @@ -5,6 +5,8 @@ $(DefaultItemExcludes);TestFiles\**\* + + false @@ -26,6 +28,8 @@ + + diff --git a/src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.csproj b/src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.csproj deleted file mode 100644 index 8c5f6d9e13..0000000000 --- a/src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - netstandard2.0 - - - - - - diff --git a/src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.netstandard2.0.cs b/src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.netstandard2.0.cs deleted file mode 100644 index f6caefbe3e..0000000000 --- a/src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.netstandard2.0.cs +++ /dev/null @@ -1,18 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Components -{ - public static partial class HttpClientJsonExtensions - { - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task GetJsonAsync(this System.Net.Http.HttpClient httpClient, string requestUri) { throw null; } - public static System.Threading.Tasks.Task PostJsonAsync(this System.Net.Http.HttpClient httpClient, string requestUri, object content) { throw null; } - public static System.Threading.Tasks.Task PostJsonAsync(this System.Net.Http.HttpClient httpClient, string requestUri, object content) { throw null; } - public static System.Threading.Tasks.Task PutJsonAsync(this System.Net.Http.HttpClient httpClient, string requestUri, object content) { throw null; } - public static System.Threading.Tasks.Task PutJsonAsync(this System.Net.Http.HttpClient httpClient, string requestUri, object content) { throw null; } - public static System.Threading.Tasks.Task SendJsonAsync(this System.Net.Http.HttpClient httpClient, System.Net.Http.HttpMethod method, string requestUri, object content) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task SendJsonAsync(this System.Net.Http.HttpClient httpClient, System.Net.Http.HttpMethod method, string requestUri, object content) { throw null; } - } -} diff --git a/src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.csproj b/src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.csproj deleted file mode 100644 index b72d6c201c..0000000000 --- a/src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - - - diff --git a/src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.netcoreapp3.0.cs b/src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.netcoreapp3.0.cs deleted file mode 100644 index 74cf8a6a8b..0000000000 --- a/src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.netcoreapp3.0.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Builder -{ - public static partial class BlazorHostingApplicationBuilderExtensions - { - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseClientSideBlazorFiles(this Microsoft.AspNetCore.Builder.IApplicationBuilder app, string clientAssemblyFilePath) { throw null; } - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseClientSideBlazorFiles(this Microsoft.AspNetCore.Builder.IApplicationBuilder app) { throw null; } - } - public static partial class BlazorHostingEndpointRouteBuilderExtensions - { - public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder MapFallbackToClientSideBlazor(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string clientAssemblyFilePath, string filePath) { throw null; } - public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder MapFallbackToClientSideBlazor(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string clientAssemblyFilePath, string pattern, string filePath) { throw null; } - public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder MapFallbackToClientSideBlazor(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string filePath) { throw null; } - public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder MapFallbackToClientSideBlazor(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string pattern, string filePath) { throw null; } - } - public static partial class BlazorMonoDebugProxyAppBuilderExtensions - { - public static void UseBlazorDebugging(this Microsoft.AspNetCore.Builder.IApplicationBuilder app) { } - } -} diff --git a/src/Components/Blazor/testassets/Directory.Build.props b/src/Components/Blazor/testassets/Directory.Build.props deleted file mode 100644 index 938199f96e..0000000000 --- a/src/Components/Blazor/testassets/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/src/Components/Components/ref/Directory.Build.props b/src/Components/Components/ref/Directory.Build.props deleted file mode 100644 index 322f33d633..0000000000 --- a/src/Components/Components/ref/Directory.Build.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.Manual.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.Manual.cs new file mode 100644 index 0000000000..8bf6b1a422 --- /dev/null +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.Manual.cs @@ -0,0 +1,360 @@ +// 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 System.Runtime.InteropServices; +using Microsoft.AspNetCore.Components.Rendering; + +namespace Microsoft.AspNetCore.Components +{ + public readonly partial struct ElementReference + { + internal static Microsoft.AspNetCore.Components.ElementReference CreateWithUniqueId() { throw null; } + } + public abstract partial class NavigationManager + { + internal static string NormalizeBaseUri(string baseUri) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public readonly partial struct RenderHandle + { + private readonly Microsoft.AspNetCore.Components.RenderTree.Renderer _renderer; + private readonly int _componentId; + internal RenderHandle(Microsoft.AspNetCore.Components.RenderTree.Renderer renderer, int componentId) { throw null; } + public Microsoft.AspNetCore.Components.Dispatcher Dispatcher { get { throw null; } } + public bool IsInitialized { get { throw null; } } + public void Render(Microsoft.AspNetCore.Components.RenderFragment renderFragment) { } + } + internal partial class ComponentFactory + { + public static readonly Microsoft.AspNetCore.Components.ComponentFactory Instance; + public ComponentFactory() { } + public Microsoft.AspNetCore.Components.IComponent InstantiateComponent(System.IServiceProvider serviceProvider, System.Type componentType) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public readonly partial struct ParameterView + { + private readonly Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame[] _frames; + private readonly int _ownerIndex; + private readonly System.Collections.Generic.IReadOnlyList _cascadingParametersOrNull; + internal ParameterView(Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame[] frames, int ownerIndex) { throw null; } + public static Microsoft.AspNetCore.Components.ParameterView Empty { get { throw null; } } + internal void CaptureSnapshot(Microsoft.AspNetCore.Components.RenderTree.ArrayBuilder builder) { } + internal bool DefinitelyEquals(Microsoft.AspNetCore.Components.ParameterView oldParameters) { throw null; } + public static Microsoft.AspNetCore.Components.ParameterView FromDictionary(System.Collections.Generic.IDictionary parameters) { throw null; } + public Microsoft.AspNetCore.Components.ParameterView.Enumerator GetEnumerator() { throw null; } + public TValue GetValueOrDefault(string parameterName) { throw null; } + public TValue GetValueOrDefault(string parameterName, TValue defaultValue) { throw null; } + public void SetParameterProperties(object target) { } + public System.Collections.Generic.IReadOnlyDictionary ToDictionary() { throw null; } + public bool TryGetValue(string parameterName, out TValue result) { throw null; } + internal Microsoft.AspNetCore.Components.ParameterView WithCascadingParameters(System.Collections.Generic.IReadOnlyList cascadingParameters) { throw null; } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public partial struct Enumerator + { + private object _dummy; + private int _dummyPrimitive; + internal Enumerator(Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame[] frames, int ownerIndex, System.Collections.Generic.IReadOnlyList cascadingParameters) { throw null; } + public Microsoft.AspNetCore.Components.ParameterValue Current { get { throw null; } } + public bool MoveNext() { throw null; } + } + } + internal static partial class RouteTableFactory + { + public static readonly System.Collections.Generic.IComparer RoutePrecedence; + internal static Microsoft.AspNetCore.Components.Routing.RouteTable Create(System.Collections.Generic.Dictionary templatesByHandler) { throw null; } + public static Microsoft.AspNetCore.Components.Routing.RouteTable Create(System.Collections.Generic.IEnumerable assemblies) { throw null; } + internal static Microsoft.AspNetCore.Components.Routing.RouteTable Create(System.Collections.Generic.IEnumerable componentTypes) { throw null; } + internal static int RouteComparison(Microsoft.AspNetCore.Components.Routing.RouteEntry x, Microsoft.AspNetCore.Components.Routing.RouteEntry y) { throw null; } + } + internal partial interface IEventCallback + { + bool HasDelegate { get; } + object UnpackForRenderTree(); + } + public readonly partial struct EventCallback : Microsoft.AspNetCore.Components.IEventCallback + { + internal readonly MulticastDelegate Delegate; + internal readonly IHandleEvent Receiver; + internal bool RequiresExplicitReceiver { get { throw null; } } + object Microsoft.AspNetCore.Components.IEventCallback.UnpackForRenderTree() { throw null; } + public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; + public static readonly Microsoft.AspNetCore.Components.EventCallbackFactory Factory; + public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } + public bool HasDelegate { get { throw null; } } + public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } + } + public readonly partial struct EventCallback : Microsoft.AspNetCore.Components.IEventCallback + { + internal readonly MulticastDelegate Delegate; + internal readonly IHandleEvent Receiver; + internal bool RequiresExplicitReceiver { get { throw null; } } + internal Microsoft.AspNetCore.Components.EventCallback AsUntyped() { throw null; } + object Microsoft.AspNetCore.Components.IEventCallback.UnpackForRenderTree() { throw null; } + public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; + public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } + public bool HasDelegate { get { throw null; } } + public System.Threading.Tasks.Task InvokeAsync(TValue arg) { throw null; } + } + internal partial interface ICascadingValueComponent + { + object CurrentValue { get; } + bool CurrentValueIsFixed { get; } + bool CanSupplyValue(System.Type valueType, string valueName); + void Subscribe(Microsoft.AspNetCore.Components.Rendering.ComponentState subscriber); + void Unsubscribe(Microsoft.AspNetCore.Components.Rendering.ComponentState subscriber); + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct CascadingParameterState + { + public CascadingParameterState(string localValueName, Microsoft.AspNetCore.Components.ICascadingValueComponent valueSupplier) { throw null; } + public string LocalValueName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.ICascadingValueComponent ValueSupplier { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public static System.Collections.Generic.IReadOnlyList FindCascadingParameters(Microsoft.AspNetCore.Components.Rendering.ComponentState componentState) { throw null; } + } +} +namespace Microsoft.AspNetCore.Components.RenderTree +{ + public readonly partial struct RenderTreeEdit + { + internal static Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit PermutationListEnd() { throw null; } + internal static Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit PermutationListEntry(int fromSiblingIndex, int toSiblingIndex) { throw null; } + internal static Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit PrependFrame(int siblingIndex, int referenceFrameIndex) { throw null; } + internal static Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit RemoveAttribute(int siblingIndex, string name) { throw null; } + internal static Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit RemoveFrame(int siblingIndex) { throw null; } + internal static Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit SetAttribute(int siblingIndex, int referenceFrameIndex) { throw null; } + internal static Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit StepIn(int siblingIndex) { throw null; } + internal static Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit StepOut() { throw null; } + internal static Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit UpdateMarkup(int siblingIndex, int referenceFrameIndex) { throw null; } + internal static Microsoft.AspNetCore.Components.RenderTree.RenderTreeEdit UpdateText(int siblingIndex, int referenceFrameIndex) { throw null; } + } + public readonly partial struct RenderBatch + { + internal RenderBatch(Microsoft.AspNetCore.Components.RenderTree.ArrayRange updatedComponents, Microsoft.AspNetCore.Components.RenderTree.ArrayRange referenceFrames, Microsoft.AspNetCore.Components.RenderTree.ArrayRange disposedComponentIDs, Microsoft.AspNetCore.Components.RenderTree.ArrayRange disposedEventHandlerIDs) { throw null; } + } + internal static partial class ArrayBuilderExtensions + { + public static Microsoft.AspNetCore.Components.RenderTree.ArrayRange ToRange(this Microsoft.AspNetCore.Components.RenderTree.ArrayBuilder builder) { throw null; } + public static Microsoft.AspNetCore.Components.RenderTree.ArrayBuilderSegment ToSegment(this Microsoft.AspNetCore.Components.RenderTree.ArrayBuilder builder, int fromIndexInclusive, int toIndexExclusive) { throw null; } + } + internal static partial class RenderTreeDiffBuilder + { + public const int SystemAddedAttributeSequenceNumber = -2147483648; + public static Microsoft.AspNetCore.Components.RenderTree.RenderTreeDiff ComputeDiff(Microsoft.AspNetCore.Components.RenderTree.Renderer renderer, Microsoft.AspNetCore.Components.Rendering.RenderBatchBuilder batchBuilder, int componentId, Microsoft.AspNetCore.Components.RenderTree.ArrayRange oldTree, Microsoft.AspNetCore.Components.RenderTree.ArrayRange newTree) { throw null; } + public static void DisposeFrames(Microsoft.AspNetCore.Components.Rendering.RenderBatchBuilder batchBuilder, Microsoft.AspNetCore.Components.RenderTree.ArrayRange frames) { } + } + internal partial class ArrayBuilder : System.IDisposable + { + public ArrayBuilder(int minCapacity = 32, System.Buffers.ArrayPool arrayPool = null) { } + public T[] Buffer { get { throw null; } } + public int Count { get { throw null; } } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public int Append(in T item) { throw null; } + internal int Append(T[] source, int startIndex, int length) { throw null; } + public void Clear() { } + public void Dispose() { } + public void InsertExpensive(int index, T value) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Overwrite(int index, in T value) { } + public void RemoveLast() { } + } + internal partial class StackObjectPool where T : class + { + public StackObjectPool(int maxPreservedItems, System.Func instanceFactory) { } + public T Get() { throw null; } + public void Return(T instance) { } + } + public readonly partial struct RenderTreeDiff + { + internal RenderTreeDiff(int componentId, Microsoft.AspNetCore.Components.RenderTree.ArrayBuilderSegment entries) { throw null; } + } + + // https://github.com/dotnet/arcade/pull/2033 + [StructLayout(LayoutKind.Explicit, Pack = 4)] + public readonly partial struct RenderTreeFrame + { + [FieldOffset(0)] public readonly int Sequence; + + [FieldOffset(4)] public readonly RenderTreeFrameType FrameType; + + [FieldOffset(8)] public readonly int ElementSubtreeLength; + + [FieldOffset(16)] public readonly string ElementName; + + [FieldOffset(24)] public readonly object ElementKey; + + [FieldOffset(16)] public readonly string TextContent; + + [FieldOffset(8)] public readonly ulong AttributeEventHandlerId; + + [FieldOffset(16)] public readonly string AttributeName; + + [FieldOffset(24)] public readonly object AttributeValue; + + [FieldOffset(32)] public readonly string AttributeEventUpdatesAttributeName; + + [FieldOffset(8)] public readonly int ComponentSubtreeLength; + + [FieldOffset(12)] public readonly int ComponentId; + + [FieldOffset(16)] public readonly Type ComponentType; + + [FieldOffset(32)] public readonly object ComponentKey; + + public IComponent Component => null; + + [FieldOffset(8)] public readonly int RegionSubtreeLength; + + [FieldOffset(16)] public readonly string ElementReferenceCaptureId; + + [FieldOffset(24)] public readonly Action ElementReferenceCaptureAction; + + [FieldOffset(8)] public readonly int ComponentReferenceCaptureParentFrameIndex; + + [FieldOffset(16)] public readonly Action ComponentReferenceCaptureAction; + + [FieldOffset(16)] public readonly string MarkupContent; + + public override string ToString() => null; + + internal static RenderTreeFrame Element(int sequence, string elementName) { throw null; } + internal static RenderTreeFrame Text(int sequence, string textContent) { throw null; } + internal static RenderTreeFrame Markup(int sequence, string markupContent) { throw null; } + internal static RenderTreeFrame Attribute(int sequence, string name, object value) { throw null; } + internal static RenderTreeFrame ChildComponent(int sequence, Type componentType) { throw null; } + internal static RenderTreeFrame PlaceholderChildComponentWithSubtreeLength(int subtreeLength) { throw null; } + internal static RenderTreeFrame Region(int sequence) { throw null; } + internal static RenderTreeFrame ElementReferenceCapture(int sequence, Action elementReferenceCaptureAction) { throw null; } + internal static RenderTreeFrame ComponentReferenceCapture(int sequence, Action componentReferenceCaptureAction, int parentFrameIndex) { throw null; } + internal RenderTreeFrame WithElementSubtreeLength(int elementSubtreeLength) { throw null; } + internal RenderTreeFrame WithComponentSubtreeLength(int componentSubtreeLength) { throw null; } + internal RenderTreeFrame WithAttributeSequence(int sequence) { throw null; } + internal RenderTreeFrame WithComponent(ComponentState componentState) { throw null; } + internal RenderTreeFrame WithAttributeEventHandlerId(ulong eventHandlerId) { throw null; } + internal RenderTreeFrame WithAttributeValue(object attributeValue) { throw null; } + internal RenderTreeFrame WithAttributeEventUpdatesAttributeName(string attributeUpdatesAttributeName) { throw null; } + internal RenderTreeFrame WithRegionSubtreeLength(int regionSubtreeLength) { throw null; } + internal RenderTreeFrame WithElementReferenceCaptureId(string elementReferenceCaptureId) { throw null; } + internal RenderTreeFrame WithElementKey(object elementKey) { throw null; } + internal RenderTreeFrame WithComponentKey(object componentKey) { throw null; } + } +} +namespace Microsoft.AspNetCore.Components.Rendering +{ + [System.Diagnostics.DebuggerDisplayAttribute("{_state,nq}")] + internal partial class RendererSynchronizationContext : System.Threading.SynchronizationContext + { + public RendererSynchronizationContext() { } + public event System.UnhandledExceptionEventHandler UnhandledException { add { } remove { } } + public override System.Threading.SynchronizationContext CreateCopy() { throw null; } + public System.Threading.Tasks.Task InvokeAsync(System.Action action) { throw null; } + public System.Threading.Tasks.Task InvokeAsync(System.Func asyncAction) { throw null; } + public System.Threading.Tasks.Task InvokeAsync(System.Func> asyncFunction) { throw null; } + public System.Threading.Tasks.Task InvokeAsync(System.Func function) { throw null; } + public override void Post(System.Threading.SendOrPostCallback d, object state) { } + public override void Send(System.Threading.SendOrPostCallback d, object state) { } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct RenderQueueEntry + { + public readonly ComponentState ComponentState; + public readonly RenderFragment RenderFragment; + public RenderQueueEntry(Microsoft.AspNetCore.Components.Rendering.ComponentState componentState, Microsoft.AspNetCore.Components.RenderFragment renderFragment) { throw null; } + } + internal partial class RenderBatchBuilder : System.IDisposable + { + public RenderBatchBuilder() { } + public System.Collections.Generic.Dictionary AttributeDiffSet { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.Queue ComponentDisposalQueue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.Queue ComponentRenderQueue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.RenderTree.ArrayBuilder DisposedComponentIds { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.RenderTree.ArrayBuilder DisposedEventHandlerIds { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.RenderTree.ArrayBuilder EditsBuffer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.Components.RenderTree.StackObjectPool> KeyedItemInfoDictionaryPool { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.RenderTree.ArrayBuilder ReferenceFramesBuffer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.RenderTree.ArrayBuilder UpdatedComponentDiffs { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void ClearStateForCurrentBatch() { } + public void Dispose() { } + public Microsoft.AspNetCore.Components.RenderTree.RenderBatch ToBatch() { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct KeyedItemInfo + { + public readonly int OldIndex; + public readonly int NewIndex; + public readonly int OldSiblingIndex; + public readonly int NewSiblingIndex; + public KeyedItemInfo(int oldIndex, int newIndex) { throw null; } + public Microsoft.AspNetCore.Components.Rendering.KeyedItemInfo WithNewSiblingIndex(int newSiblingIndex) { throw null; } + public Microsoft.AspNetCore.Components.Rendering.KeyedItemInfo WithOldSiblingIndex(int oldSiblingIndex) { throw null; } + } + internal partial class ComponentState : System.IDisposable + { + public ComponentState(Microsoft.AspNetCore.Components.RenderTree.Renderer renderer, int componentId, Microsoft.AspNetCore.Components.IComponent component, Microsoft.AspNetCore.Components.Rendering.ComponentState parentComponentState) { } + public Microsoft.AspNetCore.Components.IComponent Component { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int ComponentId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder CurrentRenderTree { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.Rendering.ComponentState ParentComponentState { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void Dispose() { } + public void NotifyCascadingValueChanged() { } + public System.Threading.Tasks.Task NotifyRenderCompletedAsync() { throw null; } + public void RenderIntoBatch(Microsoft.AspNetCore.Components.Rendering.RenderBatchBuilder batchBuilder, Microsoft.AspNetCore.Components.RenderFragment renderFragment) { } + public void SetDirectParameters(Microsoft.AspNetCore.Components.ParameterView parameters) { } + public bool TryDisposeInBatch(Microsoft.AspNetCore.Components.Rendering.RenderBatchBuilder batchBuilder, out System.Exception exception) { throw null; } + } + internal partial class RenderTreeUpdater + { + public RenderTreeUpdater() { } + public static void UpdateToMatchClientState(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder renderTreeBuilder, ulong eventHandlerId, object newFieldValue) { } + } +} +namespace Microsoft.AspNetCore.Components.Routing +{ + internal partial class TemplateParser + { + public static readonly char[] InvalidParameterNameCharacters; + public TemplateParser() { } + internal static Microsoft.AspNetCore.Components.Routing.RouteTemplate ParseTemplate(string template) { throw null; } + } + internal partial class RouteContext + { + public RouteContext(string path) { } + public System.Type Handler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.Generic.IReadOnlyDictionary Parameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string[] Segments { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + [System.Diagnostics.DebuggerDisplayAttribute("Handler = {Handler}, Template = {Template}")] + internal partial class RouteEntry + { + public RouteEntry(Microsoft.AspNetCore.Components.Routing.RouteTemplate template, System.Type handler, string[] unusedRouteParameterNames) { } + public System.Type Handler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.Routing.RouteTemplate Template { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string[] UnusedRouteParameterNames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal void Match(Microsoft.AspNetCore.Components.Routing.RouteContext context) { } + } + internal partial class RouteTable + { + public RouteTable(Microsoft.AspNetCore.Components.Routing.RouteEntry[] routes) { } + public Microsoft.AspNetCore.Components.Routing.RouteEntry[] Routes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal void Route(Microsoft.AspNetCore.Components.Routing.RouteContext routeContext) { } + } + internal abstract partial class RouteConstraint + { + protected RouteConstraint() { } + public abstract bool Match(string pathSegment, out object convertedValue); + public static Microsoft.AspNetCore.Components.Routing.RouteConstraint Parse(string template, string segment, string constraint) { throw null; } + } + internal partial class TemplateSegment + { + public TemplateSegment(string template, string segment, bool isParameter) { } + public Microsoft.AspNetCore.Components.Routing.RouteConstraint[] Constraints { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsParameter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Match(string pathSegment, out object matchedParameterValue) { throw null; } + } + [System.Diagnostics.DebuggerDisplayAttribute("{TemplateText}")] + internal partial class RouteTemplate + { + public RouteTemplate(string templateText, Microsoft.AspNetCore.Components.Routing.TemplateSegment[] segments) { } + public Microsoft.AspNetCore.Components.Routing.TemplateSegment[] Segments { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string TemplateText { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } +} diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj index 943bf67827..b0abd5623e 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj @@ -2,20 +2,22 @@ netstandard2.0;netcoreapp3.0 - false - - - - - + + + + + + - - - + + + + + diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp3.0.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp3.0.cs index 72adf28aa7..f59d5747ef 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp3.0.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp3.0.cs @@ -122,16 +122,6 @@ namespace Microsoft.AspNetCore.Components public ElementReference(string id) { throw null; } public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct EventCallback - { - private readonly object _dummy; - public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; - public static readonly Microsoft.AspNetCore.Components.EventCallbackFactory Factory; - public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } - public bool HasDelegate { get { throw null; } } - public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } - } public sealed partial class EventCallbackFactory { public EventCallbackFactory() { } @@ -194,15 +184,6 @@ namespace Microsoft.AspNetCore.Components public EventCallbackWorkItem(System.MulticastDelegate @delegate) { throw null; } public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct EventCallback - { - private readonly object _dummy; - public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; - public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } - public bool HasDelegate { get { throw null; } } - public System.Threading.Tasks.Task InvokeAsync(TValue arg) { throw null; } - } [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)] public sealed partial class EventHandlerAttribute : System.Attribute { @@ -310,39 +291,8 @@ namespace Microsoft.AspNetCore.Components public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct ParameterView - { - private readonly object _dummy; - private readonly int _dummyPrimitive; - public static Microsoft.AspNetCore.Components.ParameterView Empty { get { throw null; } } - public static Microsoft.AspNetCore.Components.ParameterView FromDictionary(System.Collections.Generic.IDictionary parameters) { throw null; } - public Microsoft.AspNetCore.Components.ParameterView.Enumerator GetEnumerator() { throw null; } - public TValue GetValueOrDefault(string parameterName) { throw null; } - public TValue GetValueOrDefault(string parameterName, TValue defaultValue) { throw null; } - public void SetParameterProperties(object target) { } - public System.Collections.Generic.IReadOnlyDictionary ToDictionary() { throw null; } - public bool TryGetValue(string parameterName, out TValue result) { throw null; } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct Enumerator - { - private object _dummy; - private int _dummyPrimitive; - public Microsoft.AspNetCore.Components.ParameterValue Current { get { throw null; } } - public bool MoveNext() { throw null; } - } - } public delegate void RenderFragment(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder); public delegate Microsoft.AspNetCore.Components.RenderFragment RenderFragment(TValue value); - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct RenderHandle - { - private readonly object _dummy; - private readonly int _dummyPrimitive; - public Microsoft.AspNetCore.Components.Dispatcher Dispatcher { get { throw null; } } - public bool IsInitialized { get { throw null; } } - public void Render(Microsoft.AspNetCore.Components.RenderFragment renderFragment) { } - } [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=false)] public sealed partial class RouteAttribute : System.Attribute { diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs deleted file mode 100644 index 0f6b699935..0000000000 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.Manual.cs +++ /dev/null @@ -1,58 +0,0 @@ -// 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 System.Runtime.InteropServices; -using Microsoft.AspNetCore.Components.Rendering; - -namespace Microsoft.AspNetCore.Components.RenderTree -{ - // https://github.com/dotnet/arcade/pull/2033 - [StructLayout(LayoutKind.Explicit, Pack = 4)] - public readonly partial struct RenderTreeFrame - { - [FieldOffset(0)] public readonly int Sequence; - - [FieldOffset(4)] public readonly RenderTreeFrameType FrameType; - - [FieldOffset(8)] public readonly int ElementSubtreeLength; - - [FieldOffset(16)] public readonly string ElementName; - - [FieldOffset(24)] public readonly object ElementKey; - - [FieldOffset(16)] public readonly string TextContent; - - [FieldOffset(8)] public readonly ulong AttributeEventHandlerId; - - [FieldOffset(16)] public readonly string AttributeName; - - [FieldOffset(24)] public readonly object AttributeValue; - - [FieldOffset(32)] public readonly string AttributeEventUpdatesAttributeName; - - [FieldOffset(8)] public readonly int ComponentSubtreeLength; - - [FieldOffset(12)] public readonly int ComponentId; - - [FieldOffset(16)] public readonly Type ComponentType; - - [FieldOffset(32)] public readonly object ComponentKey; - - public IComponent Component => null; - - [FieldOffset(8)] public readonly int RegionSubtreeLength; - - [FieldOffset(16)] public readonly string ElementReferenceCaptureId; - - [FieldOffset(24)] public readonly Action ElementReferenceCaptureAction; - - [FieldOffset(8)] public readonly int ComponentReferenceCaptureParentFrameIndex; - - [FieldOffset(16)] public readonly Action ComponentReferenceCaptureAction; - - [FieldOffset(16)] public readonly string MarkupContent; - - public override string ToString() => null; - } -} diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs index 72adf28aa7..f59d5747ef 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs @@ -122,16 +122,6 @@ namespace Microsoft.AspNetCore.Components public ElementReference(string id) { throw null; } public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct EventCallback - { - private readonly object _dummy; - public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; - public static readonly Microsoft.AspNetCore.Components.EventCallbackFactory Factory; - public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } - public bool HasDelegate { get { throw null; } } - public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } - } public sealed partial class EventCallbackFactory { public EventCallbackFactory() { } @@ -194,15 +184,6 @@ namespace Microsoft.AspNetCore.Components public EventCallbackWorkItem(System.MulticastDelegate @delegate) { throw null; } public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct EventCallback - { - private readonly object _dummy; - public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; - public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } - public bool HasDelegate { get { throw null; } } - public System.Threading.Tasks.Task InvokeAsync(TValue arg) { throw null; } - } [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)] public sealed partial class EventHandlerAttribute : System.Attribute { @@ -310,39 +291,8 @@ namespace Microsoft.AspNetCore.Components public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public object Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct ParameterView - { - private readonly object _dummy; - private readonly int _dummyPrimitive; - public static Microsoft.AspNetCore.Components.ParameterView Empty { get { throw null; } } - public static Microsoft.AspNetCore.Components.ParameterView FromDictionary(System.Collections.Generic.IDictionary parameters) { throw null; } - public Microsoft.AspNetCore.Components.ParameterView.Enumerator GetEnumerator() { throw null; } - public TValue GetValueOrDefault(string parameterName) { throw null; } - public TValue GetValueOrDefault(string parameterName, TValue defaultValue) { throw null; } - public void SetParameterProperties(object target) { } - public System.Collections.Generic.IReadOnlyDictionary ToDictionary() { throw null; } - public bool TryGetValue(string parameterName, out TValue result) { throw null; } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct Enumerator - { - private object _dummy; - private int _dummyPrimitive; - public Microsoft.AspNetCore.Components.ParameterValue Current { get { throw null; } } - public bool MoveNext() { throw null; } - } - } public delegate void RenderFragment(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder builder); public delegate Microsoft.AspNetCore.Components.RenderFragment RenderFragment(TValue value); - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct RenderHandle - { - private readonly object _dummy; - private readonly int _dummyPrimitive; - public Microsoft.AspNetCore.Components.Dispatcher Dispatcher { get { throw null; } } - public bool IsInitialized { get { throw null; } } - public void Render(Microsoft.AspNetCore.Components.RenderFragment renderFragment) { } - } [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=false)] public sealed partial class RouteAttribute : System.Attribute { diff --git a/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj b/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj index b3fe863ead..d38782eb70 100644 --- a/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj +++ b/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj @@ -2,16 +2,14 @@ netstandard2.0;netcoreapp3.0 - false - - - + + - + diff --git a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.Manual.cs b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.Manual.cs new file mode 100644 index 0000000000..9e86855bb6 --- /dev/null +++ b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.Manual.cs @@ -0,0 +1,298 @@ +// 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. + +namespace Microsoft.AspNetCore.Components +{ + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct ServerComponent + { + public ServerComponent(int sequence, string assemblyName, string typeName, System.Guid invocationId) { throw null; } + public string AssemblyName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Guid InvocationId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int Sequence { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string TypeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal static partial class ServerComponentSerializationSettings + { + public static readonly System.TimeSpan DataExpiration; + public const string DataProtectionProviderPurpose = "Microsoft.AspNetCore.Components.ComponentDescriptorSerializer,V1"; + public static readonly System.Text.Json.JsonSerializerOptions JsonSerializationOptions; + } + internal sealed partial class ElementReferenceJsonConverter : System.Text.Json.Serialization.JsonConverter + { + public ElementReferenceJsonConverter() { } + public override Microsoft.AspNetCore.Components.ElementReference Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options) { throw null; } + public override void Write(System.Text.Json.Utf8JsonWriter writer, Microsoft.AspNetCore.Components.ElementReference value, System.Text.Json.JsonSerializerOptions options) { } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct ServerComponentMarker + { + public string Descriptor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string PrerenderId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int? Sequence { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Components.ServerComponentMarker GetEndRecord() { throw null; } + public static Microsoft.AspNetCore.Components.ServerComponentMarker NonPrerendered(int sequence, string descriptor) { throw null; } + public static Microsoft.AspNetCore.Components.ServerComponentMarker Prerendered(int sequence, string descriptor) { throw null; } + } + internal partial class ServerComponentTypeCache + { + public ServerComponentTypeCache() { } + public System.Type GetRootComponent(string assembly, string type) { throw null; } + } +} +namespace Microsoft.AspNetCore.Components.Server +{ + internal partial class CircuitDisconnectMiddleware + { + public CircuitDisconnectMiddleware(Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Components.Server.Circuits.CircuitRegistry registry, Microsoft.AspNetCore.Components.Server.Circuits.CircuitIdFactory circuitIdFactory, Microsoft.AspNetCore.Http.RequestDelegate next) { } + public Microsoft.AspNetCore.Components.Server.Circuits.CircuitIdFactory CircuitIdFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.Extensions.Logging.ILogger Logger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Http.RequestDelegate Next { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.Server.Circuits.CircuitRegistry Registry { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext context) { throw null; } + } + internal partial class ServerComponentDeserializer + { + public ServerComponentDeserializer(Microsoft.AspNetCore.DataProtection.IDataProtectionProvider dataProtectionProvider, Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Components.ServerComponentTypeCache rootComponentTypeCache) { } + public bool TryDeserializeComponentDescriptorCollection(string serializedComponentRecords, out System.Collections.Generic.List descriptors) { throw null; } + } + internal partial class ComponentDescriptor + { + public ComponentDescriptor() { } + public System.Type ComponentType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int Sequence { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public void Deconstruct(out System.Type componentType, out int sequence) { throw null; } + } + internal sealed partial class ComponentHub : Microsoft.AspNetCore.SignalR.Hub + { + public ComponentHub(Microsoft.AspNetCore.Components.Server.ServerComponentDeserializer serializer, Microsoft.AspNetCore.Components.Server.Circuits.CircuitFactory circuitFactory, Microsoft.AspNetCore.Components.Server.Circuits.CircuitIdFactory circuitIdFactory, Microsoft.AspNetCore.Components.Server.Circuits.CircuitRegistry circuitRegistry, Microsoft.Extensions.Logging.ILogger logger) { } + public static Microsoft.AspNetCore.Http.PathString DefaultPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.ValueTask BeginInvokeDotNetFromJS(string callId, string assemblyName, string methodIdentifier, long dotNetObjectId, string argsJson) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.ValueTask ConnectCircuit(string circuitIdSecret) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.ValueTask DispatchBrowserEvent(string eventDescriptor, string eventArgs) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.ValueTask EndInvokeJSFromDotNet(long asyncHandle, bool succeeded, string arguments) { throw null; } + public override System.Threading.Tasks.Task OnDisconnectedAsync(System.Exception exception) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.ValueTask OnLocationChanged(string uri, bool intercepted) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.ValueTask OnRenderCompleted(long renderId, string errorMessageOrNull) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.ValueTask StartCircuit(string baseUri, string uri, string serializedComponentRecords) { throw null; } + } +} +namespace Microsoft.AspNetCore.Components.Server.BlazorPack +{ + internal sealed partial class BlazorPackHubProtocol : Microsoft.AspNetCore.SignalR.Protocol.IHubProtocol + { + internal const string ProtocolName = "blazorpack"; + public BlazorPackHubProtocol() { } + public string Name { get { throw null; } } + public Microsoft.AspNetCore.Connections.TransferFormat TransferFormat { get { throw null; } } + public int Version { get { throw null; } } + public System.ReadOnlyMemory GetMessageBytes(Microsoft.AspNetCore.SignalR.Protocol.HubMessage message) { throw null; } + public bool IsVersionSupported(int version) { throw null; } + public bool TryParseMessage(ref System.Buffers.ReadOnlySequence input, Microsoft.AspNetCore.SignalR.IInvocationBinder binder, out Microsoft.AspNetCore.SignalR.Protocol.HubMessage message) { throw null; } + public void WriteMessage(Microsoft.AspNetCore.SignalR.Protocol.HubMessage message, System.Buffers.IBufferWriter output) { } + } +} +namespace Microsoft.AspNetCore.Components.Server.Circuits +{ + internal partial class CircuitFactory + { + public CircuitFactory(Microsoft.Extensions.DependencyInjection.IServiceScopeFactory scopeFactory, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Components.Server.Circuits.CircuitIdFactory circuitIdFactory, Microsoft.Extensions.Options.IOptions options) { } + public Microsoft.AspNetCore.Components.Server.Circuits.CircuitHost CreateCircuitHost(System.Collections.Generic.IReadOnlyList components, Microsoft.AspNetCore.Components.Server.Circuits.CircuitClientProxy client, string baseUri, string uri, System.Security.Claims.ClaimsPrincipal user) { throw null; } + } + internal partial class RenderBatchWriter : System.IDisposable + { + public RenderBatchWriter(System.IO.Stream output, bool leaveOpen) { } + public void Dispose() { } + public void Write(in Microsoft.AspNetCore.Components.RenderTree.RenderBatch renderBatch) { } + } + internal partial class CircuitRegistry + { + public CircuitRegistry(Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Components.Server.Circuits.CircuitIdFactory CircuitHostFactory) { } + internal System.Collections.Concurrent.ConcurrentDictionary ConnectedCircuits { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.Extensions.Caching.Memory.MemoryCache DisconnectedCircuits { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + [System.Diagnostics.DebuggerStepThroughAttribute] + public virtual System.Threading.Tasks.Task ConnectAsync(Microsoft.AspNetCore.Components.Server.Circuits.CircuitId circuitId, Microsoft.AspNetCore.SignalR.IClientProxy clientProxy, string connectionId, System.Threading.CancellationToken cancellationToken) { throw null; } + protected virtual (Microsoft.AspNetCore.Components.Server.Circuits.CircuitHost circuitHost, bool previouslyConnected) ConnectCore(Microsoft.AspNetCore.Components.Server.Circuits.CircuitId circuitId, Microsoft.AspNetCore.SignalR.IClientProxy clientProxy, string connectionId) { throw null; } + public virtual System.Threading.Tasks.Task DisconnectAsync(Microsoft.AspNetCore.Components.Server.Circuits.CircuitHost circuitHost, string connectionId) { throw null; } + protected virtual bool DisconnectCore(Microsoft.AspNetCore.Components.Server.Circuits.CircuitHost circuitHost, string connectionId) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + protected virtual void OnEntryEvicted(object key, object value, Microsoft.Extensions.Caching.Memory.EvictionReason reason, object state) { } + public void Register(Microsoft.AspNetCore.Components.Server.Circuits.CircuitHost circuitHost) { } + public void RegisterDisconnectedCircuit(Microsoft.AspNetCore.Components.Server.Circuits.CircuitHost circuitHost) { } + public System.Threading.Tasks.ValueTask TerminateAsync(Microsoft.AspNetCore.Components.Server.Circuits.CircuitId circuitId) { throw null; } + } + internal partial class CircuitHandle + { + public CircuitHandle() { } + public Microsoft.AspNetCore.Components.Server.Circuits.CircuitHost CircuitHost { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class RemoteRenderer : Microsoft.AspNetCore.Components.RenderTree.Renderer + { + internal readonly System.Collections.Concurrent.ConcurrentQueue _unacknowledgedRenderBatches; + public RemoteRenderer(System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Components.Server.CircuitOptions options, Microsoft.AspNetCore.Components.Server.Circuits.CircuitClientProxy client, Microsoft.Extensions.Logging.ILogger logger) : base (default(System.IServiceProvider), default(Microsoft.Extensions.Logging.ILoggerFactory)) { } + public override Microsoft.AspNetCore.Components.Dispatcher Dispatcher { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public event System.EventHandler UnhandledException { add { } remove { } } + public System.Threading.Tasks.Task AddComponentAsync(System.Type componentType, string domElementSelector) { throw null; } + protected override void Dispose(bool disposing) { } + protected override void HandleException(System.Exception exception) { } + public System.Threading.Tasks.Task OnRenderCompletedAsync(long incomingBatchId, string errorMessageOrNull) { throw null; } + public System.Threading.Tasks.Task ProcessBufferedRenderBatches() { throw null; } + protected override void ProcessPendingRender() { } + protected override System.Threading.Tasks.Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.RenderTree.RenderBatch batch) { throw null; } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct UnacknowledgedRenderBatch + { + public UnacknowledgedRenderBatch(long batchId, Microsoft.AspNetCore.Components.Server.Circuits.ArrayBuilder data, System.Threading.Tasks.TaskCompletionSource completionSource, Microsoft.Extensions.Internal.ValueStopwatch valueStopwatch) { throw null; } + public long BatchId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Threading.Tasks.TaskCompletionSource CompletionSource { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.Server.Circuits.ArrayBuilder Data { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.Extensions.Internal.ValueStopwatch ValueStopwatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + } + internal partial class ArrayBuilder : System.IDisposable + { + public ArrayBuilder(int minCapacity = 32, System.Buffers.ArrayPool arrayPool = null) { } + public T[] Buffer { get { throw null; } } + public int Count { get { throw null; } } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public int Append(in T item) { throw null; } + internal int Append(T[] source, int startIndex, int length) { throw null; } + public void Clear() { } + public void Dispose() { } + public void InsertExpensive(int index, T value) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Overwrite(int index, in T value) { } + public void RemoveLast() { } + } + internal partial class CircuitClientProxy : Microsoft.AspNetCore.SignalR.IClientProxy + { + public CircuitClientProxy() { } + public CircuitClientProxy(Microsoft.AspNetCore.SignalR.IClientProxy clientProxy, string connectionId) { } + public Microsoft.AspNetCore.SignalR.IClientProxy Client { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Connected { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string ConnectionId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Threading.Tasks.Task SendCoreAsync(string method, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public void SetDisconnected() { } + public void Transfer(Microsoft.AspNetCore.SignalR.IClientProxy clientProxy, string connectionId) { } + } + internal partial class CircuitHost : System.IAsyncDisposable + { + public CircuitHost(Microsoft.AspNetCore.Components.Server.Circuits.CircuitId circuitId, Microsoft.Extensions.DependencyInjection.IServiceScope scope, Microsoft.AspNetCore.Components.Server.CircuitOptions options, Microsoft.AspNetCore.Components.Server.Circuits.CircuitClientProxy client, Microsoft.AspNetCore.Components.Server.Circuits.RemoteRenderer renderer, System.Collections.Generic.IReadOnlyList descriptors, Microsoft.AspNetCore.Components.Server.Circuits.RemoteJSRuntime jsRuntime, Microsoft.AspNetCore.Components.Server.Circuits.CircuitHandler[] circuitHandlers, Microsoft.Extensions.Logging.ILogger logger) { } + public Microsoft.AspNetCore.Components.Server.Circuits.Circuit Circuit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.Server.Circuits.CircuitId CircuitId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.Server.Circuits.CircuitClientProxy Client { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.Generic.IReadOnlyList Descriptors { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.Server.Circuits.CircuitHandle Handle { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.Server.Circuits.RemoteJSRuntime JSRuntime { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Components.Server.Circuits.RemoteRenderer Renderer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.IServiceProvider Services { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public event System.UnhandledExceptionEventHandler UnhandledException { add { } remove { } } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task BeginInvokeDotNetFromJS(string callId, string assemblyName, string methodIdentifier, long dotNetObjectId, string argsJson) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task DispatchEvent(string eventDescriptorJson, string eventArgsJson) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task EndInvokeJSFromDotNet(long asyncCall, bool succeded, string arguments) { throw null; } + public System.Threading.Tasks.Task InitializeAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task OnConnectionDownAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task OnConnectionUpAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task OnLocationChangedAsync(string uri, bool intercepted) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task OnRenderCompletedAsync(long renderId, string errorMessageOrNull) { throw null; } + public void SendPendingBatches() { } + public void SetCircuitUser(System.Security.Claims.ClaimsPrincipal user) { } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct CircuitId : System.IEquatable + { + public CircuitId(string secret, string id) { throw null; } + public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Secret { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Equals([System.Diagnostics.CodeAnalysis.AllowNullAttribute]Microsoft.AspNetCore.Components.Server.Circuits.CircuitId other) { throw null; } + public override bool Equals(object obj) { throw null; } + public override int GetHashCode() { throw null; } + public override string ToString() { throw null; } + } + internal partial class CircuitIdFactory + { + public CircuitIdFactory(Microsoft.AspNetCore.DataProtection.IDataProtectionProvider provider) { } + public Microsoft.AspNetCore.Components.Server.Circuits.CircuitId CreateCircuitId() { throw null; } + public bool TryParseCircuitId(string text, out Microsoft.AspNetCore.Components.Server.Circuits.CircuitId circuitId) { throw null; } + } + internal partial class RemoteJSRuntime : Microsoft.JSInterop.JSRuntime + { + public RemoteJSRuntime(Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Logging.ILogger logger) { } + protected override void BeginInvokeJS(long asyncHandle, string identifier, string argsJson) { } + protected override void EndInvokeDotNet(Microsoft.JSInterop.Infrastructure.DotNetInvocationInfo invocationInfo, in Microsoft.JSInterop.Infrastructure.DotNetInvocationResult invocationResult) { } + internal void Initialize(Microsoft.AspNetCore.Components.Server.Circuits.CircuitClientProxy clientProxy) { } + public static partial class Log + { + internal static void BeginInvokeJS(Microsoft.Extensions.Logging.ILogger logger, long asyncHandle, string identifier) { } + internal static void InvokeDotNetMethodException(Microsoft.Extensions.Logging.ILogger logger, in Microsoft.JSInterop.Infrastructure.DotNetInvocationInfo invocationInfo, System.Exception exception) { } + internal static void InvokeDotNetMethodSuccess(Microsoft.Extensions.Logging.ILogger logger, in Microsoft.JSInterop.Infrastructure.DotNetInvocationInfo invocationInfo) { } + } + } +} +namespace Microsoft.AspNetCore.Internal +{ + internal static partial class BinaryMessageFormatter + { + public static int LengthPrefixLength(long length) { throw null; } + public static void WriteLengthPrefix(long length, System.Buffers.IBufferWriter output) { } + public static int WriteLengthPrefix(long length, System.Span output) { throw null; } + } + internal static partial class BinaryMessageParser + { + public static bool TryParseMessage(ref System.Buffers.ReadOnlySequence buffer, out System.Buffers.ReadOnlySequence payload) { throw null; } + } + internal sealed partial class MemoryBufferWriter : System.IO.Stream, System.Buffers.IBufferWriter + { + public MemoryBufferWriter(int minimumSegmentSize = 4096) { } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanWrite { get { throw null; } } + public override long Length { get { throw null; } } + public override long Position { get { throw null; } set { } } + public void Advance(int count) { } + public void CopyTo(System.Buffers.IBufferWriter destination) { } + public void CopyTo(System.Span span) { } + public override System.Threading.Tasks.Task CopyToAsync(System.IO.Stream destination, int bufferSize, System.Threading.CancellationToken cancellationToken) { throw null; } + protected override void Dispose(bool disposing) { } + public override void Flush() { } + public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + public static Microsoft.AspNetCore.Internal.MemoryBufferWriter Get() { throw null; } + public System.Memory GetMemory(int sizeHint = 0) { throw null; } + public System.Span GetSpan(int sizeHint = 0) { throw null; } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public void Reset() { } + public static void Return(Microsoft.AspNetCore.Internal.MemoryBufferWriter writer) { } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public override void SetLength(long value) { } + public byte[] ToArray() { throw null; } + public override void Write(byte[] buffer, int offset, int count) { } + public override void Write(System.ReadOnlySpan span) { } + public override void WriteByte(byte value) { } + } +} +namespace Microsoft.Extensions.Internal +{ + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct ValueStopwatch + { + public bool IsActive { get { throw null; } } + public System.TimeSpan GetElapsedTime() { throw null; } + public static Microsoft.Extensions.Internal.ValueStopwatch StartNew() { throw null; } + } +} \ No newline at end of file diff --git a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj index 3cdf8cc2be..b629ebedc9 100644 --- a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj +++ b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj @@ -2,19 +2,19 @@ netcoreapp3.0 - false - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj b/src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj index 8e0a17ece0..311f5079cd 100644 --- a/src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj +++ b/src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj @@ -21,6 +21,10 @@ Private="false" /> + + + + diff --git a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj index 6415de5e4f..7764ef22ed 100644 --- a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj +++ b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj @@ -2,21 +2,21 @@ netstandard2.0;netcoreapp3.0 - false - - - - - + + + + + - - - - + + + + + diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index 9bf03e1c50..ba4ce1e32d 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -20,6 +20,8 @@ false + + false @@ -28,8 +30,6 @@ - - diff --git a/src/Components/test/Ignitor.Test/Ignitor.Test.csproj b/src/Components/test/Ignitor.Test/Ignitor.Test.csproj index ad35b17b42..38621e8bea 100644 --- a/src/Components/test/Ignitor.Test/Ignitor.Test.csproj +++ b/src/Components/test/Ignitor.Test/Ignitor.Test.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + + false diff --git a/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj b/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj index 3b1d34bbdc..470c119f13 100644 --- a/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj +++ b/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/Components/test/testassets/Directory.Build.props b/src/Components/test/testassets/Directory.Build.props deleted file mode 100644 index 938199f96e..0000000000 --- a/src/Components/test/testassets/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/src/Components/test/testassets/Ignitor/Ignitor.csproj b/src/Components/test/testassets/Ignitor/Ignitor.csproj index 6816e44df1..0e07855e5b 100644 --- a/src/Components/test/testassets/Ignitor/Ignitor.csproj +++ b/src/Components/test/testassets/Ignitor/Ignitor.csproj @@ -3,6 +3,8 @@ Exe netcoreapp3.0 + + false @@ -10,6 +12,8 @@ + + diff --git a/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.Manual.cs b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.Manual.cs new file mode 100644 index 0000000000..1ee28e70bf --- /dev/null +++ b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.Manual.cs @@ -0,0 +1,24 @@ +// 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. + +namespace Microsoft.AspNetCore.DataProtection.Abstractions +{ + internal static partial class Resources + { + internal static string CryptCommon_GenericError { get { throw null; } } + internal static string CryptCommon_PayloadInvalid { get { throw null; } } + internal static System.Globalization.CultureInfo Culture + { + [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } + [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } + } + + internal static string DataProtectionExtensions_NoService { get { throw null; } } + internal static string DataProtectionExtensions_NullPurposesCollection { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string FormatDataProtectionExtensions_NoService(object p0) { throw null; } + + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] + internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } + } +} diff --git a/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj index 4e04929cd1..6461cb0623 100644 --- a/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj +++ b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj @@ -2,11 +2,10 @@ netstandard2.0 - false - - + + diff --git a/src/DataProtection/AzureKeyVault/ref/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj b/src/DataProtection/AzureKeyVault/ref/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj deleted file mode 100644 index 8ed2e9d229..0000000000 --- a/src/DataProtection/AzureKeyVault/ref/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.0 - - - - - - - - diff --git a/src/DataProtection/AzureKeyVault/ref/Microsoft.AspNetCore.DataProtection.AzureKeyVault.netstandard2.0.cs b/src/DataProtection/AzureKeyVault/ref/Microsoft.AspNetCore.DataProtection.AzureKeyVault.netstandard2.0.cs deleted file mode 100644 index bdaa373e9f..0000000000 --- a/src/DataProtection/AzureKeyVault/ref/Microsoft.AspNetCore.DataProtection.AzureKeyVault.netstandard2.0.cs +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.DataProtection -{ - public static partial class AzureDataProtectionBuilderExtensions - { - public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder ProtectKeysWithAzureKeyVault(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, Microsoft.Azure.KeyVault.KeyVaultClient client, string keyIdentifier) { throw null; } - public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder ProtectKeysWithAzureKeyVault(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, string keyIdentifier, string clientId, System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { throw null; } - public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder ProtectKeysWithAzureKeyVault(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, string keyIdentifier, string clientId, string clientSecret) { throw null; } - } -} diff --git a/src/DataProtection/AzureKeyVault/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj b/src/DataProtection/AzureKeyVault/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj index 17b9fe4ac8..6ca62c9366 100644 --- a/src/DataProtection/AzureKeyVault/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj +++ b/src/DataProtection/AzureKeyVault/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj @@ -3,12 +3,16 @@ netcoreapp3.0 true + + false + + diff --git a/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj b/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj deleted file mode 100644 index 5da79e220f..0000000000 --- a/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.0 - - - - - - - - diff --git a/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.netstandard2.0.cs b/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.netstandard2.0.cs deleted file mode 100644 index 9d6c003d3e..0000000000 --- a/src/DataProtection/AzureStorage/ref/Microsoft.AspNetCore.DataProtection.AzureStorage.netstandard2.0.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.DataProtection -{ - public static partial class AzureDataProtectionBuilderExtensions - { - public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToAzureBlobStorage(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, Microsoft.Azure.Storage.Blob.CloudBlobContainer container, string blobName) { throw null; } - public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToAzureBlobStorage(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, Microsoft.Azure.Storage.Blob.CloudBlockBlob blobReference) { throw null; } - public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToAzureBlobStorage(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, Microsoft.Azure.Storage.CloudStorageAccount storageAccount, string relativePath) { throw null; } - public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToAzureBlobStorage(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, System.Uri blobUri) { throw null; } - } -} -namespace Microsoft.AspNetCore.DataProtection.AzureStorage -{ - public sealed partial class AzureBlobXmlRepository : Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository - { - public AzureBlobXmlRepository(System.Func blobRefFactory) { } - public System.Collections.Generic.IReadOnlyCollection GetAllElements() { throw null; } - public void StoreElement(System.Xml.Linq.XElement element, string friendlyName) { } - } -} diff --git a/src/DataProtection/AzureStorage/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Tests.csproj b/src/DataProtection/AzureStorage/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Tests.csproj index ae55e43152..fbe90f1bc1 100644 --- a/src/DataProtection/AzureStorage/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Tests.csproj +++ b/src/DataProtection/AzureStorage/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Tests.csproj @@ -4,6 +4,8 @@ netcoreapp3.0 true true + + false @@ -12,6 +14,8 @@ + + diff --git a/src/DataProtection/Cryptography.Internal/ref/Directory.Build.props b/src/DataProtection/Cryptography.Internal/ref/Directory.Build.props deleted file mode 100644 index b500fb5d98..0000000000 --- a/src/DataProtection/Cryptography.Internal/ref/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - true - $(NoWarn);CS0169 - - \ No newline at end of file diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs index 8120f41699..df4d98a55e 100644 --- a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.Manual.cs @@ -1,13 +1,6 @@ // 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 System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.KeyDerivation, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - namespace Microsoft.AspNetCore.Cryptography { internal static partial class Constants @@ -109,8 +102,6 @@ namespace Microsoft.AspNetCore.Cryptography public unsafe static void BlockCopy(void* from, void* to, int byteCount) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] public unsafe static void BlockCopy(void* from, void* to, uint byteCount) { } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]private unsafe static void BlockCopyCore(byte* from, byte* to, uint byteCount) { } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]private unsafe static void BlockCopyCore(byte* from, byte* to, ulong byteCount) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] public unsafe static void SecureZeroMemory(byte* buffer, int byteCount) { } [System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] @@ -123,12 +114,6 @@ namespace Microsoft.AspNetCore.Cryptography [System.Security.SuppressUnmanagedCodeSecurityAttribute] internal static partial class UnsafeNativeMethods { - private const string BCRYPT_LIB = "bcrypt.dll"; - private const string CRYPT32_LIB = "crypt32.dll"; - private const string NCRYPT_LIB = "ncrypt.dll"; - private static readonly System.Lazy _lazyBCryptLibHandle; - private static readonly System.Lazy _lazyCrypt32LibHandle; - private static readonly System.Lazy _lazyNCryptLibHandle; [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern int BCryptCloseAlgorithmProvider(System.IntPtr hAlgorithm, uint dwFlags); [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptCreateHash(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle hAlgorithm, out Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle phHash, System.IntPtr pbHashObject, uint cbHashObject, byte* pbSecret, uint cbSecret, uint dwFlags); [System.Runtime.InteropServices.DllImport("bcrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int BCryptDecrypt(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptKeyHandle hKey, byte* pbInput, uint cbInput, void* pPaddingInfo, byte* pbIV, uint cbIV, byte* pbOutput, uint cbOutput, out uint pcbResult, Microsoft.AspNetCore.Cryptography.Cng.BCryptEncryptFlags dwFlags); @@ -152,7 +137,6 @@ namespace Microsoft.AspNetCore.Cryptography [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern bool CryptUnprotectData(Microsoft.AspNetCore.Cryptography.DATA_BLOB* pDataIn, System.IntPtr ppszDataDescr, Microsoft.AspNetCore.Cryptography.DATA_BLOB* pOptionalEntropy, System.IntPtr pvReserved, System.IntPtr pPromptStruct, uint dwFlags, out Microsoft.AspNetCore.Cryptography.DATA_BLOB pDataOut); [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]public unsafe static extern bool CryptUnprotectMemory(byte* pData, uint cbData, uint dwFlags); [System.Runtime.InteropServices.DllImport("crypt32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]public static extern bool CryptUnprotectMemory(System.Runtime.InteropServices.SafeHandle pData, uint cbData, uint dwFlags); - private static System.Lazy GetLazyLibraryHandle(string libraryName) { throw null; } [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] internal static extern int NCryptCloseProtectionDescriptor(System.IntPtr hDescriptor); [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern int NCryptCreateProtectionDescriptor(string pwszDescriptorString, uint dwFlags, out Microsoft.AspNetCore.Cryptography.SafeHandles.NCryptDescriptorHandle phDescriptor); @@ -161,10 +145,8 @@ namespace Microsoft.AspNetCore.Cryptography [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int NCryptUnprotectSecret(out Microsoft.AspNetCore.Cryptography.SafeHandles.NCryptDescriptorHandle phDescriptor, uint dwFlags, byte* pbProtectedBlob, uint cbProtectedBlob, System.IntPtr pMemPara, System.IntPtr hWnd, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle ppbData, out uint pcbData); [System.Runtime.InteropServices.DllImport("ncrypt.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal unsafe static extern int NCryptUnprotectSecret(System.IntPtr phDescriptor, uint dwFlags, byte* pbProtectedBlob, uint cbProtectedBlob, System.IntPtr pMemPara, System.IntPtr hWnd, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle ppbData, out uint pcbData); [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static void ThrowExceptionForBCryptStatus(int ntstatus) { } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]private static void ThrowExceptionForBCryptStatusImpl(int ntstatus) { } public static void ThrowExceptionForLastCrypt32Error() { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static void ThrowExceptionForNCryptStatus(int ntstatus) { } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]private static void ThrowExceptionForNCryptStatusImpl(int ntstatus) { } } internal static partial class WeakReferenceHelpers { @@ -178,7 +160,7 @@ namespace Microsoft.AspNetCore.Cryptography.Cng { public uint cbBuffer; // Length of buffer, in bytes public BCryptKeyDerivationBufferType BufferType; // Buffer type - public IntPtr pvBuffer; // Pointer to buffer + public System.IntPtr pvBuffer; // Pointer to buffer } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] internal unsafe partial struct BCryptBufferDesc @@ -250,20 +232,9 @@ namespace Microsoft.AspNetCore.Cryptography.Cng internal uint dwMaxLength; internal uint dwIncrement; public void EnsureValidKeyLength(uint keyLengthInBits) { } - private bool IsValidKeyLength(uint keyLengthInBits) { throw null; } } internal static partial class CachedAlgorithmHandles { - private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _aesCbc; - private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _aesGcm; - private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _hmacSha1; - private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _hmacSha256; - private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _hmacSha512; - private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _pbkdf2; - private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _sha1; - private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _sha256; - private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _sha512; - private static Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo _sp800_108_ctr_hmac; public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle AES_CBC { get { throw null; } } public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle AES_GCM { get { throw null; } } public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle HMAC_SHA1 { get { throw null; } } @@ -274,19 +245,6 @@ namespace Microsoft.AspNetCore.Cryptography.Cng public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle SHA256 { get { throw null; } } public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle SHA512 { get { throw null; } } public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle SP800_108_CTR_HMAC { get { throw null; } } - private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetAesAlgorithm(string chainingMode) { throw null; } - private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetHashAlgorithm(string algorithm) { throw null; } - private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetHmacAlgorithm(string algorithm) { throw null; } - private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetPbkdf2Algorithm() { throw null; } - private static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetSP800_108_CTR_HMACAlgorithm() { throw null; } - - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - private partial struct CachedAlgorithmInfo - { - private object _dummy; - public CachedAlgorithmInfo(System.Func factory) { throw null; } - public static Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle GetAlgorithmHandle(ref Microsoft.AspNetCore.Cryptography.Cng.CachedAlgorithmHandles.CachedAlgorithmInfo cachedAlgorithmInfo) { throw null; } - } } [System.FlagsAttribute] internal enum NCryptEncryptFlags @@ -299,26 +257,14 @@ namespace Microsoft.AspNetCore.Cryptography.Cng } internal static partial class OSVersionUtil { - private static readonly Microsoft.AspNetCore.Cryptography.Cng.OSVersionUtil.OSVersion _osVersion; - private static Microsoft.AspNetCore.Cryptography.Cng.OSVersionUtil.OSVersion GetOSVersion() { throw null; } public static bool IsWindows() { throw null; } public static bool IsWindows8OrLater() { throw null; } - private enum OSVersion - { - NotWindows = 0, - Win7OrLater = 1, - Win8OrLater = 2, - } } } namespace Microsoft.AspNetCore.Cryptography.Internal { internal static partial class Resources { - private static System.Resources.ResourceManager s_resourceManager; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private static System.Globalization.CultureInfo _Culture_k__BackingField; internal static string BCryptAlgorithmHandle_ProviderNotFound { get { throw null; } } internal static string BCRYPT_KEY_LENGTHS_STRUCT_InvalidKeyLength { get { throw null; } } internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } @@ -328,16 +274,13 @@ namespace Microsoft.AspNetCore.Cryptography.Internal internal static string FormatBCryptAlgorithmHandle_ProviderNotFound(object p0) { throw null; } internal static string FormatBCRYPT_KEY_LENGTHS_STRUCT_InvalidKeyLength(object p0, object p1, object p2, object p3) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } - private static string GetResourceString(string resourceKey, string[] formatterNames) { throw null; } } } namespace Microsoft.AspNetCore.Cryptography.SafeHandles { internal sealed partial class BCryptAlgorithmHandle : Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle { - private BCryptAlgorithmHandle() { } public Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle CreateHash() { throw null; } - private unsafe Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle CreateHashCore(byte* pbKey, uint cbKey) { throw null; } public unsafe Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle CreateHmac(byte* pbKey, uint cbKey) { throw null; } public unsafe Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptKeyHandle GenerateSymmetricKey(byte* pbSecret, uint cbSecret) { throw null; } public string GetAlgorithmName() { throw null; } @@ -357,8 +300,6 @@ namespace Microsoft.AspNetCore.Cryptography.SafeHandles } internal sealed partial class BCryptHashHandle : Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle { - private Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle _algProviderHandle; - private BCryptHashHandle() { } public Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHashHandle DuplicateHash() { throw null; } public unsafe void HashData(byte* pbInput, uint cbInput, byte* pbHashDigest, uint cbHashDigest) { } protected override bool ReleaseHandle() { throw null; } @@ -366,8 +307,6 @@ namespace Microsoft.AspNetCore.Cryptography.SafeHandles } internal sealed partial class BCryptKeyHandle : Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptHandle { - private Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle _algProviderHandle; - private BCryptKeyHandle() { } protected override bool ReleaseHandle() { throw null; } internal void SetAlgorithmProviderHandle(Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle algProviderHandle) { } } @@ -391,26 +330,11 @@ namespace Microsoft.AspNetCore.Cryptography.SafeHandles public TDelegate GetProcAddress(string lpProcName, bool throwIfNotFound = true) where TDelegate : class { throw null; } public static Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle Open(string filename) { throw null; } protected override bool ReleaseHandle() { throw null; } - [System.Security.SuppressUnmanagedCodeSecurityAttribute] - private static partial class UnsafeNativeMethods - { - [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]public static extern int FormatMessage(uint dwFlags, Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle lpSource, uint dwMessageId, uint dwLanguageId, out Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle lpBuffer, uint nSize, System.IntPtr Arguments); - [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)][System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.Success)] - internal static extern bool FreeLibrary(System.IntPtr hModule); - [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern bool GetModuleHandleEx(uint dwFlags, Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle lpModuleName, out System.IntPtr phModule); - [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern System.IntPtr GetProcAddress(Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle hModule, string lpProcName); - [System.Runtime.InteropServices.DllImport("kernel32.dll")][System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.PreserveSig)]internal static extern Microsoft.AspNetCore.Cryptography.SafeHandles.SafeLibraryHandle LoadLibraryEx(string lpFileName, System.IntPtr hFile, uint dwFlags); - internal static void ThrowExceptionForLastWin32Error() { } - } } internal sealed partial class SecureLocalAllocHandle : Microsoft.AspNetCore.Cryptography.SafeHandles.LocalAllocHandle { - private readonly System.IntPtr _cb; - private SecureLocalAllocHandle(System.IntPtr cb) { } public System.IntPtr Length { get { throw null; } } public static Microsoft.AspNetCore.Cryptography.SafeHandles.SecureLocalAllocHandle Allocate(System.IntPtr cb) { throw null; } - [System.Runtime.ConstrainedExecution.ReliabilityContractAttribute(System.Runtime.ConstrainedExecution.Consistency.WillNotCorruptState, System.Runtime.ConstrainedExecution.Cer.MayFail)] - private void AllocateImpl(System.IntPtr cb) { } public Microsoft.AspNetCore.Cryptography.SafeHandles.SecureLocalAllocHandle Duplicate() { throw null; } protected override bool ReleaseHandle() { throw null; } } diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj index 62133dcbe8..823b288f69 100644 --- a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj @@ -2,12 +2,10 @@ netstandard2.0 - false - - + diff --git a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.Manual.cs b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.Manual.cs new file mode 100644 index 0000000000..b7d5d3ec20 --- /dev/null +++ b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.Manual.cs @@ -0,0 +1,28 @@ +// 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. + +namespace Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2 +{ + internal partial interface IPbkdf2Provider + { + byte[] DeriveKey(string password, byte[] salt, Microsoft.AspNetCore.Cryptography.KeyDerivation.KeyDerivationPrf prf, int iterationCount, int numBytesRequested); + } + + internal sealed partial class ManagedPbkdf2Provider : Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2.IPbkdf2Provider + { + public ManagedPbkdf2Provider() { } + public byte[] DeriveKey(string password, byte[] salt, Microsoft.AspNetCore.Cryptography.KeyDerivation.KeyDerivationPrf prf, int iterationCount, int numBytesRequested) { throw null; } + } + + internal sealed partial class Win7Pbkdf2Provider : Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2.IPbkdf2Provider + { + public Win7Pbkdf2Provider() { } + public byte[] DeriveKey(string password, byte[] salt, Microsoft.AspNetCore.Cryptography.KeyDerivation.KeyDerivationPrf prf, int iterationCount, int numBytesRequested) { throw null; } + } + + internal sealed partial class Win8Pbkdf2Provider : Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2.IPbkdf2Provider + { + public Win8Pbkdf2Provider() { } + public byte[] DeriveKey(string password, byte[] salt, Microsoft.AspNetCore.Cryptography.KeyDerivation.KeyDerivationPrf prf, int iterationCount, int numBytesRequested) { throw null; } + } +} diff --git a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj index ad9a99c463..d8dbf59125 100644 --- a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj +++ b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj @@ -2,15 +2,18 @@ netstandard2.0;netcoreapp2.0 - false - - + + + - + + + + diff --git a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.netcoreapp2.0.Manual.cs b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.netcoreapp2.0.Manual.cs new file mode 100644 index 0000000000..ea38de53c7 --- /dev/null +++ b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.netcoreapp2.0.Manual.cs @@ -0,0 +1,11 @@ +// 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. + +namespace Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2 +{ + internal sealed partial class NetCorePbkdf2Provider : Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2.IPbkdf2Provider + { + public NetCorePbkdf2Provider() { } + public byte[] DeriveKey(string password, byte[] salt, Microsoft.AspNetCore.Cryptography.KeyDerivation.KeyDerivationPrf prf, int iterationCount, int numBytesRequested) { throw null; } + } +} diff --git a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.Manual.cs b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.Manual.cs new file mode 100644 index 0000000000..77b0d75fa1 --- /dev/null +++ b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.Manual.cs @@ -0,0 +1,385 @@ +// 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. + + +namespace Microsoft.AspNetCore.DataProtection +{ + internal static partial class ActivatorExtensions + { + public static T CreateInstance(this Microsoft.AspNetCore.DataProtection.Internal.IActivator activator, string implementationTypeName) where T : class { throw null; } + public static Microsoft.AspNetCore.DataProtection.Internal.IActivator GetActivator(this System.IServiceProvider serviceProvider) { throw null; } + } + internal static partial class ArraySegmentExtensions + { + public static byte[] AsStandaloneArray(this System.ArraySegment arraySegment) { throw null; } + public static void Validate(this System.ArraySegment arraySegment) { } + } + internal partial interface IRegistryPolicyResolver + { + Microsoft.AspNetCore.DataProtection.RegistryPolicy ResolvePolicy(); + } + internal sealed partial class RegistryPolicyResolver : Microsoft.AspNetCore.DataProtection.IRegistryPolicyResolver + { + public RegistryPolicyResolver(Microsoft.AspNetCore.DataProtection.Internal.IActivator activator) { } + internal RegistryPolicyResolver(Microsoft.Win32.RegistryKey policyRegKey, Microsoft.AspNetCore.DataProtection.Internal.IActivator activator) { } + public Microsoft.AspNetCore.DataProtection.RegistryPolicy ResolvePolicy() { throw null; } + } + internal static partial class Error + { + public static System.InvalidOperationException CertificateXmlEncryptor_CertificateNotFound(string thumbprint) { throw null; } + public static System.ArgumentException Common_ArgumentCannotBeNullOrEmpty(string parameterName) { throw null; } + public static System.ArgumentException Common_BufferIncorrectlySized(string parameterName, int actualSize, int expectedSize) { throw null; } + public static System.Security.Cryptography.CryptographicException Common_EncryptionFailed(System.Exception inner = null) { throw null; } + public static System.Security.Cryptography.CryptographicException Common_KeyNotFound(System.Guid id) { throw null; } + public static System.Security.Cryptography.CryptographicException Common_KeyRevoked(System.Guid id) { throw null; } + public static System.InvalidOperationException Common_PropertyCannotBeNullOrEmpty(string propertyName) { throw null; } + public static System.InvalidOperationException Common_PropertyMustBeNonNegative(string propertyName) { throw null; } + public static System.ArgumentOutOfRangeException Common_ValueMustBeNonNegative(string paramName) { throw null; } + public static System.Security.Cryptography.CryptographicException CryptCommon_GenericError(System.Exception inner = null) { throw null; } + public static System.Security.Cryptography.CryptographicException CryptCommon_PayloadInvalid() { throw null; } + public static System.Security.Cryptography.CryptographicException DecryptionFailed(System.Exception inner) { throw null; } + public static System.Security.Cryptography.CryptographicException ProtectionProvider_BadMagicHeader() { throw null; } + public static System.Security.Cryptography.CryptographicException ProtectionProvider_BadVersion() { throw null; } + public static System.InvalidOperationException XmlKeyManager_DuplicateKey(System.Guid keyId) { throw null; } + } + internal static partial class Resources + { + internal static string AlgorithmAssert_BadBlockSize { get { throw null; } } + internal static string AlgorithmAssert_BadDigestSize { get { throw null; } } + internal static string AlgorithmAssert_BadKeySize { get { throw null; } } + internal static string CertificateXmlEncryptor_CertificateNotFound { get { throw null; } } + internal static string Common_ArgumentCannotBeNullOrEmpty { get { throw null; } } + internal static string Common_BufferIncorrectlySized { get { throw null; } } + internal static string Common_DecryptionFailed { get { throw null; } } + internal static string Common_EncryptionFailed { get { throw null; } } + internal static string Common_KeyNotFound { get { throw null; } } + internal static string Common_KeyRevoked { get { throw null; } } + internal static string Common_PropertyCannotBeNullOrEmpty { get { throw null; } } + internal static string Common_PropertyMustBeNonNegative { get { throw null; } } + internal static string Common_ValueMustBeNonNegative { get { throw null; } } + internal static string CryptCommon_GenericError { get { throw null; } } + internal static string CryptCommon_PayloadInvalid { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static string EncryptedXmlDecryptor_DoesNotWorkOnCoreClr { get { throw null; } } + internal static string FileSystem_EphemeralKeysLocationInContainer { get { throw null; } } + internal static string KeyManagementOptions_MinNewKeyLifetimeViolated { get { throw null; } } + internal static string KeyRingProvider_NoDefaultKey_AutoGenerateDisabled { get { throw null; } } + internal static string LifetimeMustNotBeNegative { get { throw null; } } + internal static string Platform_WindowsRequiredForGcm { get { throw null; } } + internal static string ProtectionProvider_BadMagicHeader { get { throw null; } } + internal static string ProtectionProvider_BadVersion { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string TypeExtensions_BadCast { get { throw null; } } + internal static string XmlKeyManager_DuplicateKey { get { throw null; } } + internal static string XmlKeyManager_IXmlRepositoryNotFound { get { throw null; } } + internal static string FormatAlgorithmAssert_BadBlockSize(object p0) { throw null; } + internal static string FormatAlgorithmAssert_BadDigestSize(object p0) { throw null; } + internal static string FormatAlgorithmAssert_BadKeySize(object p0) { throw null; } + internal static string FormatCertificateXmlEncryptor_CertificateNotFound(object p0) { throw null; } + internal static string FormatCommon_BufferIncorrectlySized(object p0, object p1) { throw null; } + internal static string FormatCommon_PropertyCannotBeNullOrEmpty(object p0) { throw null; } + internal static string FormatCommon_PropertyMustBeNonNegative(object p0) { throw null; } + internal static string FormatFileSystem_EphemeralKeysLocationInContainer(object path) { throw null; } + internal static string FormatLifetimeMustNotBeNegative(object p0) { throw null; } + internal static string FormatTypeExtensions_BadCast(object p0, object p1) { throw null; } + internal static string FormatXmlKeyManager_IXmlRepositoryNotFound(object p0, object p1) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } + } + internal partial class RegistryPolicy + { + public RegistryPolicy(Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AlgorithmConfiguration configuration, System.Collections.Generic.IEnumerable keyEscrowSinks, int? defaultKeyLifetime) { } + public int? DefaultKeyLifetime { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AlgorithmConfiguration EncryptorConfiguration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IEnumerable KeyEscrowSinks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class SimpleActivator : Microsoft.AspNetCore.DataProtection.Internal.IActivator + { + internal static readonly Microsoft.AspNetCore.DataProtection.SimpleActivator DefaultWithoutServices; + public SimpleActivator(System.IServiceProvider services) { } + public virtual object CreateInstance(System.Type expectedBaseType, string implementationTypeName) { throw null; } + } + internal partial class TypeForwardingActivator : Microsoft.AspNetCore.DataProtection.SimpleActivator + { + public TypeForwardingActivator(System.IServiceProvider services) : base (default(System.IServiceProvider)) { } + public TypeForwardingActivator(System.IServiceProvider services, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) : base (default(System.IServiceProvider)) { } + public override object CreateInstance(System.Type expectedBaseType, string originalTypeName) { throw null; } + internal object CreateInstance(System.Type expectedBaseType, string originalTypeName, out bool forwarded) { throw null; } + protected string RemoveVersionFromAssemblyName(string forwardedTypeName) { throw null; } + } + internal static partial class XmlConstants + { + internal static readonly System.Xml.Linq.XName DecryptorTypeAttributeName; + internal static readonly System.Xml.Linq.XName DeserializerTypeAttributeName; + internal static readonly System.Xml.Linq.XName EncryptedSecretElementName; + internal static readonly System.Xml.Linq.XName RequiresEncryptionAttributeName; + } + internal static partial class XmlExtensions + { + public static System.Xml.Linq.XElement WithoutChildNodes(this System.Xml.Linq.XElement element) { throw null; } + } +} +namespace Microsoft.AspNetCore.DataProtection.Internal +{ + internal partial class KeyManagementOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions + { + public KeyManagementOptionsSetup() { } + public KeyManagementOptionsSetup(Microsoft.AspNetCore.DataProtection.IRegistryPolicyResolver registryPolicyResolver) { } + public KeyManagementOptionsSetup(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public KeyManagementOptionsSetup(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.DataProtection.IRegistryPolicyResolver registryPolicyResolver) { } + public void Configure(Microsoft.AspNetCore.DataProtection.KeyManagement.KeyManagementOptions options) { } + } + internal static partial class ContainerUtils + { + public static bool IsContainer { get { throw null; } } + internal static bool IsDirectoryMounted(System.IO.DirectoryInfo directory, System.Collections.Generic.IEnumerable fstab) { throw null; } + public static bool IsVolumeMountedFolder(System.IO.DirectoryInfo directory) { throw null; } + } +} +namespace Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption +{ + internal partial interface IOptimizedAuthenticatedEncryptor : Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.IAuthenticatedEncryptor + { + byte[] Encrypt(System.ArraySegment plaintext, System.ArraySegment additionalAuthenticatedData, uint preBufferSize, uint postBufferSize); + } +} +namespace Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel +{ + public sealed partial class ManagedAuthenticatedEncryptorDescriptor : Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.IAuthenticatedEncryptorDescriptor + { + internal Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.ManagedAuthenticatedEncryptorConfiguration Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.DataProtection.ISecret MasterKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public sealed partial class CngCbcAuthenticatedEncryptorDescriptor : Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.IAuthenticatedEncryptorDescriptor + { + internal Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.CngCbcAuthenticatedEncryptorConfiguration Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.DataProtection.ISecret MasterKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public sealed partial class CngGcmAuthenticatedEncryptorDescriptor : Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.IAuthenticatedEncryptorDescriptor + { + internal Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.CngGcmAuthenticatedEncryptorConfiguration Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.DataProtection.ISecret MasterKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal static partial class SecretExtensions + { + public static System.Xml.Linq.XElement ToMasterKeyElement(this Microsoft.AspNetCore.DataProtection.ISecret secret) { throw null; } + public static Microsoft.AspNetCore.DataProtection.Secret ToSecret(this string base64String) { throw null; } + } +} +namespace Microsoft.AspNetCore.DataProtection.Cng +{ + internal sealed partial class GcmAuthenticatedEncryptor : Microsoft.AspNetCore.DataProtection.Cng.Internal.CngAuthenticatedEncryptorBase + { + public GcmAuthenticatedEncryptor(Microsoft.AspNetCore.DataProtection.Secret keyDerivationKey, Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle symmetricAlgorithmHandle, uint symmetricAlgorithmKeySizeInBytes, Microsoft.AspNetCore.DataProtection.Cng.IBCryptGenRandom genRandom = null) { } + protected unsafe override byte[] DecryptImpl(byte* pbCiphertext, uint cbCiphertext, byte* pbAdditionalAuthenticatedData, uint cbAdditionalAuthenticatedData) { throw null; } + public override void Dispose() { } + protected unsafe override byte[] EncryptImpl(byte* pbPlaintext, uint cbPlaintext, byte* pbAdditionalAuthenticatedData, uint cbAdditionalAuthenticatedData, uint cbPreBuffer, uint cbPostBuffer) { throw null; } + } + internal sealed partial class CbcAuthenticatedEncryptor : Microsoft.AspNetCore.DataProtection.Cng.Internal.CngAuthenticatedEncryptorBase + { + public CbcAuthenticatedEncryptor(Microsoft.AspNetCore.DataProtection.Secret keyDerivationKey, Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle symmetricAlgorithmHandle, uint symmetricAlgorithmKeySizeInBytes, Microsoft.AspNetCore.Cryptography.SafeHandles.BCryptAlgorithmHandle hmacAlgorithmHandle, Microsoft.AspNetCore.DataProtection.Cng.IBCryptGenRandom genRandom = null) { } + protected unsafe override byte[] DecryptImpl(byte* pbCiphertext, uint cbCiphertext, byte* pbAdditionalAuthenticatedData, uint cbAdditionalAuthenticatedData) { throw null; } + public override void Dispose() { } + protected unsafe override byte[] EncryptImpl(byte* pbPlaintext, uint cbPlaintext, byte* pbAdditionalAuthenticatedData, uint cbAdditionalAuthenticatedData, uint cbPreBuffer, uint cbPostBuffer) { throw null; } + } + internal unsafe partial interface IBCryptGenRandom + { + void GenRandom(byte* pbBuffer, uint cbBuffer); + } +} +namespace Microsoft.AspNetCore.DataProtection.Cng.Internal +{ + internal unsafe abstract partial class CngAuthenticatedEncryptorBase : Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.IAuthenticatedEncryptor, Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.IOptimizedAuthenticatedEncryptor, System.IDisposable + { + protected CngAuthenticatedEncryptorBase() { } + public byte[] Decrypt(System.ArraySegment ciphertext, System.ArraySegment additionalAuthenticatedData) { throw null; } + protected unsafe abstract byte[] DecryptImpl(byte* pbCiphertext, uint cbCiphertext, byte* pbAdditionalAuthenticatedData, uint cbAdditionalAuthenticatedData); + public abstract void Dispose(); + public byte[] Encrypt(System.ArraySegment plaintext, System.ArraySegment additionalAuthenticatedData) { throw null; } + public byte[] Encrypt(System.ArraySegment plaintext, System.ArraySegment additionalAuthenticatedData, uint preBufferSize, uint postBufferSize) { throw null; } + protected unsafe abstract byte[] EncryptImpl(byte* pbPlaintext, uint cbPlaintext, byte* pbAdditionalAuthenticatedData, uint cbAdditionalAuthenticatedData, uint cbPreBuffer, uint cbPostBuffer); + } +} +namespace Microsoft.AspNetCore.DataProtection.KeyManagement +{ + internal static partial class KeyEscrowServiceProviderExtensions + { + public static Microsoft.AspNetCore.DataProtection.KeyManagement.IKeyEscrowSink GetKeyEscrowSink(this System.IServiceProvider services) { throw null; } + } + internal sealed partial class DefaultKeyResolver : Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IDefaultKeyResolver + { + public DefaultKeyResolver(Microsoft.Extensions.Options.IOptions keyManagementOptions) { } + public DefaultKeyResolver(Microsoft.Extensions.Options.IOptions keyManagementOptions, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.DefaultKeyResolution ResolveDefaultKeyPolicy(System.DateTimeOffset now, System.Collections.Generic.IEnumerable allKeys) { throw null; } + } + internal sealed partial class DeferredKey : Microsoft.AspNetCore.DataProtection.KeyManagement.KeyBase + { + public DeferredKey(System.Guid keyId, System.DateTimeOffset creationDate, System.DateTimeOffset activationDate, System.DateTimeOffset expirationDate, Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IInternalXmlKeyManager keyManager, System.Xml.Linq.XElement keyElement, System.Collections.Generic.IEnumerable encryptorFactories) : base (default(System.Guid), default(System.DateTimeOffset), default(System.DateTimeOffset), default(System.DateTimeOffset), default(System.Lazy), default(System.Collections.Generic.IEnumerable)) { } + } + internal sealed partial class Key : Microsoft.AspNetCore.DataProtection.KeyManagement.KeyBase + { + public Key(System.Guid keyId, System.DateTimeOffset creationDate, System.DateTimeOffset activationDate, System.DateTimeOffset expirationDate, Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.IAuthenticatedEncryptorDescriptor descriptor, System.Collections.Generic.IEnumerable encryptorFactories) : base (default(System.Guid), default(System.DateTimeOffset), default(System.DateTimeOffset), default(System.DateTimeOffset), default(System.Lazy), default(System.Collections.Generic.IEnumerable)) { } + } + internal abstract partial class KeyBase : Microsoft.AspNetCore.DataProtection.KeyManagement.IKey + { + public KeyBase(System.Guid keyId, System.DateTimeOffset creationDate, System.DateTimeOffset activationDate, System.DateTimeOffset expirationDate, System.Lazy lazyDescriptor, System.Collections.Generic.IEnumerable encryptorFactories) { } + public System.DateTimeOffset ActivationDate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.DateTimeOffset CreationDate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.IAuthenticatedEncryptorDescriptor Descriptor { get { throw null; } } + public System.DateTimeOffset ExpirationDate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsRevoked { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Guid KeyId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.IAuthenticatedEncryptor CreateEncryptor() { throw null; } + internal void SetRevoked() { } + } + internal sealed partial class KeyRing : Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IKeyRing + { + public KeyRing(Microsoft.AspNetCore.DataProtection.KeyManagement.IKey defaultKey, System.Collections.Generic.IEnumerable allKeys) { } + public Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.IAuthenticatedEncryptor DefaultAuthenticatedEncryptor { get { throw null; } } + public System.Guid DefaultKeyId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.IAuthenticatedEncryptor GetAuthenticatedEncryptorByKeyId(System.Guid keyId, out bool isRevoked) { throw null; } + } + internal sealed partial class KeyRingProvider : Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.ICacheableKeyRingProvider, Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IKeyRingProvider + { + public KeyRingProvider(Microsoft.AspNetCore.DataProtection.KeyManagement.IKeyManager keyManager, Microsoft.Extensions.Options.IOptions keyManagementOptions, Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IDefaultKeyResolver defaultKeyResolver) { } + public KeyRingProvider(Microsoft.AspNetCore.DataProtection.KeyManagement.IKeyManager keyManager, Microsoft.Extensions.Options.IOptions keyManagementOptions, Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IDefaultKeyResolver defaultKeyResolver, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + internal System.DateTime AutoRefreshWindowEnd { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.ICacheableKeyRingProvider CacheableKeyRingProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IKeyRing GetCurrentKeyRing() { throw null; } + internal Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IKeyRing GetCurrentKeyRingCore(System.DateTime utcNow, bool forceRefresh = false) { throw null; } + internal bool InAutoRefreshWindow() { throw null; } + Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.CacheableKeyRing Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.ICacheableKeyRingProvider.GetCacheableKeyRing(System.DateTimeOffset now) { throw null; } + internal Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IKeyRing RefreshCurrentKeyRing() { throw null; } + } + internal sealed partial class KeyRingBasedDataProtector : Microsoft.AspNetCore.DataProtection.IDataProtectionProvider, Microsoft.AspNetCore.DataProtection.IDataProtector, Microsoft.AspNetCore.DataProtection.IPersistedDataProtector + { + public KeyRingBasedDataProtector(Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IKeyRingProvider keyRingProvider, Microsoft.Extensions.Logging.ILogger logger, string[] originalPurposes, string newPurpose) { } + internal string[] Purposes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.DataProtection.IDataProtector CreateProtector(string purpose) { throw null; } + public byte[] DangerousUnprotect(byte[] protectedData, bool ignoreRevocationErrors, out bool requiresMigration, out bool wasRevoked) { throw null; } + public byte[] Protect(byte[] plaintext) { throw null; } + public byte[] Unprotect(byte[] protectedData) { throw null; } + } + public sealed partial class XmlKeyManager : Microsoft.AspNetCore.DataProtection.KeyManagement.IKeyManager, Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IInternalXmlKeyManager + { + internal static readonly System.Xml.Linq.XName ActivationDateElementName; + internal static readonly System.Xml.Linq.XName CreationDateElementName; + internal static readonly System.Xml.Linq.XName DescriptorElementName; + internal static readonly System.Xml.Linq.XName DeserializerTypeAttributeName; + internal static readonly System.Xml.Linq.XName ExpirationDateElementName; + internal static readonly System.Xml.Linq.XName IdAttributeName; + internal static readonly System.Xml.Linq.XName KeyElementName; + internal static readonly System.Xml.Linq.XName ReasonElementName; + internal static readonly System.Xml.Linq.XName RevocationDateElementName; + internal static readonly System.Xml.Linq.XName RevocationElementName; + internal static readonly System.Xml.Linq.XName VersionAttributeName; + internal XmlKeyManager(Microsoft.Extensions.Options.IOptions keyManagementOptions, Microsoft.AspNetCore.DataProtection.Internal.IActivator activator, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IInternalXmlKeyManager internalXmlKeyManager) { } + internal XmlKeyManager(Microsoft.Extensions.Options.IOptions keyManagementOptions, Microsoft.AspNetCore.DataProtection.Internal.IActivator activator, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.DataProtection.Repositories.IDefaultKeyStorageDirectories keyStorageDirectories) { } + internal Microsoft.AspNetCore.DataProtection.XmlEncryption.IXmlEncryptor KeyEncryptor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository KeyRepository { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal System.Collections.Generic.KeyValuePair GetFallbackKeyRepositoryEncryptorPair() { throw null; } + } +} +namespace Microsoft.AspNetCore.DataProtection.KeyManagement.Internal +{ + public sealed partial class CacheableKeyRing + { + internal CacheableKeyRing(System.Threading.CancellationToken expirationToken, System.DateTimeOffset expirationTime, Microsoft.AspNetCore.DataProtection.KeyManagement.IKey defaultKey, System.Collections.Generic.IEnumerable allKeys) { } + internal CacheableKeyRing(System.Threading.CancellationToken expirationToken, System.DateTimeOffset expirationTime, Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IKeyRing keyRing) { } + internal System.DateTime ExpirationTimeUtc { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.IKeyRing KeyRing { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal static bool IsValid(Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.CacheableKeyRing keyRing, System.DateTime utcNow) { throw null; } + internal Microsoft.AspNetCore.DataProtection.KeyManagement.Internal.CacheableKeyRing WithTemporaryExtendedLifetime(System.DateTimeOffset now) { throw null; } + } +} +namespace Microsoft.AspNetCore.DataProtection.Managed +{ + internal sealed partial class ManagedAuthenticatedEncryptor : Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.IAuthenticatedEncryptor, System.IDisposable + { + public ManagedAuthenticatedEncryptor(Microsoft.AspNetCore.DataProtection.Secret keyDerivationKey, System.Func symmetricAlgorithmFactory, int symmetricAlgorithmKeySizeInBytes, System.Func validationAlgorithmFactory, Microsoft.AspNetCore.DataProtection.Managed.IManagedGenRandom genRandom = null) { } + public byte[] Decrypt(System.ArraySegment protectedPayload, System.ArraySegment additionalAuthenticatedData) { throw null; } + public void Dispose() { } + public byte[] Encrypt(System.ArraySegment plaintext, System.ArraySegment additionalAuthenticatedData) { throw null; } + } + internal partial interface IManagedGenRandom + { + byte[] GenRandom(int numBytes); + } +} +namespace Microsoft.AspNetCore.DataProtection.Repositories +{ + internal partial class EphemeralXmlRepository : Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository + { + public EphemeralXmlRepository(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public virtual System.Collections.Generic.IReadOnlyCollection GetAllElements() { throw null; } + public virtual void StoreElement(System.Xml.Linq.XElement element, string friendlyName) { } + } + internal partial interface IDefaultKeyStorageDirectories + { + System.IO.DirectoryInfo GetKeyStorageDirectory(); + System.IO.DirectoryInfo GetKeyStorageDirectoryForAzureWebSites(); + } +} +namespace Microsoft.AspNetCore.DataProtection.SP800_108 +{ + internal unsafe partial interface ISP800_108_CTR_HMACSHA512Provider : System.IDisposable + { + void DeriveKey(byte* pbLabel, uint cbLabel, byte* pbContext, uint cbContext, byte* pbDerivedKey, uint cbDerivedKey); + } + internal static partial class ManagedSP800_108_CTR_HMACSHA512 + { + public static void DeriveKeys(byte[] kdk, System.ArraySegment label, System.ArraySegment context, System.Func prfFactory, System.ArraySegment output) { } + public static void DeriveKeysWithContextHeader(byte[] kdk, System.ArraySegment label, byte[] contextHeader, System.ArraySegment context, System.Func prfFactory, System.ArraySegment output) { } + } + internal static partial class SP800_108_CTR_HMACSHA512Extensions + { + public unsafe static void DeriveKeyWithContextHeader(this Microsoft.AspNetCore.DataProtection.SP800_108.ISP800_108_CTR_HMACSHA512Provider provider, byte* pbLabel, uint cbLabel, byte[] contextHeader, byte* pbContext, uint cbContext, byte* pbDerivedKey, uint cbDerivedKey) { } + } + internal static partial class SP800_108_CTR_HMACSHA512Util + { + public static Microsoft.AspNetCore.DataProtection.SP800_108.ISP800_108_CTR_HMACSHA512Provider CreateEmptyProvider() { throw null; } + public static Microsoft.AspNetCore.DataProtection.SP800_108.ISP800_108_CTR_HMACSHA512Provider CreateProvider(Microsoft.AspNetCore.DataProtection.Secret kdk) { throw null; } + public unsafe static Microsoft.AspNetCore.DataProtection.SP800_108.ISP800_108_CTR_HMACSHA512Provider CreateProvider(byte* pbKdk, uint cbKdk) { throw null; } + } + internal sealed partial class Win7SP800_108_CTR_HMACSHA512Provider : Microsoft.AspNetCore.DataProtection.SP800_108.ISP800_108_CTR_HMACSHA512Provider, System.IDisposable + { + public unsafe Win7SP800_108_CTR_HMACSHA512Provider(byte* pbKdk, uint cbKdk) { } + public unsafe void DeriveKey(byte* pbLabel, uint cbLabel, byte* pbContext, uint cbContext, byte* pbDerivedKey, uint cbDerivedKey) { } + public void Dispose() { } + } + internal sealed partial class Win8SP800_108_CTR_HMACSHA512Provider : Microsoft.AspNetCore.DataProtection.SP800_108.ISP800_108_CTR_HMACSHA512Provider, System.IDisposable + { + public unsafe Win8SP800_108_CTR_HMACSHA512Provider(byte* pbKdk, uint cbKdk) { } + public unsafe void DeriveKey(byte* pbLabel, uint cbLabel, byte* pbContext, uint cbContext, byte* pbDerivedKey, uint cbDerivedKey) { } + public void Dispose() { } + } +} +namespace Microsoft.AspNetCore.DataProtection.XmlEncryption +{ + public sealed partial class CertificateXmlEncryptor : Microsoft.AspNetCore.DataProtection.XmlEncryption.IInternalCertificateXmlEncryptor, Microsoft.AspNetCore.DataProtection.XmlEncryption.IXmlEncryptor + { + System.Security.Cryptography.Xml.EncryptedData Microsoft.AspNetCore.DataProtection.XmlEncryption.IInternalCertificateXmlEncryptor.PerformEncryption(System.Security.Cryptography.Xml.EncryptedXml encryptedXml, System.Xml.XmlElement elementToEncrypt) { throw null; } + internal CertificateXmlEncryptor(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.DataProtection.XmlEncryption.IInternalCertificateXmlEncryptor encryptor) { } + } + internal partial interface IInternalCertificateXmlEncryptor + { + System.Security.Cryptography.Xml.EncryptedData PerformEncryption(System.Security.Cryptography.Xml.EncryptedXml encryptedXml, System.Xml.XmlElement elementToEncrypt); + } + internal partial interface IInternalEncryptedXmlDecryptor + { + void PerformPreDecryptionSetup(System.Security.Cryptography.Xml.EncryptedXml encryptedXml); + } + internal static partial class XmlEncryptionExtensions + { + public static System.Xml.Linq.XElement DecryptElement(this System.Xml.Linq.XElement element, Microsoft.AspNetCore.DataProtection.Internal.IActivator activator) { throw null; } + public static System.Xml.Linq.XElement EncryptIfNecessary(this Microsoft.AspNetCore.DataProtection.XmlEncryption.IXmlEncryptor encryptor, System.Xml.Linq.XElement element) { throw null; } + public static Microsoft.AspNetCore.DataProtection.Secret ToSecret(this System.Xml.Linq.XElement element) { throw null; } + public static System.Xml.Linq.XElement ToXElement(this Microsoft.AspNetCore.DataProtection.Secret secret) { throw null; } + } + internal partial class XmlKeyDecryptionOptions + { + public XmlKeyDecryptionOptions() { } + public int KeyDecryptionCertificateCount { get { throw null; } } + public void AddKeyDecryptionCertificate(System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { } + public bool TryGetKeyDecryptionCertificates(System.Security.Cryptography.X509Certificates.X509Certificate2 certInfo, out System.Collections.Generic.IReadOnlyList keyDecryptionCerts) { throw null; } + } +} \ No newline at end of file diff --git a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj index 9f8c21ba0f..b1c29c222c 100644 --- a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj +++ b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj @@ -2,30 +2,32 @@ netstandard2.0;netcoreapp3.0 - false - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + diff --git a/src/DataProtection/EntityFrameworkCore/ref/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj b/src/DataProtection/EntityFrameworkCore/ref/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj deleted file mode 100644 index dd34dcfdfd..0000000000 --- a/src/DataProtection/EntityFrameworkCore/ref/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netstandard2.1 - - - - - - - diff --git a/src/DataProtection/EntityFrameworkCore/ref/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.netstandard2.1.cs b/src/DataProtection/EntityFrameworkCore/ref/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.netstandard2.1.cs deleted file mode 100644 index 6c4ae69807..0000000000 --- a/src/DataProtection/EntityFrameworkCore/ref/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.netstandard2.1.cs +++ /dev/null @@ -1,30 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.DataProtection -{ - public static partial class EntityFrameworkCoreDataProtectionExtensions - { - public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToDbContext(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder) where TContext : Microsoft.EntityFrameworkCore.DbContext, Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.IDataProtectionKeyContext { throw null; } - } -} -namespace Microsoft.AspNetCore.DataProtection.EntityFrameworkCore -{ - public partial class DataProtectionKey - { - public DataProtectionKey() { } - public string FriendlyName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Xml { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class EntityFrameworkCoreXmlRepository : Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository where TContext : Microsoft.EntityFrameworkCore.DbContext, Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.IDataProtectionKeyContext - { - public EntityFrameworkCoreXmlRepository(System.IServiceProvider services, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public virtual System.Collections.Generic.IReadOnlyCollection GetAllElements() { throw null; } - public void StoreElement(System.Xml.Linq.XElement element, string friendlyName) { } - } - public partial interface IDataProtectionKeyContext - { - Microsoft.EntityFrameworkCore.DbSet DataProtectionKeys { get; } - } -} diff --git a/src/DataProtection/EntityFrameworkCore/test/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.Test.csproj b/src/DataProtection/EntityFrameworkCore/test/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.Test.csproj index 6d3e504879..08d7775c8f 100644 --- a/src/DataProtection/EntityFrameworkCore/test/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.Test.csproj +++ b/src/DataProtection/EntityFrameworkCore/test/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.Test.csproj @@ -2,11 +2,15 @@ netcoreapp3.0 + + false + + diff --git a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.Manual.cs b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.Manual.cs new file mode 100644 index 0000000000..f1c965458a --- /dev/null +++ b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.Manual.cs @@ -0,0 +1,34 @@ +// 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. + +namespace Microsoft.AspNetCore.DataProtection +{ + public static partial class DataProtectionProvider + { + internal static Microsoft.AspNetCore.DataProtection.IDataProtectionProvider CreateProvider(System.IO.DirectoryInfo keyDirectory, System.Action setupAction, System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { throw null; } + } + internal sealed partial class TimeLimitedDataProtector : Microsoft.AspNetCore.DataProtection.IDataProtectionProvider, Microsoft.AspNetCore.DataProtection.IDataProtector, Microsoft.AspNetCore.DataProtection.ITimeLimitedDataProtector + { + public TimeLimitedDataProtector(Microsoft.AspNetCore.DataProtection.IDataProtector innerProtector) { } + public Microsoft.AspNetCore.DataProtection.ITimeLimitedDataProtector CreateProtector(string purpose) { throw null; } + Microsoft.AspNetCore.DataProtection.IDataProtector Microsoft.AspNetCore.DataProtection.IDataProtectionProvider.CreateProtector(string purpose) { throw null; } + byte[] Microsoft.AspNetCore.DataProtection.IDataProtector.Protect(byte[] plaintext) { throw null; } + byte[] Microsoft.AspNetCore.DataProtection.IDataProtector.Unprotect(byte[] protectedData) { throw null; } + public byte[] Protect(byte[] plaintext, System.DateTimeOffset expiration) { throw null; } + public byte[] Unprotect(byte[] protectedData, out System.DateTimeOffset expiration) { throw null; } + internal byte[] UnprotectCore(byte[] protectedData, System.DateTimeOffset now, out System.DateTimeOffset expiration) { throw null; } + } +} +namespace Microsoft.AspNetCore.DataProtection.Extensions +{ + internal static partial class Resources + { + internal static string CryptCommon_GenericError { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string TimeLimitedDataProtector_PayloadExpired { get { throw null; } } + internal static string TimeLimitedDataProtector_PayloadInvalid { get { throw null; } } + internal static string FormatTimeLimitedDataProtector_PayloadExpired(object p0) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } + } +} \ No newline at end of file diff --git a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj index d2d166c02d..07ca49eb8b 100644 --- a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj +++ b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj @@ -2,17 +2,19 @@ netstandard2.0;netcoreapp3.0 - false - - - + + + + - - + + + + diff --git a/src/DataProtection/StackExchangeRedis/ref/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj b/src/DataProtection/StackExchangeRedis/ref/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj deleted file mode 100644 index 013fffddf8..0000000000 --- a/src/DataProtection/StackExchangeRedis/ref/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netstandard2.0 - - - - - - - diff --git a/src/DataProtection/StackExchangeRedis/ref/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.netstandard2.0.cs b/src/DataProtection/StackExchangeRedis/ref/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.netstandard2.0.cs deleted file mode 100644 index 3208711453..0000000000 --- a/src/DataProtection/StackExchangeRedis/ref/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.netstandard2.0.cs +++ /dev/null @@ -1,21 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.DataProtection -{ - public static partial class StackExchangeRedisDataProtectionBuilderExtensions - { - public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToStackExchangeRedis(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, StackExchange.Redis.IConnectionMultiplexer connectionMultiplexer) { throw null; } - public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToStackExchangeRedis(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, StackExchange.Redis.IConnectionMultiplexer connectionMultiplexer, StackExchange.Redis.RedisKey key) { throw null; } - public static Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder PersistKeysToStackExchangeRedis(this Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder builder, System.Func databaseFactory, StackExchange.Redis.RedisKey key) { throw null; } - } -} -namespace Microsoft.AspNetCore.DataProtection.StackExchangeRedis -{ - public partial class RedisXmlRepository : Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository - { - public RedisXmlRepository(System.Func databaseFactory, StackExchange.Redis.RedisKey key) { } - public System.Collections.Generic.IReadOnlyCollection GetAllElements() { throw null; } - public void StoreElement(System.Xml.Linq.XElement element, string friendlyName) { } - } -} diff --git a/src/DataProtection/StackExchangeRedis/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Tests.csproj b/src/DataProtection/StackExchangeRedis/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Tests.csproj index ff9e397e77..2c2a36786b 100644 --- a/src/DataProtection/StackExchangeRedis/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Tests.csproj +++ b/src/DataProtection/StackExchangeRedis/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Tests.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + + false @@ -16,6 +18,8 @@ + + diff --git a/src/DataProtection/samples/AzureBlob/AzureBlob.csproj b/src/DataProtection/samples/AzureBlob/AzureBlob.csproj index 55e41b6b18..2762eaadc1 100644 --- a/src/DataProtection/samples/AzureBlob/AzureBlob.csproj +++ b/src/DataProtection/samples/AzureBlob/AzureBlob.csproj @@ -3,6 +3,8 @@ netcoreapp3.0 exe + + false @@ -11,6 +13,8 @@ + + diff --git a/src/DataProtection/samples/AzureKeyVault/AzureKeyVault.csproj b/src/DataProtection/samples/AzureKeyVault/AzureKeyVault.csproj index b577b27124..ceedf79044 100644 --- a/src/DataProtection/samples/AzureKeyVault/AzureKeyVault.csproj +++ b/src/DataProtection/samples/AzureKeyVault/AzureKeyVault.csproj @@ -3,6 +3,8 @@ netcoreapp3.0 exe + + false @@ -12,6 +14,8 @@ + + diff --git a/src/DataProtection/samples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj b/src/DataProtection/samples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj index 0796b4d4b8..c759892e53 100644 --- a/src/DataProtection/samples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj +++ b/src/DataProtection/samples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj @@ -3,6 +3,8 @@ exe netcoreapp3.0 + + false @@ -11,6 +13,8 @@ + + diff --git a/src/DataProtection/samples/Redis/Redis.csproj b/src/DataProtection/samples/Redis/Redis.csproj index f30e056234..12b5e42652 100644 --- a/src/DataProtection/samples/Redis/Redis.csproj +++ b/src/DataProtection/samples/Redis/Redis.csproj @@ -3,6 +3,8 @@ netcoreapp3.0 exe + + false @@ -10,6 +12,8 @@ + + diff --git a/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj b/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj index b232f9b6b3..5380f58997 100644 --- a/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj +++ b/src/DefaultBuilder/ref/Microsoft.AspNetCore.csproj @@ -2,28 +2,26 @@ netcoreapp3.0 - false - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/DefaultBuilder/testassets/Directory.Build.props b/src/DefaultBuilder/testassets/Directory.Build.props index b8ad72d258..b49282fb6f 100644 --- a/src/DefaultBuilder/testassets/Directory.Build.props +++ b/src/DefaultBuilder/testassets/Directory.Build.props @@ -6,11 +6,4 @@ - - - - - diff --git a/src/Features/JsonPatch/ref/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/ref/Microsoft.AspNetCore.JsonPatch.csproj deleted file mode 100644 index c2eba6030a..0000000000 --- a/src/Features/JsonPatch/ref/Microsoft.AspNetCore.JsonPatch.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netstandard2.0 - - - - - - - diff --git a/src/Features/JsonPatch/ref/Microsoft.AspNetCore.JsonPatch.netstandard2.0.cs b/src/Features/JsonPatch/ref/Microsoft.AspNetCore.JsonPatch.netstandard2.0.cs deleted file mode 100644 index f8ba24f51f..0000000000 --- a/src/Features/JsonPatch/ref/Microsoft.AspNetCore.JsonPatch.netstandard2.0.cs +++ /dev/null @@ -1,309 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.JsonPatch -{ - public partial interface IJsonPatchDocument - { - Newtonsoft.Json.Serialization.IContractResolver ContractResolver { get; set; } - System.Collections.Generic.IList GetOperations(); - } - [Newtonsoft.Json.JsonConverterAttribute(typeof(Microsoft.AspNetCore.JsonPatch.Converters.JsonPatchDocumentConverter))] - public partial class JsonPatchDocument : Microsoft.AspNetCore.JsonPatch.IJsonPatchDocument - { - public JsonPatchDocument() { } - public JsonPatchDocument(System.Collections.Generic.List operations, Newtonsoft.Json.Serialization.IContractResolver contractResolver) { } - [Newtonsoft.Json.JsonIgnoreAttribute] - public Newtonsoft.Json.Serialization.IContractResolver ContractResolver { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.List Operations { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Add(string path, object value) { throw null; } - public void ApplyTo(object objectToApplyTo) { } - public void ApplyTo(object objectToApplyTo, Microsoft.AspNetCore.JsonPatch.Adapters.IObjectAdapter adapter) { } - public void ApplyTo(object objectToApplyTo, Microsoft.AspNetCore.JsonPatch.Adapters.IObjectAdapter adapter, System.Action logErrorAction) { } - public void ApplyTo(object objectToApplyTo, System.Action logErrorAction) { } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Copy(string from, string path) { throw null; } - System.Collections.Generic.IList Microsoft.AspNetCore.JsonPatch.IJsonPatchDocument.GetOperations() { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Move(string from, string path) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Remove(string path) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Replace(string path, object value) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Test(string path, object value) { throw null; } - } - [Newtonsoft.Json.JsonConverterAttribute(typeof(Microsoft.AspNetCore.JsonPatch.Converters.TypedJsonPatchDocumentConverter))] - public partial class JsonPatchDocument : Microsoft.AspNetCore.JsonPatch.IJsonPatchDocument where TModel : class - { - public JsonPatchDocument() { } - public JsonPatchDocument(System.Collections.Generic.List> operations, Newtonsoft.Json.Serialization.IContractResolver contractResolver) { } - [Newtonsoft.Json.JsonIgnoreAttribute] - public Newtonsoft.Json.Serialization.IContractResolver ContractResolver { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.List> Operations { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Add(System.Linq.Expressions.Expression>> path, TProp value) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Add(System.Linq.Expressions.Expression>> path, TProp value, int position) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Add(System.Linq.Expressions.Expression> path, TProp value) { throw null; } - public void ApplyTo(TModel objectToApplyTo) { } - public void ApplyTo(TModel objectToApplyTo, Microsoft.AspNetCore.JsonPatch.Adapters.IObjectAdapter adapter) { } - public void ApplyTo(TModel objectToApplyTo, Microsoft.AspNetCore.JsonPatch.Adapters.IObjectAdapter adapter, System.Action logErrorAction) { } - public void ApplyTo(TModel objectToApplyTo, System.Action logErrorAction) { } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Copy(System.Linq.Expressions.Expression>> from, int positionFrom, System.Linq.Expressions.Expression>> path) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Copy(System.Linq.Expressions.Expression>> from, int positionFrom, System.Linq.Expressions.Expression>> path, int positionTo) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Copy(System.Linq.Expressions.Expression>> from, int positionFrom, System.Linq.Expressions.Expression> path) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Copy(System.Linq.Expressions.Expression> from, System.Linq.Expressions.Expression>> path) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Copy(System.Linq.Expressions.Expression> from, System.Linq.Expressions.Expression>> path, int positionTo) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Copy(System.Linq.Expressions.Expression> from, System.Linq.Expressions.Expression> path) { throw null; } - System.Collections.Generic.IList Microsoft.AspNetCore.JsonPatch.IJsonPatchDocument.GetOperations() { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Move(System.Linq.Expressions.Expression>> from, int positionFrom, System.Linq.Expressions.Expression>> path) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Move(System.Linq.Expressions.Expression>> from, int positionFrom, System.Linq.Expressions.Expression>> path, int positionTo) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Move(System.Linq.Expressions.Expression>> from, int positionFrom, System.Linq.Expressions.Expression> path) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Move(System.Linq.Expressions.Expression> from, System.Linq.Expressions.Expression>> path) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Move(System.Linq.Expressions.Expression> from, System.Linq.Expressions.Expression>> path, int positionTo) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Move(System.Linq.Expressions.Expression> from, System.Linq.Expressions.Expression> path) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Remove(System.Linq.Expressions.Expression>> path) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Remove(System.Linq.Expressions.Expression>> path, int position) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Remove(System.Linq.Expressions.Expression> path) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Replace(System.Linq.Expressions.Expression>> path, TProp value) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Replace(System.Linq.Expressions.Expression>> path, TProp value, int position) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Replace(System.Linq.Expressions.Expression> path, TProp value) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Test(System.Linq.Expressions.Expression>> path, TProp value) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Test(System.Linq.Expressions.Expression>> path, TProp value, int position) { throw null; } - public Microsoft.AspNetCore.JsonPatch.JsonPatchDocument Test(System.Linq.Expressions.Expression> path, TProp value) { throw null; } - } - public partial class JsonPatchError - { - public JsonPatchError(object affectedObject, Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, string errorMessage) { } - public object AffectedObject { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.JsonPatch.Operations.Operation Operation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - public partial class JsonPatchProperty - { - public JsonPatchProperty(Newtonsoft.Json.Serialization.JsonProperty property, object parent) { } - public object Parent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Newtonsoft.Json.Serialization.JsonProperty Property { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.AspNetCore.JsonPatch.Adapters -{ - public partial class AdapterFactory : Microsoft.AspNetCore.JsonPatch.Adapters.IAdapterFactory - { - public AdapterFactory() { } - public virtual Microsoft.AspNetCore.JsonPatch.Internal.IAdapter Create(object target, Newtonsoft.Json.Serialization.IContractResolver contractResolver) { throw null; } - } - public partial interface IAdapterFactory - { - Microsoft.AspNetCore.JsonPatch.Internal.IAdapter Create(object target, Newtonsoft.Json.Serialization.IContractResolver contractResolver); - } - public partial interface IObjectAdapter - { - void Add(Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, object objectToApplyTo); - void Copy(Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, object objectToApplyTo); - void Move(Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, object objectToApplyTo); - void Remove(Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, object objectToApplyTo); - void Replace(Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, object objectToApplyTo); - } - public partial interface IObjectAdapterWithTest : Microsoft.AspNetCore.JsonPatch.Adapters.IObjectAdapter - { - void Test(Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, object objectToApplyTo); - } - public partial class ObjectAdapter : Microsoft.AspNetCore.JsonPatch.Adapters.IObjectAdapter, Microsoft.AspNetCore.JsonPatch.Adapters.IObjectAdapterWithTest - { - public ObjectAdapter(Newtonsoft.Json.Serialization.IContractResolver contractResolver, System.Action logErrorAction) { } - public ObjectAdapter(Newtonsoft.Json.Serialization.IContractResolver contractResolver, System.Action logErrorAction, Microsoft.AspNetCore.JsonPatch.Adapters.IAdapterFactory adapterFactory) { } - public Microsoft.AspNetCore.JsonPatch.Adapters.IAdapterFactory AdapterFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Newtonsoft.Json.Serialization.IContractResolver ContractResolver { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Action LogErrorAction { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public void Add(Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, object objectToApplyTo) { } - public void Copy(Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, object objectToApplyTo) { } - public void Move(Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, object objectToApplyTo) { } - public void Remove(Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, object objectToApplyTo) { } - public void Replace(Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, object objectToApplyTo) { } - public void Test(Microsoft.AspNetCore.JsonPatch.Operations.Operation operation, object objectToApplyTo) { } - } -} -namespace Microsoft.AspNetCore.JsonPatch.Converters -{ - public partial class JsonPatchDocumentConverter : Newtonsoft.Json.JsonConverter - { - public JsonPatchDocumentConverter() { } - public override bool CanConvert(System.Type objectType) { throw null; } - public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) { throw null; } - public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) { } - } - public partial class TypedJsonPatchDocumentConverter : Microsoft.AspNetCore.JsonPatch.Converters.JsonPatchDocumentConverter - { - public TypedJsonPatchDocumentConverter() { } - public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) { throw null; } - } -} -namespace Microsoft.AspNetCore.JsonPatch.Exceptions -{ - public partial class JsonPatchException : System.Exception - { - public JsonPatchException() { } - public JsonPatchException(Microsoft.AspNetCore.JsonPatch.JsonPatchError jsonPatchError) { } - public JsonPatchException(Microsoft.AspNetCore.JsonPatch.JsonPatchError jsonPatchError, System.Exception innerException) { } - public JsonPatchException(string message, System.Exception innerException) { } - public object AffectedObject { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.JsonPatch.Operations.Operation FailedOperation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} -namespace Microsoft.AspNetCore.JsonPatch.Helpers -{ - public partial class GetValueResult - { - public GetValueResult(object propertyValue, bool hasError) { } - public bool HasError { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object PropertyValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} -namespace Microsoft.AspNetCore.JsonPatch.Internal -{ - public partial class ConversionResult - { - public ConversionResult(bool canBeConverted, object convertedInstance) { } - public bool CanBeConverted { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public object ConvertedInstance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - public static partial class ConversionResultProvider - { - public static Microsoft.AspNetCore.JsonPatch.Internal.ConversionResult ConvertTo(object value, System.Type typeToConvertTo) { throw null; } - public static Microsoft.AspNetCore.JsonPatch.Internal.ConversionResult CopyTo(object value, System.Type typeToConvertTo) { throw null; } - } - public partial class DictionaryAdapter : Microsoft.AspNetCore.JsonPatch.Internal.IAdapter - { - public DictionaryAdapter() { } - public virtual bool TryAdd(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage) { throw null; } - protected virtual bool TryConvertKey(string key, out TKey convertedKey, out string errorMessage) { throw null; } - protected virtual bool TryConvertValue(object value, out TValue convertedValue, out string errorMessage) { throw null; } - public virtual bool TryGet(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out object value, out string errorMessage) { throw null; } - public virtual bool TryRemove(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out string errorMessage) { throw null; } - public virtual bool TryReplace(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage) { throw null; } - public virtual bool TryTest(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage) { throw null; } - public virtual bool TryTraverse(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out object nextTarget, out string errorMessage) { throw null; } - } - public partial class DynamicObjectAdapter : Microsoft.AspNetCore.JsonPatch.Internal.IAdapter - { - public DynamicObjectAdapter() { } - public virtual bool TryAdd(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage) { throw null; } - protected virtual bool TryConvertValue(object value, System.Type propertyType, out object convertedValue) { throw null; } - public virtual bool TryGet(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out object value, out string errorMessage) { throw null; } - protected virtual bool TryGetDynamicObjectProperty(object target, Newtonsoft.Json.Serialization.IContractResolver contractResolver, string segment, out object value, out string errorMessage) { throw null; } - public virtual bool TryRemove(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out string errorMessage) { throw null; } - public virtual bool TryReplace(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage) { throw null; } - protected virtual bool TrySetDynamicObjectProperty(object target, Newtonsoft.Json.Serialization.IContractResolver contractResolver, string segment, object value, out string errorMessage) { throw null; } - public virtual bool TryTest(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage) { throw null; } - public virtual bool TryTraverse(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out object nextTarget, out string errorMessage) { throw null; } - } - public partial interface IAdapter - { - bool TryAdd(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage); - bool TryGet(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out object value, out string errorMessage); - bool TryRemove(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out string errorMessage); - bool TryReplace(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage); - bool TryTest(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage); - bool TryTraverse(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out object nextTarget, out string errorMessage); - } - public partial class ListAdapter : Microsoft.AspNetCore.JsonPatch.Internal.IAdapter - { - public ListAdapter() { } - public virtual bool TryAdd(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage) { throw null; } - protected virtual bool TryConvertValue(object originalValue, System.Type listTypeArgument, string segment, out object convertedValue, out string errorMessage) { throw null; } - public virtual bool TryGet(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out object value, out string errorMessage) { throw null; } - protected virtual bool TryGetListTypeArgument(System.Collections.IList list, out System.Type listTypeArgument, out string errorMessage) { throw null; } - protected virtual bool TryGetPositionInfo(System.Collections.IList list, string segment, Microsoft.AspNetCore.JsonPatch.Internal.ListAdapter.OperationType operationType, out Microsoft.AspNetCore.JsonPatch.Internal.ListAdapter.PositionInfo positionInfo, out string errorMessage) { throw null; } - public virtual bool TryRemove(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out string errorMessage) { throw null; } - public virtual bool TryReplace(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage) { throw null; } - public virtual bool TryTest(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage) { throw null; } - public virtual bool TryTraverse(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out object value, out string errorMessage) { throw null; } - protected enum OperationType - { - Add = 0, - Remove = 1, - Get = 2, - Replace = 3, - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - protected readonly partial struct PositionInfo - { - private readonly int _dummyPrimitive; - public PositionInfo(Microsoft.AspNetCore.JsonPatch.Internal.ListAdapter.PositionType type, int index) { throw null; } - public int Index { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.JsonPatch.Internal.ListAdapter.PositionType Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - protected enum PositionType - { - Index = 0, - EndOfList = 1, - Invalid = 2, - OutOfBounds = 3, - } - } - public partial class ObjectVisitor - { - public ObjectVisitor(Microsoft.AspNetCore.JsonPatch.Internal.ParsedPath path, Newtonsoft.Json.Serialization.IContractResolver contractResolver) { } - public ObjectVisitor(Microsoft.AspNetCore.JsonPatch.Internal.ParsedPath path, Newtonsoft.Json.Serialization.IContractResolver contractResolver, Microsoft.AspNetCore.JsonPatch.Adapters.IAdapterFactory adapterFactory) { } - public bool TryVisit(ref object target, out Microsoft.AspNetCore.JsonPatch.Internal.IAdapter adapter, out string errorMessage) { throw null; } - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct ParsedPath - { - private readonly object _dummy; - public ParsedPath(string path) { throw null; } - public string LastSegment { get { throw null; } } - public System.Collections.Generic.IReadOnlyList Segments { get { throw null; } } - } - public partial class PocoAdapter : Microsoft.AspNetCore.JsonPatch.Internal.IAdapter - { - public PocoAdapter() { } - public virtual bool TryAdd(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage) { throw null; } - protected virtual bool TryConvertValue(object value, System.Type propertyType, out object convertedValue) { throw null; } - public virtual bool TryGet(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out object value, out string errorMessage) { throw null; } - protected virtual bool TryGetJsonProperty(object target, Newtonsoft.Json.Serialization.IContractResolver contractResolver, string segment, out Newtonsoft.Json.Serialization.JsonProperty jsonProperty) { throw null; } - public virtual bool TryRemove(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out string errorMessage) { throw null; } - public virtual bool TryReplace(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage) { throw null; } - public virtual bool TryTest(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, object value, out string errorMessage) { throw null; } - public virtual bool TryTraverse(object target, string segment, Newtonsoft.Json.Serialization.IContractResolver contractResolver, out object value, out string errorMessage) { throw null; } - } -} -namespace Microsoft.AspNetCore.JsonPatch.Operations -{ - public partial class Operation : Microsoft.AspNetCore.JsonPatch.Operations.OperationBase - { - public Operation() { } - public Operation(string op, string path, string from) { } - public Operation(string op, string path, string from, object value) { } - [Newtonsoft.Json.JsonPropertyAttribute("value")] - public object value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public void Apply(object objectToApplyTo, Microsoft.AspNetCore.JsonPatch.Adapters.IObjectAdapter adapter) { } - public bool ShouldSerializevalue() { throw null; } - } - public partial class OperationBase - { - public OperationBase() { } - public OperationBase(string op, string path, string from) { } - [Newtonsoft.Json.JsonPropertyAttribute("from")] - public string from { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Newtonsoft.Json.JsonPropertyAttribute("op")] - public string op { get { throw null; } set { } } - [Newtonsoft.Json.JsonIgnoreAttribute] - public Microsoft.AspNetCore.JsonPatch.Operations.OperationType OperationType { get { throw null; } } - [Newtonsoft.Json.JsonPropertyAttribute("path")] - public string path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ShouldSerializefrom() { throw null; } - } - public enum OperationType - { - Add = 0, - Remove = 1, - Replace = 2, - Move = 3, - Copy = 4, - Test = 5, - Invalid = 6, - } - public partial class Operation : Microsoft.AspNetCore.JsonPatch.Operations.Operation where TModel : class - { - public Operation() { } - public Operation(string op, string path, string from) { } - public Operation(string op, string path, string from, object value) { } - public void Apply(TModel objectToApplyTo, Microsoft.AspNetCore.JsonPatch.Adapters.IObjectAdapter adapter) { } - } -} diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index 255efbf900..4d2094750b 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -29,14 +29,17 @@ This package is an internal implementation of the .NET Core SDK and is not meant false false - + false PackageOverrides.txt true - + MSB3243 $(NoWarn);NU5131;NU5128 @@ -54,7 +57,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant - false @@ -208,7 +210,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant + Condition=" '$(IsPackable)' == 'true' "> <_TarCommand>tar <_TarCommand Condition="Exists('$(RepoRoot).tools\tar.exe')">$(RepoRoot).tools\tar.exe diff --git a/src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.csproj index 6b19abf98b..961e2af1ec 100644 --- a/src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.csproj +++ b/src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.csproj @@ -2,13 +2,11 @@ netcoreapp3.0 - false - - - - + + + diff --git a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.Manual.cs b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.Manual.cs new file mode 100644 index 0000000000..12132b3838 --- /dev/null +++ b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.Manual.cs @@ -0,0 +1,218 @@ +// 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. + +namespace Microsoft.AspNetCore.Hosting +{ + internal partial class ConfigureBuilder + { + public ConfigureBuilder(System.Reflection.MethodInfo configure) { } + public System.Reflection.MethodInfo MethodInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Action Build(object instance) { throw null; } + } + internal partial class ConfigureContainerBuilder + { + public ConfigureContainerBuilder(System.Reflection.MethodInfo configureContainerMethod) { } + public System.Func, System.Action> ConfigureContainerFilters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Reflection.MethodInfo MethodInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Action Build(object instance) { throw null; } + public System.Type GetContainerType() { throw null; } + } + internal partial class ConfigureServicesBuilder + { + public ConfigureServicesBuilder(System.Reflection.MethodInfo configureServices) { } + public System.Reflection.MethodInfo MethodInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Func, System.Func> StartupServiceFilters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Func Build(object instance) { throw null; } + } + internal partial class GenericWebHostBuilder : Microsoft.AspNetCore.Hosting.ISupportsStartup, Microsoft.AspNetCore.Hosting.ISupportsUseDefaultServiceProvider, Microsoft.AspNetCore.Hosting.IWebHostBuilder + { + public GenericWebHostBuilder(Microsoft.Extensions.Hosting.IHostBuilder builder) { } + public Microsoft.AspNetCore.Hosting.IWebHost Build() { throw null; } + public Microsoft.AspNetCore.Hosting.IWebHostBuilder Configure(System.Action configure) { throw null; } + public Microsoft.AspNetCore.Hosting.IWebHostBuilder ConfigureAppConfiguration(System.Action configureDelegate) { throw null; } + public Microsoft.AspNetCore.Hosting.IWebHostBuilder ConfigureServices(System.Action configureServices) { throw null; } + public Microsoft.AspNetCore.Hosting.IWebHostBuilder ConfigureServices(System.Action configureServices) { throw null; } + public string GetSetting(string key) { throw null; } + public Microsoft.AspNetCore.Hosting.IWebHostBuilder UseDefaultServiceProvider(System.Action configure) { throw null; } + public Microsoft.AspNetCore.Hosting.IWebHostBuilder UseSetting(string key, string value) { throw null; } + public Microsoft.AspNetCore.Hosting.IWebHostBuilder UseStartup(System.Type startupType) { throw null; } + } + internal partial class GenericWebHostService : Microsoft.Extensions.Hosting.IHostedService + { + public GenericWebHostService(Microsoft.Extensions.Options.IOptions options, Microsoft.AspNetCore.Hosting.Server.IServer server, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Http.IHttpContextFactory httpContextFactory, Microsoft.AspNetCore.Hosting.Builder.IApplicationBuilderFactory applicationBuilderFactory, System.Collections.Generic.IEnumerable startupFilters, Microsoft.Extensions.Configuration.IConfiguration configuration, Microsoft.AspNetCore.Hosting.IWebHostEnvironment hostingEnvironment) { } + public Microsoft.AspNetCore.Hosting.Builder.IApplicationBuilderFactory ApplicationBuilderFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.Extensions.Configuration.IConfiguration Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Diagnostics.DiagnosticListener DiagnosticListener { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Hosting.IWebHostEnvironment HostingEnvironment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Http.IHttpContextFactory HttpContextFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.Extensions.Logging.ILogger LifetimeLogger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.Extensions.Logging.ILogger Logger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Hosting.GenericWebHostServiceOptions Options { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Hosting.Server.IServer Server { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IEnumerable StartupFilters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + } + internal partial class GenericWebHostServiceOptions + { + public GenericWebHostServiceOptions() { } + public System.Action ConfigureApplication { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.AggregateException HostingStartupExceptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Hosting.WebHostOptions WebHostOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class HostingApplication : Microsoft.AspNetCore.Hosting.Server.IHttpApplication + { + public HostingApplication(Microsoft.AspNetCore.Http.RequestDelegate application, Microsoft.Extensions.Logging.ILogger logger, System.Diagnostics.DiagnosticListener diagnosticSource, Microsoft.AspNetCore.Http.IHttpContextFactory httpContextFactory) { } + public Microsoft.AspNetCore.Hosting.HostingApplication.Context CreateContext(Microsoft.AspNetCore.Http.Features.IFeatureCollection contextFeatures) { throw null; } + public void DisposeContext(Microsoft.AspNetCore.Hosting.HostingApplication.Context context, System.Exception exception) { } + public System.Threading.Tasks.Task ProcessRequestAsync(Microsoft.AspNetCore.Hosting.HostingApplication.Context context) { throw null; } + internal partial class Context + { + public Context() { } + public System.Diagnostics.Activity Activity { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool EventLogEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal bool HasDiagnosticListener { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Http.HttpContext HttpContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.IDisposable Scope { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public long StartTimestamp { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public void Reset() { } + } + } + internal partial class HostingEnvironment : Microsoft.AspNetCore.Hosting.IHostingEnvironment, Microsoft.AspNetCore.Hosting.IWebHostEnvironment, Microsoft.Extensions.Hosting.IHostEnvironment, Microsoft.Extensions.Hosting.IHostingEnvironment + { + public HostingEnvironment() { } + public string ApplicationName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.Extensions.FileProviders.IFileProvider ContentRootFileProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string ContentRootPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string EnvironmentName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.Extensions.FileProviders.IFileProvider WebRootFileProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string WebRootPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal static partial class HostingEnvironmentExtensions + { + internal static void Initialize(this Microsoft.AspNetCore.Hosting.IHostingEnvironment hostingEnvironment, string contentRootPath, Microsoft.AspNetCore.Hosting.WebHostOptions options) { } + internal static void Initialize(this Microsoft.AspNetCore.Hosting.IWebHostEnvironment hostingEnvironment, string contentRootPath, Microsoft.AspNetCore.Hosting.WebHostOptions options) { } + } + internal sealed partial class HostingEventSource : System.Diagnostics.Tracing.EventSource + { + public static readonly Microsoft.AspNetCore.Hosting.HostingEventSource Log; + internal HostingEventSource() { } + internal HostingEventSource(string eventSourceName) { } + [System.Diagnostics.Tracing.EventAttribute(1, Level=System.Diagnostics.Tracing.EventLevel.Informational)] + public void HostStart() { } + [System.Diagnostics.Tracing.EventAttribute(2, Level=System.Diagnostics.Tracing.EventLevel.Informational)] + public void HostStop() { } + protected override void OnEventCommand(System.Diagnostics.Tracing.EventCommandEventArgs command) { } + internal void RequestFailed() { } + [System.Diagnostics.Tracing.EventAttribute(3, Level=System.Diagnostics.Tracing.EventLevel.Informational)] + public void RequestStart(string method, string path) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)][System.Diagnostics.Tracing.EventAttribute(4, Level=System.Diagnostics.Tracing.EventLevel.Informational)] + public void RequestStop() { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)][System.Diagnostics.Tracing.EventAttribute(5, Level=System.Diagnostics.Tracing.EventLevel.Error)] + public void UnhandledException() { } + } + internal partial class HostingRequestStartingLog : System.Collections.Generic.IEnumerable>, System.Collections.Generic.IReadOnlyCollection>, System.Collections.Generic.IReadOnlyList>, System.Collections.IEnumerable + { + internal static readonly System.Func Callback; + public HostingRequestStartingLog(Microsoft.AspNetCore.Http.HttpContext httpContext) { } + public int Count { get { throw null; } } + public System.Collections.Generic.KeyValuePair this[int index] { get { throw null; } } + public System.Collections.Generic.IEnumerator> GetEnumerator() { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + public override string ToString() { throw null; } + } + internal partial interface ISupportsStartup + { + Microsoft.AspNetCore.Hosting.IWebHostBuilder Configure(System.Action configure); + Microsoft.AspNetCore.Hosting.IWebHostBuilder UseStartup(System.Type startupType); + } + internal partial interface ISupportsUseDefaultServiceProvider + { + Microsoft.AspNetCore.Hosting.IWebHostBuilder UseDefaultServiceProvider(System.Action configure); + } + internal static partial class LoggerEventIds + { + public const int ApplicationStartupException = 6; + public const int ApplicationStoppedException = 8; + public const int ApplicationStoppingException = 7; + public const int HostedServiceStartException = 9; + public const int HostedServiceStopException = 10; + public const int HostingStartupAssemblyException = 11; + public const int RequestFinished = 2; + public const int RequestStarting = 1; + public const int ServerShutdownException = 12; + public const int Shutdown = 5; + public const int Started = 4; + public const int Starting = 3; + } + internal partial class StartupLoader + { + public StartupLoader() { } + internal static Microsoft.AspNetCore.Hosting.ConfigureContainerBuilder FindConfigureContainerDelegate(System.Type startupType, string environmentName) { throw null; } + internal static Microsoft.AspNetCore.Hosting.ConfigureBuilder FindConfigureDelegate(System.Type startupType, string environmentName) { throw null; } + internal static Microsoft.AspNetCore.Hosting.ConfigureServicesBuilder FindConfigureServicesDelegate(System.Type startupType, string environmentName) { throw null; } + public static System.Type FindStartupType(string startupAssemblyName, string environmentName) { throw null; } + internal static bool HasConfigureServicesIServiceProviderDelegate(System.Type startupType, string environmentName) { throw null; } + public static Microsoft.AspNetCore.Hosting.StartupMethods LoadMethods(System.IServiceProvider hostingServiceProvider, System.Type startupType, string environmentName) { throw null; } + } + internal partial class StartupMethods + { + public StartupMethods(object instance, System.Action configure, System.Func configureServices) { } + public System.Action ConfigureDelegate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Func ConfigureServicesDelegate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object StartupInstance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class WebHostOptions + { + public WebHostOptions() { } + public WebHostOptions(Microsoft.Extensions.Configuration.IConfiguration configuration) { } + public WebHostOptions(Microsoft.Extensions.Configuration.IConfiguration configuration, string applicationNameFallback) { } + public string ApplicationName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool CaptureStartupErrors { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string ContentRootPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool DetailedErrors { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Environment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.Generic.IReadOnlyList HostingStartupAssemblies { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.Generic.IReadOnlyList HostingStartupExcludeAssemblies { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool PreventHostingStartup { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.TimeSpan ShutdownTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string StartupAssembly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool SuppressStatusMessages { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string WebRoot { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.Generic.IEnumerable GetFinalHostingStartupAssemblies() { throw null; } + } +} + +namespace Microsoft.AspNetCore.Hosting.StaticWebAssets +{ + internal partial class StaticWebAssetsFileProvider : Microsoft.Extensions.FileProviders.IFileProvider + { + public StaticWebAssetsFileProvider(string pathPrefix, string contentRoot) { } + public Microsoft.AspNetCore.Http.PathString BasePath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.Extensions.FileProviders.PhysicalFileProvider InnerProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.Extensions.FileProviders.IDirectoryContents GetDirectoryContents(string subpath) { throw null; } + public Microsoft.Extensions.FileProviders.IFileInfo GetFileInfo(string subpath) { throw null; } + public Microsoft.Extensions.Primitives.IChangeToken Watch(string filter) { throw null; } + } + public partial class StaticWebAssetsLoader + { + internal const string StaticWebAssetsManifestName = "Microsoft.AspNetCore.StaticWebAssets.xml"; + internal static string GetAssemblyLocation(System.Reflection.Assembly assembly) { throw null; } + internal static System.IO.Stream ResolveManifest(Microsoft.AspNetCore.Hosting.IWebHostEnvironment environment, Microsoft.Extensions.Configuration.IConfiguration configuration) { throw null; } + internal static void UseStaticWebAssetsCore(Microsoft.AspNetCore.Hosting.IWebHostEnvironment environment, System.IO.Stream manifest) { } + } + internal static partial class StaticWebAssetsReader + { + internal static System.Collections.Generic.IEnumerable Parse(System.IO.Stream manifest) { throw null; } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct ContentRootMapping + { + private readonly object _dummy; + public ContentRootMapping(string basePath, string path) { throw null; } + public string BasePath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + } +} diff --git a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj index b05a67027c..8721a47ffc 100644 --- a/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj +++ b/src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj @@ -2,23 +2,23 @@ netcoreapp3.0 - false - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/Hosting/Server.Abstractions/ref/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj b/src/Hosting/Server.Abstractions/ref/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj index 74101ce3e9..6d38841f4e 100644 --- a/src/Hosting/Server.Abstractions/ref/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj +++ b/src/Hosting/Server.Abstractions/ref/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj @@ -2,12 +2,10 @@ netcoreapp3.0 - false - - - + + diff --git a/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.csproj b/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.csproj deleted file mode 100644 index 6bcbe4e83c..0000000000 --- a/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - - - - - diff --git a/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp3.0.cs b/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp3.0.cs deleted file mode 100644 index a9d6aac1e1..0000000000 --- a/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp3.0.cs +++ /dev/null @@ -1,275 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Hosting -{ - public static partial class IWebHostExtensions - { - public static string GetAddress(this Microsoft.AspNetCore.Hosting.IWebHost host) { throw null; } - } -} -namespace Microsoft.AspNetCore.Server.IntegrationTesting -{ - public abstract partial class ApplicationDeployer : System.IDisposable - { - public static readonly string DotnetCommandName; - public ApplicationDeployer(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - protected Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters DeploymentParameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - protected Microsoft.Extensions.Logging.ILogger Logger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - protected Microsoft.Extensions.Logging.ILoggerFactory LoggerFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - protected void AddEnvironmentVariablesToProcess(System.Diagnostics.ProcessStartInfo startInfo, System.Collections.Generic.IDictionary environmentVariables) { } - protected void CleanPublishedOutput() { } - public abstract System.Threading.Tasks.Task DeployAsync(); - public abstract void Dispose(); - protected void DotnetPublish(string publishRoot = null) { } - protected string GetDotNetExeForArchitecture() { throw null; } - protected void InvokeUserApplicationCleanup() { } - protected void ShutDownIfAnyHostProcess(System.Diagnostics.Process hostProcess) { } - protected void StartTimer() { } - protected void StopTimer() { } - protected void TriggerHostShutdown(System.Threading.CancellationTokenSource hostShutdownSource) { } - } - public partial class ApplicationDeployerFactory - { - public ApplicationDeployerFactory() { } - public static Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationDeployer Create(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { throw null; } - } - public partial class ApplicationPublisher - { - public static readonly string DotnetCommandName; - public ApplicationPublisher(string applicationPath) { } - public string ApplicationPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - protected static System.IO.DirectoryInfo CreateTempDirectory() { throw null; } - public virtual System.Threading.Tasks.Task Publish(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILogger logger) { throw null; } - } - public enum ApplicationType - { - Portable = 0, - Standalone = 1, - } - public partial class CachingApplicationPublisher : Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationPublisher, System.IDisposable - { - public CachingApplicationPublisher(string applicationPath) : base (default(string)) { } - public static void CopyFiles(System.IO.DirectoryInfo source, System.IO.DirectoryInfo target, Microsoft.Extensions.Logging.ILogger logger) { } - public void Dispose() { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task Publish(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILogger logger) { throw null; } - } - public partial class DeploymentParameters - { - public DeploymentParameters() { } - public DeploymentParameters(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters parameters) { } - public DeploymentParameters(Microsoft.AspNetCore.Server.IntegrationTesting.TestVariant variant) { } - public DeploymentParameters(string applicationPath, Microsoft.AspNetCore.Server.IntegrationTesting.ServerType serverType, Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeFlavor runtimeFlavor, Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture runtimeArchitecture) { } - public string AdditionalPublishParameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ApplicationBaseUriHint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ApplicationName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ApplicationPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationPublisher ApplicationPublisher { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationType ApplicationType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string EnvironmentName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IDictionary EnvironmentVariables { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Server.IntegrationTesting.HostingModel HostingModel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool PreservePublishedApplicationForDebugging { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool PublishApplicationBeforeDeployment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string PublishedApplicationRootPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IDictionary PublishEnvironmentVariables { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture RuntimeArchitecture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeFlavor RuntimeFlavor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Scheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ServerConfigLocation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ServerConfigTemplateContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.IntegrationTesting.ServerType ServerType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string SiteName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool StatusMessagesEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string TargetFramework { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Action UserAdditionalCleanup { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public override string ToString() { throw null; } - } - public partial class DeploymentResult - { - public DeploymentResult(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, string applicationBaseUri) { } - public DeploymentResult(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, string applicationBaseUri, string contentRoot, System.Threading.CancellationToken hostShutdownToken) { } - public string ApplicationBaseUri { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ContentRoot { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters DeploymentParameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Threading.CancellationToken HostShutdownToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Net.Http.HttpClient HttpClient { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Net.Http.HttpClient CreateHttpClient(System.Net.Http.HttpMessageHandler baseHandler) { throw null; } - } - public static partial class DotNetCommands - { - public static string GetDotNetExecutable(Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture arch) { throw null; } - public static string GetDotNetHome() { throw null; } - public static string GetDotNetInstallDir(Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture arch) { throw null; } - public static bool IsRunningX86OnX64(Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture arch) { throw null; } - } - public enum HostingModel - { - InProcess = 2, - None = 0, - OutOfProcess = 1, - } - public partial class IISExpressAncmSchema - { - public IISExpressAncmSchema() { } - public static string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static bool SupportsInProcessHosting { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - public partial class NginxDeployer : Microsoft.AspNetCore.Server.IntegrationTesting.SelfHostDeployer - { - public NginxDeployer(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) : base (default(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters), default(Microsoft.Extensions.Logging.ILoggerFactory)) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task DeployAsync() { throw null; } - public override void Dispose() { } - } - public partial class PublishedApplication : System.IDisposable - { - public PublishedApplication(string path, Microsoft.Extensions.Logging.ILogger logger) { } - public string Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public void Dispose() { } - } - public partial class RemoteWindowsDeployer : Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationDeployer - { - public RemoteWindowsDeployer(Microsoft.AspNetCore.Server.IntegrationTesting.RemoteWindowsDeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) : base (default(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters), default(Microsoft.Extensions.Logging.ILoggerFactory)) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task DeployAsync() { throw null; } - public override void Dispose() { } - } - public partial class RemoteWindowsDeploymentParameters : Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters - { - public RemoteWindowsDeploymentParameters(string applicationPath, string dotnetRuntimePath, Microsoft.AspNetCore.Server.IntegrationTesting.ServerType serverType, Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeFlavor runtimeFlavor, Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture runtimeArchitecture, string remoteServerFileSharePath, string remoteServerName, string remoteServerAccountName, string remoteServerAccountPassword) { } - public string DotnetRuntimePath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string RemoteServerFileSharePath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ServerAccountName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ServerAccountPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ServerName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - public partial class RetryHelper - { - public RetryHelper() { } - public static void RetryOperation(System.Action retryBlock, System.Action exceptionBlock, int retryCount = 3, int retryDelayMilliseconds = 0) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task RetryRequest(System.Func> retryBlock, Microsoft.Extensions.Logging.ILogger logger, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken), int retryCount = 60) { throw null; } - } - public enum RuntimeArchitecture - { - x64 = 0, - x86 = 1, - } - public enum RuntimeFlavor - { - Clr = 2, - CoreClr = 1, - None = 0, - } - public partial class SelfHostDeployer : Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationDeployer - { - public SelfHostDeployer(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) : base (default(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters), default(Microsoft.Extensions.Logging.ILoggerFactory)) { } - public System.Diagnostics.Process HostProcess { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task DeployAsync() { throw null; } - public override void Dispose() { } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected System.Threading.Tasks.Task> StartSelfHostAsync(System.Uri hintUrl) { throw null; } - } - public enum ServerType - { - HttpSys = 3, - IIS = 2, - IISExpress = 1, - Kestrel = 4, - Nginx = 5, - None = 0, - } - [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=true)] - public partial class SkipIfEnvironmentVariableNotEnabledAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition - { - public SkipIfEnvironmentVariableNotEnabledAttribute(string environmentVariableName) { } - public string AdditionalInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsMet { get { throw null; } } - public string SkipReason { get { throw null; } } - } - [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method)] - public sealed partial class SkipIfIISExpressSchemaMissingInProcessAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition - { - public SkipIfIISExpressSchemaMissingInProcessAttribute() { } - public bool IsMet { get { throw null; } } - public string SkipReason { get { throw null; } } - } - [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)] - public partial class SkipOn32BitOSAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition - { - public SkipOn32BitOSAttribute() { } - public bool IsMet { get { throw null; } } - public string SkipReason { get { throw null; } } - } - public partial class TestMatrix : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable - { - public TestMatrix() { } - public System.Collections.Generic.IList ApplicationTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IList Architectures { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IList HostingModels { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IList Servers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IList Tfms { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public static Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix ForServers(params Microsoft.AspNetCore.Server.IntegrationTesting.ServerType[] types) { throw null; } - public System.Collections.Generic.IEnumerator GetEnumerator() { throw null; } - public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix Skip(string message, System.Func check) { throw null; } - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } - public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithAllApplicationTypes() { throw null; } - public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithAllArchitectures() { throw null; } - public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithAllHostingModels() { throw null; } - public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithAncmV2InProcess() { throw null; } - public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithApplicationTypes(params Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationType[] types) { throw null; } - public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithArchitectures(params Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture[] archs) { throw null; } - public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithHostingModels(params Microsoft.AspNetCore.Server.IntegrationTesting.HostingModel[] models) { throw null; } - public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithTfms(params string[] tfms) { throw null; } - } - public partial class TestVariant : Xunit.Abstractions.IXunitSerializable - { - public TestVariant() { } - public Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationType ApplicationType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture Architecture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.IntegrationTesting.HostingModel HostingModel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.IntegrationTesting.ServerType Server { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Skip { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Tfm { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public void Deserialize(Xunit.Abstractions.IXunitSerializationInfo info) { } - public void Serialize(Xunit.Abstractions.IXunitSerializationInfo info) { } - public override string ToString() { throw null; } - } - public static partial class Tfm - { - public const string Net461 = "net461"; - public const string NetCoreApp20 = "netcoreapp2.0"; - public const string NetCoreApp21 = "netcoreapp2.1"; - public const string NetCoreApp22 = "netcoreapp2.2"; - public const string NetCoreApp30 = "netcoreapp3.0"; - public static bool Matches(string tfm1, string tfm2) { throw null; } - } -} -namespace Microsoft.AspNetCore.Server.IntegrationTesting.Common -{ - public static partial class TestPortHelper - { - public static int GetNextPort() { throw null; } - public static int GetNextSSLPort() { throw null; } - } - public static partial class TestUriHelper - { - public static System.Uri BuildTestUri(Microsoft.AspNetCore.Server.IntegrationTesting.ServerType serverType) { throw null; } - public static System.Uri BuildTestUri(Microsoft.AspNetCore.Server.IntegrationTesting.ServerType serverType, string hint) { throw null; } - } - public static partial class TestUrlHelper - { - public static string GetTestUrl(Microsoft.AspNetCore.Server.IntegrationTesting.ServerType serverType) { throw null; } - } -} -namespace System.Diagnostics -{ - public static partial class ProcessLoggingExtensions - { - public static void StartAndCaptureOutAndErrToLogger(this System.Diagnostics.Process process, string prefix, Microsoft.Extensions.Logging.ILogger logger) { } - } -} diff --git a/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.csproj b/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.csproj deleted file mode 100644 index 3e9b20abad..0000000000 --- a/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - diff --git a/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.netcoreapp3.0.cs b/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.netcoreapp3.0.cs deleted file mode 100644 index ed7536b490..0000000000 --- a/src/Hosting/TestHost/ref/Microsoft.AspNetCore.TestHost.netcoreapp3.0.cs +++ /dev/null @@ -1,77 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.TestHost -{ - public partial class ClientHandler : System.Net.Http.HttpMessageHandler - { - internal ClientHandler() { } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task SendAsync(System.Net.Http.HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { throw null; } - } - public static partial class HostBuilderTestServerExtensions - { - public static System.Net.Http.HttpClient GetTestClient(this Microsoft.Extensions.Hosting.IHost host) { throw null; } - public static Microsoft.AspNetCore.TestHost.TestServer GetTestServer(this Microsoft.Extensions.Hosting.IHost host) { throw null; } - } - public partial class HttpResetTestException : System.Exception - { - public HttpResetTestException(int errorCode) { } - public int ErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - public partial class RequestBuilder - { - public RequestBuilder(Microsoft.AspNetCore.TestHost.TestServer server, string path) { } - public Microsoft.AspNetCore.TestHost.TestServer TestServer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.TestHost.RequestBuilder AddHeader(string name, string value) { throw null; } - public Microsoft.AspNetCore.TestHost.RequestBuilder And(System.Action configure) { throw null; } - public System.Threading.Tasks.Task GetAsync() { throw null; } - public System.Threading.Tasks.Task PostAsync() { throw null; } - public System.Threading.Tasks.Task SendAsync(string method) { throw null; } - } - public partial class TestServer : Microsoft.AspNetCore.Hosting.Server.IServer, System.IDisposable - { - public TestServer(Microsoft.AspNetCore.Hosting.IWebHostBuilder builder) { } - public TestServer(Microsoft.AspNetCore.Hosting.IWebHostBuilder builder, Microsoft.AspNetCore.Http.Features.IFeatureCollection featureCollection) { } - public TestServer(System.IServiceProvider services) { } - public TestServer(System.IServiceProvider services, Microsoft.AspNetCore.Http.Features.IFeatureCollection featureCollection) { } - public bool AllowSynchronousIO { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Uri BaseAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.Features.IFeatureCollection Features { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Hosting.IWebHost Host { get { throw null; } } - public bool PreserveExecutionContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.IServiceProvider Services { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Net.Http.HttpClient CreateClient() { throw null; } - public System.Net.Http.HttpMessageHandler CreateHandler() { throw null; } - public Microsoft.AspNetCore.TestHost.RequestBuilder CreateRequest(string path) { throw null; } - public Microsoft.AspNetCore.TestHost.WebSocketClient CreateWebSocketClient() { throw null; } - public void Dispose() { } - System.Threading.Tasks.Task Microsoft.AspNetCore.Hosting.Server.IServer.StartAsync(Microsoft.AspNetCore.Hosting.Server.IHttpApplication application, System.Threading.CancellationToken cancellationToken) { throw null; } - System.Threading.Tasks.Task Microsoft.AspNetCore.Hosting.Server.IServer.StopAsync(System.Threading.CancellationToken cancellationToken) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task SendAsync(System.Action configureContext, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public static partial class WebHostBuilderExtensions - { - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder ConfigureTestContainer(this Microsoft.AspNetCore.Hosting.IWebHostBuilder webHostBuilder, System.Action servicesConfiguration) { throw null; } - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder ConfigureTestServices(this Microsoft.AspNetCore.Hosting.IWebHostBuilder webHostBuilder, System.Action servicesConfiguration) { throw null; } - public static System.Net.Http.HttpClient GetTestClient(this Microsoft.AspNetCore.Hosting.IWebHost host) { throw null; } - public static Microsoft.AspNetCore.TestHost.TestServer GetTestServer(this Microsoft.AspNetCore.Hosting.IWebHost host) { throw null; } - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseSolutionRelativeContentRoot(this Microsoft.AspNetCore.Hosting.IWebHostBuilder builder, string solutionRelativePath, string solutionName = "*.sln") { throw null; } - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseSolutionRelativeContentRoot(this Microsoft.AspNetCore.Hosting.IWebHostBuilder builder, string solutionRelativePath, string applicationBasePath, string solutionName = "*.sln") { throw null; } - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseTestServer(this Microsoft.AspNetCore.Hosting.IWebHostBuilder builder) { throw null; } - } - public static partial class WebHostBuilderFactory - { - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder CreateFromAssemblyEntryPoint(System.Reflection.Assembly assembly, string[] args) { throw null; } - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder CreateFromTypesAssemblyEntryPoint(string[] args) { throw null; } - } - public partial class WebSocketClient - { - internal WebSocketClient() { } - public System.Action ConfigureRequest { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IList SubProtocols { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task ConnectAsync(System.Uri uri, System.Threading.CancellationToken cancellationToken) { throw null; } - } -} diff --git a/src/Hosting/WindowsServices/ref/Microsoft.AspNetCore.Hosting.WindowsServices.csproj b/src/Hosting/WindowsServices/ref/Microsoft.AspNetCore.Hosting.WindowsServices.csproj deleted file mode 100644 index 6ddfceca7c..0000000000 --- a/src/Hosting/WindowsServices/ref/Microsoft.AspNetCore.Hosting.WindowsServices.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - diff --git a/src/Hosting/WindowsServices/ref/Microsoft.AspNetCore.Hosting.WindowsServices.netcoreapp3.0.cs b/src/Hosting/WindowsServices/ref/Microsoft.AspNetCore.Hosting.WindowsServices.netcoreapp3.0.cs deleted file mode 100644 index 0bcdd5d17c..0000000000 --- a/src/Hosting/WindowsServices/ref/Microsoft.AspNetCore.Hosting.WindowsServices.netcoreapp3.0.cs +++ /dev/null @@ -1,21 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Hosting.WindowsServices -{ - [System.ComponentModel.DesignerCategoryAttribute("Code")] - public partial class WebHostService : System.ServiceProcess.ServiceBase - { - public WebHostService(Microsoft.AspNetCore.Hosting.IWebHost host) { } - protected sealed override void OnStart(string[] args) { } - protected virtual void OnStarted() { } - protected virtual void OnStarting(string[] args) { } - protected sealed override void OnStop() { } - protected virtual void OnStopped() { } - protected virtual void OnStopping() { } - } - public static partial class WebHostWindowsServiceExtensions - { - public static void RunAsService(this Microsoft.AspNetCore.Hosting.IWebHost host) { } - } -} diff --git a/src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj b/src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj index da860f1783..3ea37b679b 100644 --- a/src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj +++ b/src/Hosting/test/testassets/IStartupInjectionAssemblyName/IStartupInjectionAssemblyName.csproj @@ -6,11 +6,6 @@ - - - diff --git a/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.Manual.cs b/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.Manual.cs new file mode 100644 index 0000000000..3cb6aab378 --- /dev/null +++ b/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.Manual.cs @@ -0,0 +1,13 @@ +// 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. + +namespace Microsoft.AspNetCore.Html +{ + public partial class HtmlContentBuilder : Microsoft.AspNetCore.Html.IHtmlContent, Microsoft.AspNetCore.Html.IHtmlContentBuilder, Microsoft.AspNetCore.Html.IHtmlContentContainer + { + internal System.Collections.Generic.IList Entries + { + [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } + } + } +} diff --git a/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.csproj b/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.csproj index 20451ebbd5..676449b513 100644 --- a/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.csproj +++ b/src/Html/Abstractions/ref/Microsoft.AspNetCore.Html.Abstractions.csproj @@ -2,11 +2,10 @@ netcoreapp3.0 - false - - + + diff --git a/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.csproj b/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.csproj index 8f174166c1..559a3c2cfb 100644 --- a/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.csproj +++ b/src/Http/Authentication.Abstractions/ref/Microsoft.AspNetCore.Authentication.Abstractions.csproj @@ -2,13 +2,11 @@ netcoreapp3.0 - false - - - - + + + diff --git a/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.csproj b/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.csproj index 4be3f75582..0a0f96fe91 100644 --- a/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.csproj +++ b/src/Http/Authentication.Core/ref/Microsoft.AspNetCore.Authentication.Core.csproj @@ -2,13 +2,11 @@ netcoreapp3.0 - false - - - - + + + diff --git a/src/Http/Headers/ref/Microsoft.Net.Http.Headers.Manual.cs b/src/Http/Headers/ref/Microsoft.Net.Http.Headers.Manual.cs new file mode 100644 index 0000000000..86a0a12079 --- /dev/null +++ b/src/Http/Headers/ref/Microsoft.Net.Http.Headers.Manual.cs @@ -0,0 +1,10 @@ +// 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. + +namespace Microsoft.Net.Http.Headers +{ + public partial class SetCookieHeaderValue + { + internal static bool SuppressSameSiteNone; + } +} diff --git a/src/Http/Headers/ref/Microsoft.Net.Http.Headers.csproj b/src/Http/Headers/ref/Microsoft.Net.Http.Headers.csproj index 167dfca0e1..8c483d68a0 100644 --- a/src/Http/Headers/ref/Microsoft.Net.Http.Headers.csproj +++ b/src/Http/Headers/ref/Microsoft.Net.Http.Headers.csproj @@ -2,11 +2,11 @@ netcoreapp3.0 - false - - + + + diff --git a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.Manual.cs b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.Manual.cs new file mode 100644 index 0000000000..0d0ec8f3a5 --- /dev/null +++ b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.Manual.cs @@ -0,0 +1,101 @@ +// 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. + +namespace Microsoft.AspNetCore.Builder +{ + public static partial class UseMiddlewareExtensions + { + internal const string InvokeAsyncMethodName = "InvokeAsync"; + internal const string InvokeMethodName = "Invoke"; + } +} + +namespace Microsoft.AspNetCore.Http +{ + internal static partial class ParsingHelpers + { + public static void AppendHeaderJoined(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key, params string[] values) { } + public static void AppendHeaderUnmodified(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key, Microsoft.Extensions.Primitives.StringValues values) { } + public static Microsoft.Extensions.Primitives.StringValues GetHeader(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key) { throw null; } + public static Microsoft.Extensions.Primitives.StringValues GetHeaderSplit(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key) { throw null; } + public static Microsoft.Extensions.Primitives.StringValues GetHeaderUnmodified(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key) { throw null; } + public static void SetHeaderJoined(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key, Microsoft.Extensions.Primitives.StringValues value) { } + public static void SetHeaderUnmodified(Microsoft.AspNetCore.Http.IHeaderDictionary headers, string key, Microsoft.Extensions.Primitives.StringValues? values) { } + } +} + +namespace Microsoft.AspNetCore.Http.Abstractions +{ + internal static partial class Resources + { + internal static string ArgumentCannotBeNullOrEmpty { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static string Exception_InvokeDoesNotSupportRefOrOutParams { get { throw null; } } + internal static string Exception_InvokeMiddlewareNoService { get { throw null; } } + internal static string Exception_PathMustStartWithSlash { get { throw null; } } + internal static string Exception_PortMustBeGreaterThanZero { get { throw null; } } + internal static string Exception_UseMiddleMutlipleInvokes { get { throw null; } } + internal static string Exception_UseMiddlewareExplicitArgumentsNotSupported { get { throw null; } } + internal static string Exception_UseMiddlewareIServiceProviderNotAvailable { get { throw null; } } + internal static string Exception_UseMiddlewareNoInvokeMethod { get { throw null; } } + internal static string Exception_UseMiddlewareNoMiddlewareFactory { get { throw null; } } + internal static string Exception_UseMiddlewareNonTaskReturnType { get { throw null; } } + internal static string Exception_UseMiddlewareNoParameters { get { throw null; } } + internal static string Exception_UseMiddlewareUnableToCreateMiddleware { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string RouteValueDictionary_DuplicateKey { get { throw null; } } + internal static string RouteValueDictionary_DuplicatePropertyName { get { throw null; } } + internal static string FormatException_InvokeDoesNotSupportRefOrOutParams(object p0) { throw null; } + internal static string FormatException_InvokeMiddlewareNoService(object p0, object p1) { throw null; } + internal static string FormatException_PathMustStartWithSlash(object p0) { throw null; } + internal static string FormatException_UseMiddleMutlipleInvokes(object p0, object p1) { throw null; } + internal static string FormatException_UseMiddlewareExplicitArgumentsNotSupported(object p0) { throw null; } + internal static string FormatException_UseMiddlewareIServiceProviderNotAvailable(object p0) { throw null; } + internal static string FormatException_UseMiddlewareNoInvokeMethod(object p0, object p1, object p2) { throw null; } + internal static string FormatException_UseMiddlewareNoMiddlewareFactory(object p0) { throw null; } + internal static string FormatException_UseMiddlewareNonTaskReturnType(object p0, object p1, object p2) { throw null; } + internal static string FormatException_UseMiddlewareNoParameters(object p0, object p1, object p2) { throw null; } + internal static string FormatException_UseMiddlewareUnableToCreateMiddleware(object p0, object p1) { throw null; } + internal static string FormatRouteValueDictionary_DuplicateKey(object p0, object p1) { throw null; } + internal static string FormatRouteValueDictionary_DuplicatePropertyName(object p0, object p1, object p2, object p3) { throw null; } + } +} + +namespace Microsoft.AspNetCore.Routing +{ + public partial class RouteValueDictionary : System.Collections.Generic.ICollection>, System.Collections.Generic.IDictionary, System.Collections.Generic.IEnumerable>, System.Collections.Generic.IReadOnlyCollection>, System.Collections.Generic.IReadOnlyDictionary, System.Collections.IEnumerable + { + internal System.Collections.Generic.KeyValuePair[] _arrayStorage; + internal Microsoft.AspNetCore.Routing.RouteValueDictionary.PropertyStorage _propertyStorage; + internal partial class PropertyStorage + { + public readonly Microsoft.Extensions.Internal.PropertyHelper[] Properties; + public readonly object Value; + public PropertyStorage(object value) { } + } + } +} + +namespace Microsoft.Extensions.Internal +{ + internal partial class PropertyHelper + { + public PropertyHelper(System.Reflection.PropertyInfo property) { } + public virtual string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public System.Reflection.PropertyInfo Property { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Func ValueGetter { get { throw null; } } + public System.Action ValueSetter { get { throw null; } } + public static Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Reflection.TypeInfo typeInfo) { throw null; } + public static Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Type type) { throw null; } + protected static Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Type type, System.Func createPropertyHelper, System.Collections.Concurrent.ConcurrentDictionary cache) { throw null; } + public object GetValue(object instance) { throw null; } + public static Microsoft.Extensions.Internal.PropertyHelper[] GetVisibleProperties(System.Reflection.TypeInfo typeInfo) { throw null; } + public static Microsoft.Extensions.Internal.PropertyHelper[] GetVisibleProperties(System.Type type) { throw null; } + protected static Microsoft.Extensions.Internal.PropertyHelper[] GetVisibleProperties(System.Type type, System.Func createPropertyHelper, System.Collections.Concurrent.ConcurrentDictionary allPropertiesCache, System.Collections.Concurrent.ConcurrentDictionary visiblePropertiesCache) { throw null; } + public static System.Func MakeFastPropertyGetter(System.Reflection.PropertyInfo propertyInfo) { throw null; } + public static System.Action MakeFastPropertySetter(System.Reflection.PropertyInfo propertyInfo) { throw null; } + public static System.Func MakeNullSafeFastPropertyGetter(System.Reflection.PropertyInfo propertyInfo) { throw null; } + public static System.Collections.Generic.IDictionary ObjectToDictionary(object value) { throw null; } + public void SetValue(object instance, object value) { } + } +} diff --git a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj index 2d9a7fc6c2..93577496d6 100644 --- a/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj +++ b/src/Http/Http.Abstractions/ref/Microsoft.AspNetCore.Http.Abstractions.csproj @@ -2,13 +2,14 @@ netcoreapp3.0 - false - - - - + + + + + + diff --git a/src/Http/Http.Extensions/ref/Microsoft.AspNetCore.Http.Extensions.csproj b/src/Http/Http.Extensions/ref/Microsoft.AspNetCore.Http.Extensions.csproj index cb0f176577..059cb3a94a 100644 --- a/src/Http/Http.Extensions/ref/Microsoft.AspNetCore.Http.Extensions.csproj +++ b/src/Http/Http.Extensions/ref/Microsoft.AspNetCore.Http.Extensions.csproj @@ -2,13 +2,11 @@ netcoreapp3.0 - false - - - - + + + diff --git a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj index 410b369e19..751310909c 100644 --- a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj +++ b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj @@ -2,17 +2,15 @@ netstandard2.0;netcoreapp3.0 - false - - - + + - - + + diff --git a/src/Http/Http/ref/Microsoft.AspNetCore.Http.Manual.cs b/src/Http/Http/ref/Microsoft.AspNetCore.Http.Manual.cs new file mode 100644 index 0000000000..9709a96e49 --- /dev/null +++ b/src/Http/Http/ref/Microsoft.AspNetCore.Http.Manual.cs @@ -0,0 +1,40 @@ +// 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. + +namespace Microsoft.AspNetCore.Http +{ + internal partial class RequestCookieCollection : Microsoft.AspNetCore.Http.IRequestCookieCollection, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + { + public static readonly Microsoft.AspNetCore.Http.RequestCookieCollection Empty; + public RequestCookieCollection() { } + public RequestCookieCollection(System.Collections.Generic.Dictionary store) { } + public RequestCookieCollection(int capacity) { } + public int Count { get { throw null; } } + public string this[string key] { get { throw null; } } + public System.Collections.Generic.ICollection Keys { get { throw null; } } + public bool ContainsKey(string key) { throw null; } + public Microsoft.AspNetCore.Http.RequestCookieCollection.Enumerator GetEnumerator() { throw null; } + public static Microsoft.AspNetCore.Http.RequestCookieCollection Parse(System.Collections.Generic.IList values) { throw null; } + System.Collections.Generic.IEnumerator> System.Collections.Generic.IEnumerable>.GetEnumerator() { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + public bool TryGetValue(string key, out string value) { throw null; } + public partial struct Enumerator : System.Collections.Generic.IEnumerator>, System.Collections.IEnumerator, System.IDisposable + { + internal Enumerator(System.Collections.Generic.Dictionary.Enumerator dictionaryEnumerator) { throw null; } + public System.Collections.Generic.KeyValuePair Current { get { throw null; } } + object System.Collections.IEnumerator.Current { get { throw null; } } + public void Dispose() { } + public bool MoveNext() { throw null; } + public void Reset() { } + } + } + + internal partial class ResponseCookies : Microsoft.AspNetCore.Http.IResponseCookies + { + public ResponseCookies(Microsoft.AspNetCore.Http.IHeaderDictionary headers, Microsoft.Extensions.ObjectPool.ObjectPool builderPool) { } + public void Append(string key, string value) { } + public void Append(string key, string value, Microsoft.AspNetCore.Http.CookieOptions options) { } + public void Delete(string key) { } + public void Delete(string key, Microsoft.AspNetCore.Http.CookieOptions options) { } + } +} diff --git a/src/Http/Http/ref/Microsoft.AspNetCore.Http.csproj b/src/Http/Http/ref/Microsoft.AspNetCore.Http.csproj index ee10cacf37..87f9b707d4 100644 --- a/src/Http/Http/ref/Microsoft.AspNetCore.Http.csproj +++ b/src/Http/Http/ref/Microsoft.AspNetCore.Http.csproj @@ -2,15 +2,15 @@ netcoreapp3.0 - false - - - - - - + + + + + + + diff --git a/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj b/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj index 4507a5bf69..da5e9234e8 100644 --- a/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj +++ b/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj @@ -2,11 +2,8 @@ netstandard2.0 - false - - diff --git a/src/Http/Owin/ref/Microsoft.AspNetCore.Owin.csproj b/src/Http/Owin/ref/Microsoft.AspNetCore.Owin.csproj deleted file mode 100644 index d053acd1b3..0000000000 --- a/src/Http/Owin/ref/Microsoft.AspNetCore.Owin.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - netcoreapp3.0 - - - - - - diff --git a/src/Http/Owin/ref/Microsoft.AspNetCore.Owin.netcoreapp3.0.cs b/src/Http/Owin/ref/Microsoft.AspNetCore.Owin.netcoreapp3.0.cs deleted file mode 100644 index 84de949d34..0000000000 --- a/src/Http/Owin/ref/Microsoft.AspNetCore.Owin.netcoreapp3.0.cs +++ /dev/null @@ -1,155 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Builder -{ - public static partial class OwinExtensions - { - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseBuilder(this System.Action, System.Threading.Tasks.Task>, System.Func, System.Threading.Tasks.Task>>> app) { throw null; } - public static System.Action, System.Threading.Tasks.Task>, System.Func, System.Threading.Tasks.Task>>> UseBuilder(this System.Action, System.Threading.Tasks.Task>, System.Func, System.Threading.Tasks.Task>>> app, System.Action pipeline) { throw null; } - public static System.Action, System.Threading.Tasks.Task>, System.Func, System.Threading.Tasks.Task>>> UseBuilder(this System.Action, System.Threading.Tasks.Task>, System.Func, System.Threading.Tasks.Task>>> app, System.Action pipeline, System.IServiceProvider serviceProvider) { throw null; } - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseBuilder(this System.Action, System.Threading.Tasks.Task>, System.Func, System.Threading.Tasks.Task>>> app, System.IServiceProvider serviceProvider) { throw null; } - public static System.Action, System.Threading.Tasks.Task>, System.Func, System.Threading.Tasks.Task>>> UseOwin(this Microsoft.AspNetCore.Builder.IApplicationBuilder builder) { throw null; } - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseOwin(this Microsoft.AspNetCore.Builder.IApplicationBuilder builder, System.Action, System.Threading.Tasks.Task>, System.Func, System.Threading.Tasks.Task>>>> pipeline) { throw null; } - } -} -namespace Microsoft.AspNetCore.Owin -{ - public partial interface IOwinEnvironmentFeature - { - System.Collections.Generic.IDictionary Environment { get; set; } - } - public partial class OwinEnvironment : System.Collections.Generic.ICollection>, System.Collections.Generic.IDictionary, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable - { - public OwinEnvironment(Microsoft.AspNetCore.Http.HttpContext context) { } - public System.Collections.Generic.IDictionary FeatureMaps { get { throw null; } } - int System.Collections.Generic.ICollection>.Count { get { throw null; } } - bool System.Collections.Generic.ICollection>.IsReadOnly { get { throw null; } } - object System.Collections.Generic.IDictionary.this[string key] { get { throw null; } set { } } - System.Collections.Generic.ICollection System.Collections.Generic.IDictionary.Keys { get { throw null; } } - System.Collections.Generic.ICollection System.Collections.Generic.IDictionary.Values { get { throw null; } } - public System.Collections.Generic.IEnumerator> GetEnumerator() { throw null; } - void System.Collections.Generic.ICollection>.Add(System.Collections.Generic.KeyValuePair item) { } - void System.Collections.Generic.ICollection>.Clear() { } - bool System.Collections.Generic.ICollection>.Contains(System.Collections.Generic.KeyValuePair item) { throw null; } - void System.Collections.Generic.ICollection>.CopyTo(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { } - bool System.Collections.Generic.ICollection>.Remove(System.Collections.Generic.KeyValuePair item) { throw null; } - void System.Collections.Generic.IDictionary.Add(string key, object value) { } - bool System.Collections.Generic.IDictionary.ContainsKey(string key) { throw null; } - bool System.Collections.Generic.IDictionary.Remove(string key) { throw null; } - bool System.Collections.Generic.IDictionary.TryGetValue(string key, out object value) { throw null; } - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } - public partial class FeatureMap - { - public FeatureMap(System.Type featureInterface, System.Func getter) { } - public FeatureMap(System.Type featureInterface, System.Func getter, System.Action setter) { } - public FeatureMap(System.Type featureInterface, System.Func getter, System.Func defaultFactory) { } - public FeatureMap(System.Type featureInterface, System.Func getter, System.Func defaultFactory, System.Action setter) { } - public FeatureMap(System.Type featureInterface, System.Func getter, System.Func defaultFactory, System.Action setter, System.Func featureFactory) { } - public bool CanSet { get { throw null; } } - } - public partial class FeatureMap : Microsoft.AspNetCore.Owin.OwinEnvironment.FeatureMap - { - public FeatureMap(System.Func getter) : base (default(System.Type), default(System.Func)) { } - public FeatureMap(System.Func getter, System.Action setter) : base (default(System.Type), default(System.Func)) { } - public FeatureMap(System.Func getter, System.Func defaultFactory) : base (default(System.Type), default(System.Func)) { } - public FeatureMap(System.Func getter, System.Func defaultFactory, System.Action setter) : base (default(System.Type), default(System.Func)) { } - public FeatureMap(System.Func getter, System.Func defaultFactory, System.Action setter, System.Func featureFactory) : base (default(System.Type), default(System.Func)) { } - } - } - public partial class OwinEnvironmentFeature : Microsoft.AspNetCore.Owin.IOwinEnvironmentFeature - { - public OwinEnvironmentFeature() { } - public System.Collections.Generic.IDictionary Environment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class OwinFeatureCollection : Microsoft.AspNetCore.Http.Features.Authentication.IHttpAuthenticationFeature, Microsoft.AspNetCore.Http.Features.IFeatureCollection, Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature, Microsoft.AspNetCore.Http.Features.IHttpRequestFeature, Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature, Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature, Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature, Microsoft.AspNetCore.Http.Features.IHttpResponseFeature, Microsoft.AspNetCore.Http.Features.IHttpWebSocketFeature, Microsoft.AspNetCore.Http.Features.ITlsConnectionFeature, Microsoft.AspNetCore.Owin.IOwinEnvironmentFeature, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable - { - public OwinFeatureCollection(System.Collections.Generic.IDictionary environment) { } - public System.Collections.Generic.IDictionary Environment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsReadOnly { get { throw null; } } - public object this[System.Type key] { get { throw null; } set { } } - System.Security.Claims.ClaimsPrincipal Microsoft.AspNetCore.Http.Features.Authentication.IHttpAuthenticationFeature.User { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.ConnectionId { get { throw null; } set { } } - System.Net.IPAddress Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.LocalIpAddress { get { throw null; } set { } } - int Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.LocalPort { get { throw null; } set { } } - System.Net.IPAddress Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.RemoteIpAddress { get { throw null; } set { } } - int Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.RemotePort { get { throw null; } set { } } - System.IO.Stream Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Body { get { throw null; } set { } } - Microsoft.AspNetCore.Http.IHeaderDictionary Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Headers { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Method { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Path { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.PathBase { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Protocol { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.QueryString { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.RawTarget { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Scheme { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature.TraceIdentifier { get { throw null; } set { } } - System.Threading.CancellationToken Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature.RequestAborted { get { throw null; } set { } } - System.IO.Stream Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.Stream { get { throw null; } } - System.IO.Pipelines.PipeWriter Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.Writer { get { throw null; } } - System.IO.Stream Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.Body { get { throw null; } set { } } - bool Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.HasStarted { get { throw null; } } - Microsoft.AspNetCore.Http.IHeaderDictionary Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.Headers { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.ReasonPhrase { get { throw null; } set { } } - int Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.StatusCode { get { throw null; } set { } } - bool Microsoft.AspNetCore.Http.Features.IHttpWebSocketFeature.IsWebSocketRequest { get { throw null; } } - System.Security.Cryptography.X509Certificates.X509Certificate2 Microsoft.AspNetCore.Http.Features.ITlsConnectionFeature.ClientCertificate { get { throw null; } set { } } - public int Revision { get { throw null; } } - public bool SupportsWebSockets { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public void Dispose() { } - public object Get(System.Type key) { throw null; } - public System.Collections.Generic.IEnumerator> GetEnumerator() { throw null; } - public TFeature Get() { throw null; } - void Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature.Abort() { } - System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.CompleteAsync() { throw null; } - void Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.DisableBuffering() { } - System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.SendFileAsync(string path, long offset, long? length, System.Threading.CancellationToken cancellation) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.StartAsync(System.Threading.CancellationToken cancellationToken) { throw null; } - void Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.OnCompleted(System.Func callback, object state) { } - void Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.OnStarting(System.Func callback, object state) { } - System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.IHttpWebSocketFeature.AcceptAsync(Microsoft.AspNetCore.Http.WebSocketAcceptContext context) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.ITlsConnectionFeature.GetClientCertificateAsync(System.Threading.CancellationToken cancellationToken) { throw null; } - public void Set(System.Type key, object value) { } - public void Set(TFeature instance) { } - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } - } - public partial class OwinWebSocketAcceptAdapter - { - internal OwinWebSocketAcceptAdapter() { } - public static System.Func, System.Threading.Tasks.Task> AdaptWebSockets(System.Func, System.Threading.Tasks.Task> next) { throw null; } - } - public partial class OwinWebSocketAcceptContext : Microsoft.AspNetCore.Http.WebSocketAcceptContext - { - public OwinWebSocketAcceptContext() { } - public OwinWebSocketAcceptContext(System.Collections.Generic.IDictionary options) { } - public System.Collections.Generic.IDictionary Options { get { throw null; } } - public override string SubProtocol { get { throw null; } set { } } - } - public partial class OwinWebSocketAdapter : System.Net.WebSockets.WebSocket - { - public OwinWebSocketAdapter(System.Collections.Generic.IDictionary websocketContext, string subProtocol) { } - public override System.Net.WebSockets.WebSocketCloseStatus? CloseStatus { get { throw null; } } - public override string CloseStatusDescription { get { throw null; } } - public override System.Net.WebSockets.WebSocketState State { get { throw null; } } - public override string SubProtocol { get { throw null; } } - public override void Abort() { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task CloseAsync(System.Net.WebSockets.WebSocketCloseStatus closeStatus, string statusDescription, System.Threading.CancellationToken cancellationToken) { throw null; } - public override System.Threading.Tasks.Task CloseOutputAsync(System.Net.WebSockets.WebSocketCloseStatus closeStatus, string statusDescription, System.Threading.CancellationToken cancellationToken) { throw null; } - public override void Dispose() { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task ReceiveAsync(System.ArraySegment buffer, System.Threading.CancellationToken cancellationToken) { throw null; } - public override System.Threading.Tasks.Task SendAsync(System.ArraySegment buffer, System.Net.WebSockets.WebSocketMessageType messageType, bool endOfMessage, System.Threading.CancellationToken cancellationToken) { throw null; } - } - public partial class WebSocketAcceptAdapter - { - public WebSocketAcceptAdapter(System.Collections.Generic.IDictionary env, System.Func> accept) { } - public static System.Func, System.Threading.Tasks.Task> AdaptWebSockets(System.Func, System.Threading.Tasks.Task> next) { throw null; } - } - public partial class WebSocketAdapter - { - internal WebSocketAdapter() { } - } -} diff --git a/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.Manual.cs b/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.Manual.cs deleted file mode 100644 index 9a0e3418cf..0000000000 --- a/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.Manual.cs +++ /dev/null @@ -1,13 +0,0 @@ -// 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.Runtime.CompilerServices; -using Microsoft.AspNetCore.Routing; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; - -[assembly: TypeForwardedTo(typeof(IEndpointFeature))] -[assembly: TypeForwardedTo(typeof(IRouteValuesFeature))] -[assembly: TypeForwardedTo(typeof(Endpoint))] -[assembly: TypeForwardedTo(typeof(EndpointMetadataCollection))] -[assembly: TypeForwardedTo(typeof(RouteValueDictionary))] diff --git a/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj b/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj index 5d03f3ad8b..e131c54ad1 100644 --- a/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj +++ b/src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj @@ -2,12 +2,10 @@ netcoreapp3.0 - false - - - + + diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs new file mode 100644 index 0000000000..eac3daae29 --- /dev/null +++ b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs @@ -0,0 +1,574 @@ +// 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. + +namespace Microsoft.AspNetCore.Routing.Matching +{ + + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct Candidate + { + public readonly Microsoft.AspNetCore.Http.Endpoint Endpoint; + public readonly CandidateFlags Flags; + public readonly System.Collections.Generic.KeyValuePair[] Slots; + public readonly (string parameterName, int segmentIndex, int slotIndex)[] Captures; + public readonly (string parameterName, int segmentIndex, int slotIndex) CatchAll; + public readonly (Microsoft.AspNetCore.Routing.Patterns.RoutePatternPathSegment pathSegment, int segmentIndex)[] ComplexSegments; + public readonly System.Collections.Generic.KeyValuePair[] Constraints; + public readonly int Score; + public Candidate(Microsoft.AspNetCore.Http.Endpoint endpoint) { throw null; } + public Candidate(Microsoft.AspNetCore.Http.Endpoint endpoint, int score, System.Collections.Generic.KeyValuePair[] slots, System.ValueTuple[] captures, in (string parameterName, int segmentIndex, int slotIndex) catchAll, System.ValueTuple[] complexSegments, System.Collections.Generic.KeyValuePair[] constraints) { throw null; } + [System.FlagsAttribute] + public enum CandidateFlags + { + None = 0, + HasDefaults = 1, + HasCaptures = 2, + HasCatchAll = 4, + HasSlots = 7, + HasComplexSegments = 8, + HasConstraints = 16, + } + } + + internal partial class ILEmitTrieJumpTable : Microsoft.AspNetCore.Routing.Matching.JumpTable + { + internal System.Func _getDestination; + public ILEmitTrieJumpTable(int defaultDestination, int exitDestination, System.ValueTuple[] entries, bool? vectorize, Microsoft.AspNetCore.Routing.Matching.JumpTable fallback) { } + public override int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment) { throw null; } + internal void InitializeILDelegate() { } + internal System.Threading.Tasks.Task InitializeILDelegateAsync() { throw null; } + } + + internal partial class LinearSearchJumpTable : Microsoft.AspNetCore.Routing.Matching.JumpTable + { + public LinearSearchJumpTable(int defaultDestination, int exitDestination, System.ValueTuple[] entries) { } + public override string DebuggerToString() { throw null; } + public override int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment) { throw null; } + } + + internal partial class SingleEntryJumpTable : Microsoft.AspNetCore.Routing.Matching.JumpTable + { + public SingleEntryJumpTable(int defaultDestination, int exitDestination, string text, int destination) { } + public override string DebuggerToString() { throw null; } + public override int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment) { throw null; } + } + + internal partial class AmbiguousMatchException : System.Exception + { + protected AmbiguousMatchException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } + public AmbiguousMatchException(string message) { } + } + + public sealed partial class EndpointMetadataComparer : System.Collections.Generic.IComparer + { + internal EndpointMetadataComparer(System.IServiceProvider services) { } + } + + internal static partial class ILEmitTrieFactory + { + public const int NotAscii = -2147483648; + public static System.Func Create(int defaultDestination, int exitDestination, System.ValueTuple[] entries, bool? vectorize) { throw null; } + public static void EmitReturnDestination(System.Reflection.Emit.ILGenerator il, System.ValueTuple[] entries) { } + internal static bool ShouldVectorize(System.ValueTuple[] entries) { throw null; } + } + + internal partial class SingleEntryAsciiJumpTable : Microsoft.AspNetCore.Routing.Matching.JumpTable + { + public SingleEntryAsciiJumpTable(int defaultDestination, int exitDestination, string text, int destination) { } + public override string DebuggerToString() { throw null; } + public override int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment) { throw null; } + } + + internal partial class ZeroEntryJumpTable : Microsoft.AspNetCore.Routing.Matching.JumpTable + { + public ZeroEntryJumpTable(int defaultDestination, int exitDestination) { } + public override string DebuggerToString() { throw null; } + public override int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment) { throw null; } + } + + public sealed partial class HttpMethodMatcherPolicy : Microsoft.AspNetCore.Routing.MatcherPolicy, Microsoft.AspNetCore.Routing.Matching.IEndpointComparerPolicy, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy, Microsoft.AspNetCore.Routing.Matching.INodeBuilderPolicy + { + internal static readonly string AccessControlRequestMethod; + internal const string AnyMethod = "*"; + internal const string Http405EndpointDisplayName = "405 HTTP Method Not Supported"; + internal static readonly string OriginHeader; + internal static readonly string PreflightHttpMethod; + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct EdgeKey : System.IComparable, System.IComparable, System.IEquatable + { + public readonly bool IsCorsPreflightRequest; + public readonly string HttpMethod; + public EdgeKey(string httpMethod, bool isCorsPreflightRequest) { throw null; } + public int CompareTo(Microsoft.AspNetCore.Routing.Matching.HttpMethodMatcherPolicy.EdgeKey other) { throw null; } + public int CompareTo(object obj) { throw null; } + public bool Equals(Microsoft.AspNetCore.Routing.Matching.HttpMethodMatcherPolicy.EdgeKey other) { throw null; } + public override bool Equals(object obj) { throw null; } + public override int GetHashCode() { throw null; } + public override string ToString() { throw null; } + } + } + + internal static partial class Ascii + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool AsciiIgnoreCaseEquals(char charA, char charB) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool AsciiIgnoreCaseEquals(System.ReadOnlySpan a, System.ReadOnlySpan b, int length) { throw null; } + public static bool IsAscii(string text) { throw null; } + } + + public sealed partial class CandidateSet + { + internal Microsoft.AspNetCore.Routing.Matching.CandidateState[] Candidates; + internal CandidateSet(Microsoft.AspNetCore.Routing.Matching.CandidateState[] candidates) { } + internal CandidateSet(Microsoft.AspNetCore.Routing.Matching.Candidate[] candidates) { } + internal static bool IsValidCandidate(ref Microsoft.AspNetCore.Routing.Matching.CandidateState candidate) { throw null; } + internal static void SetValidity(ref Microsoft.AspNetCore.Routing.Matching.CandidateState candidate, bool value) { } + } + + public partial struct CandidateState + { + public Microsoft.AspNetCore.Routing.RouteValueDictionary Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + + internal sealed partial class DataSourceDependentMatcher : Microsoft.AspNetCore.Routing.Matching.Matcher + { + public DataSourceDependentMatcher(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource, Microsoft.AspNetCore.Routing.Matching.DataSourceDependentMatcher.Lifetime lifetime, System.Func matcherBuilderFactory) { } + internal Microsoft.AspNetCore.Routing.Matching.Matcher CurrentMatcher { get { throw null; } } + public override System.Threading.Tasks.Task MatchAsync(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } + public sealed partial class Lifetime : System.IDisposable + { + public Lifetime() { } + public Microsoft.AspNetCore.Routing.DataSourceDependentCache Cache { get { throw null; } set { } } + public void Dispose() { } + } + } + + internal sealed partial class DefaultEndpointSelector : Microsoft.AspNetCore.Routing.Matching.EndpointSelector + { + public DefaultEndpointSelector() { } + internal static void Select(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateState[] candidateState) { } + public override System.Threading.Tasks.Task SelectAsync(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidateSet) { throw null; } + } + + internal sealed partial class DfaMatcher : Microsoft.AspNetCore.Routing.Matching.Matcher + { + public DfaMatcher(Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Routing.Matching.EndpointSelector selector, Microsoft.AspNetCore.Routing.Matching.DfaState[] states, int maxSegmentCount) { } + internal (Microsoft.AspNetCore.Routing.Matching.Candidate[] candidates, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy[] policies) FindCandidateSet(Microsoft.AspNetCore.Http.HttpContext httpContext, string path, System.ReadOnlySpan segments) { throw null; } + public sealed override System.Threading.Tasks.Task MatchAsync(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } + internal static partial class EventIds + { + public static readonly Microsoft.Extensions.Logging.EventId CandidateNotValid; + public static readonly Microsoft.Extensions.Logging.EventId CandidateRejectedByComplexSegment; + public static readonly Microsoft.Extensions.Logging.EventId CandidateRejectedByConstraint; + public static readonly Microsoft.Extensions.Logging.EventId CandidatesFound; + public static readonly Microsoft.Extensions.Logging.EventId CandidatesNotFound; + public static readonly Microsoft.Extensions.Logging.EventId CandidateValid; + } + } + + internal partial class DictionaryJumpTable : Microsoft.AspNetCore.Routing.Matching.JumpTable + { + public DictionaryJumpTable(int defaultDestination, int exitDestination, System.ValueTuple[] entries) { } + public override string DebuggerToString() { throw null; } + public override int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment) { throw null; } + } + + [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerToString(),nq}")] + internal partial class DfaNode + { + public DfaNode() { } + public Microsoft.AspNetCore.Routing.Matching.DfaNode CatchAll { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Label { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.Generic.Dictionary Literals { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.List Matches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Routing.Matching.INodeBuilderPolicy NodeBuilder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Routing.Matching.DfaNode Parameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int PathDepth { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.Generic.Dictionary PolicyEdges { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void AddLiteral(string literal, Microsoft.AspNetCore.Routing.Matching.DfaNode node) { } + public void AddMatch(Microsoft.AspNetCore.Http.Endpoint endpoint) { } + public void AddMatches(System.Collections.Generic.IEnumerable endpoints) { } + public void AddPolicyEdge(object state, Microsoft.AspNetCore.Routing.Matching.DfaNode node) { } + public void Visit(System.Action visitor) { } + } + + internal static partial class FastPathTokenizer + { + public static int Tokenize(string path, System.Span segments) { throw null; } + } + + internal partial class DfaMatcherBuilder : Microsoft.AspNetCore.Routing.Matching.MatcherBuilder + { + public DfaMatcherBuilder(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Routing.ParameterPolicyFactory parameterPolicyFactory, Microsoft.AspNetCore.Routing.Matching.EndpointSelector selector, System.Collections.Generic.IEnumerable policies) { } + public override void AddEndpoint(Microsoft.AspNetCore.Routing.RouteEndpoint endpoint) { } + public override Microsoft.AspNetCore.Routing.Matching.Matcher Build() { throw null; } + public Microsoft.AspNetCore.Routing.Matching.DfaNode BuildDfaTree(bool includeLabel = false) { throw null; } + internal Microsoft.AspNetCore.Routing.Matching.Candidate CreateCandidate(Microsoft.AspNetCore.Http.Endpoint endpoint, int score) { throw null; } + internal Microsoft.AspNetCore.Routing.Matching.Candidate[] CreateCandidates(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } + } + + [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerToString(),nq}")] + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct DfaState + { + public readonly Candidate[] Candidates; + public readonly IEndpointSelectorPolicy[] Policies; + public readonly JumpTable PathTransitions; + public readonly PolicyJumpTable PolicyTransitions; + public DfaState(Microsoft.AspNetCore.Routing.Matching.Candidate[] candidates, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy[] policies, Microsoft.AspNetCore.Routing.Matching.JumpTable pathTransitions, Microsoft.AspNetCore.Routing.Matching.PolicyJumpTable policyTransitions) { throw null; } + public string DebuggerToString() { throw null; } + } + + internal partial class EndpointComparer : System.Collections.Generic.IComparer, System.Collections.Generic.IEqualityComparer + { + public EndpointComparer(Microsoft.AspNetCore.Routing.Matching.IEndpointComparerPolicy[] policies) { } + public int Compare(Microsoft.AspNetCore.Http.Endpoint x, Microsoft.AspNetCore.Http.Endpoint y) { throw null; } + public bool Equals(Microsoft.AspNetCore.Http.Endpoint x, Microsoft.AspNetCore.Http.Endpoint y) { throw null; } + public int GetHashCode(Microsoft.AspNetCore.Http.Endpoint obj) { throw null; } + } + + [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerToString(),nq}")] + internal abstract partial class JumpTable + { + protected JumpTable() { } + public virtual string DebuggerToString() { throw null; } + public abstract int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment); + } + + internal abstract partial class Matcher + { + protected Matcher() { } + public abstract System.Threading.Tasks.Task MatchAsync(Microsoft.AspNetCore.Http.HttpContext httpContext); + } + internal abstract partial class MatcherFactory + { + protected MatcherFactory() { } + public abstract Microsoft.AspNetCore.Routing.Matching.Matcher CreateMatcher(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource); + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct PathSegment : System.IEquatable + { + public readonly int Start; + public readonly int Length; + public PathSegment(int start, int length) { throw null; } + public bool Equals(Microsoft.AspNetCore.Routing.Matching.PathSegment other) { throw null; } + public override bool Equals(object obj) { throw null; } + public override int GetHashCode() { throw null; } + public override string ToString() { throw null; } + } + + internal abstract partial class MatcherBuilder + { + protected MatcherBuilder() { } + public abstract void AddEndpoint(Microsoft.AspNetCore.Routing.RouteEndpoint endpoint); + public abstract Microsoft.AspNetCore.Routing.Matching.Matcher Build(); + } +} + +namespace Microsoft.AspNetCore.Routing +{ + + internal partial class RoutingMarkerService + { + public RoutingMarkerService() { } + } + + internal partial class UriBuilderContextPooledObjectPolicy : Microsoft.Extensions.ObjectPool.IPooledObjectPolicy + { + public UriBuilderContextPooledObjectPolicy() { } + public Microsoft.AspNetCore.Routing.UriBuildingContext Create() { throw null; } + public bool Return(Microsoft.AspNetCore.Routing.UriBuildingContext obj) { throw null; } + } + + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct PathTokenizer : System.Collections.Generic.IEnumerable, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.IEnumerable + { + private readonly string _path; + private int _count; + public PathTokenizer(Microsoft.AspNetCore.Http.PathString path) { throw null; } + public int Count { get { throw null; } } + public Microsoft.Extensions.Primitives.StringSegment this[int index] { get { throw null; } } + public Microsoft.AspNetCore.Routing.PathTokenizer.Enumerator GetEnumerator() { throw null; } + System.Collections.Generic.IEnumerator System.Collections.Generic.IEnumerable.GetEnumerator() { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public partial struct Enumerator : System.Collections.Generic.IEnumerator, System.Collections.IEnumerator, System.IDisposable + { + private readonly string _path; + private int _index; + private int _length; + public Enumerator(Microsoft.AspNetCore.Routing.PathTokenizer tokenizer) { throw null; } + public Microsoft.Extensions.Primitives.StringSegment Current { get { throw null; } } + object System.Collections.IEnumerator.Current { get { throw null; } } + public void Dispose() { } + public bool MoveNext() { throw null; } + public void Reset() { } + } + } + + public partial class RouteOptions + { + internal System.Collections.Generic.ICollection EndpointDataSources { get { throw null; } set { } } + } + + internal sealed partial class EndpointMiddleware + { + internal const string AuthorizationMiddlewareInvokedKey = "__AuthorizationMiddlewareWithEndpointInvoked"; + internal const string CorsMiddlewareInvokedKey = "__CorsMiddlewareWithEndpointInvoked"; + public EndpointMiddleware(Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.Extensions.Options.IOptions routeOptions) { } + public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } + } + + internal sealed partial class DataSourceDependentCache : System.IDisposable where T : class + { + public DataSourceDependentCache(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource, System.Func, T> initialize) { } + public T Value { get { throw null; } } + public void Dispose() { } + public T EnsureInitialized() { throw null; } + } + + internal partial class DefaultEndpointConventionBuilder : Microsoft.AspNetCore.Builder.IEndpointConventionBuilder + { + public DefaultEndpointConventionBuilder(Microsoft.AspNetCore.Builder.EndpointBuilder endpointBuilder) { } + internal Microsoft.AspNetCore.Builder.EndpointBuilder EndpointBuilder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void Add(System.Action convention) { } + public Microsoft.AspNetCore.Http.Endpoint Build() { throw null; } + } + + internal partial class DefaultEndpointRouteBuilder : Microsoft.AspNetCore.Routing.IEndpointRouteBuilder + { + public DefaultEndpointRouteBuilder(Microsoft.AspNetCore.Builder.IApplicationBuilder applicationBuilder) { } + public Microsoft.AspNetCore.Builder.IApplicationBuilder ApplicationBuilder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.ICollection DataSources { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.IServiceProvider ServiceProvider { get { throw null; } } + public Microsoft.AspNetCore.Builder.IApplicationBuilder CreateApplicationBuilder() { throw null; } + } + + internal sealed partial class DefaultLinkGenerator : Microsoft.AspNetCore.Routing.LinkGenerator, System.IDisposable + { + public DefaultLinkGenerator(Microsoft.AspNetCore.Routing.ParameterPolicyFactory parameterPolicyFactory, Microsoft.AspNetCore.Routing.Template.TemplateBinderFactory binderFactory, Microsoft.AspNetCore.Routing.EndpointDataSource dataSource, Microsoft.Extensions.Options.IOptions routeOptions, Microsoft.Extensions.Logging.ILogger logger, System.IServiceProvider serviceProvider) { } + public void Dispose() { } + public static Microsoft.AspNetCore.Routing.RouteValueDictionary GetAmbientValues(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } + public override string GetPathByAddress(Microsoft.AspNetCore.Http.HttpContext httpContext, TAddress address, Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues = null, Microsoft.AspNetCore.Http.PathString? pathBase = default(Microsoft.AspNetCore.Http.PathString?), Microsoft.AspNetCore.Http.FragmentString fragment = default(Microsoft.AspNetCore.Http.FragmentString), Microsoft.AspNetCore.Routing.LinkOptions options = null) { throw null; } + public override string GetPathByAddress(TAddress address, Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Http.PathString pathBase = default(Microsoft.AspNetCore.Http.PathString), Microsoft.AspNetCore.Http.FragmentString fragment = default(Microsoft.AspNetCore.Http.FragmentString), Microsoft.AspNetCore.Routing.LinkOptions options = null) { throw null; } + internal Microsoft.AspNetCore.Routing.Template.TemplateBinder GetTemplateBinder(Microsoft.AspNetCore.Routing.RouteEndpoint endpoint) { throw null; } + public override string GetUriByAddress(Microsoft.AspNetCore.Http.HttpContext httpContext, TAddress address, Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues = null, string scheme = null, Microsoft.AspNetCore.Http.HostString? host = default(Microsoft.AspNetCore.Http.HostString?), Microsoft.AspNetCore.Http.PathString? pathBase = default(Microsoft.AspNetCore.Http.PathString?), Microsoft.AspNetCore.Http.FragmentString fragment = default(Microsoft.AspNetCore.Http.FragmentString), Microsoft.AspNetCore.Routing.LinkOptions options = null) { throw null; } + public override string GetUriByAddress(TAddress address, Microsoft.AspNetCore.Routing.RouteValueDictionary values, string scheme, Microsoft.AspNetCore.Http.HostString host, Microsoft.AspNetCore.Http.PathString pathBase = default(Microsoft.AspNetCore.Http.PathString), Microsoft.AspNetCore.Http.FragmentString fragment = default(Microsoft.AspNetCore.Http.FragmentString), Microsoft.AspNetCore.Routing.LinkOptions options = null) { throw null; } + public string GetUriByEndpoints(System.Collections.Generic.List endpoints, Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues, string scheme, Microsoft.AspNetCore.Http.HostString host, Microsoft.AspNetCore.Http.PathString pathBase, Microsoft.AspNetCore.Http.FragmentString fragment, Microsoft.AspNetCore.Routing.LinkOptions options) { throw null; } + internal bool TryProcessTemplate(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.RouteEndpoint endpoint, Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues, Microsoft.AspNetCore.Routing.LinkOptions options, out (Microsoft.AspNetCore.Http.PathString path, Microsoft.AspNetCore.Http.QueryString query) result) { throw null; } + } + + internal partial class DefaultLinkParser : Microsoft.AspNetCore.Routing.LinkParser, System.IDisposable + { + public DefaultLinkParser(Microsoft.AspNetCore.Routing.ParameterPolicyFactory parameterPolicyFactory, Microsoft.AspNetCore.Routing.EndpointDataSource dataSource, Microsoft.Extensions.Logging.ILogger logger, System.IServiceProvider serviceProvider) { } + public void Dispose() { } + internal Microsoft.AspNetCore.Routing.DefaultLinkParser.MatcherState GetMatcherState(Microsoft.AspNetCore.Routing.RouteEndpoint endpoint) { throw null; } + public override Microsoft.AspNetCore.Routing.RouteValueDictionary ParsePathByAddress(TAddress address, Microsoft.AspNetCore.Http.PathString path) { throw null; } + internal bool TryParse(Microsoft.AspNetCore.Routing.RouteEndpoint endpoint, Microsoft.AspNetCore.Http.PathString path, out Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct MatcherState + { + public readonly Microsoft.AspNetCore.Routing.RoutePatternMatcher Matcher; + public readonly System.Collections.Generic.Dictionary> Constraints; + public MatcherState(Microsoft.AspNetCore.Routing.RoutePatternMatcher matcher, System.Collections.Generic.Dictionary> constraints) { throw null; } + public void Deconstruct(out Microsoft.AspNetCore.Routing.RoutePatternMatcher matcher, out System.Collections.Generic.Dictionary> constraints) { throw null; } + } + } + + internal partial class DefaultParameterPolicyFactory : Microsoft.AspNetCore.Routing.ParameterPolicyFactory + { + public DefaultParameterPolicyFactory(Microsoft.Extensions.Options.IOptions options, System.IServiceProvider serviceProvider) { } + public override Microsoft.AspNetCore.Routing.IParameterPolicy Create(Microsoft.AspNetCore.Routing.Patterns.RoutePatternParameterPart parameter, Microsoft.AspNetCore.Routing.IParameterPolicy parameterPolicy) { throw null; } + public override Microsoft.AspNetCore.Routing.IParameterPolicy Create(Microsoft.AspNetCore.Routing.Patterns.RoutePatternParameterPart parameter, string inlineText) { throw null; } + } + + internal sealed partial class EndpointNameAddressScheme : Microsoft.AspNetCore.Routing.IEndpointAddressScheme, System.IDisposable + { + public EndpointNameAddressScheme(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource) { } + internal System.Collections.Generic.Dictionary Entries { get { throw null; } } + public void Dispose() { } + public System.Collections.Generic.IEnumerable FindEndpoints(string address) { throw null; } + } + + internal sealed partial class EndpointRoutingMiddleware + { + public EndpointRoutingMiddleware(Microsoft.AspNetCore.Routing.Matching.MatcherFactory matcherFactory, Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpointRouteBuilder, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Http.RequestDelegate next) { } + public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } + } + + internal partial class ModelEndpointDataSource : Microsoft.AspNetCore.Routing.EndpointDataSource + { + public ModelEndpointDataSource() { } + internal System.Collections.Generic.IEnumerable EndpointBuilders { get { throw null; } } + public override System.Collections.Generic.IReadOnlyList Endpoints { get { throw null; } } + public Microsoft.AspNetCore.Builder.IEndpointConventionBuilder AddEndpointBuilder(Microsoft.AspNetCore.Builder.EndpointBuilder endpointBuilder) { throw null; } + public override Microsoft.Extensions.Primitives.IChangeToken GetChangeToken() { throw null; } + } + + internal partial class NullRouter : Microsoft.AspNetCore.Routing.IRouter + { + public static readonly Microsoft.AspNetCore.Routing.NullRouter Instance; + public Microsoft.AspNetCore.Routing.VirtualPathData GetVirtualPath(Microsoft.AspNetCore.Routing.VirtualPathContext context) { throw null; } + public System.Threading.Tasks.Task RouteAsync(Microsoft.AspNetCore.Routing.RouteContext context) { throw null; } + } + + internal partial class RoutePatternMatcher + { + public RoutePatternMatcher(Microsoft.AspNetCore.Routing.Patterns.RoutePattern pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults) { } + public Microsoft.AspNetCore.Routing.RouteValueDictionary Defaults { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Routing.Patterns.RoutePattern RoutePattern { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal static bool MatchComplexSegment(Microsoft.AspNetCore.Routing.Patterns.RoutePatternPathSegment routeSegment, System.ReadOnlySpan requestSegment, Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } + public bool TryMatch(Microsoft.AspNetCore.Http.PathString path, Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } + } + + internal sealed partial class RouteValuesAddressScheme : Microsoft.AspNetCore.Routing.IEndpointAddressScheme, System.IDisposable + { + public RouteValuesAddressScheme(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource) { } + internal Microsoft.AspNetCore.Routing.RouteValuesAddressScheme.StateEntry State { get { throw null; } } + public void Dispose() { } + public System.Collections.Generic.IEnumerable FindEndpoints(Microsoft.AspNetCore.Routing.RouteValuesAddress address) { throw null; } + internal partial class StateEntry + { + public readonly System.Collections.Generic.List AllMatches; + public readonly Microsoft.AspNetCore.Routing.Tree.LinkGenerationDecisionTree AllMatchesLinkGenerationTree; + public readonly System.Collections.Generic.Dictionary> NamedMatches; + public StateEntry(System.Collections.Generic.List allMatches, Microsoft.AspNetCore.Routing.Tree.LinkGenerationDecisionTree allMatchesLinkGenerationTree, System.Collections.Generic.Dictionary> namedMatches) { } + } + } + + [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerToString(),nq}")] + internal partial class UriBuildingContext + { + public UriBuildingContext(System.Text.Encodings.Web.UrlEncoder urlEncoder) { } + public bool AppendTrailingSlash { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool LowercaseQueryStrings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool LowercaseUrls { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.IO.TextWriter PathWriter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.IO.TextWriter QueryWriter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Accept(string value) { throw null; } + public bool Accept(string value, bool encodeSlashes) { throw null; } + public bool Buffer(string value) { throw null; } + public void Clear() { } + internal void EncodeValue(string value, int start, int characterCount, bool encodeSlashes) { } + public void EndSegment() { } + public void Remove(string literal) { } + public Microsoft.AspNetCore.Http.PathString ToPathString() { throw null; } + public Microsoft.AspNetCore.Http.QueryString ToQueryString() { throw null; } + public override string ToString() { throw null; } + } +} + +namespace Microsoft.AspNetCore.Routing.DecisionTree +{ + + internal partial class DecisionCriterion + { + public DecisionCriterion() { } + public System.Collections.Generic.Dictionary> Branches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + + internal static partial class DecisionTreeBuilder + { + public static Microsoft.AspNetCore.Routing.DecisionTree.DecisionTreeNode GenerateTree(System.Collections.Generic.IReadOnlyList items, Microsoft.AspNetCore.Routing.DecisionTree.IClassifier classifier) { throw null; } + } + + internal partial class DecisionTreeNode + { + public DecisionTreeNode() { } + public System.Collections.Generic.IList> Criteria { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.Generic.IList Matches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct DecisionCriterionValue + { + private readonly object _value; + public DecisionCriterionValue(object value) { throw null; } + public object Value { get { throw null; } } + } + + internal partial interface IClassifier + { + System.Collections.Generic.IEqualityComparer ValueComparer { get; } + System.Collections.Generic.IDictionary GetCriteria(TItem item); + } +} + +namespace Microsoft.AspNetCore.Routing.Tree +{ + + public partial class TreeRouter : Microsoft.AspNetCore.Routing.IRouter + { + internal TreeRouter(Microsoft.AspNetCore.Routing.Tree.UrlMatchingTree[] trees, System.Collections.Generic.IEnumerable linkGenerationEntries, System.Text.Encodings.Web.UrlEncoder urlEncoder, Microsoft.Extensions.ObjectPool.ObjectPool objectPool, Microsoft.Extensions.Logging.ILogger routeLogger, Microsoft.Extensions.Logging.ILogger constraintLogger, int version) { } + internal System.Collections.Generic.IEnumerable MatchingTrees { get { throw null; } } + } + + [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerDisplayString,nq}")] + internal partial class LinkGenerationDecisionTree + { + public LinkGenerationDecisionTree(System.Collections.Generic.IReadOnlyList entries) { } + internal string DebuggerDisplayString { get { throw null; } } + public System.Collections.Generic.IList GetMatches(Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues) { throw null; } + } + + public partial class TreeRouteBuilder + { + internal TreeRouteBuilder(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.ObjectPool.ObjectPool objectPool, Microsoft.AspNetCore.Routing.IInlineConstraintResolver constraintResolver) { } + } + + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct OutboundMatchResult + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public OutboundMatchResult(Microsoft.AspNetCore.Routing.Tree.OutboundMatch match, bool isFallbackMatch) { throw null; } + public bool IsFallbackMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Routing.Tree.OutboundMatch Match { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } +} + +namespace Microsoft.AspNetCore.Routing.Patterns +{ + + [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerToString()}")] + public sealed partial class RoutePatternPathSegment + { + internal RoutePatternPathSegment(System.Collections.Generic.IReadOnlyList parts) { } + internal string DebuggerToString() { throw null; } + internal static string DebuggerToString(System.Collections.Generic.IReadOnlyList parts) { throw null; } + } + + internal static partial class RouteParameterParser + { + public static Microsoft.AspNetCore.Routing.Patterns.RoutePatternParameterPart ParseRouteParameter(string parameter) { throw null; } + } + + internal partial class DefaultRoutePatternTransformer : Microsoft.AspNetCore.Routing.Patterns.RoutePatternTransformer + { + public DefaultRoutePatternTransformer(Microsoft.AspNetCore.Routing.ParameterPolicyFactory policyFactory) { } + public override Microsoft.AspNetCore.Routing.Patterns.RoutePattern SubstituteRequiredValues(Microsoft.AspNetCore.Routing.Patterns.RoutePattern original, object requiredValues) { throw null; } + } + + internal static partial class RoutePatternParser + { + internal static readonly char[] InvalidParameterNameChars; + public static Microsoft.AspNetCore.Routing.Patterns.RoutePattern Parse(string pattern) { throw null; } + } +} + +namespace Microsoft.AspNetCore.Routing.Template +{ + public partial class TemplateBinder + { + internal TemplateBinder(System.Text.Encodings.Web.UrlEncoder urlEncoder, Microsoft.Extensions.ObjectPool.ObjectPool pool, Microsoft.AspNetCore.Routing.Patterns.RoutePattern pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults, System.Collections.Generic.IEnumerable requiredKeys, System.Collections.Generic.IEnumerable> parameterPolicies) { } + internal TemplateBinder(System.Text.Encodings.Web.UrlEncoder urlEncoder, Microsoft.Extensions.ObjectPool.ObjectPool pool, Microsoft.AspNetCore.Routing.Patterns.RoutePattern pattern, System.Collections.Generic.IEnumerable> parameterPolicies) { } + internal TemplateBinder(System.Text.Encodings.Web.UrlEncoder urlEncoder, Microsoft.Extensions.ObjectPool.ObjectPool pool, Microsoft.AspNetCore.Routing.Template.RouteTemplate template, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults) { } + internal bool TryBindValues(Microsoft.AspNetCore.Routing.RouteValueDictionary acceptedValues, Microsoft.AspNetCore.Routing.LinkOptions options, Microsoft.AspNetCore.Routing.LinkOptions globalOptions, out (Microsoft.AspNetCore.Http.PathString path, Microsoft.AspNetCore.Http.QueryString query) result) { throw null; } + } + + public static partial class RoutePrecedence + { + internal static decimal ComputeInbound(Microsoft.AspNetCore.Routing.Patterns.RoutePattern routePattern) { throw null; } + internal static decimal ComputeOutbound(Microsoft.AspNetCore.Routing.Patterns.RoutePattern routePattern) { throw null; } + } +} diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj index a2214046b7..bc4648a77b 100644 --- a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj +++ b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj @@ -2,17 +2,17 @@ netcoreapp3.0 - false - - - - - - - - + + + + + + + + + diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp3.0.cs b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp3.0.cs index 81f59873b9..d5f7e6db5d 100644 --- a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp3.0.cs +++ b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp3.0.cs @@ -517,7 +517,6 @@ namespace Microsoft.AspNetCore.Routing.Matching private int _dummyPrimitive; public Microsoft.AspNetCore.Http.Endpoint Endpoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public int Score { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Routing.RouteValueDictionary Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } } public sealed partial class EndpointMetadataComparer : System.Collections.Generic.IComparer { diff --git a/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.Manual.cs b/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.Manual.cs new file mode 100644 index 0000000000..386fc1fd0c --- /dev/null +++ b/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.Manual.cs @@ -0,0 +1,49 @@ +// 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. + +namespace Microsoft.AspNetCore.Internal +{ + internal static partial class AspNetCoreTempDirectory + { + public static string TempDirectory { get { throw null; } } + public static System.Func TempDirectoryFactory { get { throw null; } } + } +} + +namespace Microsoft.AspNetCore.WebUtilities +{ + public sealed partial class FileBufferingWriteStream : System.IO.Stream + { + internal bool Disposed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal System.IO.FileStream FileStream { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.WebUtilities.PagedByteBuffer PagedByteBuffer + { + [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } + } + } + + public partial class FormPipeReader + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)] + internal void ParseFormValues(ref System.Buffers.ReadOnlySequence buffer, ref Microsoft.AspNetCore.WebUtilities.KeyValueAccumulator accumulator, bool isFinalBlock) { } + } + + public partial class HttpResponseStreamWriter : System.IO.TextWriter + { + internal const int DefaultBufferSize = 16384; + } + + internal sealed partial class PagedByteBuffer : System.IDisposable + { + internal const int PageSize = 1024; + public PagedByteBuffer(System.Buffers.ArrayPool arrayPool) { } + internal bool Disposed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal System.Collections.Generic.List Pages { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void Add(byte[] buffer, int offset, int count) { } + public void Dispose() { } + public void MoveTo(System.IO.Stream stream) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task MoveToAsync(System.IO.Stream stream, System.Threading.CancellationToken cancellationToken) { throw null; } + } +} diff --git a/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.csproj b/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.csproj index b0338e92a7..73ee70046d 100644 --- a/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.csproj +++ b/src/Http/WebUtilities/ref/Microsoft.AspNetCore.WebUtilities.csproj @@ -2,12 +2,12 @@ netcoreapp3.0 - false - - - + + + + diff --git a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj index c9883821b4..9116bc9c3e 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj @@ -6,6 +6,8 @@ false + + false @@ -35,6 +37,8 @@ + + diff --git a/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.Manual.cs b/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.Manual.cs new file mode 100644 index 0000000000..23e07827af --- /dev/null +++ b/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.Manual.cs @@ -0,0 +1,18 @@ +// 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. + +namespace Microsoft.AspNetCore.Identity +{ + public partial class SignInManager where TUser : class + { + [System.Diagnostics.DebuggerStepThroughAttribute] + internal System.Threading.Tasks.Task StoreRememberClient(TUser user) { throw null; } + internal System.Security.Claims.ClaimsPrincipal StoreTwoFactorInfo(string userId, string loginProvider) { throw null; } + internal partial class TwoFactorAuthenticationInfo + { + public TwoFactorAuthenticationInfo() { } + public string LoginProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string UserId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + } +} diff --git a/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.csproj b/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.csproj index f67a4d2fcf..f9a48cfc4b 100644 --- a/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.csproj +++ b/src/Identity/Core/ref/Microsoft.AspNetCore.Identity.csproj @@ -2,12 +2,12 @@ netcoreapp3.0 - false - - - + + + + diff --git a/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj b/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj deleted file mode 100644 index 2550d6fc05..0000000000 --- a/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netstandard2.1;netcoreapp3.0 - - - - - - - - - - - - diff --git a/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netcoreapp3.0.cs b/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netcoreapp3.0.cs deleted file mode 100644 index 17b2093144..0000000000 --- a/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netcoreapp3.0.cs +++ /dev/null @@ -1,222 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore -{ - public partial class IdentityDbContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext - { - protected IdentityDbContext() { } - public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - } - public partial class IdentityDbContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext where TUser : Microsoft.AspNetCore.Identity.IdentityUser - { - protected IdentityDbContext() { } - public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - } - public partial class IdentityDbContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext, Microsoft.AspNetCore.Identity.IdentityUserRole, Microsoft.AspNetCore.Identity.IdentityUserLogin, Microsoft.AspNetCore.Identity.IdentityRoleClaim, Microsoft.AspNetCore.Identity.IdentityUserToken> where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TKey : System.IEquatable - { - protected IdentityDbContext() { } - public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - } - public abstract partial class IdentityDbContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TKey : System.IEquatable where TUserClaim : Microsoft.AspNetCore.Identity.IdentityUserClaim where TUserRole : Microsoft.AspNetCore.Identity.IdentityUserRole where TUserLogin : Microsoft.AspNetCore.Identity.IdentityUserLogin where TRoleClaim : Microsoft.AspNetCore.Identity.IdentityRoleClaim where TUserToken : Microsoft.AspNetCore.Identity.IdentityUserToken - { - protected IdentityDbContext() { } - public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - public virtual Microsoft.EntityFrameworkCore.DbSet RoleClaims { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.EntityFrameworkCore.DbSet Roles { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.EntityFrameworkCore.DbSet UserRoles { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - protected override void OnModelCreating(Microsoft.EntityFrameworkCore.ModelBuilder builder) { } - } - public partial class IdentityUserContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext where TUser : Microsoft.AspNetCore.Identity.IdentityUser - { - protected IdentityUserContext() { } - public IdentityUserContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - } - public partial class IdentityUserContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext, Microsoft.AspNetCore.Identity.IdentityUserLogin, Microsoft.AspNetCore.Identity.IdentityUserToken> where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TKey : System.IEquatable - { - protected IdentityUserContext() { } - public IdentityUserContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - } - public abstract partial class IdentityUserContext : Microsoft.EntityFrameworkCore.DbContext where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TKey : System.IEquatable where TUserClaim : Microsoft.AspNetCore.Identity.IdentityUserClaim where TUserLogin : Microsoft.AspNetCore.Identity.IdentityUserLogin where TUserToken : Microsoft.AspNetCore.Identity.IdentityUserToken - { - protected IdentityUserContext() { } - public IdentityUserContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - public virtual Microsoft.EntityFrameworkCore.DbSet UserClaims { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.EntityFrameworkCore.DbSet UserLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.EntityFrameworkCore.DbSet Users { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.EntityFrameworkCore.DbSet UserTokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - protected override void OnModelCreating(Microsoft.EntityFrameworkCore.ModelBuilder builder) { } - } - public partial class RoleStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore where TRole : Microsoft.AspNetCore.Identity.IdentityRole - { - public RoleStore(Microsoft.EntityFrameworkCore.DbContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.EntityFrameworkCore.DbContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class RoleStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TContext : Microsoft.EntityFrameworkCore.DbContext - { - public RoleStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class RoleStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore, Microsoft.AspNetCore.Identity.IdentityRoleClaim>, Microsoft.AspNetCore.Identity.IQueryableRoleStore, Microsoft.AspNetCore.Identity.IRoleClaimStore, Microsoft.AspNetCore.Identity.IRoleStore, System.IDisposable where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable - { - public RoleStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class RoleStore : Microsoft.AspNetCore.Identity.IQueryableRoleStore, Microsoft.AspNetCore.Identity.IRoleClaimStore, Microsoft.AspNetCore.Identity.IRoleStore, System.IDisposable where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable where TUserRole : Microsoft.AspNetCore.Identity.IdentityUserRole, new() where TRoleClaim : Microsoft.AspNetCore.Identity.IdentityRoleClaim, new() - { - public RoleStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) { } - public bool AutoSaveChanges { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual TContext Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Identity.IdentityErrorDescriber ErrorDescriber { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Linq.IQueryable Roles { get { throw null; } } - public virtual System.Threading.Tasks.Task AddClaimAsync(TRole role, System.Security.Claims.Claim claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual TKey ConvertIdFromString(string id) { throw null; } - public virtual string ConvertIdToString(TKey id) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task CreateAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected virtual TRoleClaim CreateRoleClaim(TRole role, System.Security.Claims.Claim claim) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task DeleteAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public void Dispose() { } - public virtual System.Threading.Tasks.Task FindByIdAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task FindByNameAsync(string normalizedName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task> GetClaimsAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task GetNormalizedRoleNameAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task GetRoleIdAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task GetRoleNameAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task RemoveClaimAsync(TRole role, System.Security.Claims.Claim claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task SetNormalizedRoleNameAsync(TRole role, string normalizedName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task SetRoleNameAsync(TRole role, string roleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected void ThrowIfDisposed() { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task UpdateAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class UserOnlyStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore where TUser : Microsoft.AspNetCore.Identity.IdentityUser, new() - { - public UserOnlyStore(Microsoft.EntityFrameworkCore.DbContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.EntityFrameworkCore.DbContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserOnlyStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TContext : Microsoft.EntityFrameworkCore.DbContext - { - public UserOnlyStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserOnlyStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore, Microsoft.AspNetCore.Identity.IdentityUserLogin, Microsoft.AspNetCore.Identity.IdentityUserToken> where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable - { - public UserOnlyStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserOnlyStore : Microsoft.AspNetCore.Identity.UserStoreBase, Microsoft.AspNetCore.Identity.IProtectedUserStore, Microsoft.AspNetCore.Identity.IQueryableUserStore, Microsoft.AspNetCore.Identity.IUserAuthenticationTokenStore, Microsoft.AspNetCore.Identity.IUserAuthenticatorKeyStore, Microsoft.AspNetCore.Identity.IUserClaimStore, Microsoft.AspNetCore.Identity.IUserEmailStore, Microsoft.AspNetCore.Identity.IUserLockoutStore, Microsoft.AspNetCore.Identity.IUserLoginStore, Microsoft.AspNetCore.Identity.IUserPasswordStore, Microsoft.AspNetCore.Identity.IUserPhoneNumberStore, Microsoft.AspNetCore.Identity.IUserSecurityStampStore, Microsoft.AspNetCore.Identity.IUserStore, Microsoft.AspNetCore.Identity.IUserTwoFactorRecoveryCodeStore, Microsoft.AspNetCore.Identity.IUserTwoFactorStore, System.IDisposable where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable where TUserClaim : Microsoft.AspNetCore.Identity.IdentityUserClaim, new() where TUserLogin : Microsoft.AspNetCore.Identity.IdentityUserLogin, new() where TUserToken : Microsoft.AspNetCore.Identity.IdentityUserToken, new() - { - public UserOnlyStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - public bool AutoSaveChanges { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual TContext Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - protected Microsoft.EntityFrameworkCore.DbSet UserClaims { get { throw null; } } - protected Microsoft.EntityFrameworkCore.DbSet UserLogins { get { throw null; } } - public override System.Linq.IQueryable Users { get { throw null; } } - protected Microsoft.EntityFrameworkCore.DbSet UsersSet { get { throw null; } } - protected Microsoft.EntityFrameworkCore.DbSet UserTokens { get { throw null; } } - public override System.Threading.Tasks.Task AddClaimsAsync(TUser user, System.Collections.Generic.IEnumerable claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task AddLoginAsync(TUser user, Microsoft.AspNetCore.Identity.UserLoginInfo login, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected override System.Threading.Tasks.Task AddUserTokenAsync(TUserToken token) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task CreateAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task DeleteAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task FindByEmailAsync(string normalizedEmail, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task FindByIdAsync(string userId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task FindByLoginAsync(string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task FindByNameAsync(string normalizedUserName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected override System.Threading.Tasks.Task FindTokenAsync(TUser user, string loginProvider, string name, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserAsync(TKey userId, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserLoginAsync(string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserLoginAsync(TKey userId, string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetClaimsAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetLoginsAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetUsersForClaimAsync(System.Security.Claims.Claim claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task RemoveClaimsAsync(TUser user, System.Collections.Generic.IEnumerable claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task RemoveLoginAsync(TUser user, string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected override System.Threading.Tasks.Task RemoveUserTokenAsync(TUserToken token) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task ReplaceClaimAsync(TUser user, System.Security.Claims.Claim claim, System.Security.Claims.Claim newClaim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected System.Threading.Tasks.Task SaveChanges(System.Threading.CancellationToken cancellationToken) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task UpdateAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class UserStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore> - { - public UserStore(Microsoft.EntityFrameworkCore.DbContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.EntityFrameworkCore.DbContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore where TUser : Microsoft.AspNetCore.Identity.IdentityUser, new() - { - public UserStore(Microsoft.EntityFrameworkCore.DbContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.EntityFrameworkCore.DbContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TContext : Microsoft.EntityFrameworkCore.DbContext - { - public UserStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore, Microsoft.AspNetCore.Identity.IdentityUserRole, Microsoft.AspNetCore.Identity.IdentityUserLogin, Microsoft.AspNetCore.Identity.IdentityUserToken, Microsoft.AspNetCore.Identity.IdentityRoleClaim> where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable - { - public UserStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserStore : Microsoft.AspNetCore.Identity.UserStoreBase, Microsoft.AspNetCore.Identity.IProtectedUserStore, Microsoft.AspNetCore.Identity.IUserStore, System.IDisposable where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable where TUserClaim : Microsoft.AspNetCore.Identity.IdentityUserClaim, new() where TUserRole : Microsoft.AspNetCore.Identity.IdentityUserRole, new() where TUserLogin : Microsoft.AspNetCore.Identity.IdentityUserLogin, new() where TUserToken : Microsoft.AspNetCore.Identity.IdentityUserToken, new() where TRoleClaim : Microsoft.AspNetCore.Identity.IdentityRoleClaim, new() - { - public UserStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - public bool AutoSaveChanges { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual TContext Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override System.Linq.IQueryable Users { get { throw null; } } - public override System.Threading.Tasks.Task AddClaimsAsync(TUser user, System.Collections.Generic.IEnumerable claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task AddLoginAsync(TUser user, Microsoft.AspNetCore.Identity.UserLoginInfo login, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task AddToRoleAsync(TUser user, string normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected override System.Threading.Tasks.Task AddUserTokenAsync(TUserToken token) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task CreateAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task DeleteAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task FindByEmailAsync(string normalizedEmail, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task FindByIdAsync(string userId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task FindByLoginAsync(string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task FindByNameAsync(string normalizedUserName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected override System.Threading.Tasks.Task FindRoleAsync(string normalizedRoleName, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindTokenAsync(TUser user, string loginProvider, string name, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserAsync(TKey userId, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserLoginAsync(string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserLoginAsync(TKey userId, string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserRoleAsync(TKey userId, TKey roleId, System.Threading.CancellationToken cancellationToken) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetClaimsAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetLoginsAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetRolesAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetUsersForClaimAsync(System.Security.Claims.Claim claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetUsersInRoleAsync(string normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task IsInRoleAsync(TUser user, string normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task RemoveClaimsAsync(TUser user, System.Collections.Generic.IEnumerable claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task RemoveFromRoleAsync(TUser user, string normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task RemoveLoginAsync(TUser user, string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected override System.Threading.Tasks.Task RemoveUserTokenAsync(TUserToken token) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task ReplaceClaimAsync(TUser user, System.Security.Claims.Claim claim, System.Security.Claims.Claim newClaim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected System.Threading.Tasks.Task SaveChanges(System.Threading.CancellationToken cancellationToken) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task UpdateAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class IdentityEntityFrameworkBuilderExtensions - { - public static Microsoft.AspNetCore.Identity.IdentityBuilder AddEntityFrameworkStores(this Microsoft.AspNetCore.Identity.IdentityBuilder builder) where TContext : Microsoft.EntityFrameworkCore.DbContext { throw null; } - } -} diff --git a/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netstandard2.1.cs b/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netstandard2.1.cs deleted file mode 100644 index 17b2093144..0000000000 --- a/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.netstandard2.1.cs +++ /dev/null @@ -1,222 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore -{ - public partial class IdentityDbContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext - { - protected IdentityDbContext() { } - public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - } - public partial class IdentityDbContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext where TUser : Microsoft.AspNetCore.Identity.IdentityUser - { - protected IdentityDbContext() { } - public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - } - public partial class IdentityDbContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext, Microsoft.AspNetCore.Identity.IdentityUserRole, Microsoft.AspNetCore.Identity.IdentityUserLogin, Microsoft.AspNetCore.Identity.IdentityRoleClaim, Microsoft.AspNetCore.Identity.IdentityUserToken> where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TKey : System.IEquatable - { - protected IdentityDbContext() { } - public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - } - public abstract partial class IdentityDbContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TKey : System.IEquatable where TUserClaim : Microsoft.AspNetCore.Identity.IdentityUserClaim where TUserRole : Microsoft.AspNetCore.Identity.IdentityUserRole where TUserLogin : Microsoft.AspNetCore.Identity.IdentityUserLogin where TRoleClaim : Microsoft.AspNetCore.Identity.IdentityRoleClaim where TUserToken : Microsoft.AspNetCore.Identity.IdentityUserToken - { - protected IdentityDbContext() { } - public IdentityDbContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - public virtual Microsoft.EntityFrameworkCore.DbSet RoleClaims { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.EntityFrameworkCore.DbSet Roles { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.EntityFrameworkCore.DbSet UserRoles { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - protected override void OnModelCreating(Microsoft.EntityFrameworkCore.ModelBuilder builder) { } - } - public partial class IdentityUserContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext where TUser : Microsoft.AspNetCore.Identity.IdentityUser - { - protected IdentityUserContext() { } - public IdentityUserContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - } - public partial class IdentityUserContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserContext, Microsoft.AspNetCore.Identity.IdentityUserLogin, Microsoft.AspNetCore.Identity.IdentityUserToken> where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TKey : System.IEquatable - { - protected IdentityUserContext() { } - public IdentityUserContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - } - public abstract partial class IdentityUserContext : Microsoft.EntityFrameworkCore.DbContext where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TKey : System.IEquatable where TUserClaim : Microsoft.AspNetCore.Identity.IdentityUserClaim where TUserLogin : Microsoft.AspNetCore.Identity.IdentityUserLogin where TUserToken : Microsoft.AspNetCore.Identity.IdentityUserToken - { - protected IdentityUserContext() { } - public IdentityUserContext(Microsoft.EntityFrameworkCore.DbContextOptions options) { } - public virtual Microsoft.EntityFrameworkCore.DbSet UserClaims { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.EntityFrameworkCore.DbSet UserLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.EntityFrameworkCore.DbSet Users { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.EntityFrameworkCore.DbSet UserTokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - protected override void OnModelCreating(Microsoft.EntityFrameworkCore.ModelBuilder builder) { } - } - public partial class RoleStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore where TRole : Microsoft.AspNetCore.Identity.IdentityRole - { - public RoleStore(Microsoft.EntityFrameworkCore.DbContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.EntityFrameworkCore.DbContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class RoleStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TContext : Microsoft.EntityFrameworkCore.DbContext - { - public RoleStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class RoleStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore, Microsoft.AspNetCore.Identity.IdentityRoleClaim>, Microsoft.AspNetCore.Identity.IQueryableRoleStore, Microsoft.AspNetCore.Identity.IRoleClaimStore, Microsoft.AspNetCore.Identity.IRoleStore, System.IDisposable where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable - { - public RoleStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class RoleStore : Microsoft.AspNetCore.Identity.IQueryableRoleStore, Microsoft.AspNetCore.Identity.IRoleClaimStore, Microsoft.AspNetCore.Identity.IRoleStore, System.IDisposable where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable where TUserRole : Microsoft.AspNetCore.Identity.IdentityUserRole, new() where TRoleClaim : Microsoft.AspNetCore.Identity.IdentityRoleClaim, new() - { - public RoleStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) { } - public bool AutoSaveChanges { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual TContext Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Identity.IdentityErrorDescriber ErrorDescriber { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Linq.IQueryable Roles { get { throw null; } } - public virtual System.Threading.Tasks.Task AddClaimAsync(TRole role, System.Security.Claims.Claim claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual TKey ConvertIdFromString(string id) { throw null; } - public virtual string ConvertIdToString(TKey id) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task CreateAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected virtual TRoleClaim CreateRoleClaim(TRole role, System.Security.Claims.Claim claim) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task DeleteAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public void Dispose() { } - public virtual System.Threading.Tasks.Task FindByIdAsync(string id, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task FindByNameAsync(string normalizedName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task> GetClaimsAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task GetNormalizedRoleNameAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task GetRoleIdAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task GetRoleNameAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task RemoveClaimAsync(TRole role, System.Security.Claims.Claim claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task SetNormalizedRoleNameAsync(TRole role, string normalizedName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public virtual System.Threading.Tasks.Task SetRoleNameAsync(TRole role, string roleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected void ThrowIfDisposed() { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task UpdateAsync(TRole role, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class UserOnlyStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore where TUser : Microsoft.AspNetCore.Identity.IdentityUser, new() - { - public UserOnlyStore(Microsoft.EntityFrameworkCore.DbContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.EntityFrameworkCore.DbContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserOnlyStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TContext : Microsoft.EntityFrameworkCore.DbContext - { - public UserOnlyStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserOnlyStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserOnlyStore, Microsoft.AspNetCore.Identity.IdentityUserLogin, Microsoft.AspNetCore.Identity.IdentityUserToken> where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable - { - public UserOnlyStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserOnlyStore : Microsoft.AspNetCore.Identity.UserStoreBase, Microsoft.AspNetCore.Identity.IProtectedUserStore, Microsoft.AspNetCore.Identity.IQueryableUserStore, Microsoft.AspNetCore.Identity.IUserAuthenticationTokenStore, Microsoft.AspNetCore.Identity.IUserAuthenticatorKeyStore, Microsoft.AspNetCore.Identity.IUserClaimStore, Microsoft.AspNetCore.Identity.IUserEmailStore, Microsoft.AspNetCore.Identity.IUserLockoutStore, Microsoft.AspNetCore.Identity.IUserLoginStore, Microsoft.AspNetCore.Identity.IUserPasswordStore, Microsoft.AspNetCore.Identity.IUserPhoneNumberStore, Microsoft.AspNetCore.Identity.IUserSecurityStampStore, Microsoft.AspNetCore.Identity.IUserStore, Microsoft.AspNetCore.Identity.IUserTwoFactorRecoveryCodeStore, Microsoft.AspNetCore.Identity.IUserTwoFactorStore, System.IDisposable where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable where TUserClaim : Microsoft.AspNetCore.Identity.IdentityUserClaim, new() where TUserLogin : Microsoft.AspNetCore.Identity.IdentityUserLogin, new() where TUserToken : Microsoft.AspNetCore.Identity.IdentityUserToken, new() - { - public UserOnlyStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - public bool AutoSaveChanges { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual TContext Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - protected Microsoft.EntityFrameworkCore.DbSet UserClaims { get { throw null; } } - protected Microsoft.EntityFrameworkCore.DbSet UserLogins { get { throw null; } } - public override System.Linq.IQueryable Users { get { throw null; } } - protected Microsoft.EntityFrameworkCore.DbSet UsersSet { get { throw null; } } - protected Microsoft.EntityFrameworkCore.DbSet UserTokens { get { throw null; } } - public override System.Threading.Tasks.Task AddClaimsAsync(TUser user, System.Collections.Generic.IEnumerable claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task AddLoginAsync(TUser user, Microsoft.AspNetCore.Identity.UserLoginInfo login, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected override System.Threading.Tasks.Task AddUserTokenAsync(TUserToken token) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task CreateAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task DeleteAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task FindByEmailAsync(string normalizedEmail, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task FindByIdAsync(string userId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task FindByLoginAsync(string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task FindByNameAsync(string normalizedUserName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected override System.Threading.Tasks.Task FindTokenAsync(TUser user, string loginProvider, string name, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserAsync(TKey userId, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserLoginAsync(string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserLoginAsync(TKey userId, string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetClaimsAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetLoginsAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetUsersForClaimAsync(System.Security.Claims.Claim claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task RemoveClaimsAsync(TUser user, System.Collections.Generic.IEnumerable claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task RemoveLoginAsync(TUser user, string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected override System.Threading.Tasks.Task RemoveUserTokenAsync(TUserToken token) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task ReplaceClaimAsync(TUser user, System.Security.Claims.Claim claim, System.Security.Claims.Claim newClaim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected System.Threading.Tasks.Task SaveChanges(System.Threading.CancellationToken cancellationToken) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task UpdateAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class UserStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore> - { - public UserStore(Microsoft.EntityFrameworkCore.DbContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.EntityFrameworkCore.DbContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore where TUser : Microsoft.AspNetCore.Identity.IdentityUser, new() - { - public UserStore(Microsoft.EntityFrameworkCore.DbContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.EntityFrameworkCore.DbContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TContext : Microsoft.EntityFrameworkCore.DbContext - { - public UserStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore, Microsoft.AspNetCore.Identity.IdentityUserRole, Microsoft.AspNetCore.Identity.IdentityUserLogin, Microsoft.AspNetCore.Identity.IdentityUserToken, Microsoft.AspNetCore.Identity.IdentityRoleClaim> where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable - { - public UserStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(TContext), default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - } - public partial class UserStore : Microsoft.AspNetCore.Identity.UserStoreBase, Microsoft.AspNetCore.Identity.IProtectedUserStore, Microsoft.AspNetCore.Identity.IUserStore, System.IDisposable where TUser : Microsoft.AspNetCore.Identity.IdentityUser where TRole : Microsoft.AspNetCore.Identity.IdentityRole where TContext : Microsoft.EntityFrameworkCore.DbContext where TKey : System.IEquatable where TUserClaim : Microsoft.AspNetCore.Identity.IdentityUserClaim, new() where TUserRole : Microsoft.AspNetCore.Identity.IdentityUserRole, new() where TUserLogin : Microsoft.AspNetCore.Identity.IdentityUserLogin, new() where TUserToken : Microsoft.AspNetCore.Identity.IdentityUserToken, new() where TRoleClaim : Microsoft.AspNetCore.Identity.IdentityRoleClaim, new() - { - public UserStore(TContext context, Microsoft.AspNetCore.Identity.IdentityErrorDescriber describer = null) : base (default(Microsoft.AspNetCore.Identity.IdentityErrorDescriber)) { } - public bool AutoSaveChanges { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual TContext Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override System.Linq.IQueryable Users { get { throw null; } } - public override System.Threading.Tasks.Task AddClaimsAsync(TUser user, System.Collections.Generic.IEnumerable claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task AddLoginAsync(TUser user, Microsoft.AspNetCore.Identity.UserLoginInfo login, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task AddToRoleAsync(TUser user, string normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected override System.Threading.Tasks.Task AddUserTokenAsync(TUserToken token) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task CreateAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task DeleteAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task FindByEmailAsync(string normalizedEmail, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task FindByIdAsync(string userId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task FindByLoginAsync(string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task FindByNameAsync(string normalizedUserName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected override System.Threading.Tasks.Task FindRoleAsync(string normalizedRoleName, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindTokenAsync(TUser user, string loginProvider, string name, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserAsync(TKey userId, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserLoginAsync(string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserLoginAsync(TKey userId, string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken) { throw null; } - protected override System.Threading.Tasks.Task FindUserRoleAsync(TKey userId, TKey roleId, System.Threading.CancellationToken cancellationToken) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetClaimsAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetLoginsAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetRolesAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetUsersForClaimAsync(System.Security.Claims.Claim claim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task> GetUsersInRoleAsync(string normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task IsInRoleAsync(TUser user, string normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task RemoveClaimsAsync(TUser user, System.Collections.Generic.IEnumerable claims, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task RemoveFromRoleAsync(TUser user, string normalizedRoleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task RemoveLoginAsync(TUser user, string loginProvider, string providerKey, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected override System.Threading.Tasks.Task RemoveUserTokenAsync(TUserToken token) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task ReplaceClaimAsync(TUser user, System.Security.Claims.Claim claim, System.Security.Claims.Claim newClaim, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - protected System.Threading.Tasks.Task SaveChanges(System.Threading.CancellationToken cancellationToken) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task UpdateAsync(TUser user, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class IdentityEntityFrameworkBuilderExtensions - { - public static Microsoft.AspNetCore.Identity.IdentityBuilder AddEntityFrameworkStores(this Microsoft.AspNetCore.Identity.IdentityBuilder builder) where TContext : Microsoft.EntityFrameworkCore.DbContext { throw null; } - } -} diff --git a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj index e5ef39b41b..5b8b86eab1 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj +++ b/src/Identity/EntityFrameworkCore/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + + false @@ -15,6 +17,8 @@ + + diff --git a/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj index 8f724760cb..ec539e2fd0 100644 --- a/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj +++ b/src/Identity/EntityFrameworkCore/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + + false @@ -20,6 +22,8 @@ + + diff --git a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.Manual.cs b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.Manual.cs new file mode 100644 index 0000000000..54ab6e3c01 --- /dev/null +++ b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.Manual.cs @@ -0,0 +1,83 @@ +// 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. + +namespace Microsoft.AspNetCore.Identity +{ + public partial class PasswordHasherOptions + { + internal System.Security.Cryptography.RandomNumberGenerator Rng { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } +} +namespace Microsoft.Extensions.Identity.Core +{ + internal static partial class Resources + { + internal static string ConcurrencyFailure { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static string DefaultError { get { throw null; } } + internal static string DuplicateEmail { get { throw null; } } + internal static string DuplicateRoleName { get { throw null; } } + internal static string DuplicateUserName { get { throw null; } } + internal static string InvalidEmail { get { throw null; } } + internal static string InvalidManagerType { get { throw null; } } + internal static string InvalidPasswordHasherCompatibilityMode { get { throw null; } } + internal static string InvalidPasswordHasherIterationCount { get { throw null; } } + internal static string InvalidRoleName { get { throw null; } } + internal static string InvalidToken { get { throw null; } } + internal static string InvalidUserName { get { throw null; } } + internal static string LoginAlreadyAssociated { get { throw null; } } + internal static string MustCallAddIdentity { get { throw null; } } + internal static string NoPersonalDataProtector { get { throw null; } } + internal static string NoRoleType { get { throw null; } } + internal static string NoTokenProvider { get { throw null; } } + internal static string NullSecurityStamp { get { throw null; } } + internal static string PasswordMismatch { get { throw null; } } + internal static string PasswordRequiresDigit { get { throw null; } } + internal static string PasswordRequiresLower { get { throw null; } } + internal static string PasswordRequiresNonAlphanumeric { get { throw null; } } + internal static string PasswordRequiresUniqueChars { get { throw null; } } + internal static string PasswordRequiresUpper { get { throw null; } } + internal static string PasswordTooShort { get { throw null; } } + internal static string RecoveryCodeRedemptionFailed { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string RoleNotFound { get { throw null; } } + internal static string StoreNotIProtectedUserStore { get { throw null; } } + internal static string StoreNotIQueryableRoleStore { get { throw null; } } + internal static string StoreNotIQueryableUserStore { get { throw null; } } + internal static string StoreNotIRoleClaimStore { get { throw null; } } + internal static string StoreNotIUserAuthenticationTokenStore { get { throw null; } } + internal static string StoreNotIUserAuthenticatorKeyStore { get { throw null; } } + internal static string StoreNotIUserClaimStore { get { throw null; } } + internal static string StoreNotIUserConfirmationStore { get { throw null; } } + internal static string StoreNotIUserEmailStore { get { throw null; } } + internal static string StoreNotIUserLockoutStore { get { throw null; } } + internal static string StoreNotIUserLoginStore { get { throw null; } } + internal static string StoreNotIUserPasswordStore { get { throw null; } } + internal static string StoreNotIUserPhoneNumberStore { get { throw null; } } + internal static string StoreNotIUserRoleStore { get { throw null; } } + internal static string StoreNotIUserSecurityStampStore { get { throw null; } } + internal static string StoreNotIUserTwoFactorRecoveryCodeStore { get { throw null; } } + internal static string StoreNotIUserTwoFactorStore { get { throw null; } } + internal static string UserAlreadyHasPassword { get { throw null; } } + internal static string UserAlreadyInRole { get { throw null; } } + internal static string UserLockedOut { get { throw null; } } + internal static string UserLockoutNotEnabled { get { throw null; } } + internal static string UserNameNotFound { get { throw null; } } + internal static string UserNotInRole { get { throw null; } } + internal static string FormatDuplicateEmail(object p0) { throw null; } + internal static string FormatDuplicateRoleName(object p0) { throw null; } + internal static string FormatDuplicateUserName(object p0) { throw null; } + internal static string FormatInvalidEmail(object p0) { throw null; } + internal static string FormatInvalidManagerType(object p0, object p1, object p2) { throw null; } + internal static string FormatInvalidRoleName(object p0) { throw null; } + internal static string FormatInvalidUserName(object p0) { throw null; } + internal static string FormatNoTokenProvider(object p0, object p1) { throw null; } + internal static string FormatPasswordRequiresUniqueChars(object p0) { throw null; } + internal static string FormatPasswordTooShort(object p0) { throw null; } + internal static string FormatRoleNotFound(object p0) { throw null; } + internal static string FormatUserAlreadyInRole(object p0) { throw null; } + internal static string FormatUserNameNotFound(object p0) { throw null; } + internal static string FormatUserNotInRole(object p0) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } + } +} diff --git a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj index 1d35660722..9603f7bd76 100644 --- a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj +++ b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj @@ -2,19 +2,21 @@ netstandard2.0;netcoreapp3.0 - false - - - - + + + + + - - - + + + + + diff --git a/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.Manual.cs b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.Manual.cs similarity index 58% rename from src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.Manual.cs rename to src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.Manual.cs index 039f419cd4..0d2641bedd 100644 --- a/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.Manual.cs +++ b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.Manual.cs @@ -1,7 +1,6 @@ // 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.Runtime.CompilerServices; -using Microsoft.AspNetCore.Mvc; - -[assembly: TypeForwardedTo(typeof(JsonResult))] +namespace Microsoft.Extensions.Internal +{ +} diff --git a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj index c101e8c68d..1a76a8fb85 100644 --- a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj +++ b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj @@ -2,17 +2,19 @@ netstandard2.0;netcoreapp3.0 - false - - - + + + + - - + + + + diff --git a/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj index 49955dc48b..578dabd639 100644 --- a/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj +++ b/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj @@ -11,6 +11,7 @@ + diff --git a/src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.csproj deleted file mode 100644 index 4ae55abe9a..0000000000 --- a/src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - - diff --git a/src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.netcoreapp3.0.cs b/src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.netcoreapp3.0.cs deleted file mode 100644 index 946e9c778c..0000000000 --- a/src/Identity/UI/ref/Microsoft.AspNetCore.Identity.UI.netcoreapp3.0.cs +++ /dev/null @@ -1,935 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Identity -{ - public static partial class IdentityBuilderUIExtensions - { - public static Microsoft.AspNetCore.Identity.IdentityBuilder AddDefaultUI(this Microsoft.AspNetCore.Identity.IdentityBuilder builder) { throw null; } - } -} -namespace Microsoft.AspNetCore.Identity.UI -{ - [System.AttributeUsageAttribute(System.AttributeTargets.Assembly, Inherited=false, AllowMultiple=false)] - public sealed partial class UIFrameworkAttribute : System.Attribute - { - public UIFrameworkAttribute(string uiFramework) { } - public string UIFramework { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} -namespace Microsoft.AspNetCore.Identity.UI.Services -{ - public partial interface IEmailSender - { - System.Threading.Tasks.Task SendEmailAsync(string email, string subject, string htmlMessage); - } -} -namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal -{ - public partial class AccessDeniedModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public AccessDeniedModel() { } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class ConfirmEmailChangeModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ConfirmEmailChangeModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(string userId, string email, string code) { throw null; } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class ConfirmEmailModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ConfirmEmailModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(string userId, string code) { throw null; } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class ExternalLoginModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ExternalLoginModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string ErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal.ExternalLoginModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ProviderDisplayName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ReturnUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.AspNetCore.Mvc.IActionResult OnGet() { throw null; } - public virtual System.Threading.Tasks.Task OnGetCallbackAsync(string returnUrl = null, string remoteError = null) { throw null; } - public virtual Microsoft.AspNetCore.Mvc.IActionResult OnPost(string provider, string returnUrl = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostConfirmationAsync(string returnUrl = null) { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class ForgotPasswordConfirmation : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ForgotPasswordConfirmation() { } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class ForgotPasswordModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ForgotPasswordModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal.ForgotPasswordModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class LockoutModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public LockoutModel() { } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class LoginModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected LoginModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string ErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IList ExternalLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal.LoginModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ReturnUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(string returnUrl = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync(string returnUrl = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostSendVerificationEmailAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Password { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Remember me?")] - public bool RememberMe { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class LoginWith2faModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected LoginWith2faModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal.LoginWith2faModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RememberMe { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ReturnUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(bool rememberMe, string returnUrl = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync(bool rememberMe, string returnUrl = null) { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Remember this machine")] - public bool RememberMachine { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Text)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Authenticator code")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - [System.ComponentModel.DataAnnotations.StringLengthAttribute(7, ErrorMessage="The {0} must be at least {2} and at max {1} characters long.", MinimumLength=6)] - public string TwoFactorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class LoginWithRecoveryCodeModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected LoginWithRecoveryCodeModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal.LoginWithRecoveryCodeModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ReturnUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(string returnUrl = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync(string returnUrl = null) { throw null; } - public partial class InputModel - { - public InputModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Text)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Recovery Code")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string RecoveryCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class LogoutModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected LogoutModel() { } - public void OnGet() { } - public virtual System.Threading.Tasks.Task OnPost(string returnUrl = null) { throw null; } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class RegisterConfirmationModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public RegisterConfirmationModel() { } - public bool DisplayConfirmAccountLink { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string EmailConfirmationUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(string email) { throw null; } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class RegisterModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected RegisterModel() { } - public System.Collections.Generic.IList ExternalLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal.RegisterModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ReturnUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(string returnUrl = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync(string returnUrl = null) { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.CompareAttribute("Password", ErrorMessage="The password and confirmation password do not match.")] - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Confirm password")] - public string ConfirmPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Email")] - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Password")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - [System.ComponentModel.DataAnnotations.StringLengthAttribute(100, ErrorMessage="The {0} must be at least {2} and at max {1} characters long.", MinimumLength=6)] - public string Password { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class ResetPasswordConfirmationModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ResetPasswordConfirmationModel() { } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class ResetPasswordModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ResetPasswordModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal.ResetPasswordModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.AspNetCore.Mvc.IActionResult OnGet(string code = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.CompareAttribute("Password", ErrorMessage="The password and confirmation password do not match.")] - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Confirm password")] - public string ConfirmPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - [System.ComponentModel.DataAnnotations.StringLengthAttribute(100, ErrorMessage="The {0} must be at least {2} and at max {1} characters long.", MinimumLength=6)] - public string Password { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } -} -namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Manage.Internal -{ - public abstract partial class ChangePasswordModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ChangePasswordModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Manage.Internal.ChangePasswordModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.CompareAttribute("NewPassword", ErrorMessage="The new password and confirmation password do not match.")] - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Confirm new password")] - public string ConfirmPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="New password")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - [System.ComponentModel.DataAnnotations.StringLengthAttribute(100, ErrorMessage="The {0} must be at least {2} and at max {1} characters long.", MinimumLength=6)] - public string NewPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Current password")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string OldPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - public abstract partial class DeletePersonalDataModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected DeletePersonalDataModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Manage.Internal.DeletePersonalDataModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RequirePassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGet() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Password { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - public abstract partial class Disable2faModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected Disable2faModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGet() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - } - public abstract partial class DownloadPersonalDataModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected DownloadPersonalDataModel() { } - public virtual Microsoft.AspNetCore.Mvc.IActionResult OnGet() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - } - public abstract partial class EmailModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected EmailModel() { } - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Manage.Internal.EmailModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsEmailConfirmed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostChangeEmailAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostSendVerificationEmailAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="New email")] - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string NewEmail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - public partial class EnableAuthenticatorModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public EnableAuthenticatorModel() { } - public string AuthenticatorUri { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Manage.Internal.EnableAuthenticatorModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string[] RecoveryCodes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string SharedKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Text)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Verification Code")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - [System.ComponentModel.DataAnnotations.StringLengthAttribute(7, ErrorMessage="The {0} must be at least {2} and at max {1} characters long.", MinimumLength=6)] - public string Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - public abstract partial class ExternalLoginsModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ExternalLoginsModel() { } - public System.Collections.Generic.IList CurrentLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IList OtherLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ShowRemoveButton { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnGetLinkLoginCallbackAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostLinkLoginAsync(string provider) { throw null; } - public virtual System.Threading.Tasks.Task OnPostRemoveLoginAsync(string loginProvider, string providerKey) { throw null; } - } - public abstract partial class GenerateRecoveryCodesModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected GenerateRecoveryCodesModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string[] RecoveryCodes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - } - public abstract partial class IndexModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected IndexModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Manage.Internal.IndexModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Username { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Phone number")] - [System.ComponentModel.DataAnnotations.PhoneAttribute] - public string PhoneNumber { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - public static partial class ManageNavPages - { - public static string ChangePassword { get { throw null; } } - public static string DeletePersonalData { get { throw null; } } - public static string DownloadPersonalData { get { throw null; } } - public static string Email { get { throw null; } } - public static string ExternalLogins { get { throw null; } } - public static string Index { get { throw null; } } - public static string PersonalData { get { throw null; } } - public static string TwoFactorAuthentication { get { throw null; } } - public static string ChangePasswordNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string DeletePersonalDataNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string DownloadPersonalDataNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string EmailNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string ExternalLoginsNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string IndexNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string PageNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext, string page) { throw null; } - public static string PersonalDataNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string TwoFactorAuthenticationNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - } - public abstract partial class PersonalDataModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected PersonalDataModel() { } - public virtual System.Threading.Tasks.Task OnGet() { throw null; } - } - public abstract partial class ResetAuthenticatorModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ResetAuthenticatorModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGet() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - } - public abstract partial class SetPasswordModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected SetPasswordModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Manage.Internal.SetPasswordModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.CompareAttribute("NewPassword", ErrorMessage="The new password and confirmation password do not match.")] - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Confirm new password")] - public string ConfirmPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="New password")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - [System.ComponentModel.DataAnnotations.StringLengthAttribute(100, ErrorMessage="The {0} must be at least {2} and at max {1} characters long.", MinimumLength=6)] - public string NewPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - public partial class ShowRecoveryCodesModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ShowRecoveryCodesModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string[] RecoveryCodes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Mvc.IActionResult OnGet() { throw null; } - } - public abstract partial class TwoFactorAuthenticationModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected TwoFactorAuthenticationModel() { } - public bool HasAuthenticator { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public bool Is2faEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsMachineRemembered { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int RecoveryCodesLeft { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - } -} -namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Internal -{ - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - [Microsoft.AspNetCore.Mvc.ResponseCacheAttribute(Duration=0, Location=Microsoft.AspNetCore.Mvc.ResponseCacheLocation.None, NoStore=true)] - public partial class ErrorModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ErrorModel() { } - public string RequestId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ShowRequestId { get { throw null; } } - public void OnGet() { } - } -} -namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal -{ - public partial class AccessDeniedModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public AccessDeniedModel() { } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class ConfirmEmailChangeModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ConfirmEmailChangeModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(string userId, string email, string code) { throw null; } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class ConfirmEmailModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ConfirmEmailModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(string userId, string code) { throw null; } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class ExternalLoginModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ExternalLoginModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string ErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal.ExternalLoginModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ProviderDisplayName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ReturnUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.AspNetCore.Mvc.IActionResult OnGet() { throw null; } - public virtual System.Threading.Tasks.Task OnGetCallbackAsync(string returnUrl = null, string remoteError = null) { throw null; } - public virtual Microsoft.AspNetCore.Mvc.IActionResult OnPost(string provider, string returnUrl = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostConfirmationAsync(string returnUrl = null) { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class ForgotPasswordConfirmation : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ForgotPasswordConfirmation() { } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class ForgotPasswordModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ForgotPasswordModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal.ForgotPasswordModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class LockoutModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public LockoutModel() { } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class LoginModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected LoginModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string ErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IList ExternalLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal.LoginModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ReturnUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(string returnUrl = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync(string returnUrl = null) { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Password { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Remember me?")] - public bool RememberMe { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class LoginWith2faModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected LoginWith2faModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal.LoginWith2faModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RememberMe { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ReturnUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(bool rememberMe, string returnUrl = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync(bool rememberMe, string returnUrl = null) { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Remember this machine")] - public bool RememberMachine { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Text)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Authenticator code")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - [System.ComponentModel.DataAnnotations.StringLengthAttribute(7, ErrorMessage="The {0} must be at least {2} and at max {1} characters long.", MinimumLength=6)] - public string TwoFactorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class LoginWithRecoveryCodeModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected LoginWithRecoveryCodeModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal.LoginWithRecoveryCodeModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ReturnUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(string returnUrl = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync(string returnUrl = null) { throw null; } - public partial class InputModel - { - public InputModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Text)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Recovery Code")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string RecoveryCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class LogoutModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected LogoutModel() { } - public void OnGet() { } - public virtual System.Threading.Tasks.Task OnPost(string returnUrl = null) { throw null; } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class RegisterConfirmationModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public RegisterConfirmationModel() { } - public bool DisplayConfirmAccountLink { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string EmailConfirmationUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(string email) { throw null; } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class RegisterModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected RegisterModel() { } - public System.Collections.Generic.IList ExternalLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal.RegisterModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ReturnUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync(string returnUrl = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync(string returnUrl = null) { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.CompareAttribute("Password", ErrorMessage="The password and confirmation password do not match.")] - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Confirm password")] - public string ConfirmPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Email")] - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Password")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - [System.ComponentModel.DataAnnotations.StringLengthAttribute(100, ErrorMessage="The {0} must be at least {2} and at max {1} characters long.", MinimumLength=6)] - public string Password { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class ResetPasswordConfirmationModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ResetPasswordConfirmationModel() { } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public abstract partial class ResetPasswordModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ResetPasswordModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal.ResetPasswordModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual Microsoft.AspNetCore.Mvc.IActionResult OnGet(string code = null) { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.CompareAttribute("Password", ErrorMessage="The password and confirmation password do not match.")] - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Confirm password")] - public string ConfirmPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - [System.ComponentModel.DataAnnotations.StringLengthAttribute(100, ErrorMessage="The {0} must be at least {2} and at max {1} characters long.", MinimumLength=6)] - public string Password { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } -} -namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Manage.Internal -{ - public abstract partial class ChangePasswordModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ChangePasswordModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Manage.Internal.ChangePasswordModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.CompareAttribute("NewPassword", ErrorMessage="The new password and confirmation password do not match.")] - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Confirm new password")] - public string ConfirmPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="New password")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - [System.ComponentModel.DataAnnotations.StringLengthAttribute(100, ErrorMessage="The {0} must be at least {2} and at max {1} characters long.", MinimumLength=6)] - public string NewPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Current password")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string OldPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - public abstract partial class DeletePersonalDataModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected DeletePersonalDataModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Manage.Internal.DeletePersonalDataModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RequirePassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGet() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string Password { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - public abstract partial class Disable2faModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected Disable2faModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGet() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - } - public abstract partial class DownloadPersonalDataModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected DownloadPersonalDataModel() { } - public virtual Microsoft.AspNetCore.Mvc.IActionResult OnGet() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - } - public abstract partial class EmailModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected EmailModel() { } - public string Email { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Manage.Internal.EmailModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsEmailConfirmed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostChangeEmailAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostSendVerificationEmailAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="New email")] - [System.ComponentModel.DataAnnotations.EmailAddressAttribute] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - public string NewEmail { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - public partial class EnableAuthenticatorModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public EnableAuthenticatorModel() { } - public string AuthenticatorUri { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Manage.Internal.EnableAuthenticatorModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string[] RecoveryCodes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string SharedKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Text)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Verification Code")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - [System.ComponentModel.DataAnnotations.StringLengthAttribute(7, ErrorMessage="The {0} must be at least {2} and at max {1} characters long.", MinimumLength=6)] - public string Code { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - public abstract partial class ExternalLoginsModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ExternalLoginsModel() { } - public System.Collections.Generic.IList CurrentLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IList OtherLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ShowRemoveButton { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnGetLinkLoginCallbackAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostLinkLoginAsync(string provider) { throw null; } - public virtual System.Threading.Tasks.Task OnPostRemoveLoginAsync(string loginProvider, string providerKey) { throw null; } - } - public abstract partial class GenerateRecoveryCodesModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected GenerateRecoveryCodesModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string[] RecoveryCodes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - } - public abstract partial class IndexModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected IndexModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Manage.Internal.IndexModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Username { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Phone number")] - [System.ComponentModel.DataAnnotations.PhoneAttribute] - public string PhoneNumber { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - public static partial class ManageNavPages - { - public static string ChangePassword { get { throw null; } } - public static string DeletePersonalData { get { throw null; } } - public static string DownloadPersonalData { get { throw null; } } - public static string Email { get { throw null; } } - public static string ExternalLogins { get { throw null; } } - public static string Index { get { throw null; } } - public static string PersonalData { get { throw null; } } - public static string TwoFactorAuthentication { get { throw null; } } - public static string ChangePasswordNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string DeletePersonalDataNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string DownloadPersonalDataNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string EmailNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string ExternalLoginsNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string IndexNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string PageNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext, string page) { throw null; } - public static string PersonalDataNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - public static string TwoFactorAuthenticationNavClass(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext) { throw null; } - } - public abstract partial class PersonalDataModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected PersonalDataModel() { } - public virtual System.Threading.Tasks.Task OnGet() { throw null; } - } - public abstract partial class ResetAuthenticatorModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected ResetAuthenticatorModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGet() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - } - public abstract partial class SetPasswordModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected SetPasswordModel() { } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Manage.Internal.SetPasswordModel.InputModel Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - public partial class InputModel - { - public InputModel() { } - [System.ComponentModel.DataAnnotations.CompareAttribute("NewPassword", ErrorMessage="The new password and confirmation password do not match.")] - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="Confirm new password")] - public string ConfirmPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.DataAnnotations.DataTypeAttribute(System.ComponentModel.DataAnnotations.DataType.Password)] - [System.ComponentModel.DataAnnotations.DisplayAttribute(Name="New password")] - [System.ComponentModel.DataAnnotations.RequiredAttribute] - [System.ComponentModel.DataAnnotations.StringLengthAttribute(100, ErrorMessage="The {0} must be at least {2} and at max {1} characters long.", MinimumLength=6)] - public string NewPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - } - public partial class ShowRecoveryCodesModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ShowRecoveryCodesModel() { } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string[] RecoveryCodes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Mvc.IActionResult OnGet() { throw null; } - } - public abstract partial class TwoFactorAuthenticationModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - protected TwoFactorAuthenticationModel() { } - public bool HasAuthenticator { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.BindPropertyAttribute] - public bool Is2faEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool IsMachineRemembered { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int RecoveryCodesLeft { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.TempDataAttribute] - public string StatusMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task OnGetAsync() { throw null; } - public virtual System.Threading.Tasks.Task OnPostAsync() { throw null; } - } -} -namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Internal -{ - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - [Microsoft.AspNetCore.Mvc.ResponseCacheAttribute(Duration=0, Location=Microsoft.AspNetCore.Mvc.ResponseCacheLocation.None, NoStore=true)] - public partial class ErrorModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ErrorModel() { } - public string RequestId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ShowRequestId { get { throw null; } } - public void OnGet() { } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class IdentityServiceCollectionUIExtensions - { - public static Microsoft.AspNetCore.Identity.IdentityBuilder AddDefaultIdentity(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) where TUser : class { throw null; } - public static Microsoft.AspNetCore.Identity.IdentityBuilder AddDefaultIdentity(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configureOptions) where TUser : class { throw null; } - } -} diff --git a/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj b/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj index 5512886233..b40e55e8bf 100644 --- a/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj +++ b/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj @@ -5,6 +5,8 @@ netcoreapp3.0 aspnetcore-2ff9bc27-5e8c-4484-90ca-e3aace89b72a Bootstrap4 + + false @@ -31,6 +33,8 @@ + + diff --git a/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj b/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj index b78dc55331..43ddc35fb6 100644 --- a/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj +++ b/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj @@ -4,6 +4,8 @@ Identity sample MVC application on ASP.NET Core netcoreapp3.0 aspnetcore-b3d20cbe-418e-4bf2-a0f4-57f91d067e07 + + false @@ -27,5 +29,7 @@ + + diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj index 534f1b50a5..7804f9beb4 100644 --- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -4,6 +4,8 @@ netcoreapp3.0 true + + false diff --git a/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj b/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj index 4309f2248c..7587d067fc 100644 --- a/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj +++ b/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj @@ -4,6 +4,8 @@ netcoreapp3.0 aspnet-Identity.DefaultUI.WebSite-80C658D8-CED7-467F-9B47-75DA3BC1A16D Bootstrap3 + + false @@ -42,6 +44,8 @@ + + diff --git a/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.Manual.cs b/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.Manual.cs new file mode 100644 index 0000000000..e2ca285e3c --- /dev/null +++ b/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.Manual.cs @@ -0,0 +1,30 @@ +// 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. + +namespace Microsoft.AspNetCore.Cors +{ + internal static partial class Resources + { + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static string InsecureConfiguration { get { throw null; } } + internal static string PreflightMaxAgeOutOfRange { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } + } +} + +namespace Microsoft.AspNetCore.Cors.Infrastructure +{ + public partial class CorsPolicyBuilder + { + internal static string GetNormalizedOrigin(string origin) { throw null; } + } + internal static partial class CorsPolicyExtensions + { + public static bool IsOriginAnAllowedSubdomain(this Microsoft.AspNetCore.Cors.Infrastructure.CorsPolicy policy, string origin) { throw null; } + } + internal static partial class UriHelpers + { + public static bool IsSubdomainOf(System.Uri subdomain, System.Uri domain) { throw null; } + } +} diff --git a/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.csproj b/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.csproj index 9a9c7c1a77..e7c5a453f5 100644 --- a/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.csproj +++ b/src/Middleware/CORS/ref/Microsoft.AspNetCore.Cors.csproj @@ -2,16 +2,16 @@ netcoreapp3.0 - false - - - - - - - + + + + + + + + diff --git a/src/Middleware/CORS/test/testassets/Directory.Build.props b/src/Middleware/CORS/test/testassets/Directory.Build.props index b8ad72d258..b49282fb6f 100644 --- a/src/Middleware/CORS/test/testassets/Directory.Build.props +++ b/src/Middleware/CORS/test/testassets/Directory.Build.props @@ -6,11 +6,4 @@ - - - - - diff --git a/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.csproj b/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.csproj deleted file mode 100644 index 9744b563e9..0000000000 --- a/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - diff --git a/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.netcoreapp3.0.cs b/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.netcoreapp3.0.cs deleted file mode 100644 index 6c2e1cf26d..0000000000 --- a/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.netcoreapp3.0.cs +++ /dev/null @@ -1,43 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Builder -{ - public static partial class ConcurrencyLimiterExtensions - { - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseConcurrencyLimiter(this Microsoft.AspNetCore.Builder.IApplicationBuilder app) { throw null; } - } -} -namespace Microsoft.AspNetCore.ConcurrencyLimiter -{ - public partial class ConcurrencyLimiterMiddleware - { - public ConcurrencyLimiterMiddleware(Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.ConcurrencyLimiter.IQueuePolicy queue, Microsoft.Extensions.Options.IOptions options) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext context) { throw null; } - } - public partial class ConcurrencyLimiterOptions - { - public ConcurrencyLimiterOptions() { } - public Microsoft.AspNetCore.Http.RequestDelegate OnRejected { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial interface IQueuePolicy - { - void OnExit(); - System.Threading.Tasks.ValueTask TryEnterAsync(); - } - public partial class QueuePolicyOptions - { - public QueuePolicyOptions() { } - public int MaxConcurrentRequests { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int RequestQueueLimit { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class QueuePolicyServiceCollectionExtensions - { - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddQueuePolicy(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddStackPolicy(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) { throw null; } - } -} diff --git a/src/Middleware/Diagnostics.Abstractions/ref/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj b/src/Middleware/Diagnostics.Abstractions/ref/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj index 474f1b32be..58272570e8 100644 --- a/src/Middleware/Diagnostics.Abstractions/ref/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj +++ b/src/Middleware/Diagnostics.Abstractions/ref/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj @@ -2,11 +2,9 @@ netcoreapp3.0 - false - - + diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/ref/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj b/src/Middleware/Diagnostics.EntityFrameworkCore/ref/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj deleted file mode 100644 index f7efb9db49..0000000000 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/ref/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/ref/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.netcoreapp3.0.cs b/src/Middleware/Diagnostics.EntityFrameworkCore/ref/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.netcoreapp3.0.cs deleted file mode 100644 index 04d8f01552..0000000000 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/ref/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.netcoreapp3.0.cs +++ /dev/null @@ -1,48 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Builder -{ - public static partial class DatabaseErrorPageExtensions - { - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseDatabaseErrorPage(this Microsoft.AspNetCore.Builder.IApplicationBuilder app) { throw null; } - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseDatabaseErrorPage(this Microsoft.AspNetCore.Builder.IApplicationBuilder app, Microsoft.AspNetCore.Builder.DatabaseErrorPageOptions options) { throw null; } - } - public partial class DatabaseErrorPageOptions - { - public DatabaseErrorPageOptions() { } - public virtual Microsoft.AspNetCore.Http.PathString MigrationsEndPointPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public static partial class MigrationsEndPointExtensions - { - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseMigrationsEndPoint(this Microsoft.AspNetCore.Builder.IApplicationBuilder app) { throw null; } - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseMigrationsEndPoint(this Microsoft.AspNetCore.Builder.IApplicationBuilder app, Microsoft.AspNetCore.Builder.MigrationsEndPointOptions options) { throw null; } - } - public partial class MigrationsEndPointOptions - { - public static Microsoft.AspNetCore.Http.PathString DefaultPath; - public MigrationsEndPointOptions() { } - public virtual Microsoft.AspNetCore.Http.PathString Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore -{ - public partial class DatabaseErrorPageMiddleware : System.IObserver>, System.IObserver - { - public DatabaseErrorPageMiddleware(Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.Options.IOptions options) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } - void System.IObserver>.OnCompleted() { } - void System.IObserver>.OnError(System.Exception error) { } - void System.IObserver>.OnNext(System.Collections.Generic.KeyValuePair keyValuePair) { } - void System.IObserver.OnCompleted() { } - void System.IObserver.OnError(System.Exception error) { } - void System.IObserver.OnNext(System.Diagnostics.DiagnosticListener diagnosticListener) { } - } - public partial class MigrationsEndPointMiddleware - { - public MigrationsEndPointMiddleware(Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.Extensions.Logging.ILogger logger, Microsoft.Extensions.Options.IOptions options) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext context) { throw null; } - } -} diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj index d5020b851c..6f75405290 100644 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/test/FunctionalTests/Diagnostics.EFCore.FunctionalTests.csproj @@ -4,12 +4,17 @@ netcoreapp3.0 Diagnostics.EFCore.FunctionalTests + + false + + + diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj index b0f219bc79..f179e54b8e 100644 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/test/UnitTests/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj @@ -2,11 +2,15 @@ netcoreapp3.0 + + false + + diff --git a/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.Manual.cs b/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.Manual.cs new file mode 100644 index 0000000000..1ec2cf85ff --- /dev/null +++ b/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.Manual.cs @@ -0,0 +1,32 @@ +// 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. + +namespace Microsoft.Extensions.StackTrace.Sources +{ + internal partial class ExceptionDetails + { + public ExceptionDetails() { } + public System.Exception Error { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string ErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.Generic.IEnumerable StackFrames { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class ExceptionDetailsProvider + { + public ExceptionDetailsProvider(Microsoft.Extensions.FileProviders.IFileProvider fileProvider, int sourceCodeLineCount) { } + public System.Collections.Generic.IEnumerable GetDetails(System.Exception exception) { throw null; } + internal Microsoft.Extensions.StackTrace.Sources.StackFrameSourceCodeInfo GetStackFrameSourceCodeInfo(string method, string filePath, int lineNumber) { throw null; } + internal void ReadFrameContent(Microsoft.Extensions.StackTrace.Sources.StackFrameSourceCodeInfo frame, System.Collections.Generic.IEnumerable allLines, int errorStartLineNumberInFile, int errorEndLineNumberInFile) { } + } + internal partial class StackFrameSourceCodeInfo + { + public StackFrameSourceCodeInfo() { } + public System.Collections.Generic.IEnumerable ContextCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string ErrorDetails { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string File { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Function { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int Line { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.Generic.IEnumerable PostContextCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.Generic.IEnumerable PreContextCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int PreContextLine { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } +} diff --git a/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj b/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj index 8e7f04791b..84f5070e9e 100644 --- a/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj +++ b/src/Middleware/Diagnostics/ref/Microsoft.AspNetCore.Diagnostics.csproj @@ -2,19 +2,19 @@ netcoreapp3.0 - false - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj b/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj index 397c24b633..0f66b6d849 100644 --- a/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj +++ b/src/Middleware/Diagnostics/test/testassets/DatabaseErrorPageSample/DatabaseErrorPageSample.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + + false @@ -13,6 +15,8 @@ + + diff --git a/src/Middleware/HeaderPropagation/ref/Microsoft.AspNetCore.HeaderPropagation.csproj b/src/Middleware/HeaderPropagation/ref/Microsoft.AspNetCore.HeaderPropagation.csproj deleted file mode 100644 index 7c2004e0a7..0000000000 --- a/src/Middleware/HeaderPropagation/ref/Microsoft.AspNetCore.HeaderPropagation.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - diff --git a/src/Middleware/HeaderPropagation/ref/Microsoft.AspNetCore.HeaderPropagation.netcoreapp3.0.cs b/src/Middleware/HeaderPropagation/ref/Microsoft.AspNetCore.HeaderPropagation.netcoreapp3.0.cs deleted file mode 100644 index 887719c624..0000000000 --- a/src/Middleware/HeaderPropagation/ref/Microsoft.AspNetCore.HeaderPropagation.netcoreapp3.0.cs +++ /dev/null @@ -1,87 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Builder -{ - public static partial class HeaderPropagationApplicationBuilderExtensions - { - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseHeaderPropagation(this Microsoft.AspNetCore.Builder.IApplicationBuilder app) { throw null; } - } -} -namespace Microsoft.AspNetCore.HeaderPropagation -{ - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct HeaderPropagationContext - { - private readonly object _dummy; - public HeaderPropagationContext(Microsoft.AspNetCore.Http.HttpContext httpContext, string headerName, Microsoft.Extensions.Primitives.StringValues headerValue) { throw null; } - public string HeaderName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.Extensions.Primitives.StringValues HeaderValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Http.HttpContext HttpContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - public partial class HeaderPropagationEntry - { - public HeaderPropagationEntry(string inboundHeaderName, string capturedHeaderName, System.Func valueFilter) { } - public string CapturedHeaderName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string InboundHeaderName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Func ValueFilter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - public sealed partial class HeaderPropagationEntryCollection : System.Collections.ObjectModel.Collection - { - public HeaderPropagationEntryCollection() { } - public void Add(string headerName) { } - public void Add(string headerName, System.Func valueFilter) { } - public void Add(string inboundHeaderName, string outboundHeaderName) { } - public void Add(string inboundHeaderName, string outboundHeaderName, System.Func valueFilter) { } - } - public partial class HeaderPropagationMessageHandler : System.Net.Http.DelegatingHandler - { - public HeaderPropagationMessageHandler(Microsoft.AspNetCore.HeaderPropagation.HeaderPropagationMessageHandlerOptions options, Microsoft.AspNetCore.HeaderPropagation.HeaderPropagationValues values) { } - protected override System.Threading.Tasks.Task SendAsync(System.Net.Http.HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { throw null; } - } - public partial class HeaderPropagationMessageHandlerEntry - { - public HeaderPropagationMessageHandlerEntry(string capturedHeaderName, string outboundHeaderName) { } - public string CapturedHeaderName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string OutboundHeaderName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - public sealed partial class HeaderPropagationMessageHandlerEntryCollection : System.Collections.ObjectModel.Collection - { - public HeaderPropagationMessageHandlerEntryCollection() { } - public void Add(string headerName) { } - public void Add(string capturedHeaderName, string outboundHeaderName) { } - } - public partial class HeaderPropagationMessageHandlerOptions - { - public HeaderPropagationMessageHandlerOptions() { } - public Microsoft.AspNetCore.HeaderPropagation.HeaderPropagationMessageHandlerEntryCollection Headers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class HeaderPropagationMiddleware - { - public HeaderPropagationMiddleware(Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.Extensions.Options.IOptions options, Microsoft.AspNetCore.HeaderPropagation.HeaderPropagationValues values) { } - public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext context) { throw null; } - } - public partial class HeaderPropagationOptions - { - public HeaderPropagationOptions() { } - public Microsoft.AspNetCore.HeaderPropagation.HeaderPropagationEntryCollection Headers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class HeaderPropagationValues - { - public HeaderPropagationValues() { } - public System.Collections.Generic.IDictionary Headers { get { throw null; } set { } } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class HeaderPropagationHttpClientBuilderExtensions - { - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHeaderPropagation(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IHttpClientBuilder AddHeaderPropagation(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Action configure) { throw null; } - } - public static partial class HeaderPropagationServiceCollectionExtensions - { - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddHeaderPropagation(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddHeaderPropagation(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configureOptions) { throw null; } - } -} diff --git a/src/Middleware/HealthChecks.EntityFrameworkCore/ref/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj b/src/Middleware/HealthChecks.EntityFrameworkCore/ref/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj deleted file mode 100644 index 0f5cd79b7d..0000000000 --- a/src/Middleware/HealthChecks.EntityFrameworkCore/ref/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.1 - - - - - - - - diff --git a/src/Middleware/HealthChecks.EntityFrameworkCore/ref/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.netstandard2.1.cs b/src/Middleware/HealthChecks.EntityFrameworkCore/ref/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.netstandard2.1.cs deleted file mode 100644 index e8fdd147a3..0000000000 --- a/src/Middleware/HealthChecks.EntityFrameworkCore/ref/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.netstandard2.1.cs +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class EntityFrameworkCoreHealthChecksBuilderExtensions - { - public static Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder AddDbContextCheck(this Microsoft.Extensions.DependencyInjection.IHealthChecksBuilder builder, string name = null, Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus? failureStatus = default(Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus?), System.Collections.Generic.IEnumerable tags = null, System.Func> customTestQuery = null) where TContext : Microsoft.EntityFrameworkCore.DbContext { throw null; } - } -} diff --git a/src/Middleware/HealthChecks.EntityFrameworkCore/test/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj b/src/Middleware/HealthChecks.EntityFrameworkCore/test/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj index 45271b91bc..687b1f7438 100644 --- a/src/Middleware/HealthChecks.EntityFrameworkCore/test/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj +++ b/src/Middleware/HealthChecks.EntityFrameworkCore/test/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.Tests.csproj @@ -3,12 +3,18 @@ netcoreapp3.0 Microsoft.AspNetCore.Diagnostics.HealthChecks + + false + + + + diff --git a/src/Middleware/HealthChecks/ref/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj b/src/Middleware/HealthChecks/ref/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj index a47255bc03..66a0e30671 100644 --- a/src/Middleware/HealthChecks/ref/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj +++ b/src/Middleware/HealthChecks/ref/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj @@ -2,15 +2,13 @@ netcoreapp3.0 - false - - - - - - + + + + + diff --git a/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj b/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj index c471797b20..ceca32ace9 100644 --- a/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj +++ b/src/Middleware/HealthChecks/test/testassets/HealthChecksSample/HealthChecksSample.csproj @@ -2,14 +2,11 @@ netcoreapp3.0 + + false - - - @@ -20,6 +17,10 @@ + + + + diff --git a/src/Middleware/HostFiltering/ref/Microsoft.AspNetCore.HostFiltering.csproj b/src/Middleware/HostFiltering/ref/Microsoft.AspNetCore.HostFiltering.csproj index 96216afaf5..b97e316540 100644 --- a/src/Middleware/HostFiltering/ref/Microsoft.AspNetCore.HostFiltering.csproj +++ b/src/Middleware/HostFiltering/ref/Microsoft.AspNetCore.HostFiltering.csproj @@ -2,14 +2,12 @@ netcoreapp3.0 - false - - - - - + + + + diff --git a/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.csproj index 59fcb83baa..0ab2aa5b4a 100644 --- a/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.csproj +++ b/src/Middleware/HttpOverrides/ref/Microsoft.AspNetCore.HttpOverrides.csproj @@ -2,13 +2,11 @@ netcoreapp3.0 - false - - - - + + + diff --git a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj index eb0950221c..c5f9652ddc 100644 --- a/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj +++ b/src/Middleware/HttpOverrides/test/Microsoft.AspNetCore.HttpOverrides.Tests.csproj @@ -5,11 +5,6 @@ - - - diff --git a/src/Middleware/HttpsPolicy/ref/Microsoft.AspNetCore.HttpsPolicy.csproj b/src/Middleware/HttpsPolicy/ref/Microsoft.AspNetCore.HttpsPolicy.csproj index 8a24b069bf..9519d7ec1a 100644 --- a/src/Middleware/HttpsPolicy/ref/Microsoft.AspNetCore.HttpsPolicy.csproj +++ b/src/Middleware/HttpsPolicy/ref/Microsoft.AspNetCore.HttpsPolicy.csproj @@ -2,15 +2,13 @@ netcoreapp3.0 - false - - - - - - + + + + + diff --git a/src/Middleware/Localization.Routing/ref/Microsoft.AspNetCore.Localization.Routing.csproj b/src/Middleware/Localization.Routing/ref/Microsoft.AspNetCore.Localization.Routing.csproj index 3dccb4a64b..46071f9fcd 100644 --- a/src/Middleware/Localization.Routing/ref/Microsoft.AspNetCore.Localization.Routing.csproj +++ b/src/Middleware/Localization.Routing/ref/Microsoft.AspNetCore.Localization.Routing.csproj @@ -2,12 +2,10 @@ netcoreapp3.0 - false - - - + + diff --git a/src/Middleware/Localization/ref/Microsoft.AspNetCore.Localization.csproj b/src/Middleware/Localization/ref/Microsoft.AspNetCore.Localization.csproj index 5ec5751618..cb55e38780 100644 --- a/src/Middleware/Localization/ref/Microsoft.AspNetCore.Localization.csproj +++ b/src/Middleware/Localization/ref/Microsoft.AspNetCore.Localization.csproj @@ -2,14 +2,12 @@ netcoreapp3.0 - false - - - - - + + + + diff --git a/src/Middleware/Middleware.sln b/src/Middleware/Middleware.sln index f29cf549fd..6e898c80af 100644 --- a/src/Middleware/Middleware.sln +++ b/src/Middleware/Middleware.sln @@ -299,6 +299,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaServices.Extensions.Tests", "SpaServices.Extensions\test\Microsoft.AspNetCore.SpaServices.Extensions.Tests.csproj", "{D0CB733B-4CE8-4F6C-BBB9-548EA1A96966}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SpaServices.Tests", "SpaServices\test\Microsoft.AspNetCore.SpaServices.Tests.csproj", "{8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1641,6 +1643,18 @@ Global {D0CB733B-4CE8-4F6C-BBB9-548EA1A96966}.Release|x64.Build.0 = Release|Any CPU {D0CB733B-4CE8-4F6C-BBB9-548EA1A96966}.Release|x86.ActiveCfg = Release|Any CPU {D0CB733B-4CE8-4F6C-BBB9-548EA1A96966}.Release|x86.Build.0 = Release|Any CPU + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}.Debug|x64.ActiveCfg = Debug|Any CPU + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}.Debug|x64.Build.0 = Debug|Any CPU + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}.Debug|x86.ActiveCfg = Debug|Any CPU + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}.Debug|x86.Build.0 = Debug|Any CPU + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}.Release|Any CPU.Build.0 = Release|Any CPU + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}.Release|x64.ActiveCfg = Release|Any CPU + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}.Release|x64.Build.0 = Release|Any CPU + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}.Release|x86.ActiveCfg = Release|Any CPU + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1770,6 +1784,7 @@ Global {46B4FE62-06A1-4D54-B3E8-D8B4B3560075} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} {92E11EBB-759E-4DA8-AB61-A9977D9F97D0} = {ACA6DDB9-7592-47CE-A740-D15BF307E9E0} {D0CB733B-4CE8-4F6C-BBB9-548EA1A96966} = {D6FA4ABE-E685-4EDD-8B06-D8777E76B472} + {8A9C1F6C-3A47-4868-AA95-3EBE0260F5A0} = {D6FA4ABE-E685-4EDD-8B06-D8777E76B472} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {83786312-A93B-4BB4-AB06-7C6913A59AFA} diff --git a/src/Middleware/MiddlewareAnalysis/ref/Microsoft.AspNetCore.MiddlewareAnalysis.csproj b/src/Middleware/MiddlewareAnalysis/ref/Microsoft.AspNetCore.MiddlewareAnalysis.csproj deleted file mode 100644 index 0d6b743c99..0000000000 --- a/src/Middleware/MiddlewareAnalysis/ref/Microsoft.AspNetCore.MiddlewareAnalysis.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - diff --git a/src/Middleware/MiddlewareAnalysis/ref/Microsoft.AspNetCore.MiddlewareAnalysis.netcoreapp3.0.cs b/src/Middleware/MiddlewareAnalysis/ref/Microsoft.AspNetCore.MiddlewareAnalysis.netcoreapp3.0.cs deleted file mode 100644 index 3436075858..0000000000 --- a/src/Middleware/MiddlewareAnalysis/ref/Microsoft.AspNetCore.MiddlewareAnalysis.netcoreapp3.0.cs +++ /dev/null @@ -1,34 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.MiddlewareAnalysis -{ - public partial class AnalysisBuilder : Microsoft.AspNetCore.Builder.IApplicationBuilder - { - public AnalysisBuilder(Microsoft.AspNetCore.Builder.IApplicationBuilder inner) { } - public System.IServiceProvider ApplicationServices { get { throw null; } set { } } - public System.Collections.Generic.IDictionary Properties { get { throw null; } } - public Microsoft.AspNetCore.Http.Features.IFeatureCollection ServerFeatures { get { throw null; } } - public Microsoft.AspNetCore.Http.RequestDelegate Build() { throw null; } - public Microsoft.AspNetCore.Builder.IApplicationBuilder New() { throw null; } - public Microsoft.AspNetCore.Builder.IApplicationBuilder Use(System.Func middleware) { throw null; } - } - public partial class AnalysisMiddleware - { - public AnalysisMiddleware(Microsoft.AspNetCore.Http.RequestDelegate next, System.Diagnostics.DiagnosticSource diagnosticSource, string middlewareName) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } - } - public partial class AnalysisStartupFilter : Microsoft.AspNetCore.Hosting.IStartupFilter - { - public AnalysisStartupFilter() { } - public System.Action Configure(System.Action next) { throw null; } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class AnalysisServiceCollectionExtensions - { - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddMiddlewareAnalysis(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; } - } -} diff --git a/src/Middleware/NodeServices/ref/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/ref/Microsoft.AspNetCore.NodeServices.csproj deleted file mode 100644 index fceac7cf81..0000000000 --- a/src/Middleware/NodeServices/ref/Microsoft.AspNetCore.NodeServices.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - diff --git a/src/Middleware/NodeServices/ref/Microsoft.AspNetCore.NodeServices.netcoreapp3.0.cs b/src/Middleware/NodeServices/ref/Microsoft.AspNetCore.NodeServices.netcoreapp3.0.cs deleted file mode 100644 index c57f1991df..0000000000 --- a/src/Middleware/NodeServices/ref/Microsoft.AspNetCore.NodeServices.netcoreapp3.0.cs +++ /dev/null @@ -1,104 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.NodeServices -{ - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static partial class EmbeddedResourceReader - { - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static string Read(System.Type assemblyContainingType, string path) { throw null; } - } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public partial interface INodeServices : System.IDisposable - { - System.Threading.Tasks.Task InvokeAsync(string moduleName, params object[] args); - System.Threading.Tasks.Task InvokeAsync(System.Threading.CancellationToken cancellationToken, string moduleName, params object[] args); - System.Threading.Tasks.Task InvokeExportAsync(string moduleName, string exportedFunctionName, params object[] args); - System.Threading.Tasks.Task InvokeExportAsync(System.Threading.CancellationToken cancellationToken, string moduleName, string exportedFunctionName, params object[] args); - } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static partial class NodeServicesFactory - { - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static Microsoft.AspNetCore.NodeServices.INodeServices CreateNodeServices(Microsoft.AspNetCore.NodeServices.NodeServicesOptions options) { throw null; } - } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public partial class NodeServicesOptions - { - public NodeServicesOptions(System.IServiceProvider serviceProvider) { } - public System.Threading.CancellationToken ApplicationStoppingToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int DebuggingPort { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IDictionary EnvironmentVariables { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int InvocationTimeoutMilliseconds { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool LaunchWithDebugging { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func NodeInstanceFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.Extensions.Logging.ILogger NodeInstanceOutputLogger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ProjectPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string[] WatchFileExtensions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public sealed partial class StringAsTempFile : System.IDisposable - { - public StringAsTempFile(string content, System.Threading.CancellationToken applicationStoppingToken) { } - public string FileName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public void Dispose() { } - ~StringAsTempFile() { } - } -} -namespace Microsoft.AspNetCore.NodeServices.HostingModels -{ - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public partial interface INodeInstance : System.IDisposable - { - System.Threading.Tasks.Task InvokeExportAsync(System.Threading.CancellationToken cancellationToken, string moduleName, string exportNameOrNull, params object[] args); - } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public partial class NodeInvocationException : System.Exception - { - public NodeInvocationException(string message, string details) { } - public NodeInvocationException(string message, string details, bool nodeInstanceUnavailable, bool allowConnectionDraining) { } - public bool AllowConnectionDraining { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool NodeInstanceUnavailable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public partial class NodeInvocationInfo - { - public NodeInvocationInfo() { } - public object[] Args { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ExportedFunctionName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ModuleName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static partial class NodeServicesOptionsExtensions - { - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static void UseHttpHosting(this Microsoft.AspNetCore.NodeServices.NodeServicesOptions options) { } - } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public abstract partial class OutOfProcessNodeInstance : Microsoft.AspNetCore.NodeServices.HostingModels.INodeInstance, System.IDisposable - { - protected readonly Microsoft.Extensions.Logging.ILogger OutputLogger; - public OutOfProcessNodeInstance(string entryPointScript, string projectPath, string[] watchFileExtensions, string commandLineArguments, System.Threading.CancellationToken applicationStoppingToken, Microsoft.Extensions.Logging.ILogger nodeOutputLogger, System.Collections.Generic.IDictionary environmentVars, int invocationTimeoutMilliseconds, bool launchWithDebugging, int debuggingPort) { } - public void Dispose() { } - protected virtual void Dispose(bool disposing) { } - ~OutOfProcessNodeInstance() { } - protected abstract System.Threading.Tasks.Task InvokeExportAsync(Microsoft.AspNetCore.NodeServices.HostingModels.NodeInvocationInfo invocationInfo, System.Threading.CancellationToken cancellationToken); - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task InvokeExportAsync(System.Threading.CancellationToken cancellationToken, string moduleName, string exportNameOrNull, params object[] args) { throw null; } - protected virtual void OnErrorDataReceived(string errorData) { } - protected virtual void OnOutputDataReceived(string outputData) { } - protected virtual System.Diagnostics.ProcessStartInfo PrepareNodeProcessStartInfo(string entryPointFilename, string projectPath, string commandLineArguments, System.Collections.Generic.IDictionary environmentVars, bool launchWithDebugging, int debuggingPort) { throw null; } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static partial class NodeServicesServiceCollectionExtensions - { - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static void AddNodeServices(this Microsoft.Extensions.DependencyInjection.IServiceCollection serviceCollection) { } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static void AddNodeServices(this Microsoft.Extensions.DependencyInjection.IServiceCollection serviceCollection, System.Action setupAction) { } - } -} diff --git a/src/Middleware/ResponseCaching.Abstractions/ref/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj b/src/Middleware/ResponseCaching.Abstractions/ref/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj index dbc557d005..70bf628383 100644 --- a/src/Middleware/ResponseCaching.Abstractions/ref/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj +++ b/src/Middleware/ResponseCaching.Abstractions/ref/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj @@ -2,11 +2,9 @@ netcoreapp3.0 - false - - + diff --git a/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.Manual.cs b/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.Manual.cs new file mode 100644 index 0000000000..75a6c20e62 --- /dev/null +++ b/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.Manual.cs @@ -0,0 +1,189 @@ +// 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. + +namespace Microsoft.AspNetCore.ResponseCaching +{ + internal partial class CachedResponse : Microsoft.AspNetCore.ResponseCaching.IResponseCacheEntry + { + public CachedResponse() { } + public System.IO.Stream Body { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DateTimeOffset Created { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Http.IHeaderDictionary Headers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int StatusCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class CachedVaryByRules : Microsoft.AspNetCore.ResponseCaching.IResponseCacheEntry + { + public CachedVaryByRules() { } + public Microsoft.Extensions.Primitives.StringValues Headers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.Extensions.Primitives.StringValues QueryKeys { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string VaryByKeyPrefix { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class FastGuid + { + internal FastGuid(long id) { } + internal string IdString { get { throw null; } } + internal long IdValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal static Microsoft.AspNetCore.ResponseCaching.FastGuid NewGuid() { throw null; } + } + internal partial interface IResponseCache + { + Microsoft.AspNetCore.ResponseCaching.IResponseCacheEntry Get(string key); + System.Threading.Tasks.Task GetAsync(string key); + void Set(string key, Microsoft.AspNetCore.ResponseCaching.IResponseCacheEntry entry, System.TimeSpan validFor); + System.Threading.Tasks.Task SetAsync(string key, Microsoft.AspNetCore.ResponseCaching.IResponseCacheEntry entry, System.TimeSpan validFor); + } + internal partial interface IResponseCacheEntry + { + } + internal partial interface IResponseCachingKeyProvider + { + string CreateBaseKey(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context); + System.Collections.Generic.IEnumerable CreateLookupVaryByKeys(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context); + string CreateStorageVaryByKey(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context); + } + internal partial interface IResponseCachingPolicyProvider + { + bool AllowCacheLookup(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context); + bool AllowCacheStorage(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context); + bool AttemptResponseCaching(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context); + bool IsCachedEntryFresh(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context); + bool IsResponseCacheable(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context); + } + internal partial interface ISystemClock + { + System.DateTimeOffset UtcNow { get; } + } + internal partial class MemoryResponseCache : Microsoft.AspNetCore.ResponseCaching.IResponseCache + { + internal MemoryResponseCache(Microsoft.Extensions.Caching.Memory.IMemoryCache cache) { } + public Microsoft.AspNetCore.ResponseCaching.IResponseCacheEntry Get(string key) { throw null; } + public System.Threading.Tasks.Task GetAsync(string key) { throw null; } + public void Set(string key, Microsoft.AspNetCore.ResponseCaching.IResponseCacheEntry entry, System.TimeSpan validFor) { } + public System.Threading.Tasks.Task SetAsync(string key, Microsoft.AspNetCore.ResponseCaching.IResponseCacheEntry entry, System.TimeSpan validFor) { throw null; } + } + internal partial class ResponseCachingContext + { + internal ResponseCachingContext(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.Extensions.Logging.ILogger logger) { } + internal string BaseKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.TimeSpan? CachedEntryAge { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } + internal Microsoft.AspNetCore.ResponseCaching.CachedResponse CachedResponse { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal Microsoft.AspNetCore.Http.IHeaderDictionary CachedResponseHeaders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal System.TimeSpan CachedResponseValidFor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.ResponseCaching.CachedVaryByRules CachedVaryByRules { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Http.HttpContext HttpContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.Extensions.Logging.ILogger Logger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal System.IO.Stream OriginalResponseStream { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal Microsoft.AspNetCore.ResponseCaching.ResponseCachingStream ResponseCachingStream { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal System.DateTimeOffset? ResponseDate { get { throw null; } set { } } + internal System.DateTimeOffset? ResponseExpires { get { throw null; } } + internal System.TimeSpan? ResponseMaxAge { get { throw null; } } + internal System.TimeSpan? ResponseSharedMaxAge { get { throw null; } } + internal bool ResponseStarted { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.DateTimeOffset? ResponseTime { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } + internal bool ShouldCacheResponse { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal string StorageVaryKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class ResponseCachingKeyProvider : Microsoft.AspNetCore.ResponseCaching.IResponseCachingKeyProvider + { + internal ResponseCachingKeyProvider(Microsoft.Extensions.ObjectPool.ObjectPoolProvider poolProvider, Microsoft.Extensions.Options.IOptions options) { } + public string CreateBaseKey(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + public System.Collections.Generic.IEnumerable CreateLookupVaryByKeys(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + public string CreateStorageVaryByKey(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + } + public partial class ResponseCachingMiddleware + { + internal ResponseCachingMiddleware(Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.ResponseCaching.IResponseCachingPolicyProvider policyProvider, Microsoft.AspNetCore.ResponseCaching.IResponseCache cache, Microsoft.AspNetCore.ResponseCaching.IResponseCachingKeyProvider keyProvider) { } + internal static void AddResponseCachingFeature(Microsoft.AspNetCore.Http.HttpContext context) { } + internal static bool ContentIsNotModified(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + internal System.Threading.Tasks.Task FinalizeCacheBodyAsync(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + internal System.Threading.Tasks.Task FinalizeCacheHeadersAsync(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + internal static Microsoft.Extensions.Primitives.StringValues GetOrderCasingNormalizedStringValues(Microsoft.Extensions.Primitives.StringValues stringValues) { throw null; } + internal void ShimResponseStream(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { } + internal System.Threading.Tasks.Task StartResponseAsync(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + internal System.Threading.Tasks.Task TryServeFromCacheAsync(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + } + public partial class ResponseCachingOptions + { + internal Microsoft.AspNetCore.ResponseCaching.ISystemClock SystemClock { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class ResponseCachingPolicyProvider : Microsoft.AspNetCore.ResponseCaching.IResponseCachingPolicyProvider + { + public ResponseCachingPolicyProvider() { } + public virtual bool AllowCacheLookup(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + public virtual bool AllowCacheStorage(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + public virtual bool AttemptResponseCaching(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + public virtual bool IsCachedEntryFresh(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + public virtual bool IsResponseCacheable(Microsoft.AspNetCore.ResponseCaching.ResponseCachingContext context) { throw null; } + } + internal partial class ResponseCachingStream : System.IO.Stream + { + internal ResponseCachingStream(System.IO.Stream innerStream, long maxBufferSize, int segmentSize, System.Action startResponseCallback, System.Func startResponseCallbackAsync) { } + internal bool BufferingEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanWrite { get { throw null; } } + public override long Length { get { throw null; } } + public override long Position { get { throw null; } set { } } + public override System.IAsyncResult BeginWrite(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + internal void DisableBuffering() { } + public override void EndWrite(System.IAsyncResult asyncResult) { } + public override void Flush() { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + internal System.IO.Stream GetBufferStream() { throw null; } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public override void SetLength(long value) { } + public override void Write(byte[] buffer, int offset, int count) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override void WriteByte(byte value) { } + } + internal partial class SegmentReadStream : System.IO.Stream + { + internal SegmentReadStream(System.Collections.Generic.List segments, long length) { } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanWrite { get { throw null; } } + public override long Length { get { throw null; } } + public override long Position { get { throw null; } set { } } + public override System.IAsyncResult BeginRead(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public override System.Threading.Tasks.Task CopyToAsync(System.IO.Stream destination, int bufferSize, System.Threading.CancellationToken cancellationToken) { throw null; } + public override int EndRead(System.IAsyncResult asyncResult) { throw null; } + public override void Flush() { } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override int ReadByte() { throw null; } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public override void SetLength(long value) { } + public override void Write(byte[] buffer, int offset, int count) { } + } + internal partial class SegmentWriteStream : System.IO.Stream + { + internal SegmentWriteStream(int segmentSize) { } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanWrite { get { throw null; } } + public override long Length { get { throw null; } } + public override long Position { get { throw null; } set { } } + public override System.IAsyncResult BeginWrite(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + protected override void Dispose(bool disposing) { } + public override void EndWrite(System.IAsyncResult asyncResult) { } + public override void Flush() { } + internal System.Collections.Generic.List GetSegments() { throw null; } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public override void SetLength(long value) { } + public override void Write(byte[] buffer, int offset, int count) { } + public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override void WriteByte(byte value) { } + } + internal static partial class StreamUtilities + { + internal static int BodySegmentSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static System.IAsyncResult ToIAsyncResult(System.Threading.Tasks.Task task, System.AsyncCallback callback, object state) { throw null; } + } +} diff --git a/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.csproj b/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.csproj index 8fa81e3f4a..fc14162e71 100644 --- a/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.csproj +++ b/src/Middleware/ResponseCaching/ref/Microsoft.AspNetCore.ResponseCaching.csproj @@ -2,15 +2,15 @@ netcoreapp3.0 - false - - - - - - + + + + + + + diff --git a/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.Manual.cs b/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.Manual.cs new file mode 100644 index 0000000000..952a972c83 --- /dev/null +++ b/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.Manual.cs @@ -0,0 +1,35 @@ +// 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. + +namespace Microsoft.AspNetCore.ResponseCompression +{ + internal partial class ResponseCompressionBody : System.IO.Stream, Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature, Microsoft.AspNetCore.Http.Features.IHttpsCompressionFeature + { + internal ResponseCompressionBody(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.ResponseCompression.IResponseCompressionProvider provider, Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature innerBodyFeature) { } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanWrite { get { throw null; } } + public override long Length { get { throw null; } } + Microsoft.AspNetCore.Http.Features.HttpsCompressionMode Microsoft.AspNetCore.Http.Features.IHttpsCompressionFeature.Mode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override long Position { get { throw null; } set { } } + public System.IO.Stream Stream { get { throw null; } } + public System.IO.Pipelines.PipeWriter Writer { get { throw null; } } + public override System.IAsyncResult BeginWrite(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task CompleteAsync() { throw null; } + public void DisableBuffering() { } + public override void EndWrite(System.IAsyncResult asyncResult) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + internal System.Threading.Tasks.Task FinishCompressionAsync() { throw null; } + public override void Flush() { } + public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public System.Threading.Tasks.Task SendFileAsync(string path, long offset, long? count, System.Threading.CancellationToken cancellation) { throw null; } + public override void SetLength(long value) { } + public System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) { throw null; } + public override void Write(byte[] buffer, int offset, int count) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + } +} diff --git a/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.csproj b/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.csproj index 8f6c10f1e8..c7882083b3 100644 --- a/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.csproj +++ b/src/Middleware/ResponseCompression/ref/Microsoft.AspNetCore.ResponseCompression.csproj @@ -2,14 +2,14 @@ netcoreapp3.0 - false - - - - - + + + + + + diff --git a/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.Manual.cs b/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.Manual.cs new file mode 100644 index 0000000000..98253230f7 --- /dev/null +++ b/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.Manual.cs @@ -0,0 +1,587 @@ +// 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. + +namespace Microsoft.AspNetCore.Rewrite +{ + internal partial class BackReferenceCollection + { + public BackReferenceCollection(string reference) { } + public BackReferenceCollection(System.Text.RegularExpressions.GroupCollection references) { } + public string this[int index] { get { throw null; } } + public void Add(Microsoft.AspNetCore.Rewrite.BackReferenceCollection references) { } + } + internal partial class MatchResults + { + public static readonly Microsoft.AspNetCore.Rewrite.MatchResults EmptyFailure; + public static readonly Microsoft.AspNetCore.Rewrite.MatchResults EmptySuccess; + public MatchResults() { } + public Microsoft.AspNetCore.Rewrite.BackReferenceCollection BackReferences { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool Success { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class ParserContext + { + public readonly string Template; + public ParserContext(string condition) { } + public char Current { get { throw null; } } + public int Index { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool Back() { throw null; } + public string Capture() { throw null; } + public int GetIndex() { throw null; } + public bool HasNext() { throw null; } + public void Mark() { } + public bool Next() { throw null; } + } + internal partial class Pattern + { + public Pattern(System.Collections.Generic.IList patternSegments) { } + public System.Collections.Generic.IList PatternSegments { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal abstract partial class PatternSegment + { + protected PatternSegment() { } + public abstract string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences); + } + internal static partial class Resources + { + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static string Error_ChangeEnvironmentNotSupported { get { throw null; } } + internal static string Error_CouldNotParseInteger { get { throw null; } } + internal static string Error_InputParserIndexOutOfRange { get { throw null; } } + internal static string Error_InputParserInvalidInteger { get { throw null; } } + internal static string Error_InputParserMissingCloseBrace { get { throw null; } } + internal static string Error_InputParserNoBackreference { get { throw null; } } + internal static string Error_InputParserUnrecognizedParameter { get { throw null; } } + internal static string Error_IntegerMatch_FormatExceptionMessage { get { throw null; } } + internal static string Error_InvalidChangeCookieFlag { get { throw null; } } + internal static string Error_ModRewriteGeneralParseError { get { throw null; } } + internal static string Error_ModRewriteParseError { get { throw null; } } + internal static string Error_UnsupportedServerVariable { get { throw null; } } + internal static string Error_UrlRewriteParseError { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string FormatError_CouldNotParseInteger(object p0) { throw null; } + internal static string FormatError_InputParserIndexOutOfRange(object p0, object p1) { throw null; } + internal static string FormatError_InputParserInvalidInteger(object p0, object p1) { throw null; } + internal static string FormatError_InputParserMissingCloseBrace(object p0) { throw null; } + internal static string FormatError_InputParserNoBackreference(object p0) { throw null; } + internal static string FormatError_InputParserUnrecognizedParameter(object p0, object p1) { throw null; } + internal static string FormatError_InvalidChangeCookieFlag(object p0) { throw null; } + internal static string FormatError_ModRewriteGeneralParseError(object p0) { throw null; } + internal static string FormatError_ModRewriteParseError(object p0, object p1) { throw null; } + internal static string FormatError_UnsupportedServerVariable(object p0) { throw null; } + internal static string FormatError_UrlRewriteParseError(object p0, object p1, object p2) { throw null; } + } + internal abstract partial class UrlAction + { + protected UrlAction() { } + protected Microsoft.AspNetCore.Rewrite.Pattern Url { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public abstract void ApplyAction(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences); + } + internal abstract partial class UrlMatch + { + protected UrlMatch() { } + protected bool Negate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public abstract Microsoft.AspNetCore.Rewrite.MatchResults Evaluate(string input, Microsoft.AspNetCore.Rewrite.RewriteContext context); + } +} + +namespace Microsoft.AspNetCore.Rewrite.ApacheModRewrite +{ + internal partial class ApacheModRewriteRule : Microsoft.AspNetCore.Rewrite.IRule + { + public ApacheModRewriteRule(Microsoft.AspNetCore.Rewrite.UrlMatch initialMatch, System.Collections.Generic.IList conditions, System.Collections.Generic.IList urlActions) { } + public System.Collections.Generic.IList Actions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IList Conditions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Rewrite.UrlMatch InitialMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public virtual void ApplyRule(Microsoft.AspNetCore.Rewrite.RewriteContext context) { } + } + internal partial class Condition + { + public Condition() { } + public Microsoft.AspNetCore.Rewrite.Pattern Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Rewrite.UrlMatch Match { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool OrNext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Rewrite.MatchResults Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class ConditionPatternParser + { + public ConditionPatternParser() { } + public Microsoft.AspNetCore.Rewrite.ApacheModRewrite.ParsedModRewriteInput ParseActionCondition(string condition) { throw null; } + } + internal enum ConditionType + { + Regex = 0, + PropertyTest = 1, + StringComp = 2, + IntComp = 3, + } + internal partial class CookieActionFactory + { + public CookieActionFactory() { } + public Microsoft.AspNetCore.Rewrite.UrlActions.ChangeCookieAction Create(string flagValue) { throw null; } + } + internal partial class FileParser + { + public FileParser() { } + public System.Collections.Generic.IList Parse(System.IO.TextReader input) { throw null; } + } + internal partial class FlagParser + { + public FlagParser() { } + public Microsoft.AspNetCore.Rewrite.ApacheModRewrite.Flags Parse(string flagString) { throw null; } + } + internal partial class Flags + { + public Flags() { } + public Flags(System.Collections.Generic.IDictionary flags) { } + public System.Collections.Generic.IDictionary FlagDictionary { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string this[Microsoft.AspNetCore.Rewrite.ApacheModRewrite.FlagType flag] { get { throw null; } set { } } + public bool GetValue(Microsoft.AspNetCore.Rewrite.ApacheModRewrite.FlagType flag, out string value) { throw null; } + public bool HasFlag(Microsoft.AspNetCore.Rewrite.ApacheModRewrite.FlagType flag) { throw null; } + public void SetFlag(Microsoft.AspNetCore.Rewrite.ApacheModRewrite.FlagType flag, string value) { } + } + internal enum FlagType + { + EscapeBackreference = 0, + Chain = 1, + Cookie = 2, + DiscardPath = 3, + Env = 4, + End = 5, + Forbidden = 6, + Gone = 7, + Handler = 8, + Last = 9, + Next = 10, + NoCase = 11, + NoEscape = 12, + NoSubReq = 13, + NoVary = 14, + Or = 15, + Proxy = 16, + PassThrough = 17, + QSAppend = 18, + QSDiscard = 19, + QSLast = 20, + Redirect = 21, + Skip = 22, + Type = 23, + } + internal enum OperationType + { + None = 0, + Equal = 1, + Greater = 2, + GreaterEqual = 3, + Less = 4, + LessEqual = 5, + NotEqual = 6, + Directory = 7, + RegularFile = 8, + ExistingFile = 9, + SymbolicLink = 10, + Size = 11, + ExistingUrl = 12, + Executable = 13, + } + internal partial class ParsedModRewriteInput + { + public ParsedModRewriteInput() { } + public ParsedModRewriteInput(bool invert, Microsoft.AspNetCore.Rewrite.ApacheModRewrite.ConditionType conditionType, Microsoft.AspNetCore.Rewrite.ApacheModRewrite.OperationType operationType, string operand) { } + public Microsoft.AspNetCore.Rewrite.ApacheModRewrite.ConditionType ConditionType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool Invert { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Operand { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Rewrite.ApacheModRewrite.OperationType OperationType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class RuleBuilder + { + internal System.Collections.Generic.IList _actions; + public RuleBuilder() { } + public void AddAction(Microsoft.AspNetCore.Rewrite.Pattern pattern, Microsoft.AspNetCore.Rewrite.ApacheModRewrite.Flags flags) { } + public void AddConditionFromParts(Microsoft.AspNetCore.Rewrite.Pattern pattern, Microsoft.AspNetCore.Rewrite.ApacheModRewrite.ParsedModRewriteInput input, Microsoft.AspNetCore.Rewrite.ApacheModRewrite.Flags flags) { } + public void AddMatch(Microsoft.AspNetCore.Rewrite.ApacheModRewrite.ParsedModRewriteInput input, Microsoft.AspNetCore.Rewrite.ApacheModRewrite.Flags flags) { } + public void AddRule(string rule) { } + public Microsoft.AspNetCore.Rewrite.ApacheModRewrite.ApacheModRewriteRule Build() { throw null; } + } + internal partial class RuleRegexParser + { + public RuleRegexParser() { } + public Microsoft.AspNetCore.Rewrite.ApacheModRewrite.ParsedModRewriteInput ParseRuleRegex(string regex) { throw null; } + } + internal partial class TestStringParser + { + public TestStringParser() { } + public Microsoft.AspNetCore.Rewrite.Pattern Parse(string testString) { throw null; } + } + internal partial class Tokenizer + { + public Tokenizer() { } + public System.Collections.Generic.IList Tokenize(string rule) { throw null; } + } +} + +namespace Microsoft.AspNetCore.Rewrite.IISUrlRewrite +{ + internal enum ActionType + { + None = 0, + Rewrite = 1, + Redirect = 2, + CustomResponse = 3, + AbortRequest = 4, + } + internal partial class Condition + { + public Condition() { } + public Microsoft.AspNetCore.Rewrite.Pattern Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Rewrite.UrlMatch Match { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Rewrite.MatchResults Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class ConditionCollection : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable + { + public ConditionCollection() { } + public ConditionCollection(Microsoft.AspNetCore.Rewrite.IISUrlRewrite.LogicalGrouping grouping, bool trackAllCaptures) { } + public int Count { get { throw null; } } + public Microsoft.AspNetCore.Rewrite.IISUrlRewrite.LogicalGrouping Grouping { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Rewrite.IISUrlRewrite.Condition this[int index] { get { throw null; } } + public bool TrackAllCaptures { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void Add(Microsoft.AspNetCore.Rewrite.IISUrlRewrite.Condition condition) { } + public void AddConditions(System.Collections.Generic.IEnumerable conditions) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + } + internal partial class IISRewriteMap + { + public IISRewriteMap(string name) { } + public string this[string key] { get { throw null; } set { } } + public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class IISRewriteMapCollection : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable + { + public IISRewriteMapCollection() { } + public int Count { get { throw null; } } + public Microsoft.AspNetCore.Rewrite.IISUrlRewrite.IISRewriteMap this[string key] { get { throw null; } } + public void Add(Microsoft.AspNetCore.Rewrite.IISUrlRewrite.IISRewriteMap rewriteMap) { } + public System.Collections.Generic.IEnumerator GetEnumerator() { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + } + internal partial class IISUrlRewriteRule : Microsoft.AspNetCore.Rewrite.IRule + { + public IISUrlRewriteRule(string name, Microsoft.AspNetCore.Rewrite.UrlMatch initialMatch, Microsoft.AspNetCore.Rewrite.IISUrlRewrite.ConditionCollection conditions, Microsoft.AspNetCore.Rewrite.UrlAction action) { } + public IISUrlRewriteRule(string name, Microsoft.AspNetCore.Rewrite.UrlMatch initialMatch, Microsoft.AspNetCore.Rewrite.IISUrlRewrite.ConditionCollection conditions, Microsoft.AspNetCore.Rewrite.UrlAction action, bool global) { } + public Microsoft.AspNetCore.Rewrite.UrlAction Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Rewrite.IISUrlRewrite.ConditionCollection Conditions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool Global { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Rewrite.UrlMatch InitialMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public virtual void ApplyRule(Microsoft.AspNetCore.Rewrite.RewriteContext context) { } + } + internal partial class InputParser + { + public InputParser() { } + public InputParser(Microsoft.AspNetCore.Rewrite.IISUrlRewrite.IISRewriteMapCollection rewriteMaps, bool alwaysUseManagedServerVariables) { } + public Microsoft.AspNetCore.Rewrite.Pattern ParseInputString(string testString) { throw null; } + public Microsoft.AspNetCore.Rewrite.Pattern ParseInputString(string testString, Microsoft.AspNetCore.Rewrite.IISUrlRewrite.UriMatchPart uriMatchPart) { throw null; } + } + internal partial class InvalidUrlRewriteFormatException : System.FormatException + { + public InvalidUrlRewriteFormatException(System.Xml.Linq.XElement element, string message) { } + public InvalidUrlRewriteFormatException(System.Xml.Linq.XElement element, string message, System.Exception innerException) { } + public int LineNumber { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int LinePosition { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal enum LogicalGrouping + { + MatchAll = 0, + MatchAny = 1, + } + internal enum PatternSyntax + { + ECMAScript = 0, + Wildcard = 1, + ExactMatch = 2, + } + internal enum RedirectType + { + Permanent = 301, + Found = 302, + SeeOther = 303, + Temporary = 307, + } + internal static partial class RewriteMapParser + { + public static Microsoft.AspNetCore.Rewrite.IISUrlRewrite.IISRewriteMapCollection Parse(System.Xml.Linq.XElement xmlRoot) { throw null; } + } + internal static partial class RewriteTags + { + public const string Action = "action"; + public const string Add = "add"; + public const string AppendQueryString = "appendQueryString"; + public const string Conditions = "conditions"; + public const string Enabled = "enabled"; + public const string GlobalRules = "globalRules"; + public const string IgnoreCase = "ignoreCase"; + public const string Input = "input"; + public const string Key = "key"; + public const string LogicalGrouping = "logicalGrouping"; + public const string LogRewrittenUrl = "logRewrittenUrl"; + public const string Match = "match"; + public const string MatchPattern = "matchPattern"; + public const string MatchType = "matchType"; + public const string Name = "name"; + public const string Negate = "negate"; + public const string Pattern = "pattern"; + public const string PatternSyntax = "patternSyntax"; + public const string RedirectType = "redirectType"; + public const string Rewrite = "rewrite"; + public const string RewriteMap = "rewriteMap"; + public const string RewriteMaps = "rewriteMaps"; + public const string Rule = "rule"; + public const string Rules = "rules"; + public const string StatusCode = "statusCode"; + public const string StatusDescription = "statusDescription"; + public const string StatusReason = "statusReason"; + public const string StopProcessing = "stopProcessing"; + public const string SubStatusCode = "subStatusCode"; + public const string TrackAllCaptures = "trackAllCaptures"; + public const string Type = "type"; + public const string Url = "url"; + public const string Value = "value"; + } + internal static partial class ServerVariables + { + public static Microsoft.AspNetCore.Rewrite.PatternSegment FindServerVariable(string serverVariable, Microsoft.AspNetCore.Rewrite.ParserContext context, Microsoft.AspNetCore.Rewrite.IISUrlRewrite.UriMatchPart uriMatchPart, bool alwaysUseManagedServerVariables) { throw null; } + } + internal partial class UriMatchCondition : Microsoft.AspNetCore.Rewrite.IISUrlRewrite.Condition + { + public UriMatchCondition(Microsoft.AspNetCore.Rewrite.IISUrlRewrite.InputParser inputParser, string input, string pattern, Microsoft.AspNetCore.Rewrite.IISUrlRewrite.UriMatchPart uriMatchPart, bool ignoreCase, bool negate) { } + } + internal enum UriMatchPart + { + Full = 0, + Path = 1, + } + internal partial class UrlRewriteFileParser + { + public UrlRewriteFileParser() { } + public System.Collections.Generic.IList Parse(System.IO.TextReader reader, bool alwaysUseManagedServerVariables) { throw null; } + } + internal partial class UrlRewriteRuleBuilder + { + public UrlRewriteRuleBuilder() { } + public bool Enabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool Global { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Rewrite.IISUrlRewrite.UriMatchPart UriMatchPart { get { throw null; } } + public void AddUrlAction(Microsoft.AspNetCore.Rewrite.UrlAction action) { } + public void AddUrlCondition(Microsoft.AspNetCore.Rewrite.IISUrlRewrite.Condition condition) { } + public void AddUrlConditions(System.Collections.Generic.IEnumerable conditions) { } + public void AddUrlMatch(string input, bool ignoreCase = true, bool negate = false, Microsoft.AspNetCore.Rewrite.IISUrlRewrite.PatternSyntax patternSyntax = Microsoft.AspNetCore.Rewrite.IISUrlRewrite.PatternSyntax.ECMAScript) { } + public Microsoft.AspNetCore.Rewrite.IISUrlRewrite.IISUrlRewriteRule Build() { throw null; } + public void ConfigureConditionBehavior(Microsoft.AspNetCore.Rewrite.IISUrlRewrite.LogicalGrouping logicalGrouping, bool trackAllCaptures) { } + } +} + +namespace Microsoft.AspNetCore.Rewrite.PatternSegments +{ + internal partial class ConditionMatchSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public ConditionMatchSegment(int index) { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class DateTimeSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public DateTimeSegment(string segment) { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReference) { throw null; } + } + internal partial class HeaderSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public HeaderSegment(string header) { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class IsHttpsModSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public IsHttpsModSegment() { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class IsHttpsUrlSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public IsHttpsUrlSegment() { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class IsIPV6Segment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public IsIPV6Segment() { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class LiteralSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public LiteralSegment(string literal) { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class LocalAddressSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public LocalAddressSegment() { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class LocalPortSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public LocalPortSegment() { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class QueryStringSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public QueryStringSegment() { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackRefernces, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class RemoteAddressSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public RemoteAddressSegment() { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class RemotePortSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public RemotePortSegment() { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class RequestFileNameSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public RequestFileNameSegment() { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class RequestMethodSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public RequestMethodSegment() { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class RewriteMapSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public RewriteMapSegment(Microsoft.AspNetCore.Rewrite.IISUrlRewrite.IISRewriteMap rewriteMap, Microsoft.AspNetCore.Rewrite.Pattern pattern) { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class RuleMatchSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public RuleMatchSegment(int index) { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class SchemeSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public SchemeSegment() { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class ServerProtocolSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public ServerProtocolSegment() { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class ToLowerSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public ToLowerSegment(Microsoft.AspNetCore.Rewrite.Pattern pattern) { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class UrlEncodeSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public UrlEncodeSegment(Microsoft.AspNetCore.Rewrite.Pattern pattern) { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } + internal partial class UrlSegment : Microsoft.AspNetCore.Rewrite.PatternSegment + { + public UrlSegment() { } + public UrlSegment(Microsoft.AspNetCore.Rewrite.IISUrlRewrite.UriMatchPart uriMatchPart) { } + public override string Evaluate(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { throw null; } + } +} + +namespace Microsoft.AspNetCore.Rewrite.UrlActions +{ + internal partial class AbortAction : Microsoft.AspNetCore.Rewrite.UrlAction + { + public AbortAction() { } + public override void ApplyAction(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { } + } + internal partial class ChangeCookieAction : Microsoft.AspNetCore.Rewrite.UrlAction + { + public ChangeCookieAction(string name) { } + internal ChangeCookieAction(string name, System.Func timeSource) { } + public string Domain { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool HttpOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.TimeSpan Lifetime { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool Secure { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public override void ApplyAction(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { } + } + internal partial class ForbiddenAction : Microsoft.AspNetCore.Rewrite.UrlAction + { + public ForbiddenAction() { } + public override void ApplyAction(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { } + } + internal partial class GoneAction : Microsoft.AspNetCore.Rewrite.UrlAction + { + public GoneAction() { } + public override void ApplyAction(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { } + } + internal partial class RedirectAction : Microsoft.AspNetCore.Rewrite.UrlAction + { + public RedirectAction(int statusCode, Microsoft.AspNetCore.Rewrite.Pattern pattern, bool queryStringAppend) { } + public RedirectAction(int statusCode, Microsoft.AspNetCore.Rewrite.Pattern pattern, bool queryStringAppend, bool queryStringDelete, bool escapeBackReferences) { } + public bool EscapeBackReferences { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool QueryStringAppend { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool QueryStringDelete { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int StatusCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public override void ApplyAction(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { } + } + internal partial class RewriteAction : Microsoft.AspNetCore.Rewrite.UrlAction + { + public RewriteAction(Microsoft.AspNetCore.Rewrite.RuleResult result, Microsoft.AspNetCore.Rewrite.Pattern pattern, bool queryStringAppend) { } + public RewriteAction(Microsoft.AspNetCore.Rewrite.RuleResult result, Microsoft.AspNetCore.Rewrite.Pattern pattern, bool queryStringAppend, bool queryStringDelete, bool escapeBackReferences) { } + public bool EscapeBackReferences { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool QueryStringAppend { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool QueryStringDelete { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Rewrite.RuleResult Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public override void ApplyAction(Microsoft.AspNetCore.Rewrite.RewriteContext context, Microsoft.AspNetCore.Rewrite.BackReferenceCollection ruleBackReferences, Microsoft.AspNetCore.Rewrite.BackReferenceCollection conditionBackReferences) { } + } +} + +namespace Microsoft.AspNetCore.Rewrite.UrlMatches +{ + internal partial class ExactMatch : Microsoft.AspNetCore.Rewrite.UrlMatch + { + public ExactMatch(bool ignoreCase, string input, bool negate) { } + public override Microsoft.AspNetCore.Rewrite.MatchResults Evaluate(string pattern, Microsoft.AspNetCore.Rewrite.RewriteContext context) { throw null; } + } + internal partial class IntegerMatch : Microsoft.AspNetCore.Rewrite.UrlMatch + { + public IntegerMatch(int value, Microsoft.AspNetCore.Rewrite.UrlMatches.IntegerOperationType operation) { } + public IntegerMatch(string value, Microsoft.AspNetCore.Rewrite.UrlMatches.IntegerOperationType operation) { } + public override Microsoft.AspNetCore.Rewrite.MatchResults Evaluate(string input, Microsoft.AspNetCore.Rewrite.RewriteContext context) { throw null; } + } + internal enum IntegerOperationType + { + Equal = 0, + Greater = 1, + GreaterEqual = 2, + Less = 3, + LessEqual = 4, + NotEqual = 5, + } + internal partial class RegexMatch : Microsoft.AspNetCore.Rewrite.UrlMatch + { + public RegexMatch(System.Text.RegularExpressions.Regex match, bool negate) { } + public override Microsoft.AspNetCore.Rewrite.MatchResults Evaluate(string pattern, Microsoft.AspNetCore.Rewrite.RewriteContext context) { throw null; } + } + internal partial class StringMatch : Microsoft.AspNetCore.Rewrite.UrlMatch + { + public StringMatch(string value, Microsoft.AspNetCore.Rewrite.UrlMatches.StringOperationType operation, bool ignoreCase) { } + public override Microsoft.AspNetCore.Rewrite.MatchResults Evaluate(string input, Microsoft.AspNetCore.Rewrite.RewriteContext context) { throw null; } + } + internal enum StringOperationType + { + Equal = 0, + Greater = 1, + GreaterEqual = 2, + Less = 3, + LessEqual = 4, + } +} diff --git a/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.csproj b/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.csproj index 6d6b32b2d9..d79210adad 100644 --- a/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.csproj +++ b/src/Middleware/Rewrite/ref/Microsoft.AspNetCore.Rewrite.csproj @@ -2,16 +2,16 @@ netcoreapp3.0 - false - - - - - - - + + + + + + + + diff --git a/src/Middleware/Session/ref/Microsoft.AspNetCore.Session.csproj b/src/Middleware/Session/ref/Microsoft.AspNetCore.Session.csproj index ce87d521d4..9795391628 100644 --- a/src/Middleware/Session/ref/Microsoft.AspNetCore.Session.csproj +++ b/src/Middleware/Session/ref/Microsoft.AspNetCore.Session.csproj @@ -2,15 +2,13 @@ netcoreapp3.0 - false - - - - - - + + + + + diff --git a/src/Middleware/SpaServices.Extensions/ref/Microsoft.AspNetCore.SpaServices.Extensions.csproj b/src/Middleware/SpaServices.Extensions/ref/Microsoft.AspNetCore.SpaServices.Extensions.csproj deleted file mode 100644 index b3c1224b3d..0000000000 --- a/src/Middleware/SpaServices.Extensions/ref/Microsoft.AspNetCore.SpaServices.Extensions.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - diff --git a/src/Middleware/SpaServices.Extensions/ref/Microsoft.AspNetCore.SpaServices.Extensions.netcoreapp3.0.cs b/src/Middleware/SpaServices.Extensions/ref/Microsoft.AspNetCore.SpaServices.Extensions.netcoreapp3.0.cs deleted file mode 100644 index 97f23b740d..0000000000 --- a/src/Middleware/SpaServices.Extensions/ref/Microsoft.AspNetCore.SpaServices.Extensions.netcoreapp3.0.cs +++ /dev/null @@ -1,97 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Builder -{ - public static partial class SpaApplicationBuilderExtensions - { - public static void UseSpa(this Microsoft.AspNetCore.Builder.IApplicationBuilder app, System.Action configuration) { } - } - [System.ObsoleteAttribute("Prerendering is no longer supported out of box")] - public static partial class SpaPrerenderingExtensions - { - [System.ObsoleteAttribute("Prerendering is no longer supported out of box")] - public static void UseSpaPrerendering(this Microsoft.AspNetCore.SpaServices.ISpaBuilder spaBuilder, System.Action configuration) { } - } - [System.ObsoleteAttribute("Prerendering is no longer supported out of box")] - public partial class SpaPrerenderingOptions - { - public SpaPrerenderingOptions() { } - public Microsoft.AspNetCore.SpaServices.Prerendering.ISpaPrerendererBuilder BootModuleBuilder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string BootModulePath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string[] ExcludeUrls { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Action> SupplyData { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public static partial class SpaProxyingExtensions - { - public static void UseProxyToSpaDevelopmentServer(this Microsoft.AspNetCore.SpaServices.ISpaBuilder spaBuilder, System.Func> baseUriTaskFactory) { } - public static void UseProxyToSpaDevelopmentServer(this Microsoft.AspNetCore.SpaServices.ISpaBuilder spaBuilder, string baseUri) { } - public static void UseProxyToSpaDevelopmentServer(this Microsoft.AspNetCore.SpaServices.ISpaBuilder spaBuilder, System.Uri baseUri) { } - } -} -namespace Microsoft.AspNetCore.SpaServices -{ - public partial interface ISpaBuilder - { - Microsoft.AspNetCore.Builder.IApplicationBuilder ApplicationBuilder { get; } - Microsoft.AspNetCore.SpaServices.SpaOptions Options { get; } - } - public partial class SpaOptions - { - public SpaOptions() { } - public Microsoft.AspNetCore.Http.PathString DefaultPage { get { throw null; } set { } } - public Microsoft.AspNetCore.Builder.StaticFileOptions DefaultPageStaticFileOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string SourcePath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan StartupTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.AspNetCore.SpaServices.AngularCli -{ - [System.ObsoleteAttribute("Prerendering is no longer supported out of box")] - public partial class AngularCliBuilder : Microsoft.AspNetCore.SpaServices.Prerendering.ISpaPrerendererBuilder - { - public AngularCliBuilder(string npmScript) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task Build(Microsoft.AspNetCore.SpaServices.ISpaBuilder spaBuilder) { throw null; } - } - public static partial class AngularCliMiddlewareExtensions - { - public static void UseAngularCliServer(this Microsoft.AspNetCore.SpaServices.ISpaBuilder spaBuilder, string npmScript) { } - } -} -namespace Microsoft.AspNetCore.SpaServices.Prerendering -{ - [System.ObsoleteAttribute("Prerendering is no longer supported out of box")] - public partial interface ISpaPrerendererBuilder - { - System.Threading.Tasks.Task Build(Microsoft.AspNetCore.SpaServices.ISpaBuilder spaBuilder); - } -} -namespace Microsoft.AspNetCore.SpaServices.ReactDevelopmentServer -{ - public static partial class ReactDevelopmentServerMiddlewareExtensions - { - public static void UseReactDevelopmentServer(this Microsoft.AspNetCore.SpaServices.ISpaBuilder spaBuilder, string npmScript) { } - } -} -namespace Microsoft.AspNetCore.SpaServices.StaticFiles -{ - public partial interface ISpaStaticFileProvider - { - Microsoft.Extensions.FileProviders.IFileProvider FileProvider { get; } - } - public partial class SpaStaticFilesOptions - { - public SpaStaticFilesOptions() { } - public string RootPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class SpaStaticFilesExtensions - { - public static void AddSpaStaticFiles(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configuration = null) { } - public static void UseSpaStaticFiles(this Microsoft.AspNetCore.Builder.IApplicationBuilder applicationBuilder) { } - public static void UseSpaStaticFiles(this Microsoft.AspNetCore.Builder.IApplicationBuilder applicationBuilder, Microsoft.AspNetCore.Builder.StaticFileOptions options) { } - } -} diff --git a/src/Middleware/SpaServices/ref/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/ref/Microsoft.AspNetCore.SpaServices.csproj deleted file mode 100644 index 3c4c84ffb7..0000000000 --- a/src/Middleware/SpaServices/ref/Microsoft.AspNetCore.SpaServices.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - diff --git a/src/Middleware/SpaServices/ref/Microsoft.AspNetCore.SpaServices.netcoreapp3.0.cs b/src/Middleware/SpaServices/ref/Microsoft.AspNetCore.SpaServices.netcoreapp3.0.cs deleted file mode 100644 index 1b9fa3ae00..0000000000 --- a/src/Middleware/SpaServices/ref/Microsoft.AspNetCore.SpaServices.netcoreapp3.0.cs +++ /dev/null @@ -1,94 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Builder -{ - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static partial class SpaRouteExtensions - { - public static void MapSpaFallbackRoute(this Microsoft.AspNetCore.Routing.IRouteBuilder routeBuilder, string name, object defaults, object constraints = null, object dataTokens = null) { } - public static void MapSpaFallbackRoute(this Microsoft.AspNetCore.Routing.IRouteBuilder routeBuilder, string name, string templatePrefix, object defaults, object constraints = null, object dataTokens = null) { } - } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static partial class WebpackDevMiddleware - { - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static void UseWebpackDevMiddleware(this Microsoft.AspNetCore.Builder.IApplicationBuilder appBuilder, Microsoft.AspNetCore.SpaServices.Webpack.WebpackDevMiddlewareOptions options = null) { } - } -} -namespace Microsoft.AspNetCore.SpaServices.Prerendering -{ - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public partial interface ISpaPrerenderer - { - System.Threading.Tasks.Task RenderToString(string moduleName, string exportName = null, object customDataParameter = null, int timeoutMilliseconds = 0); - } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public partial class JavaScriptModuleExport - { - public JavaScriptModuleExport(string moduleName) { } - public string ExportName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ModuleName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static partial class Prerenderer - { - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static System.Threading.Tasks.Task RenderToString(string applicationBasePath, Microsoft.AspNetCore.NodeServices.INodeServices nodeServices, System.Threading.CancellationToken applicationStoppingToken, Microsoft.AspNetCore.SpaServices.Prerendering.JavaScriptModuleExport bootModule, string requestAbsoluteUrl, string requestPathAndQuery, object customDataParameter, int timeoutMilliseconds, string requestPathBase) { throw null; } - } - [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(Attributes="asp-prerender-module")] - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public partial class PrerenderTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper - { - public PrerenderTagHelper(System.IServiceProvider serviceProvider) { } - [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute("asp-prerender-data")] - public object CustomDataParameter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute("asp-prerender-export")] - public string ExportName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute("asp-prerender-module")] - public string ModuleName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute("asp-prerender-timeout")] - public int TimeoutMillisecondsParameter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute] - [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute] - public Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output) { throw null; } - } - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public partial class RenderToStringResult - { - public RenderToStringResult() { } - public Newtonsoft.Json.Linq.JObject Globals { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Html { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string RedirectUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int? StatusCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string CreateGlobalsAssignmentScript() { throw null; } - } -} -namespace Microsoft.AspNetCore.SpaServices.Webpack -{ - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public partial class WebpackDevMiddlewareOptions - { - public WebpackDevMiddlewareOptions() { } - public string ConfigFile { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IDictionary EnvironmentVariables { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public object EnvParam { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool HotModuleReplacement { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IDictionary HotModuleReplacementClientOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string HotModuleReplacementEndpoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int HotModuleReplacementServerPort { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ProjectPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ReactHotModuleReplacement { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static partial class PrerenderingServiceCollectionExtensions - { - [System.ObsoleteAttribute("Use Microsoft.AspNetCore.SpaServices.Extensions")] - public static void AddSpaPrerenderer(this Microsoft.Extensions.DependencyInjection.IServiceCollection serviceCollection) { } - } -} diff --git a/src/Middleware/SpaServices/test/RenderToStringResultTests.cs b/src/Middleware/SpaServices/test/RenderToStringResultTests.cs index e87312d211..2a828c6596 100644 --- a/src/Middleware/SpaServices/test/RenderToStringResultTests.cs +++ b/src/Middleware/SpaServices/test/RenderToStringResultTests.cs @@ -15,7 +15,9 @@ namespace Microsoft.AspNetCore.SpaServices.Tests public void HandlesNullGlobals() { // Arrange +#pragma warning disable CS0618 // Type or member is obsolete var renderToStringResult = new RenderToStringResult(); +#pragma warning restore CS0618 // Type or member is obsolete renderToStringResult.Globals = null; // Act @@ -29,7 +31,9 @@ namespace Microsoft.AspNetCore.SpaServices.Tests public void HandlesGlobalsWithMultipleProperties() { // Arrange +#pragma warning disable CS0618 // Type or member is obsolete var renderToStringResult = new RenderToStringResult(); +#pragma warning restore CS0618 // Type or member is obsolete renderToStringResult.Globals = ToJObject(new { FirstProperty = "first value", @@ -49,7 +53,9 @@ namespace Microsoft.AspNetCore.SpaServices.Tests public void HandlesGlobalsWithCorrectStringEncoding() { // Arrange +#pragma warning disable CS0618 // Type or member is obsolete var renderToStringResult = new RenderToStringResult(); +#pragma warning restore CS0618 // Type or member is obsolete renderToStringResult.Globals = ToJObject(new Dictionary { { "Va\"'}\u260E" } diff --git a/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.Manual.cs b/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.Manual.cs new file mode 100644 index 0000000000..b4b8bdc322 --- /dev/null +++ b/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.Manual.cs @@ -0,0 +1,77 @@ +// 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. + +namespace Microsoft.AspNetCore.Internal +{ + internal static partial class RangeHelper + { + internal static Microsoft.Net.Http.Headers.RangeItemHeaderValue NormalizeRange(Microsoft.Net.Http.Headers.RangeItemHeaderValue range, long length) { throw null; } + public static (bool isRangeRequest, Microsoft.Net.Http.Headers.RangeItemHeaderValue range) ParseRange(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Http.Headers.RequestHeaders requestHeaders, long length, Microsoft.Extensions.Logging.ILogger logger) { throw null; } + } +} + +namespace Microsoft.AspNetCore.StaticFiles +{ + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct StaticFileContext + { + private readonly Microsoft.AspNetCore.Http.HttpContext _context; + private readonly Microsoft.AspNetCore.Builder.StaticFileOptions _options; + private readonly Microsoft.AspNetCore.Http.HttpRequest _request; + private readonly Microsoft.AspNetCore.Http.HttpResponse _response; + private readonly Microsoft.Extensions.Logging.ILogger _logger; + private readonly Microsoft.Extensions.FileProviders.IFileProvider _fileProvider; + private readonly string _method; + private readonly string _contentType; + private Microsoft.Extensions.FileProviders.IFileInfo _fileInfo; + private Microsoft.Net.Http.Headers.EntityTagHeaderValue _etag; + private Microsoft.AspNetCore.Http.Headers.RequestHeaders _requestHeaders; + private Microsoft.AspNetCore.Http.Headers.ResponseHeaders _responseHeaders; + private Microsoft.Net.Http.Headers.RangeItemHeaderValue _range; + private long _length; + private readonly Microsoft.AspNetCore.Http.PathString _subPath; + private System.DateTimeOffset _lastModified; + private Microsoft.AspNetCore.StaticFiles.StaticFileContext.PreconditionState _ifMatchState; + private Microsoft.AspNetCore.StaticFiles.StaticFileContext.PreconditionState _ifNoneMatchState; + private Microsoft.AspNetCore.StaticFiles.StaticFileContext.PreconditionState _ifModifiedSinceState; + private Microsoft.AspNetCore.StaticFiles.StaticFileContext.PreconditionState _ifUnmodifiedSinceState; + private Microsoft.AspNetCore.StaticFiles.StaticFileContext.RequestType _requestType; + public StaticFileContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Builder.StaticFileOptions options, Microsoft.Extensions.Logging.ILogger logger, Microsoft.Extensions.FileProviders.IFileProvider fileProvider, string contentType, Microsoft.AspNetCore.Http.PathString subPath) { throw null; } + public bool IsGetMethod { get { throw null; } } + public bool IsHeadMethod { get { throw null; } } + public bool IsRangeRequest { get { throw null; } } + public string PhysicalPath { get { throw null; } } + public string SubPath { get { throw null; } } + public void ApplyResponseHeaders(int statusCode) { } + public void ComprehendRequestHeaders() { } + public Microsoft.AspNetCore.StaticFiles.StaticFileContext.PreconditionState GetPreconditionState() { throw null; } + public bool LookupFileInfo() { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task SendAsync() { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + internal System.Threading.Tasks.Task SendRangeAsync() { throw null; } + public System.Threading.Tasks.Task SendStatusAsync(int statusCode) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task ServeStaticFile(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Http.RequestDelegate next) { throw null; } + internal enum PreconditionState : byte + { + Unspecified = (byte)0, + NotModified = (byte)1, + ShouldProcess = (byte)2, + PreconditionFailed = (byte)3, + } + [System.FlagsAttribute] + private enum RequestType : byte + { + Unspecified = (byte)0, + IsHead = (byte)1, + IsGet = (byte)2, + IsRange = (byte)4, + } + } + public partial class StaticFileMiddleware + { + internal static bool LookupContentType(Microsoft.AspNetCore.StaticFiles.IContentTypeProvider contentTypeProvider, Microsoft.AspNetCore.Builder.StaticFileOptions options, Microsoft.AspNetCore.Http.PathString subPath, out string contentType) { throw null; } + internal static bool ValidatePath(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Http.PathString matchUrl, out Microsoft.AspNetCore.Http.PathString subPath) { throw null; } + } +} diff --git a/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.csproj b/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.csproj index d59c4f309c..953bd9433f 100644 --- a/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.csproj +++ b/src/Middleware/StaticFiles/ref/Microsoft.AspNetCore.StaticFiles.csproj @@ -2,16 +2,16 @@ netcoreapp3.0 - false - - - - - - - + + + + + + + + diff --git a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj index 82bb9259ae..e6c8278b30 100644 --- a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj +++ b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj @@ -26,12 +26,6 @@ - - - - diff --git a/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj b/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj index d5319c29c1..d331b75f5b 100644 --- a/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj +++ b/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj @@ -2,13 +2,11 @@ netcoreapp3.0 - false - - - - + + + diff --git a/src/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj index 989c42a4a6..3b65df4864 100644 --- a/src/MusicStore/samples/MusicStore/MusicStore.csproj +++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj @@ -8,6 +8,8 @@ $(DefineConstants);DEMO win-x86;win-x64;linux-x64;osx-x64 true + + false @@ -33,6 +35,8 @@ + + diff --git a/src/MusicStore/test/MusicStore.Test/MusicStore.Test.csproj b/src/MusicStore/test/MusicStore.Test/MusicStore.Test.csproj index 88a794f766..0a33769822 100644 --- a/src/MusicStore/test/MusicStore.Test/MusicStore.Test.csproj +++ b/src/MusicStore/test/MusicStore.Test/MusicStore.Test.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + + false diff --git a/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.Manual.cs b/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.Manual.cs new file mode 100644 index 0000000000..9ded2d7210 --- /dev/null +++ b/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.Manual.cs @@ -0,0 +1,10 @@ +// 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. + +namespace Microsoft.Extensions.Internal +{ + internal static partial class ClosedGenericMatcher + { + public static System.Type ExtractGenericInterface(System.Type queryType, System.Type interfaceType) { throw null; } + } +} diff --git a/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj index 9e352d857f..984a44a17a 100644 --- a/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj +++ b/src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj @@ -2,13 +2,13 @@ netcoreapp3.0 - false - - - - + + + + + diff --git a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj index 94f546a1cd..e61676508f 100644 --- a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj +++ b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj index 285dfc7866..973a616c58 100644 --- a/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj +++ b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.Manual.cs b/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.Manual.cs index 55c1e57727..8159e0f969 100644 --- a/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.Manual.cs +++ b/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.Manual.cs @@ -1,13 +1,26 @@ // 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.Runtime.CompilerServices; +namespace Microsoft.AspNetCore.Mvc.ApiExplorer +{ + internal partial class ApiResponseTypeProvider + { + public ApiResponseTypeProvider(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.MvcOptions mvcOptions) { } + public System.Collections.Generic.ICollection GetApiResponseTypes(Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor action) { throw null; } + } -[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider))] -[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription))] -[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext))] -[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription))] -[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo))] -[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiRequestFormat))] -[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat))] -[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType))] + internal partial class ApiParameterContext + { + public ApiParameterContext(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor actionDescriptor, System.Collections.Generic.IReadOnlyList routeParameters) { } + public Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor ActionDescriptor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider MetadataProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IList Results { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IReadOnlyList RouteParameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + + public partial class DefaultApiDescriptionProvider : Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider + { + internal static void ProcessIsRequired(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterContext context) { } + internal static void ProcessParameterDefaultValue(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterContext context) { } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj b/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj index 5e6529a67f..06f01cf895 100644 --- a/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj +++ b/src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj @@ -2,12 +2,11 @@ netcoreapp3.0 - false - - + + diff --git a/src/Mvc/Mvc.Core/ref/Directory.Build.props b/src/Mvc/Mvc.Core/ref/Directory.Build.props deleted file mode 100644 index ea5de23302..0000000000 --- a/src/Mvc/Mvc.Core/ref/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - $(NoWarn);CS0169 - - \ No newline at end of file diff --git a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs index 1e37951241..67e80c698c 100644 --- a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs +++ b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs @@ -1,167 +1,373 @@ // 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.Runtime.CompilerServices; -using Microsoft.AspNetCore.Mvc.Formatters; - -[assembly: TypeForwardedTo(typeof(InputFormatterException))] - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ApiExplorer, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Cors, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.DataAnnotations, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Formatters.Xml, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Localization, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Testing, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] - +namespace Microsoft.AspNetCore.Builder +{ + public sealed partial class ControllerActionEndpointConventionBuilder : Microsoft.AspNetCore.Builder.IEndpointConventionBuilder + { + internal ControllerActionEndpointConventionBuilder(object @lock, System.Collections.Generic.List> conventions) { } + } +} namespace Microsoft.AspNetCore.Internal { - internal partial interface IResponseCacheFilter + internal partial class ChunkingCookieManager { + public const int DefaultChunkSize = 4050; + public ChunkingCookieManager() { } + public int? ChunkSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool ThrowForPartialCookies { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public void AppendResponseCookie(Microsoft.AspNetCore.Http.HttpContext context, string key, string value, Microsoft.AspNetCore.Http.CookieOptions options) { } + public void DeleteCookie(Microsoft.AspNetCore.Http.HttpContext context, string key, Microsoft.AspNetCore.Http.CookieOptions options) { } + public string GetRequestCookie(Microsoft.AspNetCore.Http.HttpContext context, string key) { throw null; } + } + internal static partial class RangeHelper + { + internal static Microsoft.Net.Http.Headers.RangeItemHeaderValue NormalizeRange(Microsoft.Net.Http.Headers.RangeItemHeaderValue range, long length) { throw null; } + public static (bool isRangeRequest, Microsoft.Net.Http.Headers.RangeItemHeaderValue range) ParseRange(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Http.Headers.RequestHeaders requestHeaders, long length, Microsoft.Extensions.Logging.ILogger logger) { throw null; } } } namespace Microsoft.AspNetCore.Mvc { - internal partial class MvcCoreMvcOptionsSetup + public sealed partial class ApiConventionMethodAttribute : System.Attribute + { + internal System.Reflection.MethodInfo Method { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public sealed partial class ApiConventionTypeAttribute : System.Attribute + { + internal static void EnsureValid(System.Type conventionType) { } + } + internal partial class ApiDescriptionActionData + { + public ApiDescriptionActionData() { } + public string GroupName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal static partial class MvcCoreDiagnosticListenerExtensions + { + public static void AfterAction(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor actionDescriptor, Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.RouteData routeData) { } + public static void AfterActionResult(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.IActionResult result) { } + public static void AfterControllerActionMethod(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IReadOnlyDictionary actionArguments, object controller, Microsoft.AspNetCore.Mvc.IActionResult result) { } + public static void AfterOnActionExecuted(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext actionExecutedContext, Microsoft.AspNetCore.Mvc.Filters.IActionFilter filter) { } + public static void AfterOnActionExecuting(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext actionExecutingContext, Microsoft.AspNetCore.Mvc.Filters.IActionFilter filter) { } + public static void AfterOnActionExecution(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext actionExecutedContext, Microsoft.AspNetCore.Mvc.Filters.IAsyncActionFilter filter) { } + public static void AfterOnAuthorization(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext authorizationContext, Microsoft.AspNetCore.Mvc.Filters.IAuthorizationFilter filter) { } + public static void AfterOnAuthorizationAsync(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext authorizationContext, Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter filter) { } + public static void AfterOnException(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ExceptionContext exceptionContext, Microsoft.AspNetCore.Mvc.Filters.IExceptionFilter filter) { } + public static void AfterOnExceptionAsync(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ExceptionContext exceptionContext, Microsoft.AspNetCore.Mvc.Filters.IAsyncExceptionFilter filter) { } + public static void AfterOnResourceExecuted(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ResourceExecutedContext resourceExecutedContext, Microsoft.AspNetCore.Mvc.Filters.IResourceFilter filter) { } + public static void AfterOnResourceExecuting(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext resourceExecutingContext, Microsoft.AspNetCore.Mvc.Filters.IResourceFilter filter) { } + public static void AfterOnResourceExecution(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ResourceExecutedContext resourceExecutedContext, Microsoft.AspNetCore.Mvc.Filters.IAsyncResourceFilter filter) { } + public static void AfterOnResultExecuted(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext resultExecutedContext, Microsoft.AspNetCore.Mvc.Filters.IResultFilter filter) { } + public static void AfterOnResultExecuting(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext resultExecutingContext, Microsoft.AspNetCore.Mvc.Filters.IResultFilter filter) { } + public static void AfterOnResultExecution(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext resultExecutedContext, Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter filter) { } + public static void BeforeAction(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor actionDescriptor, Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.RouteData routeData) { } + public static void BeforeActionResult(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.IActionResult result) { } + public static void BeforeControllerActionMethod(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IReadOnlyDictionary actionArguments, object controller) { } + public static void BeforeOnActionExecuted(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext actionExecutedContext, Microsoft.AspNetCore.Mvc.Filters.IActionFilter filter) { } + public static void BeforeOnActionExecuting(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext actionExecutingContext, Microsoft.AspNetCore.Mvc.Filters.IActionFilter filter) { } + public static void BeforeOnActionExecution(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext actionExecutingContext, Microsoft.AspNetCore.Mvc.Filters.IAsyncActionFilter filter) { } + public static void BeforeOnAuthorization(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext authorizationContext, Microsoft.AspNetCore.Mvc.Filters.IAuthorizationFilter filter) { } + public static void BeforeOnAuthorizationAsync(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext authorizationContext, Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter filter) { } + public static void BeforeOnException(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ExceptionContext exceptionContext, Microsoft.AspNetCore.Mvc.Filters.IExceptionFilter filter) { } + public static void BeforeOnExceptionAsync(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ExceptionContext exceptionContext, Microsoft.AspNetCore.Mvc.Filters.IAsyncExceptionFilter filter) { } + public static void BeforeOnResourceExecuted(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ResourceExecutedContext resourceExecutedContext, Microsoft.AspNetCore.Mvc.Filters.IResourceFilter filter) { } + public static void BeforeOnResourceExecuting(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext resourceExecutingContext, Microsoft.AspNetCore.Mvc.Filters.IResourceFilter filter) { } + public static void BeforeOnResourceExecution(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext resourceExecutingContext, Microsoft.AspNetCore.Mvc.Filters.IAsyncResourceFilter filter) { } + public static void BeforeOnResultExecuted(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext resultExecutedContext, Microsoft.AspNetCore.Mvc.Filters.IResultFilter filter) { } + public static void BeforeOnResultExecuting(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext resultExecutingContext, Microsoft.AspNetCore.Mvc.Filters.IResultFilter filter) { } + public static void BeforeOnResultExecution(this System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext resultExecutingContext, Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter filter) { } + } + internal static partial class MvcCoreLoggerExtensions + { + public const string ActionFilter = "Action Filter"; + public static void ActionDoesNotExplicitlySpecifyContentTypes(this Microsoft.Extensions.Logging.ILogger logger) { } + public static void ActionDoesNotSupportFormatFilterContentType(this Microsoft.Extensions.Logging.ILogger logger, string format, Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection supportedMediaTypes) { } + public static void ActionFiltersExecutionPlan(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IEnumerable filters) { } + public static void ActionFilterShortCircuited(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filter) { } + public static void ActionMethodExecuted(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ControllerContext context, Microsoft.AspNetCore.Mvc.IActionResult result, System.TimeSpan timeSpan) { } + public static void ActionMethodExecuting(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ControllerContext context, object[] arguments) { } +#nullable enable + public static System.IDisposable ActionScope(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action) { throw new System.ArgumentException(); } +#nullable restore + public static void AfterExecutingActionResult(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.IActionResult actionResult) { } + public static void AfterExecutingMethodOnFilter(this Microsoft.Extensions.Logging.ILogger logger, string filterType, string methodName, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filter) { } + public static void AmbiguousActions(this Microsoft.Extensions.Logging.ILogger logger, string actionNames) { } + public static void AppliedRequestFormLimits(this Microsoft.Extensions.Logging.ILogger logger) { } + public static void AttemptingToBindCollectionUsingIndices(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { } + public static void AttemptingToBindModel(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { } + public static void AttemptingToBindParameterOrProperty(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor parameter, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata) { } + public static void AttemptingToValidateParameterOrProperty(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor parameter, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata) { } + public static void AuthorizationFailure(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filter) { } + public static void AuthorizationFiltersExecutionPlan(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IEnumerable filters) { } + public static void BeforeExecutingActionResult(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.IActionResult actionResult) { } + public static void BeforeExecutingMethodOnFilter(this Microsoft.Extensions.Logging.ILogger logger, string filterType, string methodName, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filter) { } + public static void CannotApplyFormatFilterContentType(this Microsoft.Extensions.Logging.ILogger logger, string format) { } + public static void CannotApplyRequestFormLimits(this Microsoft.Extensions.Logging.ILogger logger) { } + public static void CannotBindToComplexType(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { } + public static void CannotBindToFilesCollectionDueToUnsupportedContentType(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { } + public static void CannotCreateHeaderModelBinder(this Microsoft.Extensions.Logging.ILogger logger, System.Type modelType) { } + public static void CannotCreateHeaderModelBinderCompatVersion_2_0(this Microsoft.Extensions.Logging.ILogger logger, System.Type modelType) { } + public static void ChallengeResultExecuting(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IList schemes) { } + public static void ConstraintMismatch(this Microsoft.Extensions.Logging.ILogger logger, string actionName, string actionId, Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint actionConstraint) { } + public static void ContentResultExecuting(this Microsoft.Extensions.Logging.ILogger logger, string contentType) { } + public static void DoneAttemptingToBindModel(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { } + public static void DoneAttemptingToBindParameterOrProperty(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor parameter, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata) { } + public static void DoneAttemptingToValidateParameterOrProperty(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor parameter, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata) { } + public static void ExceptionFiltersExecutionPlan(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IEnumerable filters) { } + public static void ExceptionFilterShortCircuited(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filter) { } + public static void ExecutedAction(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, System.TimeSpan timeSpan) { } + public static void ExecutedControllerFactory(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ControllerContext context) { } + public static void ExecutingAction(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action) { } + public static void ExecutingControllerFactory(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ControllerContext context) { } + public static void ExecutingFileResult(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.FileResult fileResult) { } + public static void ExecutingFileResult(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.FileResult fileResult, string fileName) { } + public static void FeatureIsReadOnly(this Microsoft.Extensions.Logging.ILogger logger) { } + public static void FeatureNotFound(this Microsoft.Extensions.Logging.ILogger logger) { } + public static void ForbidResultExecuting(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IList authenticationSchemes) { } + public static void FormatterSelected(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Formatters.IOutputFormatter outputFormatter, Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext context) { } + public static void FoundNoValueInRequest(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { } + public static void HttpStatusCodeResultExecuting(this Microsoft.Extensions.Logging.ILogger logger, int statusCode) { } + public static void IfMatchPreconditionFailed(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.Net.Http.Headers.EntityTagHeaderValue etag) { } + public static void IfRangeETagPreconditionFailed(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.Net.Http.Headers.EntityTagHeaderValue currentETag, Microsoft.Net.Http.Headers.EntityTagHeaderValue ifRangeTag) { } + public static void IfRangeLastModifiedPreconditionFailed(this Microsoft.Extensions.Logging.ILogger logger, System.DateTimeOffset? lastModified, System.DateTimeOffset? ifRangeLastModifiedDate) { } + public static void IfUnmodifiedSincePreconditionFailed(this Microsoft.Extensions.Logging.ILogger logger, System.DateTimeOffset? lastModified, System.DateTimeOffset? ifUnmodifiedSinceDate) { } + public static void InferredParameterBindingSource(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModel parameterModel, Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource bindingSource) { } + public static void InputFormatterRejected(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter inputFormatter, Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext formatterContext) { } + public static void InputFormatterSelected(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Formatters.IInputFormatter inputFormatter, Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext formatterContext) { } + public static void LocalRedirectResultExecuting(this Microsoft.Extensions.Logging.ILogger logger, string destination) { } + public static void MaxRequestBodySizeSet(this Microsoft.Extensions.Logging.ILogger logger, string requestSize) { } + public static void ModelStateInvalidFilterExecuting(this Microsoft.Extensions.Logging.ILogger logger) { } + public static void NoAcceptForNegotiation(this Microsoft.Extensions.Logging.ILogger logger) { } + public static void NoActionsMatched(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IDictionary routeValueDictionary) { } + public static void NoFilesFoundInRequest(this Microsoft.Extensions.Logging.ILogger logger) { } + public static void NoFormatter(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext context, Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection contentTypes) { } + public static void NoFormatterFromNegotiation(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IList acceptTypes) { } + public static void NoInputFormatterSelected(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext formatterContext) { } + public static void NoKeyValueFormatForDictionaryModelBinder(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { } + public static void NoNonIndexBasedFormatFoundForCollection(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { } + public static void NoPublicSettableProperties(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { } + public static void NotEnabledForRangeProcessing(this Microsoft.Extensions.Logging.ILogger logger) { } + public static void NotMostEffectiveFilter(this Microsoft.Extensions.Logging.ILogger logger, System.Type overridenFilter, System.Type overridingFilter, System.Type policyType) { } + public static void ObjectResultExecuting(this Microsoft.Extensions.Logging.ILogger logger, object value) { } + public static void ParameterBinderRequestPredicateShortCircuit(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor parameter, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata) { } + public static void RedirectResultExecuting(this Microsoft.Extensions.Logging.ILogger logger, string destination) { } + public static void RedirectToActionResultExecuting(this Microsoft.Extensions.Logging.ILogger logger, string destination) { } + public static void RedirectToPageResultExecuting(this Microsoft.Extensions.Logging.ILogger logger, string page) { } + public static void RedirectToRouteResultExecuting(this Microsoft.Extensions.Logging.ILogger logger, string destination, string routeName) { } + public static void RegisteredModelBinderProviders(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider[] providers) { } + public static void RegisteredOutputFormatters(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IEnumerable outputFormatters) { } + public static void RequestBodySizeLimitDisabled(this Microsoft.Extensions.Logging.ILogger logger) { } + public static void ResourceFiltersExecutionPlan(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IEnumerable filters) { } + public static void ResourceFilterShortCircuited(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filter) { } + public static void ResultFiltersExecutionPlan(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IEnumerable filters) { } + public static void ResultFilterShortCircuited(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filter) { } + public static void SelectFirstCanWriteFormatter(this Microsoft.Extensions.Logging.ILogger logger) { } + public static void SelectingOutputFormatterUsingAcceptHeader(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IEnumerable acceptHeader) { } + public static void SelectingOutputFormatterUsingAcceptHeaderAndExplicitContentTypes(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IEnumerable acceptHeader, Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection mediaTypeCollection) { } + public static void SelectingOutputFormatterUsingContentTypes(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Formatters.MediaTypeCollection mediaTypeCollection) { } + public static void SelectingOutputFormatterWithoutUsingContentTypes(this Microsoft.Extensions.Logging.ILogger logger) { } + public static void SignInResultExecuting(this Microsoft.Extensions.Logging.ILogger logger, string authenticationScheme, System.Security.Claims.ClaimsPrincipal principal) { } + public static void SignOutResultExecuting(this Microsoft.Extensions.Logging.ILogger logger, System.Collections.Generic.IList authenticationSchemes) { } + public static void SkippedContentNegotiation(this Microsoft.Extensions.Logging.ILogger logger, string contentType) { } + public static void TransformingClientError(this Microsoft.Extensions.Logging.ILogger logger, System.Type initialType, System.Type replacedType, int? statusCode) { } + public static void UnsupportedFormatFilterContentType(this Microsoft.Extensions.Logging.ILogger logger, string format) { } + public static void WritingRangeToBody(this Microsoft.Extensions.Logging.ILogger logger) { } + } + internal partial class MvcCoreMvcOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions, Microsoft.Extensions.Options.IPostConfigureOptions { - private readonly Microsoft.Extensions.Options.IOptions _jsonOptions; - private readonly Microsoft.Extensions.Logging.ILoggerFactory _loggerFactory; - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory _readerFactory; public MvcCoreMvcOptionsSetup(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory readerFactory) { } public MvcCoreMvcOptionsSetup(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory readerFactory, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.Options.IOptions jsonOptions) { } public void Configure(Microsoft.AspNetCore.Mvc.MvcOptions options) { } internal static void ConfigureAdditionalModelMetadataDetailsProviders(System.Collections.Generic.IList modelMetadataDetailsProviders) { } public void PostConfigure(string name, Microsoft.AspNetCore.Mvc.MvcOptions options) { } } -} -namespace Microsoft.AspNetCore.Mvc.Controllers -{ - internal delegate System.Threading.Tasks.Task ControllerBinderDelegate(Microsoft.AspNetCore.Mvc.ControllerContext controllerContext, object controller, System.Collections.Generic.Dictionary arguments); + public partial class MvcOptions : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable + { + internal const int DefaultMaxModelBindingCollectionSize = 1024; + internal const int DefaultMaxModelBindingRecursionDepth = 32; + } + public partial class RequestFormLimitsAttribute : System.Attribute, Microsoft.AspNetCore.Mvc.Filters.IFilterFactory, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + internal Microsoft.AspNetCore.Http.Features.FormOptions FormOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } } namespace Microsoft.AspNetCore.Mvc.ActionConstraints { + internal partial class ActionConstraintCache + { + public ActionConstraintCache(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, System.Collections.Generic.IEnumerable actionConstraintProviders) { } + internal Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache.InnerCache CurrentCache { get { throw null; } } + public System.Collections.Generic.IReadOnlyList GetActionConstraints(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action) { throw null; } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct CacheEntry + { + private readonly object _dummy; + public CacheEntry(System.Collections.Generic.IReadOnlyList actionConstraints) { throw null; } + public CacheEntry(System.Collections.Generic.List items) { throw null; } + public System.Collections.Generic.IReadOnlyList ActionConstraints { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.List Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class InnerCache + { + public InnerCache(Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection actions) { } + public System.Collections.Concurrent.ConcurrentDictionary Entries { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Version { get { throw null; } } + } + } internal partial class DefaultActionConstraintProvider : Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintProvider { public DefaultActionConstraintProvider() { } public int Order { get { throw null; } } public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintProviderContext context) { } public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintProviderContext context) { } - private void ProvideConstraint(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintItem item, System.IServiceProvider services) { } } - internal partial class ActionConstraintCache + internal partial interface IConsumesActionConstraint : Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint, Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintMetadata { - private readonly Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintProvider[] _actionConstraintProviders; - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _collectionProvider; - private volatile Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache.InnerCache _currentCache; - public ActionConstraintCache(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, System.Collections.Generic.IEnumerable actionConstraintProviders) { } - internal Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache.InnerCache CurrentCache { get { throw null; } } - private void ExecuteProviders(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, System.Collections.Generic.List items) { } - private System.Collections.Generic.IReadOnlyList ExtractActionConstraints(System.Collections.Generic.List items) { throw null; } - public System.Collections.Generic.IReadOnlyList GetActionConstraints(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action) { throw null; } - private System.Collections.Generic.IReadOnlyList GetActionConstraintsFromEntry(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache.CacheEntry entry, Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action) { throw null; } - internal readonly partial struct CacheEntry - { - private readonly object _dummy; - public CacheEntry(System.Collections.Generic.IReadOnlyList actionConstraints) { throw null; } - public CacheEntry(System.Collections.Generic.List items) { throw null; } - public System.Collections.Generic.IReadOnlyList ActionConstraints { get { throw null; } } - public System.Collections.Generic.List Items { get { throw null; } } - } - internal partial class InnerCache - { - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection _actions; - private readonly System.Collections.Concurrent.ConcurrentDictionary _Entries_k__BackingField; - public InnerCache(Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection actions) { } - public System.Collections.Concurrent.ConcurrentDictionary Entries { get { throw null; } } - public int Version { get { throw null; } } - } + } +} +namespace Microsoft.AspNetCore.Mvc.ApiExplorer +{ + internal static partial class ApiConventionMatcher + { + internal static Microsoft.AspNetCore.Mvc.ApiExplorer.ApiConventionNameMatchBehavior GetNameMatchBehavior(System.Reflection.ICustomAttributeProvider attributeProvider) { throw null; } + internal static Microsoft.AspNetCore.Mvc.ApiExplorer.ApiConventionTypeMatchBehavior GetTypeMatchBehavior(System.Reflection.ICustomAttributeProvider attributeProvider) { throw null; } + internal static bool IsMatch(System.Reflection.MethodInfo methodInfo, System.Reflection.MethodInfo conventionMethod) { throw null; } + internal static bool IsNameMatch(string name, string conventionName, Microsoft.AspNetCore.Mvc.ApiExplorer.ApiConventionNameMatchBehavior nameMatchBehavior) { throw null; } + internal static bool IsTypeMatch(System.Type type, System.Type conventionType, Microsoft.AspNetCore.Mvc.ApiExplorer.ApiConventionTypeMatchBehavior typeMatchBehavior) { throw null; } + } + public sealed partial class ApiConventionResult + { + internal static bool TryGetApiConvention(System.Reflection.MethodInfo method, Microsoft.AspNetCore.Mvc.ApiConventionTypeAttribute[] apiConventionAttributes, out Microsoft.AspNetCore.Mvc.ApiExplorer.ApiConventionResult result) { throw null; } } } namespace Microsoft.AspNetCore.Mvc.ApplicationModels { + internal static partial class ActionAttributeRouteModel + { + public static System.Collections.Generic.IEnumerable FlattenSelectors(Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel actionModel) { throw null; } + public static System.Collections.Generic.IEnumerable> GetAttributeRoutes(Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel actionModel) { throw null; } + } internal partial class ApiBehaviorApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider { - private readonly System.Collections.Generic.List _ActionModelConventions_k__BackingField; public ApiBehaviorApplicationModelProvider(Microsoft.Extensions.Options.IOptions apiBehaviorOptions, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.Infrastructure.IClientErrorFactory clientErrorFactory, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public System.Collections.Generic.List ActionModelConventions { get { throw null; } } + public System.Collections.Generic.List ActionModelConventions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public int Order { get { throw null; } } - private static void EnsureActionIsAttributeRouted(Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel actionModel) { } - private static bool IsApiController(Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel controller) { throw null; } public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } } + internal static partial class ApplicationModelConventions + { + public static void ApplyConventions(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel applicationModel, System.Collections.Generic.IEnumerable conventions) { } + } internal partial class ApplicationModelFactory { - private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider[] _applicationModelProviders; - private readonly System.Collections.Generic.IList _conventions; public ApplicationModelFactory(System.Collections.Generic.IEnumerable applicationModelProviders, Microsoft.Extensions.Options.IOptions options) { } - private static void AddActionToMethodInfoMap(System.Collections.Generic.Dictionary>> actionsByMethod, Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel action, Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel selector) { } - private static void AddActionToRouteNameMap(System.Collections.Generic.Dictionary>> actionsByRouteName, Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel action, Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel selector) { } - private static System.Collections.Generic.List AddErrorNumbers(System.Collections.Generic.IEnumerable namedRoutedErrors) { throw null; } public Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel CreateApplicationModel(System.Collections.Generic.IEnumerable controllerTypes) { throw null; } - private static string CreateAttributeRoutingAggregateErrorMessage(System.Collections.Generic.IEnumerable individualErrors) { throw null; } - private static string CreateMixedRoutedActionDescriptorsErrorMessage(System.Reflection.MethodInfo method, System.Collections.Generic.List> actions) { throw null; } public static System.Collections.Generic.List Flatten(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel application, System.Func flattener) { throw null; } - private static void ReplaceAttributeRouteTokens(Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel controller, Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel action, Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel selector, System.Collections.Generic.List errors) { } - private static void ValidateActionGroupConfiguration(System.Reflection.MethodInfo method, System.Collections.Generic.List> actions, System.Collections.Generic.IDictionary routingConfigurationErrors) { } - private static System.Collections.Generic.List ValidateNamedAttributeRoutedActions(System.Collections.Generic.Dictionary>> actionsByRouteName) { throw null; } - } - internal partial class ControllerActionDescriptorProvider - { - private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelFactory _applicationModelFactory; - private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _partManager; - public ControllerActionDescriptorProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager partManager, Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelFactory applicationModelFactory) { } - public int Order { get { throw null; } } - private System.Collections.Generic.IEnumerable GetControllerTypes() { throw null; } - internal System.Collections.Generic.IEnumerable GetDescriptors() { throw null; } - public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext context) { } - public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext context) { } } internal partial class AuthorizationApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider { - private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; - private readonly Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider _policyProvider; public AuthorizationApplicationModelProvider(Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider policyProvider, Microsoft.Extensions.Options.IOptions mvcOptions) { } public int Order { get { throw null; } } public static Microsoft.AspNetCore.Mvc.Authorization.AuthorizeFilter GetFilter(Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider policyProvider, System.Collections.Generic.IEnumerable authData) { throw null; } public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } } + public partial class ConsumesConstraintForFormFileParameterConvention : Microsoft.AspNetCore.Mvc.ApplicationModels.IActionModelConvention + { + internal void AddMultipartFormDataConsumesAttribute(Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel action) { } + } + internal static partial class ControllerActionDescriptorBuilder + { + public static void AddRouteValues(Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor actionDescriptor, Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel controller, Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel action) { } + public static System.Collections.Generic.IList Build(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModel application) { throw null; } + } + internal partial class ControllerActionDescriptorProvider : Microsoft.AspNetCore.Mvc.Abstractions.IActionDescriptorProvider + { + public ControllerActionDescriptorProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager partManager, Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelFactory applicationModelFactory) { } + public int Order { get { throw null; } } + internal System.Collections.Generic.IEnumerable GetDescriptors() { throw null; } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorProviderContext context) { } + } internal partial class DefaultApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider { - private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _modelMetadataProvider; - private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; - private readonly System.Func _supportsAllRequests; - private readonly System.Func _supportsNonGetRequests; public DefaultApplicationModelProvider(Microsoft.Extensions.Options.IOptions mvcOptionsAccessor, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider) { } public int Order { get { throw null; } } - private static void AddRange(System.Collections.Generic.IList list, System.Collections.Generic.IEnumerable items) { } - private string CanonicalizeActionName(string actionName) { throw null; } internal Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel CreateActionModel(System.Reflection.TypeInfo typeInfo, System.Reflection.MethodInfo methodInfo) { throw null; } internal Microsoft.AspNetCore.Mvc.ApplicationModels.ControllerModel CreateControllerModel(System.Reflection.TypeInfo typeInfo) { throw null; } internal Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModel CreateParameterModel(System.Reflection.ParameterInfo parameterInfo) { throw null; } internal Microsoft.AspNetCore.Mvc.ApplicationModels.PropertyModel CreatePropertyModel(System.Reflection.PropertyInfo propertyInfo) { throw null; } - private static Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel CreateSelectorModel(Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider route, System.Collections.Generic.IList attributes) { throw null; } - private System.Collections.Generic.IList CreateSelectors(System.Collections.Generic.IList attributes) { throw null; } - private static bool InRouteProviders(System.Collections.Generic.List routeProviders, object attribute) { throw null; } internal bool IsAction(System.Reflection.TypeInfo typeInfo, System.Reflection.MethodInfo methodInfo) { throw null; } - private bool IsIDisposableMethod(System.Reflection.MethodInfo methodInfo) { throw null; } - private bool IsSilentRouteAttribute(Microsoft.AspNetCore.Mvc.Routing.IRouteTemplateProvider routeTemplateProvider) { throw null; } public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } } + public partial class InferParameterBindingInfoConvention : Microsoft.AspNetCore.Mvc.ApplicationModels.IActionModelConvention + { + internal Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource InferBindingSourceForParameter(Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModel parameter) { throw null; } + internal void InferParameterBindingSources(Microsoft.AspNetCore.Mvc.ApplicationModels.ActionModel action) { } + } +} +namespace Microsoft.AspNetCore.Mvc.ApplicationParts +{ + public partial class ApplicationPartManager + { + internal void PopulateDefaultParts(string entryAssemblyName) { } + } + public sealed partial class RelatedAssemblyAttribute : System.Attribute + { + internal static string GetAssemblyLocation(System.Reflection.Assembly assembly) { throw null; } + internal static System.Collections.Generic.IReadOnlyList GetRelatedAssemblies(System.Reflection.Assembly assembly, bool throwOnError, System.Func fileExists, System.Func loadFile) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Authorization +{ + public partial class AuthorizeFilter : Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterFactory, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata + { + [System.Diagnostics.DebuggerStepThroughAttribute] + internal System.Threading.Tasks.Task GetEffectivePolicyAsync(Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext context) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Controllers +{ + internal delegate System.Threading.Tasks.Task ControllerBinderDelegate(Microsoft.AspNetCore.Mvc.ControllerContext controllerContext, object controller, System.Collections.Generic.Dictionary arguments); + internal static partial class ControllerBinderDelegateProvider + { + public static Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegate CreateBinderDelegate(Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor actionDescriptor, Microsoft.AspNetCore.Mvc.MvcOptions mvcOptions) { throw null; } + } + internal partial class ControllerFactoryProvider : Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider + { + public ControllerFactoryProvider(Microsoft.AspNetCore.Mvc.Controllers.IControllerActivatorProvider activatorProvider, Microsoft.AspNetCore.Mvc.Controllers.IControllerFactory controllerFactory, System.Collections.Generic.IEnumerable propertyActivators) { } + public System.Func CreateControllerFactory(Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor descriptor) { throw null; } + public System.Action CreateControllerReleaser(Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor descriptor) { throw null; } + } + internal partial class DefaultControllerActivator : Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator + { + public DefaultControllerActivator(Microsoft.AspNetCore.Mvc.Infrastructure.ITypeActivatorCache typeActivatorCache) { } + public object Create(Microsoft.AspNetCore.Mvc.ControllerContext controllerContext) { throw null; } + public void Release(Microsoft.AspNetCore.Mvc.ControllerContext context, object controller) { } + } + internal partial class DefaultControllerFactory : Microsoft.AspNetCore.Mvc.Controllers.IControllerFactory + { + public DefaultControllerFactory(Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator controllerActivator, System.Collections.Generic.IEnumerable propertyActivators) { } + public object CreateController(Microsoft.AspNetCore.Mvc.ControllerContext context) { throw null; } + public void ReleaseController(Microsoft.AspNetCore.Mvc.ControllerContext context, object controller) { } + } + internal partial class DefaultControllerPropertyActivator : Microsoft.AspNetCore.Mvc.Controllers.IControllerPropertyActivator + { + public DefaultControllerPropertyActivator() { } + public void Activate(Microsoft.AspNetCore.Mvc.ControllerContext context, object controller) { } + public System.Action GetActivatorDelegate(Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor actionDescriptor) { throw null; } + } + internal partial interface IControllerPropertyActivator + { + void Activate(Microsoft.AspNetCore.Mvc.ControllerContext context, object controller); + System.Action GetActivatorDelegate(Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor actionDescriptor); + } } namespace Microsoft.AspNetCore.Mvc.Core { internal static partial class Resources { - private static System.Resources.ResourceManager s_resourceManager; - private static System.Globalization.CultureInfo _Culture_k__BackingField; internal static string AcceptHeaderParser_ParseAcceptHeader_InvalidValues { get { throw null; } } internal static string ActionDescriptorMustBeBasedOnControllerAction { get { throw null; } } internal static string ActionExecutor_UnexpectedTaskInstance { get { throw null; } } @@ -218,7 +424,7 @@ namespace Microsoft.AspNetCore.Mvc.Core internal static string ComplexTypeModelBinder_NoParameterlessConstructor_ForProperty { get { throw null; } } internal static string ComplexTypeModelBinder_NoParameterlessConstructor_ForType { get { throw null; } } internal static string CouldNotCreateIModelBinder { get { throw null; } } - internal static System.Globalization.CultureInfo Culture { get { throw null; } set { } } + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } internal static string DefaultActionSelector_AmbiguousActions { get { throw null; } } internal static string FileResult_InvalidPath { get { throw null; } } internal static string FileResult_PathNotRooted { get { throw null; } } @@ -392,56 +598,37 @@ namespace Microsoft.AspNetCore.Mvc.Core internal static string FormatValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated(object p0, object p1) { throw null; } internal static string FormatValueProviderResult_NoConverterExists(object p0, object p1) { throw null; } internal static string FormatVaryByQueryKeys_Requires_ResponseCachingMiddleware(object p0) { throw null; } - internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } - private static string GetResourceString(string resourceKey, string[] formatterNames) { throw null; } - } -} -namespace Microsoft.AspNetCore.Mvc.Controllers -{ - internal partial class DefaultControllerPropertyActivator : Microsoft.AspNetCore.Mvc.Controllers.IControllerPropertyActivator - { - private System.Collections.Concurrent.ConcurrentDictionary[]> _activateActions; - private static readonly System.Func[]> _getPropertiesToActivate; - private bool _initialized; - private object _initializeLock; - public DefaultControllerPropertyActivator() { } - public void Activate(Microsoft.AspNetCore.Mvc.ControllerContext context, object controller) { } - public System.Action GetActivatorDelegate(Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor actionDescriptor) { throw null; } - private static Microsoft.Extensions.Internal.PropertyActivator[] GetPropertiesToActivate(System.Type type) { throw null; } - } - internal partial interface IControllerPropertyActivator - { - void Activate(Microsoft.AspNetCore.Mvc.ControllerContext context, object controller); - System.Action GetActivatorDelegate(Microsoft.AspNetCore.Mvc.Controllers.ControllerActionDescriptor actionDescriptor); + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } } } namespace Microsoft.AspNetCore.Mvc.Filters { - internal partial class DefaultFilterProvider + internal partial class ControllerActionFilter : Microsoft.AspNetCore.Mvc.Filters.IAsyncActionFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + public ControllerActionFilter() { } + public int Order { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Threading.Tasks.Task OnActionExecutionAsync(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext context, Microsoft.AspNetCore.Mvc.Filters.ActionExecutionDelegate next) { throw null; } + } + internal partial class ControllerResultFilter : Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + public ControllerResultFilter() { } + public int Order { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Threading.Tasks.Task OnResultExecutionAsync(Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext context, Microsoft.AspNetCore.Mvc.Filters.ResultExecutionDelegate next) { throw null; } + } + internal partial class DefaultFilterProvider : Microsoft.AspNetCore.Mvc.Filters.IFilterProvider { public DefaultFilterProvider() { } public int Order { get { throw null; } } - private void ApplyFilterToContainer(object actualFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filterMetadata) { } public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext context) { } public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext context) { } public void ProvideFilter(Microsoft.AspNetCore.Mvc.Filters.FilterProviderContext context, Microsoft.AspNetCore.Mvc.Filters.FilterItem filterItem) { } } - internal readonly partial struct FilterFactoryResult - { - private readonly object _dummy; - public FilterFactoryResult(Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cacheableFilters, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) { throw null; } - public Microsoft.AspNetCore.Mvc.Filters.FilterItem[] CacheableFilters { get { throw null; } } - public Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] Filters { get { throw null; } } - } - internal static partial class FilterFactory - { - public static Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] CreateUncachedFilters(Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] filterProviders, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cachedFilterItems) { throw null; } - private static Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] CreateUncachedFiltersCore(Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] filterProviders, Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.List filterItems) { throw null; } - public static Microsoft.AspNetCore.Mvc.Filters.FilterFactoryResult GetAllFilters(Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] filterProviders, Microsoft.AspNetCore.Mvc.ActionContext actionContext) { throw null; } - } - internal partial interface IResponseCacheFilter : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata + internal partial class DisableRequestSizeLimitFilter : Microsoft.AspNetCore.Mvc.Filters.IAuthorizationFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.IRequestSizePolicy { + public DisableRequestSizeLimitFilter(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public void OnAuthorization(Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext context) { } } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] internal partial struct FilterCursor { private object _dummy; @@ -450,14 +637,92 @@ namespace Microsoft.AspNetCore.Mvc.Filters public Microsoft.AspNetCore.Mvc.Filters.FilterCursorItem GetNextFilter() where TFilter : class where TFilterAsync : class { throw null; } public void Reset() { } } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct FilterCursorItem + { + public FilterCursorItem(TFilter filter, TFilterAsync filterAsync) { throw null; } + public TFilter Filter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public TFilterAsync FilterAsync { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class FilterDescriptorOrderComparer : System.Collections.Generic.IComparer + { + public FilterDescriptorOrderComparer() { } + public static Microsoft.AspNetCore.Mvc.Filters.FilterDescriptorOrderComparer Comparer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Compare(Microsoft.AspNetCore.Mvc.Filters.FilterDescriptor x, Microsoft.AspNetCore.Mvc.Filters.FilterDescriptor y) { throw null; } + } + internal static partial class FilterFactory + { + public static Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] CreateUncachedFilters(Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] filterProviders, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cachedFilterItems) { throw null; } + public static Microsoft.AspNetCore.Mvc.Filters.FilterFactoryResult GetAllFilters(Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] filterProviders, Microsoft.AspNetCore.Mvc.ActionContext actionContext) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct FilterFactoryResult + { + private readonly object _dummy; + public FilterFactoryResult(Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cacheableFilters, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) { throw null; } + public Microsoft.AspNetCore.Mvc.Filters.FilterItem[] CacheableFilters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] Filters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial interface IMiddlewareFilterFeature + { + Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext ResourceExecutingContext { get; } + Microsoft.AspNetCore.Mvc.Filters.ResourceExecutionDelegate ResourceExecutionDelegate { get; } + } + internal partial interface IResponseCacheFilter : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata + { + } + internal partial class MiddlewareFilter : Microsoft.AspNetCore.Mvc.Filters.IAsyncResourceFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata + { + public MiddlewareFilter(Microsoft.AspNetCore.Http.RequestDelegate middlewarePipeline) { } + public System.Threading.Tasks.Task OnResourceExecutionAsync(Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext context, Microsoft.AspNetCore.Mvc.Filters.ResourceExecutionDelegate next) { throw null; } + } + internal partial class MiddlewareFilterBuilder + { + public MiddlewareFilterBuilder(Microsoft.AspNetCore.Mvc.Filters.MiddlewareFilterConfigurationProvider configurationProvider) { } + public Microsoft.AspNetCore.Builder.IApplicationBuilder ApplicationBuilder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Http.RequestDelegate GetPipeline(System.Type configurationType) { throw null; } + } + internal partial class MiddlewareFilterBuilderStartupFilter : Microsoft.AspNetCore.Hosting.IStartupFilter + { + public MiddlewareFilterBuilderStartupFilter() { } + public System.Action Configure(System.Action next) { throw null; } + } + internal partial class MiddlewareFilterConfigurationProvider + { + public MiddlewareFilterConfigurationProvider() { } + public System.Action CreateConfigureDelegate(System.Type configurationType) { throw null; } + } + internal partial class MiddlewareFilterFeature : Microsoft.AspNetCore.Mvc.Filters.IMiddlewareFilterFeature + { + public MiddlewareFilterFeature() { } + public Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext ResourceExecutingContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Mvc.Filters.ResourceExecutionDelegate ResourceExecutionDelegate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class RequestFormLimitsFilter : Microsoft.AspNetCore.Mvc.Filters.IAuthorizationFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.IRequestFormLimitsPolicy + { + public RequestFormLimitsFilter(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public Microsoft.AspNetCore.Http.Features.FormOptions FormOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public void OnAuthorization(Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext context) { } + } + internal partial class RequestSizeLimitFilter : Microsoft.AspNetCore.Mvc.Filters.IAuthorizationFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.IRequestSizePolicy + { + public RequestSizeLimitFilter(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public long Bytes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public void OnAuthorization(Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext context) { } + } + internal partial class ResponseCacheFilter : Microsoft.AspNetCore.Mvc.Filters.IActionFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IResponseCacheFilter + { + public ResponseCacheFilter(Microsoft.AspNetCore.Mvc.CacheProfile cacheProfile, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public int Duration { get { throw null; } set { } } + public Microsoft.AspNetCore.Mvc.ResponseCacheLocation Location { get { throw null; } set { } } + public bool NoStore { get { throw null; } set { } } + public string VaryByHeader { get { throw null; } set { } } + public string[] VaryByQueryKeys { get { throw null; } set { } } + public void OnActionExecuted(Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext context) { } + public void OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext context) { } + } internal partial class ResponseCacheFilterExecutor { - private int? _cacheDuration; - private Microsoft.AspNetCore.Mvc.ResponseCacheLocation? _cacheLocation; - private bool? _cacheNoStore; - private readonly Microsoft.AspNetCore.Mvc.CacheProfile _cacheProfile; - private string _cacheVaryByHeader; - private string[] _cacheVaryByQueryKeys; public ResponseCacheFilterExecutor(Microsoft.AspNetCore.Mvc.CacheProfile cacheProfile) { } public int Duration { get { throw null; } set { } } public Microsoft.AspNetCore.Mvc.ResponseCacheLocation Location { get { throw null; } set { } } @@ -466,24 +731,44 @@ namespace Microsoft.AspNetCore.Mvc.Filters public string[] VaryByQueryKeys { get { throw null; } set { } } public void Execute(Microsoft.AspNetCore.Mvc.Filters.FilterContext context) { } } - internal readonly partial struct FilterCursorItem - { - private readonly TFilter _Filter_k__BackingField; - private readonly TFilterAsync _FilterAsync_k__BackingField; - private readonly int _dummyPrimitive; - public FilterCursorItem(TFilter filter, TFilterAsync filterAsync) { throw null; } - public TFilter Filter { get { throw null; } } - public TFilterAsync FilterAsync { get { throw null; } } - } } namespace Microsoft.AspNetCore.Mvc.Formatters { + internal static partial class AcceptHeaderParser + { + public static System.Collections.Generic.IList ParseAcceptHeader(System.Collections.Generic.IList acceptHeaders) { throw null; } + public static void ParseAcceptHeader(System.Collections.Generic.IList acceptHeaders, System.Collections.Generic.IList parsedValues) { } + } + internal enum HttpParseResult + { + Parsed = 0, + NotParsed = 1, + InvalidFormat = 2, + } + internal static partial class HttpTokenParsingRules + { + internal const char CR = '\r'; + internal static readonly System.Text.Encoding DefaultHttpEncoding; + internal const char LF = '\n'; + internal const int MaxInt32Digits = 10; + internal const int MaxInt64Digits = 19; + internal const char SP = ' '; + internal const char Tab = '\t'; + internal static Microsoft.AspNetCore.Mvc.Formatters.HttpParseResult GetQuotedPairLength(string input, int startIndex, out int length) { throw null; } + internal static Microsoft.AspNetCore.Mvc.Formatters.HttpParseResult GetQuotedStringLength(string input, int startIndex, out int length) { throw null; } + internal static int GetTokenLength(string input, int startIndex) { throw null; } + internal static int GetWhitespaceLength(string input, int startIndex) { throw null; } + internal static bool IsTokenChar(char character) { throw null; } + } + internal partial interface IFormatFilter : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata + { + string GetFormat(Microsoft.AspNetCore.Mvc.ActionContext context); + } internal static partial class MediaTypeHeaderValues { public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationAnyJsonSyntax; public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationAnyXmlSyntax; public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationJson; - public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationJsonPatch; public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue ApplicationXml; public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue TextJson; public static readonly Microsoft.Net.Http.Headers.MediaTypeHeaderValue TextXml; @@ -492,165 +777,155 @@ namespace Microsoft.AspNetCore.Mvc.Formatters { public static void ResolveContentTypeAndEncoding(string actionResultContentType, string httpResponseContentType, string defaultContentType, out string resolvedContentType, out System.Text.Encoding resolvedContentTypeEncoding) { throw null; } } + public partial class SystemTextJsonOutputFormatter : Microsoft.AspNetCore.Mvc.Formatters.TextOutputFormatter + { + internal static Microsoft.AspNetCore.Mvc.Formatters.SystemTextJsonOutputFormatter CreateFormatter(Microsoft.AspNetCore.Mvc.JsonOptions jsonOptions) { throw null; } + } + public abstract partial class TextOutputFormatter : Microsoft.AspNetCore.Mvc.Formatters.OutputFormatter + { + internal static System.Collections.Generic.IList GetAcceptCharsetHeaderValues(Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext context) { throw null; } + } +} +namespace Microsoft.AspNetCore.Mvc.Formatters.Json +{ + internal sealed partial class TranscodingReadStream : System.IO.Stream + { + internal const int MaxByteBufferSize = 4096; + internal const int MaxCharBufferSize = 12288; + public TranscodingReadStream(System.IO.Stream input, System.Text.Encoding sourceEncoding) { } + internal int ByteBufferCount { get { throw null; } } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanWrite { get { throw null; } } + internal int CharBufferCount { get { throw null; } } + public override long Length { get { throw null; } } + internal int OverflowCount { get { throw null; } } + public override long Position { get { throw null; } set { } } + protected override void Dispose(bool disposing) { } + public override void Flush() { } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public override void SetLength(long value) { } + public override void Write(byte[] buffer, int offset, int count) { } + } + internal sealed partial class TranscodingWriteStream : System.IO.Stream + { + internal const int MaxByteBufferSize = 16384; + internal const int MaxCharBufferSize = 4096; + public TranscodingWriteStream(System.IO.Stream stream, System.Text.Encoding targetEncoding) { } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanWrite { get { throw null; } } + public override long Length { get { throw null; } } + public override long Position { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + protected override void Dispose(bool disposing) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task FinalWriteAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + public override void Flush() { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public override void SetLength(long value) { } + public override void Write(byte[] buffer, int offset, int count) { } + public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + } } namespace Microsoft.AspNetCore.Mvc.Infrastructure { + public partial class ActionContextAccessor : Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor + { + internal static readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor Null; + } + internal partial class ActionInvokerFactory : Microsoft.AspNetCore.Mvc.Infrastructure.IActionInvokerFactory + { + public ActionInvokerFactory(System.Collections.Generic.IEnumerable actionInvokerProviders) { } + public Microsoft.AspNetCore.Mvc.Abstractions.IActionInvoker CreateInvoker(Microsoft.AspNetCore.Mvc.ActionContext actionContext) { throw null; } + } internal abstract partial class ActionMethodExecutor { - private static readonly Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor[] Executors; protected ActionMethodExecutor() { } protected abstract bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor); - private Microsoft.AspNetCore.Mvc.IActionResult ConvertToActionResult(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, object returnValue, System.Type declaredType) { throw null; } - private static void EnsureActionResultNotNull(Microsoft.Extensions.Internal.ObjectMethodExecutor executor, Microsoft.AspNetCore.Mvc.IActionResult actionResult) { } public abstract System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments); public static Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor GetExecutor(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } - private partial class AwaitableObjectResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor - { - public AwaitableObjectResultExecutor() { } - protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } - public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } - } - private partial class AwaitableResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor - { - public AwaitableResultExecutor() { } - protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } - public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } - } - private partial class SyncActionResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor - { - public SyncActionResultExecutor() { } - protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } - public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } - } - private partial class SyncObjectResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor - { - public SyncObjectResultExecutor() { } - protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } - public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } - } - private partial class TaskOfActionResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor - { - public TaskOfActionResultExecutor() { } - protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } - public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } - } - private partial class TaskOfIActionResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor - { - public TaskOfIActionResultExecutor() { } - protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } - public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } - } - private partial class TaskResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor - { - public TaskResultExecutor() { } - protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } - public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } - } - private partial class VoidResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor - { - public VoidResultExecutor() { } - protected override bool CanExecute(Microsoft.Extensions.Internal.ObjectMethodExecutor executor) { throw null; } - public override System.Threading.Tasks.ValueTask Execute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.Extensions.Internal.ObjectMethodExecutor executor, object controller, object[] arguments) { throw null; } - } } - internal partial class ControllerActionInvokerCacheEntry + internal partial class ActionResultTypeMapper : Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper { - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor _ActionMethodExecutor_k__BackingField; - private readonly Microsoft.AspNetCore.Mvc.Filters.FilterItem[] _CachedFilters_k__BackingField; - private readonly Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegate _ControllerBinderDelegate_k__BackingField; - private readonly System.Func _ControllerFactory_k__BackingField; - private readonly System.Action _ControllerReleaser_k__BackingField; - private readonly Microsoft.Extensions.Internal.ObjectMethodExecutor _ObjectMethodExecutor_k__BackingField; - internal ControllerActionInvokerCacheEntry(Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cachedFilters, System.Func controllerFactory, System.Action controllerReleaser, Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegate controllerBinderDelegate, Microsoft.Extensions.Internal.ObjectMethodExecutor objectMethodExecutor, Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor actionMethodExecutor) { } - internal Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor ActionMethodExecutor { get { throw null; } } - public Microsoft.AspNetCore.Mvc.Filters.FilterItem[] CachedFilters { get { throw null; } } - public Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegate ControllerBinderDelegate { get { throw null; } } - public System.Func ControllerFactory { get { throw null; } } - public System.Action ControllerReleaser { get { throw null; } } - internal Microsoft.Extensions.Internal.ObjectMethodExecutor ObjectMethodExecutor { get { throw null; } } + public ActionResultTypeMapper() { } + public Microsoft.AspNetCore.Mvc.IActionResult Convert(object value, System.Type returnType) { throw null; } + public System.Type GetResultDataType(System.Type returnType) { throw null; } + } + internal partial class ActionSelectionTable + { + public int Version { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Create(Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection actions) { throw null; } + public static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Create(System.Collections.Generic.IEnumerable endpoints) { throw null; } + public System.Collections.Generic.IReadOnlyList Select(Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } + } + internal partial class ActionSelector : Microsoft.AspNetCore.Mvc.Infrastructure.IActionSelector + { + public ActionSelector(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actionDescriptorCollectionProvider, Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache actionConstraintCache, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor SelectBestCandidate(Microsoft.AspNetCore.Routing.RouteContext context, System.Collections.Generic.IReadOnlyList candidates) { throw null; } + public System.Collections.Generic.IReadOnlyList SelectCandidates(Microsoft.AspNetCore.Routing.RouteContext context) { throw null; } + } + internal sealed partial class AsyncEnumerableReader + { + public AsyncEnumerableReader(Microsoft.AspNetCore.Mvc.MvcOptions mvcOptions) { } + public System.Threading.Tasks.Task ReadAsync(System.Collections.Generic.IAsyncEnumerable value) { throw null; } + } + internal partial class ClientErrorResultFilter : Microsoft.AspNetCore.Mvc.Filters.IAlwaysRunResultFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter, Microsoft.AspNetCore.Mvc.Filters.IResultFilter + { + internal const int FilterOrder = -2000; + public ClientErrorResultFilter(Microsoft.AspNetCore.Mvc.Infrastructure.IClientErrorFactory clientErrorFactory, Microsoft.Extensions.Logging.ILogger logger) { } + public int Order { get { throw null; } } + public void OnResultExecuted(Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext context) { } + public void OnResultExecuting(Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext context) { } + } + internal sealed partial class ClientErrorResultFilterFactory : Microsoft.AspNetCore.Mvc.Filters.IFilterFactory, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + public ClientErrorResultFilterFactory() { } + public bool IsReusable { get { throw null; } } + public int Order { get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata CreateInstance(System.IServiceProvider serviceProvider) { throw null; } + } + internal partial class ControllerActionInvoker : Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker, Microsoft.AspNetCore.Mvc.Abstractions.IActionInvoker + { + internal ControllerActionInvoker(Microsoft.Extensions.Logging.ILogger logger, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.ControllerContext controllerContext, Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCacheEntry cacheEntry, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) : base (default(System.Diagnostics.DiagnosticListener), default(Microsoft.Extensions.Logging.ILogger), default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor), default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper), default(Microsoft.AspNetCore.Mvc.ActionContext), default(Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[]), default(System.Collections.Generic.IList)) { } + internal Microsoft.AspNetCore.Mvc.ControllerContext ControllerContext { get { throw null; } } + protected override System.Threading.Tasks.Task InvokeInnerFilterAsync() { throw null; } + protected override void ReleaseResources() { } } internal partial class ControllerActionInvokerCache { - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _collectionProvider; - private readonly Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider _controllerFactoryProvider; - private volatile Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache.InnerCache _currentCache; - private readonly Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] _filterProviders; - private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory _modelBinderFactory; - private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _modelMetadataProvider; - private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; - private readonly Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder _parameterBinder; public ControllerActionInvokerCache(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, System.Collections.Generic.IEnumerable filterProviders, Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider factoryProvider, Microsoft.Extensions.Options.IOptions mvcOptions) { } - private Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache.InnerCache CurrentCache { get { throw null; } } public (Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCacheEntry cacheEntry, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) GetCachedResult(Microsoft.AspNetCore.Mvc.ControllerContext controllerContext) { throw null; } - private partial class InnerCache - { - private readonly System.Collections.Concurrent.ConcurrentDictionary _Entries_k__BackingField; - private readonly int _Version_k__BackingField; - public InnerCache(int version) { } - public System.Collections.Concurrent.ConcurrentDictionary Entries { get { throw null; } } - public int Version { get { throw null; } } - } } - internal partial class MvcOptionsConfigureCompatibilityOptions : Microsoft.AspNetCore.Mvc.Infrastructure.ConfigureCompatibilityOptions + internal partial class ControllerActionInvokerCacheEntry { - public MvcOptionsConfigureCompatibilityOptions(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.Options.IOptions compatibilityOptions) : base(loggerFactory, compatibilityOptions) { } - protected override System.Collections.Generic.IReadOnlyDictionary DefaultValues { get { throw null; } } + internal ControllerActionInvokerCacheEntry(Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cachedFilters, System.Func controllerFactory, System.Action controllerReleaser, Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegate controllerBinderDelegate, Microsoft.Extensions.Internal.ObjectMethodExecutor objectMethodExecutor, Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor actionMethodExecutor) { } + internal Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor ActionMethodExecutor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.FilterItem[] CachedFilters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegate ControllerBinderDelegate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Func ControllerFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Action ControllerReleaser { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.Extensions.Internal.ObjectMethodExecutor ObjectMethodExecutor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } } - internal partial class DefaultActionDescriptorCollectionProvider : Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollectionProvider + internal partial class ControllerActionInvokerProvider : Microsoft.AspNetCore.Mvc.Abstractions.IActionInvokerProvider { - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorChangeProvider[] _actionDescriptorChangeProviders; - private readonly Microsoft.AspNetCore.Mvc.Abstractions.IActionDescriptorProvider[] _actionDescriptorProviders; - private System.Threading.CancellationTokenSource _cancellationTokenSource; - private Microsoft.Extensions.Primitives.IChangeToken _changeToken; - private Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection _collection; - private readonly object _lock; - private int _version; - public DefaultActionDescriptorCollectionProvider(System.Collections.Generic.IEnumerable actionDescriptorProviders, System.Collections.Generic.IEnumerable actionDescriptorChangeProviders) { } - public override Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection ActionDescriptors { get { throw null; } } - public override Microsoft.Extensions.Primitives.IChangeToken GetChangeToken() { throw null; } - private Microsoft.Extensions.Primitives.IChangeToken GetCompositeChangeToken() { throw null; } - private void Initialize() { } - private void UpdateCollection() { } - } - internal partial class ControllerActionInvokerProvider - { - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor _actionContextAccessor; - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache _controllerActionInvokerCache; - private readonly System.Diagnostics.DiagnosticListener _diagnosticListener; - private readonly Microsoft.Extensions.Logging.ILogger _logger; - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper _mapper; - private readonly int _maxModelValidationErrors; - private readonly System.Collections.Generic.IReadOnlyList _valueProviderFactories; public ControllerActionInvokerProvider(Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache controllerActionInvokerCache, Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper) { } public ControllerActionInvokerProvider(Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvokerCache controllerActionInvokerCache, Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor) { } public int Order { get { throw null; } } public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context) { } public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context) { } } - internal partial class ActionSelector : Microsoft.AspNetCore.Mvc.Infrastructure.IActionSelector + internal partial class CopyOnWriteList : System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable, System.Collections.Generic.IList, System.Collections.IEnumerable { - private readonly Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache _actionConstraintCache; - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _actionDescriptorCollectionProvider; - private Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable _cache; - private readonly Microsoft.Extensions.Logging.ILogger _logger; - public ActionSelector(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actionDescriptorCollectionProvider, Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache actionConstraintCache, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - private Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Current { get { throw null; } } - private System.Collections.Generic.IReadOnlyList EvaluateActionConstraints(Microsoft.AspNetCore.Routing.RouteContext context, System.Collections.Generic.IReadOnlyList actions) { throw null; } - private System.Collections.Generic.IReadOnlyList EvaluateActionConstraintsCore(Microsoft.AspNetCore.Routing.RouteContext context, System.Collections.Generic.IReadOnlyList candidates, int? startingOrder) { throw null; } - private System.Collections.Generic.IReadOnlyList SelectBestActions(System.Collections.Generic.IReadOnlyList actions) { throw null; } - public Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor SelectBestCandidate(Microsoft.AspNetCore.Routing.RouteContext context, System.Collections.Generic.IReadOnlyList candidates) { throw null; } - public System.Collections.Generic.IReadOnlyList SelectCandidates(Microsoft.AspNetCore.Routing.RouteContext context) { throw null; } - } - internal partial class CopyOnWriteList : System.Collections.Generic.IList - { - private System.Collections.Generic.List _copy; - private readonly System.Collections.Generic.IReadOnlyList _source; public CopyOnWriteList(System.Collections.Generic.IReadOnlyList source) { } public int Count { get { throw null; } } public bool IsReadOnly { get { throw null; } } public T this[int index] { get { throw null; } set { } } - private System.Collections.Generic.IReadOnlyList Readable { get { throw null; } } - private System.Collections.Generic.List Writable { get { throw null; } } public void Add(T item) { } public void Clear() { } public bool Contains(T item) { throw null; } @@ -662,29 +937,69 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure public void RemoveAt(int index) { } System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } } - public partial class ActionContextAccessor : Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor + internal partial class DefaultActionDescriptorCollectionProvider : Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollectionProvider { - internal static readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor Null; + public DefaultActionDescriptorCollectionProvider(System.Collections.Generic.IEnumerable actionDescriptorProviders, System.Collections.Generic.IEnumerable actionDescriptorChangeProviders) { } + public override Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection ActionDescriptors { get { throw null; } } + public override Microsoft.Extensions.Primitives.IChangeToken GetChangeToken() { throw null; } } - internal static partial class ParameterDefaultValues + internal sealed partial class DefaultProblemDetailsFactory : Microsoft.AspNetCore.Mvc.Infrastructure.ProblemDetailsFactory { - private static object GetParameterDefaultValue(System.Reflection.ParameterInfo parameterInfo) { throw null; } - public static object[] GetParameterDefaultValues(System.Reflection.MethodInfo methodInfo) { throw null; } - public static bool TryGetDeclaredParameterDefaultValue(System.Reflection.ParameterInfo parameterInfo, out object defaultValue) { throw null; } + public DefaultProblemDetailsFactory(Microsoft.Extensions.Options.IOptions options) { } + public override Microsoft.AspNetCore.Mvc.ProblemDetails CreateProblemDetails(Microsoft.AspNetCore.Http.HttpContext httpContext, int? statusCode = default(int?), string title = null, string type = null, string detail = null, string instance = null) { throw null; } + public override Microsoft.AspNetCore.Mvc.ValidationProblemDetails CreateValidationProblemDetails(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary modelStateDictionary, int? statusCode = default(int?), string title = null, string type = null, string detail = null, string instance = null) { throw null; } + } + public partial class FileResultExecutorBase + { + internal Microsoft.AspNetCore.Mvc.Infrastructure.FileResultExecutorBase.PreconditionState GetPreconditionState(Microsoft.AspNetCore.Http.Headers.RequestHeaders httpRequestHeaders, System.DateTimeOffset? lastModified = default(System.DateTimeOffset?), Microsoft.Net.Http.Headers.EntityTagHeaderValue etag = null) { throw null; } + internal bool IfRangeValid(Microsoft.AspNetCore.Http.Headers.RequestHeaders httpRequestHeaders, System.DateTimeOffset? lastModified = default(System.DateTimeOffset?), Microsoft.Net.Http.Headers.EntityTagHeaderValue etag = null) { throw null; } + internal enum PreconditionState + { + Unspecified = 0, + NotModified = 1, + ShouldProcess = 2, + PreconditionFailed = 3, + } } internal partial interface ITypeActivatorCache { TInstance CreateInstance(System.IServiceProvider serviceProvider, System.Type optionType); } + internal partial class MemoryPoolHttpRequestStreamReaderFactory : Microsoft.AspNetCore.Mvc.Infrastructure.IHttpRequestStreamReaderFactory + { + public static readonly int DefaultBufferSize; + public MemoryPoolHttpRequestStreamReaderFactory(System.Buffers.ArrayPool bytePool, System.Buffers.ArrayPool charPool) { } + public System.IO.TextReader CreateReader(System.IO.Stream stream, System.Text.Encoding encoding) { throw null; } + } + internal partial class MemoryPoolHttpResponseStreamWriterFactory : Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory + { + public static readonly int DefaultBufferSize; + public MemoryPoolHttpResponseStreamWriterFactory(System.Buffers.ArrayPool bytePool, System.Buffers.ArrayPool charPool) { } + public System.IO.TextWriter CreateWriter(System.IO.Stream stream, System.Text.Encoding encoding) { throw null; } + } + public partial class ModelStateInvalidFilter : Microsoft.AspNetCore.Mvc.Filters.IActionFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + internal const int FilterOrder = -2000; + } + internal partial class ModelStateInvalidFilterFactory : Microsoft.AspNetCore.Mvc.Filters.IFilterFactory, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + public ModelStateInvalidFilterFactory() { } + public bool IsReusable { get { throw null; } } + public int Order { get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata CreateInstance(System.IServiceProvider serviceProvider) { throw null; } + } + internal partial class MvcOptionsConfigureCompatibilityOptions : Microsoft.AspNetCore.Mvc.Infrastructure.ConfigureCompatibilityOptions + { + public MvcOptionsConfigureCompatibilityOptions(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.Options.IOptions compatibilityOptions) : base (default(Microsoft.Extensions.Logging.ILoggerFactory), default(Microsoft.Extensions.Options.IOptions)) { } + protected override System.Collections.Generic.IReadOnlyDictionary DefaultValues { get { throw null; } } + } internal partial class NonDisposableStream : System.IO.Stream { - private readonly System.IO.Stream _innerStream; public NonDisposableStream(System.IO.Stream innerStream) { } public override bool CanRead { get { throw null; } } public override bool CanSeek { get { throw null; } } public override bool CanTimeout { get { throw null; } } public override bool CanWrite { get { throw null; } } - private System.IO.Stream InnerStream { get { throw null; } } public override long Length { get { throw null; } } public override long Position { get { throw null; } set { } } public override int ReadTimeout { get { throw null; } set { } } @@ -707,149 +1022,101 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } public override void WriteByte(byte value) { } } - internal partial class ActionSelectionTable + internal partial class NullableCompatibilitySwitch : Microsoft.AspNetCore.Mvc.Infrastructure.ICompatibilitySwitch where TValue : struct { - private readonly System.Collections.Generic.Dictionary> _OrdinalEntries_k__BackingField; - private readonly System.Collections.Generic.Dictionary> _OrdinalIgnoreCaseEntries_k__BackingField; - private readonly string[] _RouteKeys_k__BackingField; - private readonly int _Version_k__BackingField; - private ActionSelectionTable(int version, string[] routeKeys, System.Collections.Generic.Dictionary> ordinalEntries, System.Collections.Generic.Dictionary> ordinalIgnoreCaseEntries) { } - private System.Collections.Generic.Dictionary> OrdinalEntries { get { throw null; } } - private System.Collections.Generic.Dictionary> OrdinalIgnoreCaseEntries { get { throw null; } } - private string[] RouteKeys { get { throw null; } } - public int Version { get { throw null; } } - public static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Create(Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection actions) { throw null; } - public static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Create(System.Collections.Generic.IEnumerable endpoints) { throw null; } - private static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable CreateCore(int version, System.Collections.Generic.IEnumerable items, System.Func> getRouteKeys, System.Func getRouteValue) { throw null; } - public System.Collections.Generic.IReadOnlyList Select(Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } + public NullableCompatibilitySwitch(string name) { } + public bool IsValueSet { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + object Microsoft.AspNetCore.Mvc.Infrastructure.ICompatibilitySwitch.Value { get { throw null; } set { } } + public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public TValue? Value { get { throw null; } set { } } } + internal static partial class ParameterDefaultValues + { + public static object[] GetParameterDefaultValues(System.Reflection.MethodInfo methodInfo) { throw null; } + public static bool TryGetDeclaredParameterDefaultValue(System.Reflection.ParameterInfo parameterInfo, out object defaultValue) { throw null; } + } + internal partial class ProblemDetailsClientErrorFactory : Microsoft.AspNetCore.Mvc.Infrastructure.IClientErrorFactory + { + public ProblemDetailsClientErrorFactory(Microsoft.AspNetCore.Mvc.Infrastructure.ProblemDetailsFactory problemDetailsFactory) { } + public Microsoft.AspNetCore.Mvc.IActionResult GetClientError(Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.Infrastructure.IClientErrorActionResult clientError) { throw null; } + } + internal partial class ProblemDetailsJsonConverter : System.Text.Json.Serialization.JsonConverter + { + public ProblemDetailsJsonConverter() { } + public override Microsoft.AspNetCore.Mvc.ProblemDetails Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options) { throw null; } + internal static void ReadValue(ref System.Text.Json.Utf8JsonReader reader, Microsoft.AspNetCore.Mvc.ProblemDetails value, System.Text.Json.JsonSerializerOptions options) { } + internal static bool TryReadStringProperty(ref System.Text.Json.Utf8JsonReader reader, System.Text.Json.JsonEncodedText propertyName, out string value) { throw null; } + public override void Write(System.Text.Json.Utf8JsonWriter writer, Microsoft.AspNetCore.Mvc.ProblemDetails value, System.Text.Json.JsonSerializerOptions options) { } + internal static void WriteProblemDetails(System.Text.Json.Utf8JsonWriter writer, Microsoft.AspNetCore.Mvc.ProblemDetails value, System.Text.Json.JsonSerializerOptions options) { } + } +#nullable enable internal abstract partial class ResourceInvoker { protected readonly Microsoft.AspNetCore.Mvc.ActionContext _actionContext; protected readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor _actionContextAccessor; - private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.AuthorizationFilterContextSealed _authorizationContext; protected Microsoft.AspNetCore.Mvc.Filters.FilterCursor _cursor; protected readonly System.Diagnostics.DiagnosticListener _diagnosticListener; - private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ExceptionContextSealed _exceptionContext; protected readonly Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] _filters; - protected object _instance; + protected object? _instance; protected readonly Microsoft.Extensions.Logging.ILogger _logger; protected readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper _mapper; - private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResourceExecutedContextSealed _resourceExecutedContext; - private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResourceExecutingContextSealed _resourceExecutingContext; - protected Microsoft.AspNetCore.Mvc.IActionResult _result; - private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResultExecutedContextSealed _resultExecutedContext; - private Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResultExecutingContextSealed _resultExecutingContext; + protected Microsoft.AspNetCore.Mvc.IActionResult? _result; protected readonly System.Collections.Generic.IList _valueProviderFactories; - public ResourceInvoker(System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters, System.Collections.Generic.IList valueProviderFactories) { } - private System.Threading.Tasks.Task InvokeAlwaysRunResultFilters() { throw null; } - public virtual System.Threading.Tasks.Task InvokeAsync() { throw null; } - private System.Threading.Tasks.Task InvokeFilterPipelineAsync() { throw null; } + public ResourceInvoker(System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters, System.Collections.Generic.IList valueProviderFactories) + { + _actionContext = actionContext; + _actionContextAccessor = actionContextAccessor; + _diagnosticListener = diagnosticListener; + _filters = filters; + _logger = logger; + _mapper = mapper; + _valueProviderFactories = valueProviderFactories; + } + public virtual System.Threading.Tasks.Task InvokeAsync() { throw new System.ArgumentException(); } protected abstract System.Threading.Tasks.Task InvokeInnerFilterAsync(); - private System.Threading.Tasks.Task InvokeNextExceptionFilterAsync() { throw null; } - private System.Threading.Tasks.Task InvokeNextResourceFilter() { throw null; } - private System.Threading.Tasks.Task InvokeNextResourceFilterAwaitedAsync() { throw null; } - private System.Threading.Tasks.Task InvokeNextResultFilterAsync() where TFilter : class, Microsoft.AspNetCore.Mvc.Filters.IResultFilter where TFilterAsync : class, Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter { throw null; } - private System.Threading.Tasks.Task InvokeNextResultFilterAwaitedAsync() where TFilter : class, Microsoft.AspNetCore.Mvc.Filters.IResultFilter where TFilterAsync : class, Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter { throw null; } - protected virtual System.Threading.Tasks.Task InvokeResultAsync(Microsoft.AspNetCore.Mvc.IActionResult result) { throw null; } - private System.Threading.Tasks.Task InvokeResultFilters() { throw null; } - private System.Threading.Tasks.Task Next(ref Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.State next, ref Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.Scope scope, ref object state, ref bool isCompleted) { throw null; } + protected virtual System.Threading.Tasks.Task InvokeResultAsync(Microsoft.AspNetCore.Mvc.IActionResult result) { throw new System.ArgumentException(); } protected abstract void ReleaseResources(); - private System.Threading.Tasks.Task ResultNext(ref Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.State next, ref Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.Scope scope, ref object state, ref bool isCompleted) where TFilter : class, Microsoft.AspNetCore.Mvc.Filters.IResultFilter where TFilterAsync : class, Microsoft.AspNetCore.Mvc.Filters.IAsyncResultFilter { throw null; } - private static void Rethrow(Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ExceptionContextSealed context) { } - private static void Rethrow(Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResourceExecutedContextSealed context) { } - private static void Rethrow(Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.ResultExecutedContextSealed context) { } - private sealed partial class AuthorizationFilterContextSealed - { - public AuthorizationFilterContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters) { } - } - private sealed partial class ExceptionContextSealed - { - public ExceptionContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters) { } - } - private static partial class FilterTypeConstants - { - public const string ActionFilter = "Action Filter"; - public const string AlwaysRunResultFilter = "Always Run Result Filter"; - public const string AuthorizationFilter = "Authorization Filter"; - public const string ExceptionFilter = "Exception Filter"; - public const string ResourceFilter = "Resource Filter"; - public const string ResultFilter = "Result Filter"; - } - private sealed partial class ResourceExecutedContextSealed - { - public ResourceExecutedContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters) { } - } - private sealed partial class ResourceExecutingContextSealed - { - public ResourceExecutingContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters, System.Collections.Generic.IList valueProviderFactories) { } - } - private sealed partial class ResultExecutedContextSealed - { - public ResultExecutedContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters, Microsoft.AspNetCore.Mvc.IActionResult result, object controller) { } - } - private sealed partial class ResultExecutingContextSealed - { - public ResultExecutingContextSealed(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList filters, Microsoft.AspNetCore.Mvc.IActionResult result, object controller) { } - } - private enum Scope - { - Invoker = 0, - Resource = 1, - Exception = 2, - Result = 3, - } - private enum State - { - InvokeBegin = 0, - AuthorizationBegin = 1, - AuthorizationNext = 2, - AuthorizationAsyncBegin = 3, - AuthorizationAsyncEnd = 4, - AuthorizationSync = 5, - AuthorizationShortCircuit = 6, - AuthorizationEnd = 7, - ResourceBegin = 8, - ResourceNext = 9, - ResourceAsyncBegin = 10, - ResourceAsyncEnd = 11, - ResourceSyncBegin = 12, - ResourceSyncEnd = 13, - ResourceShortCircuit = 14, - ResourceInside = 15, - ResourceInsideEnd = 16, - ResourceEnd = 17, - ExceptionBegin = 18, - ExceptionNext = 19, - ExceptionAsyncBegin = 20, - ExceptionAsyncResume = 21, - ExceptionAsyncEnd = 22, - ExceptionSyncBegin = 23, - ExceptionSyncEnd = 24, - ExceptionInside = 25, - ExceptionHandled = 26, - ExceptionEnd = 27, - ActionBegin = 28, - ActionEnd = 29, - ResultBegin = 30, - ResultNext = 31, - ResultAsyncBegin = 32, - ResultAsyncEnd = 33, - ResultSyncBegin = 34, - ResultSyncEnd = 35, - ResultInside = 36, - ResultEnd = 37, - InvokeEnd = 38, - } + } +#nullable restore + internal partial class StringArrayComparer : System.Collections.Generic.IEqualityComparer + { + public static readonly Microsoft.AspNetCore.Mvc.Infrastructure.StringArrayComparer Ordinal; + public static readonly Microsoft.AspNetCore.Mvc.Infrastructure.StringArrayComparer OrdinalIgnoreCase; + public bool Equals(string[] x, string[] y) { throw null; } + public int GetHashCode(string[] obj) { throw null; } + } + internal sealed partial class SystemTextJsonResultExecutor : Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultExecutor + { + public SystemTextJsonResultExecutor(Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Logging.ILogger logger, Microsoft.Extensions.Options.IOptions mvcOptions) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task ExecuteAsync(Microsoft.AspNetCore.Mvc.ActionContext context, Microsoft.AspNetCore.Mvc.JsonResult result) { throw null; } + } + internal partial class TypeActivatorCache : Microsoft.AspNetCore.Mvc.Infrastructure.ITypeActivatorCache + { + public TypeActivatorCache() { } + public TInstance CreateInstance(System.IServiceProvider serviceProvider, System.Type implementationType) { throw null; } + } + internal partial class ValidationProblemDetailsJsonConverter : System.Text.Json.Serialization.JsonConverter + { + public ValidationProblemDetailsJsonConverter() { } + public override Microsoft.AspNetCore.Mvc.ValidationProblemDetails Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options) { throw null; } + public override void Write(System.Text.Json.Utf8JsonWriter writer, Microsoft.AspNetCore.Mvc.ValidationProblemDetails value, System.Text.Json.JsonSerializerOptions options) { } } } namespace Microsoft.AspNetCore.Mvc.ModelBinding { - internal static partial class PropertyValueSetter + internal partial class ElementalValueProvider : Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider { - private static readonly System.Reflection.MethodInfo CallPropertyAddRangeOpenGenericMethod; - private static void CallPropertyAddRange(object target, object source) { } - public static void SetValue(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata, object instance, object value) { } + public ElementalValueProvider(string key, string value, System.Globalization.CultureInfo culture) { } + public System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool ContainsPrefix(string prefix) { throw null; } + public Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult GetValue(string key) { throw null; } + } + public partial class ModelAttributes + { + internal ModelAttributes(System.Collections.Generic.IEnumerable typeAttributes, System.Collections.Generic.IEnumerable propertyAttributes, System.Collections.Generic.IEnumerable parameterAttributes) { } } internal static partial class ModelBindingHelper { @@ -857,254 +1124,419 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding internal static TModel CastOrDefault(object model) { throw null; } public static void ClearValidationStateForModel(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary modelState, string modelKey) { } public static void ClearValidationStateForModel(System.Type modelType, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary modelState, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, string modelKey) { } - private static object ConvertSimpleType(object value, System.Type destinationType, System.Globalization.CultureInfo culture) { throw null; } public static object ConvertTo(object value, System.Type type, System.Globalization.CultureInfo culture) { throw null; } public static T ConvertTo(object value, System.Globalization.CultureInfo culture) { throw null; } - private static System.Collections.Generic.List CreateList(int? capacity) { throw null; } public static System.Collections.Generic.ICollection GetCompatibleCollection(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { throw null; } public static System.Collections.Generic.ICollection GetCompatibleCollection(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext, int capacity) { throw null; } - private static System.Collections.Generic.ICollection GetCompatibleCollection(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext, int? capacity) { throw null; } - private static System.Linq.Expressions.Expression> GetPredicateExpression(System.Linq.Expressions.Expression> expression) { throw null; } public static System.Linq.Expressions.Expression> GetPropertyFilterExpression(System.Linq.Expressions.Expression>[] expressions) { throw null; } internal static string GetPropertyName(System.Linq.Expressions.Expression expression) { throw null; } public static System.Threading.Tasks.Task TryUpdateModelAsync(object model, System.Type modelType, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] public static System.Threading.Tasks.Task TryUpdateModelAsync(object model, System.Type modelType, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator, System.Func propertyFilter) { throw null; } public static System.Threading.Tasks.Task TryUpdateModelAsync(TModel model, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator) where TModel : class { throw null; } public static System.Threading.Tasks.Task TryUpdateModelAsync(TModel model, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator, System.Func propertyFilter) where TModel : class { throw null; } public static System.Threading.Tasks.Task TryUpdateModelAsync(TModel model, string prefix, Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IValueProvider valueProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator objectModelValidator, params System.Linq.Expressions.Expression>[] includeExpressions) where TModel : class { throw null; } - private static System.Type UnwrapNullableType(System.Type destinationType) { throw null; } - private static object UnwrapPossibleArrayType(object value, System.Type destinationType, System.Globalization.CultureInfo culture) { throw null; } + } + internal partial class NoOpBinder : Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder + { + public static readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder Instance; + public NoOpBinder() { } + public System.Threading.Tasks.Task BindModelAsync(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { throw null; } + } + internal partial class PlaceholderBinder : Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder + { + public PlaceholderBinder() { } + public Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder Inner { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Threading.Tasks.Task BindModelAsync(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { throw null; } + } + internal static partial class PropertyValueSetter + { + public static void SetValue(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata, object instance, object value) { } + } + internal partial class ReferenceEqualityComparer : System.Collections.Generic.IEqualityComparer + { + public ReferenceEqualityComparer() { } + public static Microsoft.AspNetCore.Mvc.ModelBinding.ReferenceEqualityComparer Instance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public new bool Equals(object x, object y) { throw null; } + public int GetHashCode(object obj) { throw null; } } } -namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation +namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders { - internal partial class DefaultModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IMetadataBasedModelValidatorProvider + public partial class CollectionModelBinder : Microsoft.AspNetCore.Mvc.ModelBinding.ICollectionModelBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder { - public DefaultModelValidatorProvider() { } - public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidatorProviderContext context) { } - public bool HasValidators(System.Type modelType, System.Collections.Generic.IList validatorMetadata) { throw null; } + internal bool AllowValidatingTopLevelNodes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + [System.Diagnostics.DebuggerStepThroughAttribute] + internal System.Threading.Tasks.Task.CollectionResult> BindComplexCollectionFromIndexes(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext, System.Collections.Generic.IEnumerable indexNames) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + internal System.Threading.Tasks.Task.CollectionResult> BindSimpleCollection(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext, Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult values) { throw null; } + internal partial class CollectionResult + { + public CollectionResult() { } + public System.Collections.Generic.IEnumerable Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy ValidationStrategy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } } - internal partial class HasValidatorsValidationMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider + public partial class ComplexTypeModelBinder : Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder { - private readonly bool _hasOnlyMetadataBasedValidators; - private readonly Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IMetadataBasedModelValidatorProvider[] _validatorProviders; - public HasValidatorsValidationMetadataProvider(System.Collections.Generic.IList modelValidatorProviders) { } - public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } + internal const int GreedyPropertiesMayHaveData = 1; + internal const int NoDataAvailable = 0; + internal const int ValueProviderDataAvailable = 2; + internal int CanCreateModel(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext) { throw null; } + internal static bool CanUpdatePropertyInternal(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata propertyMetadata) { throw null; } + } + public partial class FloatingPointTypeModelBinderProvider : Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderProvider + { + internal static readonly System.Globalization.NumberStyles SupportedStyles; + } + public partial class HeaderModelBinder : Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder + { + internal Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder InnerModelBinder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public partial class KeyValuePairModelBinder : Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder + { + [System.Diagnostics.DebuggerStepThroughAttribute] + internal System.Threading.Tasks.Task TryBindStrongModel(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingContext bindingContext, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder binder, string propertyName, string propertyModelName) { throw null; } } } namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata -{internal partial class DefaultBindingMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider +{ + internal partial class DefaultBindingMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider { public DefaultBindingMetadataProvider() { } public void CreateBindingMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext context) { } - private static Microsoft.AspNetCore.Mvc.ModelBinding.BindingBehaviorAttribute FindBindingBehavior(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext context) { throw null; } - private partial class CompositePropertyFilterProvider - { - private readonly System.Collections.Generic.IEnumerable _providers; - public CompositePropertyFilterProvider(System.Collections.Generic.IEnumerable providers) { } - public System.Func PropertyFilter { get { throw null; } } - private System.Func CreatePropertyFilter() { throw null; } - } } internal partial class DefaultCompositeMetadataDetailsProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ICompositeMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IDisplayMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider { - private readonly System.Collections.Generic.IEnumerable _providers; public DefaultCompositeMetadataDetailsProvider(System.Collections.Generic.IEnumerable providers) { } public void CreateBindingMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext context) { } public void CreateDisplayMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadataProviderContext context) { } public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } } + public partial class DefaultModelMetadata : Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata + { + internal static bool CalculateHasValidators(System.Collections.Generic.HashSet visited, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata) { throw null; } + } internal partial class DefaultValidationMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider { public DefaultValidationMetadataProvider() { } public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } } } -namespace Microsoft.AspNetCore.Internal +namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation { - internal partial class ChunkingCookieManager + internal partial class DefaultCollectionValidationStrategy : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy { - private const string ChunkCountPrefix = "chunks-"; - private const string ChunkKeySuffix = "C"; - public const int DefaultChunkSize = 4050; - private int? _ChunkSize_k__BackingField; - private bool _ThrowForPartialCookies_k__BackingField; - public ChunkingCookieManager() { } - public int? ChunkSize { get { throw null; } set { } } - public bool ThrowForPartialCookies { get { throw null; } set { } } - public void AppendResponseCookie(Microsoft.AspNetCore.Http.HttpContext context, string key, string value, Microsoft.AspNetCore.Http.CookieOptions options) { } - public void DeleteCookie(Microsoft.AspNetCore.Http.HttpContext context, string key, Microsoft.AspNetCore.Http.CookieOptions options) { } - public string GetRequestCookie(Microsoft.AspNetCore.Http.HttpContext context, string key) { throw null; } - private static int ParseChunksCount(string value) { throw null; } + public static readonly Microsoft.AspNetCore.Mvc.ModelBinding.Validation.DefaultCollectionValidationStrategy Instance; + public System.Collections.Generic.IEnumerator GetChildren(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata, string key, object model) { throw null; } + public System.Collections.IEnumerator GetEnumeratorForElementType(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata, object model) { throw null; } } -} -namespace Microsoft.AspNetCore.Mvc -{ - internal partial class ApiDescriptionActionData + internal partial class DefaultComplexObjectValidationStrategy : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy { - private string _GroupName_k__BackingField; - public ApiDescriptionActionData() { } - public string GroupName { get { throw null; } set { } } + public static readonly Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy Instance; + public System.Collections.Generic.IEnumerator GetChildren(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata, string key, object model) { throw null; } + } + internal partial class DefaultModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IMetadataBasedModelValidatorProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider + { + public DefaultModelValidatorProvider() { } + public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidatorProviderContext context) { } + public bool HasValidators(System.Type modelType, System.Collections.Generic.IList validatorMetadata) { throw null; } + } + internal partial class DefaultObjectValidator : Microsoft.AspNetCore.Mvc.ModelBinding.ObjectModelValidator + { + public DefaultObjectValidator(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, System.Collections.Generic.IList validatorProviders, Microsoft.AspNetCore.Mvc.MvcOptions mvcOptions) : base (default(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider), default(System.Collections.Generic.IList)) { } + public override Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationVisitor GetValidationVisitor(Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider validatorProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidatorCache validatorCache, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary validationState) { throw null; } + } + internal partial class ExplicitIndexCollectionValidationStrategy : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy + { + public ExplicitIndexCollectionValidationStrategy(System.Collections.Generic.IEnumerable elementKeys) { } + public System.Collections.Generic.IEnumerable ElementKeys { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IEnumerator GetChildren(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata, string key, object model) { throw null; } + } + internal partial class HasValidatorsValidationMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider + { + public HasValidatorsValidationMetadataProvider(System.Collections.Generic.IList modelValidatorProviders) { } + public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } + } + internal partial class ShortFormDictionaryValidationStrategy : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IValidationStrategy + { + public ShortFormDictionaryValidationStrategy(System.Collections.Generic.IEnumerable> keyMappings, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata valueMetadata) { } + public System.Collections.Generic.IEnumerable> KeyMappings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IEnumerator GetChildren(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata, string key, object model) { throw null; } + } + internal partial class ValidationStack + { + internal const int CutOff = 20; + public ValidationStack() { } + public int Count { get { throw null; } } + internal System.Collections.Generic.HashSet HashSet { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal System.Collections.Generic.List List { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void Pop(object model) { } + public bool Push(object model) { throw null; } } } namespace Microsoft.AspNetCore.Mvc.Routing { - internal static partial class ViewEnginePath - { - private const string CurrentDirectoryToken = "."; - private const string ParentDirectoryToken = ".."; - public static readonly char[] PathSeparators; - public static string CombinePath(string first, string second) { throw null; } - public static string ResolvePath(string path) { throw null; } - } - internal static partial class NormalizedRouteValue - { - public static string GetNormalizedRouteValue(Microsoft.AspNetCore.Mvc.ActionContext context, string key) { throw null; } - } - internal partial class ControllerActionEndpointDataSource : Microsoft.AspNetCore.Mvc.Routing.ActionEndpointDataSourceBase - { - private readonly Microsoft.AspNetCore.Mvc.Routing.ActionEndpointFactory _endpointFactory; - private int _order; - private readonly System.Collections.Generic.List _routes; - private bool _CreateInertEndpoints_k__BackingField; - private readonly Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder _DefaultBuilder_k__BackingField; - public ControllerActionEndpointDataSource(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actions, Microsoft.AspNetCore.Mvc.Routing.ActionEndpointFactory endpointFactory) : base (default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider)) { } - public bool CreateInertEndpoints { get { throw null; } set { } } - public Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder DefaultBuilder { get { throw null; } } - public Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder AddRoute(string routeName, string pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults, System.Collections.Generic.IDictionary constraints, Microsoft.AspNetCore.Routing.RouteValueDictionary dataTokens) { throw null; } - protected override System.Collections.Generic.List CreateEndpoints(System.Collections.Generic.IReadOnlyList actions, System.Collections.Generic.IReadOnlyList> conventions) { throw null; } - } - internal readonly partial struct ConventionalRouteEntry - { - private readonly object _dummy; - private readonly int _dummyPrimitive; - public ConventionalRouteEntry(string routeName, string pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults, System.Collections.Generic.IDictionary constraints, Microsoft.AspNetCore.Routing.RouteValueDictionary dataTokens, int order, System.Collections.Generic.List> conventions) { throw null; } - } internal partial class ActionConstraintMatcherPolicy : Microsoft.AspNetCore.Routing.MatcherPolicy, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy { - private static readonly System.Collections.Generic.IReadOnlyList EmptyEndpoints; internal static readonly Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor NonAction; - private readonly Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache _actionConstraintCache; public ActionConstraintMatcherPolicy(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintCache actionConstraintCache) { } public override int Order { get { throw null; } } public bool AppliesToEndpoints(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } public System.Threading.Tasks.Task ApplyAsync(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidateSet) { throw null; } - private System.Collections.Generic.IReadOnlyList> EvaluateActionConstraints(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidateSet) { throw null; } - private System.Collections.Generic.IReadOnlyList> EvaluateActionConstraintsCore(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidateSet, System.Collections.Generic.IReadOnlyList> items, int? startingOrder) { throw null; } } internal abstract partial class ActionEndpointDataSourceBase : Microsoft.AspNetCore.Routing.EndpointDataSource, System.IDisposable { protected readonly System.Collections.Generic.List> Conventions; protected readonly object Lock; - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _actions; - private System.Threading.CancellationTokenSource _cancellationTokenSource; - private Microsoft.Extensions.Primitives.IChangeToken _changeToken; - private System.IDisposable _disposable; - private System.Collections.Generic.List _endpoints; public ActionEndpointDataSourceBase(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actions) { } public override System.Collections.Generic.IReadOnlyList Endpoints { get { throw null; } } protected abstract System.Collections.Generic.List CreateEndpoints(System.Collections.Generic.IReadOnlyList actions, System.Collections.Generic.IReadOnlyList> conventions); public void Dispose() { } public override Microsoft.Extensions.Primitives.IChangeToken GetChangeToken() { throw null; } - private void Initialize() { } protected void Subscribe() { } - private void UpdateEndpoints() { } } internal partial class ActionEndpointFactory { - private readonly Microsoft.AspNetCore.Http.RequestDelegate _requestDelegate; - private readonly Microsoft.AspNetCore.Routing.Patterns.RoutePatternTransformer _routePatternTransformer; public ActionEndpointFactory(Microsoft.AspNetCore.Routing.Patterns.RoutePatternTransformer routePatternTransformer) { } - private void AddActionDataToBuilder(Microsoft.AspNetCore.Builder.EndpointBuilder builder, System.Collections.Generic.HashSet routeNames, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, string routeName, Microsoft.AspNetCore.Routing.RouteValueDictionary dataTokens, bool suppressLinkGeneration, bool suppressPathMatching, System.Collections.Generic.IReadOnlyList> conventions, System.Collections.Generic.IReadOnlyList> perRouteConventions) { } public void AddConventionalLinkGenerationRoute(System.Collections.Generic.List endpoints, System.Collections.Generic.HashSet routeNames, System.Collections.Generic.HashSet keys, Microsoft.AspNetCore.Mvc.Routing.ConventionalRouteEntry route, System.Collections.Generic.IReadOnlyList> conventions) { } public void AddEndpoints(System.Collections.Generic.List endpoints, System.Collections.Generic.HashSet routeNames, Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, System.Collections.Generic.IReadOnlyList routes, System.Collections.Generic.IReadOnlyList> conventions, bool createInertEndpoints) { } - private static Microsoft.AspNetCore.Http.RequestDelegate CreateRequestDelegate() { throw null; } - private static (Microsoft.AspNetCore.Routing.Patterns.RoutePattern resolvedRoutePattern, System.Collections.Generic.IDictionary resolvedRequiredValues) ResolveDefaultsAndRequiredValues(Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor action, Microsoft.AspNetCore.Routing.Patterns.RoutePattern attributeRoutePattern) { throw null; } - private partial class InertEndpointBuilder : Microsoft.AspNetCore.Builder.EndpointBuilder - { - public InertEndpointBuilder() { } - public override Microsoft.AspNetCore.Http.Endpoint Build() { throw null; } - } } - internal partial class DynamicControllerEndpointSelector + internal partial class AttributeRoute : Microsoft.AspNetCore.Routing.IRouter + { + public AttributeRoute(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actionDescriptorCollectionProvider, System.IServiceProvider services, System.Func handlerFactory) { } + internal void AddEntries(Microsoft.AspNetCore.Routing.Tree.TreeRouteBuilder builder, Microsoft.AspNetCore.Mvc.Infrastructure.ActionDescriptorCollection actions) { } + public Microsoft.AspNetCore.Routing.VirtualPathData GetVirtualPath(Microsoft.AspNetCore.Routing.VirtualPathContext context) { throw null; } + public System.Threading.Tasks.Task RouteAsync(Microsoft.AspNetCore.Routing.RouteContext context) { throw null; } + } + internal static partial class AttributeRouting + { + public static Microsoft.AspNetCore.Routing.IRouter CreateAttributeMegaRoute(System.IServiceProvider services) { throw null; } + } + internal partial class ConsumesMatcherPolicy : Microsoft.AspNetCore.Routing.MatcherPolicy, Microsoft.AspNetCore.Routing.Matching.IEndpointComparerPolicy, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy, Microsoft.AspNetCore.Routing.Matching.INodeBuilderPolicy + { + internal const string AnyContentType = "*/*"; + internal const string Http415EndpointDisplayName = "415 HTTP Unsupported Media Type"; + public ConsumesMatcherPolicy() { } + public System.Collections.Generic.IComparer Comparer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public override int Order { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Threading.Tasks.Task ApplyAsync(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidates) { throw null; } + public Microsoft.AspNetCore.Routing.Matching.PolicyJumpTable BuildJumpTable(int exitDestination, System.Collections.Generic.IReadOnlyList edges) { throw null; } + public System.Collections.Generic.IReadOnlyList GetEdges(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } + bool Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy.AppliesToEndpoints(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } + bool Microsoft.AspNetCore.Routing.Matching.INodeBuilderPolicy.AppliesToEndpoints(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } + } + internal partial class ConsumesMetadata : Microsoft.AspNetCore.Mvc.Routing.IConsumesMetadata + { + public ConsumesMetadata(string[] contentTypes) { } + public System.Collections.Generic.IReadOnlyList ContentTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class ControllerActionEndpointDataSource : Microsoft.AspNetCore.Mvc.Routing.ActionEndpointDataSourceBase + { + public ControllerActionEndpointDataSource(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actions, Microsoft.AspNetCore.Mvc.Routing.ActionEndpointFactory endpointFactory) : base (default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider)) { } + public bool CreateInertEndpoints { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder DefaultBuilder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Builder.ControllerActionEndpointConventionBuilder AddRoute(string routeName, string pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults, System.Collections.Generic.IDictionary constraints, Microsoft.AspNetCore.Routing.RouteValueDictionary dataTokens) { throw null; } + protected override System.Collections.Generic.List CreateEndpoints(System.Collections.Generic.IReadOnlyList actions, System.Collections.Generic.IReadOnlyList> conventions) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct ConventionalRouteEntry + { + public readonly Microsoft.AspNetCore.Routing.Patterns.RoutePattern Pattern; + public readonly string RouteName; + public readonly Microsoft.AspNetCore.Routing.RouteValueDictionary DataTokens; + public readonly int Order; + public readonly System.Collections.Generic.IReadOnlyList> Conventions; + public ConventionalRouteEntry(string routeName, string pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults, System.Collections.Generic.IDictionary constraints, Microsoft.AspNetCore.Routing.RouteValueDictionary dataTokens, int order, System.Collections.Generic.List> conventions) { throw null; } + } + internal partial class DynamicControllerEndpointMatcherPolicy : Microsoft.AspNetCore.Routing.MatcherPolicy, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy + { + public DynamicControllerEndpointMatcherPolicy(Microsoft.AspNetCore.Mvc.Routing.DynamicControllerEndpointSelector selector, Microsoft.AspNetCore.Routing.Matching.EndpointMetadataComparer comparer) { } + public override int Order { get { throw null; } } + public bool AppliesToEndpoints(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task ApplyAsync(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidates) { throw null; } + } + internal partial class DynamicControllerEndpointSelector : System.IDisposable { - private readonly Microsoft.AspNetCore.Routing.DataSourceDependentCache> _cache; - private readonly Microsoft.AspNetCore.Routing.EndpointDataSource _dataSource; public DynamicControllerEndpointSelector(Microsoft.AspNetCore.Mvc.Routing.ControllerActionEndpointDataSource dataSource) { } protected DynamicControllerEndpointSelector(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource) { } - private Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Table { get { throw null; } } public void Dispose() { } - private static Microsoft.AspNetCore.Mvc.Infrastructure.ActionSelectionTable Initialize(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } public System.Collections.Generic.IReadOnlyList SelectEndpoints(Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } } + internal partial class DynamicControllerMetadata : Microsoft.AspNetCore.Routing.IDynamicEndpointMetadata + { + public DynamicControllerMetadata(Microsoft.AspNetCore.Routing.RouteValueDictionary values) { } + public bool IsDynamic { get { throw null; } } + public Microsoft.AspNetCore.Routing.RouteValueDictionary Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class DynamicControllerRouteValueTransformerMetadata : Microsoft.AspNetCore.Routing.IDynamicEndpointMetadata + { + public DynamicControllerRouteValueTransformerMetadata(System.Type selectorType) { } + public bool IsDynamic { get { throw null; } } + public System.Type SelectorType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class EndpointRoutingUrlHelper : Microsoft.AspNetCore.Mvc.Routing.UrlHelperBase + { + public EndpointRoutingUrlHelper(Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Routing.LinkGenerator linkGenerator, Microsoft.Extensions.Logging.ILogger logger) : base (default(Microsoft.AspNetCore.Mvc.ActionContext)) { } + public override string Action(Microsoft.AspNetCore.Mvc.Routing.UrlActionContext urlActionContext) { throw null; } + public override string RouteUrl(Microsoft.AspNetCore.Mvc.Routing.UrlRouteContext routeContext) { throw null; } + } + internal partial interface IConsumesMetadata + { + System.Collections.Generic.IReadOnlyList ContentTypes { get; } + } + internal partial class MvcAttributeRouteHandler : Microsoft.AspNetCore.Routing.IRouter + { + public MvcAttributeRouteHandler(Microsoft.AspNetCore.Mvc.Infrastructure.IActionInvokerFactory actionInvokerFactory, Microsoft.AspNetCore.Mvc.Infrastructure.IActionSelector actionSelector, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor[] Actions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Routing.VirtualPathData GetVirtualPath(Microsoft.AspNetCore.Routing.VirtualPathContext context) { throw null; } + public System.Threading.Tasks.Task RouteAsync(Microsoft.AspNetCore.Routing.RouteContext context) { throw null; } + } + internal partial class MvcRouteHandler : Microsoft.AspNetCore.Routing.IRouter + { + public MvcRouteHandler(Microsoft.AspNetCore.Mvc.Infrastructure.IActionInvokerFactory actionInvokerFactory, Microsoft.AspNetCore.Mvc.Infrastructure.IActionSelector actionSelector, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public Microsoft.AspNetCore.Routing.VirtualPathData GetVirtualPath(Microsoft.AspNetCore.Routing.VirtualPathContext context) { throw null; } + public System.Threading.Tasks.Task RouteAsync(Microsoft.AspNetCore.Routing.RouteContext context) { throw null; } + } + internal static partial class NormalizedRouteValue + { + public static string GetNormalizedRouteValue(Microsoft.AspNetCore.Mvc.ActionContext context, string key) { throw null; } + } + internal partial class NullRouter : Microsoft.AspNetCore.Routing.IRouter + { + public static Microsoft.AspNetCore.Routing.IRouter Instance; + public Microsoft.AspNetCore.Routing.VirtualPathData GetVirtualPath(Microsoft.AspNetCore.Routing.VirtualPathContext context) { throw null; } + public System.Threading.Tasks.Task RouteAsync(Microsoft.AspNetCore.Routing.RouteContext context) { throw null; } + } + internal static partial class RoutePatternWriter + { + public static void WriteString(System.Text.StringBuilder sb, System.Collections.Generic.IEnumerable routeSegments) { } + } + public abstract partial class UrlHelperBase : Microsoft.AspNetCore.Mvc.IUrlHelper + { + internal static void AppendPathAndFragment(System.Text.StringBuilder builder, Microsoft.AspNetCore.Http.PathString pathBase, string virtualPath, string fragment) { } + internal static void NormalizeRouteValuesForAction(string action, string controller, Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues) { } + internal static void NormalizeRouteValuesForPage(Microsoft.AspNetCore.Mvc.ActionContext context, string page, string handler, Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues) { } + } + internal static partial class ViewEnginePath + { + public static readonly char[] PathSeparators; + public static string CombinePath(string first, string second) { throw null; } + public static string ResolvePath(string path) { throw null; } + } } namespace Microsoft.AspNetCore.Routing { - internal sealed partial class DataSourceDependentCache where T : class + internal sealed partial class DataSourceDependentCache : System.IDisposable where T : class { - private readonly Microsoft.AspNetCore.Routing.EndpointDataSource _dataSource; - private System.IDisposable _disposable; - private bool _disposed; - private readonly System.Func, T> _initializeCore; - private bool _initialized; - private readonly System.Func _initializer; - private readonly System.Action _initializerWithState; - private object _lock; - private T _value; public DataSourceDependentCache(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource, System.Func, T> initialize) { } public T Value { get { throw null; } } public void Dispose() { } public T EnsureInitialized() { throw null; } - private T Initialize() { throw null; } } } namespace Microsoft.Extensions.DependencyInjection { - internal partial class ApiBehaviorOptionsSetup + internal partial class ApiBehaviorOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions { - private Microsoft.AspNetCore.Mvc.Infrastructure.ProblemDetailsFactory _problemDetailsFactory; public ApiBehaviorOptionsSetup() { } public void Configure(Microsoft.AspNetCore.Mvc.ApiBehaviorOptions options) { } internal static void ConfigureClientErrorMapping(Microsoft.AspNetCore.Mvc.ApiBehaviorOptions options) { } internal static Microsoft.AspNetCore.Mvc.IActionResult ProblemDetailsInvalidModelStateResponse(Microsoft.AspNetCore.Mvc.Infrastructure.ProblemDetailsFactory problemDetailsFactory, Microsoft.AspNetCore.Mvc.ActionContext context) { throw null; } } - internal partial class MvcCoreRouteOptionsSetup + internal partial class MvcBuilder : Microsoft.Extensions.DependencyInjection.IMvcBuilder + { + public MvcBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager manager) { } + public Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager PartManager { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class MvcCoreBuilder : Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder + { + public MvcCoreBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager manager) { } + public Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager PartManager { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public static partial class MvcCoreMvcCoreBuilderExtensions + { + internal static void AddAuthorizationServices(Microsoft.Extensions.DependencyInjection.IServiceCollection services) { } + internal static void AddFormatterMappingsServices(Microsoft.Extensions.DependencyInjection.IServiceCollection services) { } + } + internal partial class MvcCoreRouteOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions { public MvcCoreRouteOptionsSetup() { } public void Configure(Microsoft.AspNetCore.Routing.RouteOptions options) { } } - internal partial class MvcCoreBuilder : Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder + public static partial class MvcCoreServiceCollectionExtensions { - private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _PartManager_k__BackingField; - private readonly Microsoft.Extensions.DependencyInjection.IServiceCollection _Services_k__BackingField; - public MvcCoreBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager manager) { } - public Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager PartManager { get { throw null; } } - public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { get { throw null; } } + internal static void AddMvcCoreServices(Microsoft.Extensions.DependencyInjection.IServiceCollection services) { } } - internal partial class MvcBuilder : Microsoft.Extensions.DependencyInjection.IMvcBuilder + internal partial class MvcMarkerService { - private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _PartManager_k__BackingField; - private readonly Microsoft.Extensions.DependencyInjection.IServiceCollection _Services_k__BackingField; - public MvcBuilder(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager manager) { } - public Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager PartManager { get { throw null; } } - public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { get { throw null; } } + public MvcMarkerService() { } } } namespace Microsoft.Extensions.Internal { - internal partial class CopyOnWriteDictionary : System.Collections.Generic.IDictionary + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct AwaitableInfo + { + private readonly object _dummy; + public AwaitableInfo(System.Type awaiterType, System.Reflection.PropertyInfo awaiterIsCompletedProperty, System.Reflection.MethodInfo awaiterGetResultMethod, System.Reflection.MethodInfo awaiterOnCompletedMethod, System.Reflection.MethodInfo awaiterUnsafeOnCompletedMethod, System.Type resultType, System.Reflection.MethodInfo getAwaiterMethod) { throw null; } + public System.Reflection.MethodInfo AwaiterGetResultMethod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Reflection.PropertyInfo AwaiterIsCompletedProperty { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Reflection.MethodInfo AwaiterOnCompletedMethod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type AwaiterType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Reflection.MethodInfo AwaiterUnsafeOnCompletedMethod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Reflection.MethodInfo GetAwaiterMethod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type ResultType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public static bool IsTypeAwaitable(System.Type type, out Microsoft.Extensions.Internal.AwaitableInfo awaitableInfo) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct CoercedAwaitableInfo + { + private readonly object _dummy; + public CoercedAwaitableInfo(Microsoft.Extensions.Internal.AwaitableInfo awaitableInfo) { throw null; } + public CoercedAwaitableInfo(System.Linq.Expressions.Expression coercerExpression, System.Type coercerResultType, Microsoft.Extensions.Internal.AwaitableInfo coercedAwaitableInfo) { throw null; } + public Microsoft.Extensions.Internal.AwaitableInfo AwaitableInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Linq.Expressions.Expression CoercerExpression { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type CoercerResultType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool RequiresCoercion { get { throw null; } } + public static bool IsTypeAwaitable(System.Type type, out Microsoft.Extensions.Internal.CoercedAwaitableInfo info) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct CopyOnWriteDictionaryHolder + { + private object _dummy; + public CopyOnWriteDictionaryHolder(Microsoft.Extensions.Internal.CopyOnWriteDictionaryHolder source) { throw null; } + public CopyOnWriteDictionaryHolder(System.Collections.Generic.Dictionary source) { throw null; } + public int Count { get { throw null; } } + public bool HasBeenCopied { get { throw null; } } + public bool IsReadOnly { get { throw null; } } + public TValue this[TKey key] { get { throw null; } set { } } + public System.Collections.Generic.Dictionary.KeyCollection Keys { get { throw null; } } + public System.Collections.Generic.Dictionary ReadDictionary { get { throw null; } } + public System.Collections.Generic.Dictionary.ValueCollection Values { get { throw null; } } + public System.Collections.Generic.Dictionary WriteDictionary { get { throw null; } } + public void Add(System.Collections.Generic.KeyValuePair item) { } + public void Add(TKey key, TValue value) { } + public void Clear() { } + public bool Contains(System.Collections.Generic.KeyValuePair item) { throw null; } + public bool ContainsKey(TKey key) { throw null; } + public void CopyTo(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { } + public System.Collections.Generic.Dictionary.Enumerator GetEnumerator() { throw null; } + public bool Remove(System.Collections.Generic.KeyValuePair item) { throw null; } + public bool Remove(TKey key) { throw null; } + public bool TryGetValue(TKey key, out TValue value) { throw null; } + } + internal partial class CopyOnWriteDictionary : System.Collections.Generic.ICollection>, System.Collections.Generic.IDictionary, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable { - private readonly System.Collections.Generic.IEqualityComparer _comparer; - private System.Collections.Generic.IDictionary _innerDictionary; - private readonly System.Collections.Generic.IDictionary _sourceDictionary; public CopyOnWriteDictionary(System.Collections.Generic.IDictionary sourceDictionary, System.Collections.Generic.IEqualityComparer comparer) { } public virtual int Count { get { throw null; } } public virtual bool IsReadOnly { get { throw null; } } public virtual TValue this[TKey key] { get { throw null; } set { } } public virtual System.Collections.Generic.ICollection Keys { get { throw null; } } - private System.Collections.Generic.IDictionary ReadDictionary { get { throw null; } } public virtual System.Collections.Generic.ICollection Values { get { throw null; } } - private System.Collections.Generic.IDictionary WriteDictionary { get { throw null; } } public virtual void Add(System.Collections.Generic.KeyValuePair item) { } public virtual void Add(TKey key, TValue value) { } public virtual void Clear() { } @@ -1117,67 +1549,28 @@ namespace Microsoft.Extensions.Internal System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } public virtual bool TryGetValue(TKey key, out TValue value) { throw null; } } - internal readonly partial struct AwaitableInfo - { - private readonly object _dummy; - public AwaitableInfo(System.Type awaiterType, System.Reflection.PropertyInfo awaiterIsCompletedProperty, System.Reflection.MethodInfo awaiterGetResultMethod, System.Reflection.MethodInfo awaiterOnCompletedMethod, System.Reflection.MethodInfo awaiterUnsafeOnCompletedMethod, System.Type resultType, System.Reflection.MethodInfo getAwaiterMethod) { throw null; } - public System.Reflection.MethodInfo AwaiterGetResultMethod { get { throw null; } } - public System.Reflection.PropertyInfo AwaiterIsCompletedProperty { get { throw null; } } - public System.Reflection.MethodInfo AwaiterOnCompletedMethod { get { throw null; } } - public System.Type AwaiterType { get { throw null; } } - public System.Reflection.MethodInfo AwaiterUnsafeOnCompletedMethod { get { throw null; } } - public System.Reflection.MethodInfo GetAwaiterMethod { get { throw null; } } - public System.Type ResultType { get { throw null; } } - public static bool IsTypeAwaitable(System.Type type, out Microsoft.Extensions.Internal.AwaitableInfo awaitableInfo) { throw null; } - } - internal readonly partial struct CoercedAwaitableInfo - { - private readonly object _dummy; - public CoercedAwaitableInfo(Microsoft.Extensions.Internal.AwaitableInfo awaitableInfo) { throw null; } - public CoercedAwaitableInfo(System.Linq.Expressions.Expression coercerExpression, System.Type coercerResultType, Microsoft.Extensions.Internal.AwaitableInfo coercedAwaitableInfo) { throw null; } - public Microsoft.Extensions.Internal.AwaitableInfo AwaitableInfo { get { throw null; } } - public System.Linq.Expressions.Expression CoercerExpression { get { throw null; } } - public System.Type CoercerResultType { get { throw null; } } - public bool RequiresCoercion { get { throw null; } } - public static bool IsTypeAwaitable(System.Type type, out Microsoft.Extensions.Internal.CoercedAwaitableInfo info) { throw null; } - } internal partial class ObjectMethodExecutor { - private readonly Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutor _executor; - private readonly Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutorAsync _executorAsync; - private static readonly System.Reflection.ConstructorInfo _objectMethodExecutorAwaitableConstructor; - private readonly object[] _parameterDefaultValues; - private readonly System.Type _AsyncResultType_k__BackingField; - private readonly bool _IsMethodAsync_k__BackingField; - private readonly System.Reflection.MethodInfo _MethodInfo_k__BackingField; - private readonly System.Reflection.ParameterInfo[] _MethodParameters_k__BackingField; - private System.Type _MethodReturnType_k__BackingField; - private readonly System.Reflection.TypeInfo _TargetTypeInfo_k__BackingField; - private ObjectMethodExecutor(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo, object[] parameterDefaultValues) { } - public System.Type AsyncResultType { get { throw null; } } - public bool IsMethodAsync { get { throw null; } } - public System.Reflection.MethodInfo MethodInfo { get { throw null; } } - public System.Reflection.ParameterInfo[] MethodParameters { get { throw null; } } - public System.Type MethodReturnType { get { throw null; } internal set { } } - public System.Reflection.TypeInfo TargetTypeInfo { get { throw null; } } + public System.Type AsyncResultType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsMethodAsync { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Reflection.MethodInfo MethodInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Reflection.ParameterInfo[] MethodParameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type MethodReturnType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } + public System.Reflection.TypeInfo TargetTypeInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public static Microsoft.Extensions.Internal.ObjectMethodExecutor Create(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo) { throw null; } public static Microsoft.Extensions.Internal.ObjectMethodExecutor Create(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo, object[] parameterDefaultValues) { throw null; } public object Execute(object target, object[] parameters) { throw null; } public Microsoft.Extensions.Internal.ObjectMethodExecutorAwaitable ExecuteAsync(object target, object[] parameters) { throw null; } public object GetDefaultValueForParameter(int index) { throw null; } - private static Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutor GetExecutor(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo) { throw null; } - private static Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutorAsync GetExecutorAsync(System.Reflection.MethodInfo methodInfo, System.Reflection.TypeInfo targetTypeInfo, Microsoft.Extensions.Internal.CoercedAwaitableInfo coercedAwaitableInfo) { throw null; } - private static Microsoft.Extensions.Internal.ObjectMethodExecutor.MethodExecutor WrapVoidMethod(Microsoft.Extensions.Internal.ObjectMethodExecutor.VoidMethodExecutor executor) { throw null; } - private delegate object MethodExecutor(object target, object[] parameters); - private delegate Microsoft.Extensions.Internal.ObjectMethodExecutorAwaitable MethodExecutorAsync(object target, object[] parameters); - private delegate void VoidMethodExecutor(object target, object[] parameters); } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] internal readonly partial struct ObjectMethodExecutorAwaitable { private readonly object _dummy; public ObjectMethodExecutorAwaitable(object customAwaitable, System.Func getAwaiterMethod, System.Func isCompletedMethod, System.Func getResultMethod, System.Action onCompletedMethod, System.Action unsafeOnCompletedMethod) { throw null; } public Microsoft.Extensions.Internal.ObjectMethodExecutorAwaitable.Awaiter GetAwaiter() { throw null; } - public readonly partial struct Awaiter : System.Runtime.CompilerServices.ICriticalNotifyCompletion + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public readonly partial struct Awaiter : System.Runtime.CompilerServices.ICriticalNotifyCompletion, System.Runtime.CompilerServices.INotifyCompletion { private readonly object _dummy; public Awaiter(object customAwaiter, System.Func isCompletedMethod, System.Func getResultMethod, System.Action onCompletedMethod, System.Action unsafeOnCompletedMethod) { throw null; } @@ -1187,42 +1580,25 @@ namespace Microsoft.Extensions.Internal public void UnsafeOnCompleted(System.Action continuation) { } } } + internal static partial class ObjectMethodExecutorFSharpSupport + { + public static bool TryBuildCoercerFromFSharpAsyncToAwaitable(System.Type possibleFSharpAsyncType, out System.Linq.Expressions.Expression coerceToAwaitableExpression, out System.Type awaitableType) { throw null; } + } internal partial class PropertyActivator { - private readonly System.Action _fastPropertySetter; - private readonly System.Func _valueAccessor; - private System.Reflection.PropertyInfo _PropertyInfo_k__BackingField; public PropertyActivator(System.Reflection.PropertyInfo propertyInfo, System.Func valueAccessor) { } - public System.Reflection.PropertyInfo PropertyInfo { get { throw null; } private set { } } + public System.Reflection.PropertyInfo PropertyInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public object Activate(object instance, TContext context) { throw null; } public static Microsoft.Extensions.Internal.PropertyActivator[] GetPropertiesToActivate(System.Type type, System.Type activateAttributeType, System.Func> createActivateInfo) { throw null; } public static Microsoft.Extensions.Internal.PropertyActivator[] GetPropertiesToActivate(System.Type type, System.Type activateAttributeType, System.Func> createActivateInfo, bool includeNonPublic) { throw null; } } internal partial class PropertyHelper { - private static readonly System.Reflection.MethodInfo CallNullSafePropertyGetterByReferenceOpenGenericMethod; - private static readonly System.Reflection.MethodInfo CallNullSafePropertyGetterOpenGenericMethod; - private static readonly System.Reflection.MethodInfo CallPropertyGetterByReferenceOpenGenericMethod; - private static readonly System.Reflection.MethodInfo CallPropertyGetterOpenGenericMethod; - private static readonly System.Reflection.MethodInfo CallPropertySetterOpenGenericMethod; - private static readonly System.Type IsByRefLikeAttribute; - private static readonly System.Collections.Concurrent.ConcurrentDictionary PropertiesCache; - private static readonly System.Collections.Concurrent.ConcurrentDictionary VisiblePropertiesCache; - private System.Func _valueGetter; - private System.Action _valueSetter; - private string _Name_k__BackingField; - private readonly System.Reflection.PropertyInfo _Property_k__BackingField; public PropertyHelper(System.Reflection.PropertyInfo property) { } - public virtual string Name { get { throw null; } protected set { } } - public System.Reflection.PropertyInfo Property { get { throw null; } } + public virtual string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public System.Reflection.PropertyInfo Property { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public System.Func ValueGetter { get { throw null; } } public System.Action ValueSetter { get { throw null; } } - private static object CallNullSafePropertyGetterByReference(Microsoft.Extensions.Internal.PropertyHelper.ByRefFunc getter, object target) { throw null; } - private static object CallNullSafePropertyGetter(System.Func getter, object target) { throw null; } - private static object CallPropertyGetterByReference(Microsoft.Extensions.Internal.PropertyHelper.ByRefFunc getter, object target) { throw null; } - private static object CallPropertyGetter(System.Func getter, object target) { throw null; } - private static void CallPropertySetter(System.Action setter, object target, object value) { } - private static Microsoft.Extensions.Internal.PropertyHelper CreateInstance(System.Reflection.PropertyInfo property) { throw null; } public static Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Reflection.TypeInfo typeInfo) { throw null; } public static Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Type type) { throw null; } protected static Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Type type, System.Func createPropertyHelper, System.Collections.Concurrent.ConcurrentDictionary cache) { throw null; } @@ -1230,16 +1606,15 @@ namespace Microsoft.Extensions.Internal public static Microsoft.Extensions.Internal.PropertyHelper[] GetVisibleProperties(System.Reflection.TypeInfo typeInfo) { throw null; } public static Microsoft.Extensions.Internal.PropertyHelper[] GetVisibleProperties(System.Type type) { throw null; } protected static Microsoft.Extensions.Internal.PropertyHelper[] GetVisibleProperties(System.Type type, System.Func createPropertyHelper, System.Collections.Concurrent.ConcurrentDictionary allPropertiesCache, System.Collections.Concurrent.ConcurrentDictionary visiblePropertiesCache) { throw null; } - private static bool IsInterestingProperty(System.Reflection.PropertyInfo property) { throw null; } - private static bool IsRefStructProperty(System.Reflection.PropertyInfo property) { throw null; } public static System.Func MakeFastPropertyGetter(System.Reflection.PropertyInfo propertyInfo) { throw null; } - private static System.Func MakeFastPropertyGetter(System.Reflection.PropertyInfo propertyInfo, System.Reflection.MethodInfo propertyGetterWrapperMethod, System.Reflection.MethodInfo propertyGetterByRefWrapperMethod) { throw null; } - private static System.Func MakeFastPropertyGetter(System.Type openGenericDelegateType, System.Reflection.MethodInfo propertyGetMethod, System.Reflection.MethodInfo openGenericWrapperMethod) { throw null; } public static System.Action MakeFastPropertySetter(System.Reflection.PropertyInfo propertyInfo) { throw null; } public static System.Func MakeNullSafeFastPropertyGetter(System.Reflection.PropertyInfo propertyInfo) { throw null; } public static System.Collections.Generic.IDictionary ObjectToDictionary(object value) { throw null; } public void SetValue(object instance, object value) { } - private delegate TValue ByRefFunc(ref TDeclaringType arg); + } + internal static partial class SecurityHelper + { + public static System.Security.Claims.ClaimsPrincipal MergeUserPrincipal(System.Security.Claims.ClaimsPrincipal existingPrincipal, System.Security.Claims.ClaimsPrincipal additionalPrincipal) { throw null; } } } namespace System.Text.Json @@ -1248,4 +1623,4 @@ namespace System.Text.Json { public static System.Text.Json.JsonSerializerOptions Copy(this System.Text.Json.JsonSerializerOptions serializerOptions, System.Text.Encodings.Web.JavaScriptEncoder encoder) { throw null; } } -} \ No newline at end of file +} diff --git a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj index e468693de9..224f90fab5 100644 --- a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj @@ -2,27 +2,25 @@ netcoreapp3.0 - false - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj index 983aed9ca1..203e5cdddf 100644 --- a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj @@ -20,7 +20,6 @@ Microsoft.AspNetCore.Mvc.RouteAttribute - @@ -49,7 +48,6 @@ Microsoft.AspNetCore.Mvc.RouteAttribute - diff --git a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.Manual.cs b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.Manual.cs new file mode 100644 index 0000000000..641495d93c --- /dev/null +++ b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.Manual.cs @@ -0,0 +1,34 @@ +// 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. + +namespace Microsoft.AspNetCore.Mvc.Cors +{ + internal partial interface ICorsAuthorizationFilter : Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + } + internal partial class CorsHttpMethodActionConstraint : Microsoft.AspNetCore.Mvc.ActionConstraints.HttpMethodActionConstraint + { + public CorsHttpMethodActionConstraint(Microsoft.AspNetCore.Mvc.ActionConstraints.HttpMethodActionConstraint constraint) : base (default(System.Collections.Generic.IEnumerable)) { } + public override bool Accept(Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintContext context) { throw null; } + } + internal partial class DisableCorsAuthorizationFilter : Microsoft.AspNetCore.Mvc.Cors.ICorsAuthorizationFilter, Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + public DisableCorsAuthorizationFilter() { } + public int Order { get { throw null; } } + public System.Threading.Tasks.Task OnAuthorizationAsync(Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext context) { throw null; } + } + internal partial class CorsApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IApplicationModelProvider + { + public CorsApplicationModelProvider(Microsoft.Extensions.Options.IOptions mvcOptions) { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } + internal partial class CorsAuthorizationFilterFactory : Microsoft.AspNetCore.Mvc.Filters.IFilterFactory, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter + { + public CorsAuthorizationFilterFactory(string policyName) { } + public bool IsReusable { get { throw null; } } + public int Order { get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata CreateInstance(System.IServiceProvider serviceProvider) { throw null; } + } +} diff --git a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj index 315dc16d7c..e6715291f9 100644 --- a/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj +++ b/src/Mvc/Mvc.Cors/ref/Microsoft.AspNetCore.Mvc.Cors.csproj @@ -2,12 +2,12 @@ netcoreapp3.0 - false - - - + + + + diff --git a/src/Mvc/Mvc.DataAnnotations/ref/Directory.Build.props b/src/Mvc/Mvc.DataAnnotations/ref/Directory.Build.props deleted file mode 100644 index b500fb5d98..0000000000 --- a/src/Mvc/Mvc.DataAnnotations/ref/Directory.Build.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - true - $(NoWarn);CS0169 - - \ No newline at end of file diff --git a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs index 355dbe4c15..3e175d1fb7 100644 --- a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs +++ b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.Manual.cs @@ -1,27 +1,62 @@ // 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.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - namespace Microsoft.AspNetCore.Mvc.DataAnnotations { + internal partial class RegularExpressionAttributeAdapter : Microsoft.AspNetCore.Mvc.DataAnnotations.AttributeAdapterBase + { + public RegularExpressionAttributeAdapter(System.ComponentModel.DataAnnotations.RegularExpressionAttribute attribute, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) : base (default(System.ComponentModel.DataAnnotations.RegularExpressionAttribute), default(Microsoft.Extensions.Localization.IStringLocalizer)) { } + public override void AddValidation(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext context) { } + public override string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } + } + internal partial class MaxLengthAttributeAdapter : Microsoft.AspNetCore.Mvc.DataAnnotations.AttributeAdapterBase + { + public MaxLengthAttributeAdapter(System.ComponentModel.DataAnnotations.MaxLengthAttribute attribute, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) : base (default(System.ComponentModel.DataAnnotations.MaxLengthAttribute), default(Microsoft.Extensions.Localization.IStringLocalizer)) { } + public override void AddValidation(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext context) { } + public override string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } + } + internal partial class MinLengthAttributeAdapter : Microsoft.AspNetCore.Mvc.DataAnnotations.AttributeAdapterBase + { + public MinLengthAttributeAdapter(System.ComponentModel.DataAnnotations.MinLengthAttribute attribute, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) : base (default(System.ComponentModel.DataAnnotations.MinLengthAttribute), default(Microsoft.Extensions.Localization.IStringLocalizer)) { } + public override void AddValidation(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext context) { } + public override string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } + } + internal partial class RangeAttributeAdapter : Microsoft.AspNetCore.Mvc.DataAnnotations.AttributeAdapterBase + { + public RangeAttributeAdapter(System.ComponentModel.DataAnnotations.RangeAttribute attribute, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) : base (default(System.ComponentModel.DataAnnotations.RangeAttribute), default(Microsoft.Extensions.Localization.IStringLocalizer)) { } + public override void AddValidation(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext context) { } + public override string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } + } + internal partial class CompareAttributeAdapter : Microsoft.AspNetCore.Mvc.DataAnnotations.AttributeAdapterBase + { + public CompareAttributeAdapter(System.ComponentModel.DataAnnotations.CompareAttribute attribute, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) : base (default(System.ComponentModel.DataAnnotations.CompareAttribute), default(Microsoft.Extensions.Localization.IStringLocalizer)) { } + public override void AddValidation(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext context) { } + public override string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } + } + internal partial class FileExtensionsAttributeAdapter : Microsoft.AspNetCore.Mvc.DataAnnotations.AttributeAdapterBase + { + public FileExtensionsAttributeAdapter(System.ComponentModel.DataAnnotations.FileExtensionsAttribute attribute, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) : base (default(System.ComponentModel.DataAnnotations.FileExtensionsAttribute), default(Microsoft.Extensions.Localization.IStringLocalizer)) { } + public override void AddValidation(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext context) { } + public override string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } + } + internal partial class DataTypeAttributeAdapter : Microsoft.AspNetCore.Mvc.DataAnnotations.AttributeAdapterBase + { + public DataTypeAttributeAdapter(System.ComponentModel.DataAnnotations.DataTypeAttribute attribute, string ruleName, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) : base (default(System.ComponentModel.DataAnnotations.DataTypeAttribute), default(Microsoft.Extensions.Localization.IStringLocalizer)) { } + public string RuleName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public override void AddValidation(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext context) { } + public override string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } + } + internal partial class NumericClientModelValidator : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidator + { + public NumericClientModelValidator() { } + public void AddValidation(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext context) { } + } internal partial class DataAnnotationsMetadataProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IBindingMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IDisplayMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IMetadataDetailsProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.IValidationMetadataProvider { - private const string NullableAttributeFullTypeName = "System.Runtime.CompilerServices.NullableAttribute"; - private const string NullableContextAttributeFullName = "System.Runtime.CompilerServices.NullableContextAttribute"; - private const string NullableContextFlagsFieldName = "Flag"; - private const string NullableFlagsFieldName = "NullableFlags"; - private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.MvcDataAnnotationsLocalizationOptions _localizationOptions; - private readonly Microsoft.AspNetCore.Mvc.MvcOptions _options; - private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; public DataAnnotationsMetadataProvider(Microsoft.AspNetCore.Mvc.MvcOptions options, Microsoft.Extensions.Options.IOptions localizationOptions, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } public void CreateBindingMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.BindingMetadataProviderContext context) { } public void CreateDisplayMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.DisplayMetadataProviderContext context) { } public void CreateValidationMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ValidationMetadataProviderContext context) { } - private static string GetDisplayGroup(System.Reflection.FieldInfo field) { throw null; } - private static string GetDisplayName(System.Reflection.FieldInfo field, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) { throw null; } internal static bool HasNullableAttribute(System.Collections.Generic.IEnumerable attributes, out bool isNullable) { throw null; } internal static bool IsNullableBasedOnContext(System.Type containingType, System.Reflection.MemberInfo member) { throw null; } internal static bool IsNullableReferenceType(System.Type containingType, System.Reflection.MemberInfo member, System.Collections.Generic.IEnumerable attributes) { throw null; } @@ -33,9 +68,6 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations } internal partial class DataAnnotationsClientModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidatorProvider { - private readonly Microsoft.Extensions.Options.IOptions _options; - private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; - private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; public DataAnnotationsClientModelValidatorProvider(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientValidatorProviderContext context) { } } @@ -46,32 +78,20 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations } internal sealed partial class DataAnnotationsModelValidatorProvider : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IMetadataBasedModelValidatorProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider { - private readonly Microsoft.Extensions.Options.IOptions _options; - private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; - private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; public DataAnnotationsModelValidatorProvider(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } public void CreateValidators(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidatorProviderContext context) { } public bool HasValidators(System.Type modelType, System.Collections.Generic.IList validatorMetadata) { throw null; } } internal partial class StringLengthAttributeAdapter : Microsoft.AspNetCore.Mvc.DataAnnotations.AttributeAdapterBase { - private readonly string _max; - private readonly string _min; public StringLengthAttributeAdapter(System.ComponentModel.DataAnnotations.StringLengthAttribute attribute, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) : base (default(System.ComponentModel.DataAnnotations.StringLengthAttribute), default(Microsoft.Extensions.Localization.IStringLocalizer)) { } public override void AddValidation(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ClientModelValidationContext context) { } public override string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } } internal partial class DataAnnotationsModelValidator : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidator { - private static readonly object _emptyValidationContextInstance; - private readonly Microsoft.Extensions.Localization.IStringLocalizer _stringLocalizer; - private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly System.ComponentModel.DataAnnotations.ValidationAttribute _Attribute_k__BackingField; public DataAnnotationsModelValidator(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, System.ComponentModel.DataAnnotations.ValidationAttribute attribute, Microsoft.Extensions.Localization.IStringLocalizer stringLocalizer) { } public System.ComponentModel.DataAnnotations.ValidationAttribute Attribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - private string GetErrorMessage(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContextBase validationContext) { throw null; } public System.Collections.Generic.IEnumerable Validate(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContext validationContext) { throw null; } } internal partial class ValidatableObjectAdapter : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidator @@ -80,15 +100,13 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations public System.Collections.Generic.IEnumerable Validate(Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationContext context) { throw null; } } } + namespace Microsoft.Extensions.DependencyInjection { internal partial class MvcDataAnnotationsMvcOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions { - private readonly Microsoft.Extensions.Options.IOptions _dataAnnotationLocalizationOptions; - private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; - private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; public MvcDataAnnotationsMvcOptionsSetup(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Options.IOptions dataAnnotationLocalizationOptions) { } public MvcDataAnnotationsMvcOptionsSetup(Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Options.IOptions dataAnnotationLocalizationOptions, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } public void Configure(Microsoft.AspNetCore.Mvc.MvcOptions options) { } } -} \ No newline at end of file +} diff --git a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj index 396d4391a3..b873f8c94b 100644 --- a/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/Mvc/Mvc.DataAnnotations/ref/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj @@ -2,13 +2,12 @@ netcoreapp3.0 - false - - - + + + diff --git a/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj b/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj index b020972f0a..c47f2a6e3b 100644 --- a/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj +++ b/src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj @@ -2,12 +2,10 @@ netcoreapp3.0 - false - - - + + diff --git a/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.Manual.cs b/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.Manual.cs new file mode 100644 index 0000000000..1133d2a605 --- /dev/null +++ b/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.Manual.cs @@ -0,0 +1,40 @@ +// 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. + +namespace Microsoft.AspNetCore.Mvc.Formatters.Xml +{ + public partial class ProblemDetailsWrapper : Microsoft.AspNetCore.Mvc.Formatters.Xml.IUnwrappable, System.Xml.Serialization.IXmlSerializable + { + internal Microsoft.AspNetCore.Mvc.ProblemDetails ProblemDetails { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public partial class ValidationProblemDetailsWrapper : Microsoft.AspNetCore.Mvc.Formatters.Xml.ProblemDetailsWrapper, Microsoft.AspNetCore.Mvc.Formatters.Xml.IUnwrappable + { + internal new Microsoft.AspNetCore.Mvc.ValidationProblemDetails ProblemDetails { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class ProblemDetailsWrapperProviderFactory : Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProviderFactory + { + public ProblemDetailsWrapperProviderFactory() { } + public Microsoft.AspNetCore.Mvc.Formatters.Xml.IWrapperProvider GetProvider(Microsoft.AspNetCore.Mvc.Formatters.Xml.WrapperProviderContext context) { throw null; } + } + internal static partial class FormattingUtilities + { + public static readonly int DefaultMaxDepth; + public static readonly System.Runtime.Serialization.XsdDataContractExporter XsdDataContractExporter; + public static System.Xml.XmlDictionaryReaderQuotas GetDefaultXmlReaderQuotas() { throw null; } + public static System.Xml.XmlWriterSettings GetDefaultXmlWriterSettings() { throw null; } + } +} + +namespace Microsoft.Extensions.DependencyInjection +{ + internal sealed partial class XmlDataContractSerializerMvcOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions + { + public XmlDataContractSerializerMvcOptionsSetup(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public void Configure(Microsoft.AspNetCore.Mvc.MvcOptions options) { } + } + internal sealed partial class XmlSerializerMvcOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions + { + public XmlSerializerMvcOptionsSetup(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public void Configure(Microsoft.AspNetCore.Mvc.MvcOptions options) { } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj index 401f13b62f..1f52efdeb3 100644 --- a/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj +++ b/src/Mvc/Mvc.Formatters.Xml/ref/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj @@ -2,11 +2,11 @@ netcoreapp3.0 - false - - + + + diff --git a/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj index 6c9b248d01..72e0ef3fdc 100644 --- a/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj +++ b/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj @@ -11,8 +11,6 @@ - - diff --git a/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.Manual.cs b/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.Manual.cs new file mode 100644 index 0000000000..69cfbdb072 --- /dev/null +++ b/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.Manual.cs @@ -0,0 +1,11 @@ +// 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. + +namespace Microsoft.AspNetCore.Mvc.Localization +{ + internal static partial class MvcLocalizationServices + { + public static void AddLocalizationServices(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat format, System.Action setupAction) { } + public static void AddMvcViewLocalizationServices(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.AspNetCore.Mvc.Razor.LanguageViewLocationExpanderFormat format) { } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.csproj b/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.csproj index 19eedd135a..e698d54447 100644 --- a/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.csproj +++ b/src/Mvc/Mvc.Localization/ref/Microsoft.AspNetCore.Mvc.Localization.csproj @@ -2,14 +2,14 @@ netcoreapp3.0 - false - - - - - + + + + + + diff --git a/src/Mvc/Mvc.NewtonsoftJson/ref/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj b/src/Mvc/Mvc.NewtonsoftJson/ref/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj deleted file mode 100644 index f8ff2e9fee..0000000000 --- a/src/Mvc/Mvc.NewtonsoftJson/ref/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - diff --git a/src/Mvc/Mvc.NewtonsoftJson/ref/Microsoft.AspNetCore.Mvc.NewtonsoftJson.netcoreapp3.0.cs b/src/Mvc/Mvc.NewtonsoftJson/ref/Microsoft.AspNetCore.Mvc.NewtonsoftJson.netcoreapp3.0.cs deleted file mode 100644 index 94884372e6..0000000000 --- a/src/Mvc/Mvc.NewtonsoftJson/ref/Microsoft.AspNetCore.Mvc.NewtonsoftJson.netcoreapp3.0.cs +++ /dev/null @@ -1,97 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Mvc -{ - public static partial class JsonPatchExtensions - { - public static void ApplyTo(this Microsoft.AspNetCore.JsonPatch.JsonPatchDocument patchDoc, T objectToApplyTo, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary modelState) where T : class { } - public static void ApplyTo(this Microsoft.AspNetCore.JsonPatch.JsonPatchDocument patchDoc, T objectToApplyTo, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary modelState, string prefix) where T : class { } - } - public partial class MvcNewtonsoftJsonOptions : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable - { - public MvcNewtonsoftJsonOptions() { } - public bool AllowInputFormatterExceptionMessages { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Newtonsoft.Json.JsonSerializerSettings SerializerSettings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - System.Collections.Generic.IEnumerator System.Collections.Generic.IEnumerable.GetEnumerator() { throw null; } - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } - } -} -namespace Microsoft.AspNetCore.Mvc.Formatters -{ - public partial class NewtonsoftJsonInputFormatter : Microsoft.AspNetCore.Mvc.Formatters.TextInputFormatter, Microsoft.AspNetCore.Mvc.Formatters.IInputFormatterExceptionPolicy - { - public NewtonsoftJsonInputFormatter(Microsoft.Extensions.Logging.ILogger logger, Newtonsoft.Json.JsonSerializerSettings serializerSettings, System.Buffers.ArrayPool charPool, Microsoft.Extensions.ObjectPool.ObjectPoolProvider objectPoolProvider, Microsoft.AspNetCore.Mvc.MvcOptions options, Microsoft.AspNetCore.Mvc.MvcNewtonsoftJsonOptions jsonOptions) { } - public virtual Microsoft.AspNetCore.Mvc.Formatters.InputFormatterExceptionPolicy ExceptionPolicy { get { throw null; } } - protected Newtonsoft.Json.JsonSerializerSettings SerializerSettings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - protected virtual Newtonsoft.Json.JsonSerializer CreateJsonSerializer() { throw null; } - protected virtual Newtonsoft.Json.JsonSerializer CreateJsonSerializer(Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext context) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task ReadRequestBodyAsync(Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext context, System.Text.Encoding encoding) { throw null; } - protected virtual void ReleaseJsonSerializer(Newtonsoft.Json.JsonSerializer serializer) { } - } - public partial class NewtonsoftJsonOutputFormatter : Microsoft.AspNetCore.Mvc.Formatters.TextOutputFormatter - { - public NewtonsoftJsonOutputFormatter(Newtonsoft.Json.JsonSerializerSettings serializerSettings, System.Buffers.ArrayPool charPool, Microsoft.AspNetCore.Mvc.MvcOptions mvcOptions) { } - protected Newtonsoft.Json.JsonSerializerSettings SerializerSettings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - protected virtual Newtonsoft.Json.JsonSerializer CreateJsonSerializer() { throw null; } - protected virtual Newtonsoft.Json.JsonSerializer CreateJsonSerializer(Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext context) { throw null; } - protected virtual Newtonsoft.Json.JsonWriter CreateJsonWriter(System.IO.TextWriter writer) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task WriteResponseBodyAsync(Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterWriteContext context, System.Text.Encoding selectedEncoding) { throw null; } - } - public partial class NewtonsoftJsonPatchInputFormatter : Microsoft.AspNetCore.Mvc.Formatters.NewtonsoftJsonInputFormatter - { - public NewtonsoftJsonPatchInputFormatter(Microsoft.Extensions.Logging.ILogger logger, Newtonsoft.Json.JsonSerializerSettings serializerSettings, System.Buffers.ArrayPool charPool, Microsoft.Extensions.ObjectPool.ObjectPoolProvider objectPoolProvider, Microsoft.AspNetCore.Mvc.MvcOptions options, Microsoft.AspNetCore.Mvc.MvcNewtonsoftJsonOptions jsonOptions) : base (default(Microsoft.Extensions.Logging.ILogger), default(Newtonsoft.Json.JsonSerializerSettings), default(System.Buffers.ArrayPool), default(Microsoft.Extensions.ObjectPool.ObjectPoolProvider), default(Microsoft.AspNetCore.Mvc.MvcOptions), default(Microsoft.AspNetCore.Mvc.MvcNewtonsoftJsonOptions)) { } - public override Microsoft.AspNetCore.Mvc.Formatters.InputFormatterExceptionPolicy ExceptionPolicy { get { throw null; } } - public override bool CanRead(Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext context) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task ReadRequestBodyAsync(Microsoft.AspNetCore.Mvc.Formatters.InputFormatterContext context, System.Text.Encoding encoding) { throw null; } - } -} -namespace Microsoft.AspNetCore.Mvc.NewtonsoftJson -{ - public static partial class JsonSerializerSettingsProvider - { - public static Newtonsoft.Json.JsonSerializerSettings CreateSerializerSettings() { throw null; } - } - public sealed partial class ProblemDetailsConverter : Newtonsoft.Json.JsonConverter - { - public ProblemDetailsConverter() { } - public override bool CanConvert(System.Type objectType) { throw null; } - public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) { throw null; } - public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) { } - } - public sealed partial class ValidationProblemDetailsConverter : Newtonsoft.Json.JsonConverter - { - public ValidationProblemDetailsConverter() { } - public override bool CanConvert(System.Type objectType) { throw null; } - public override object ReadJson(Newtonsoft.Json.JsonReader reader, System.Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer) { throw null; } - public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer) { } - } -} -namespace Microsoft.AspNetCore.Mvc.Rendering -{ - public static partial class JsonHelperExtensions - { - public static Microsoft.AspNetCore.Html.IHtmlContent Serialize(this Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper jsonHelper, object value, Newtonsoft.Json.JsonSerializerSettings serializerSettings) { throw null; } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class MvcNewtonsoftJsonOptionsExtensions - { - public static Microsoft.AspNetCore.Mvc.MvcNewtonsoftJsonOptions UseCamelCasing(this Microsoft.AspNetCore.Mvc.MvcNewtonsoftJsonOptions options, bool processDictionaryKeys) { throw null; } - public static Microsoft.AspNetCore.Mvc.MvcNewtonsoftJsonOptions UseMemberCasing(this Microsoft.AspNetCore.Mvc.MvcNewtonsoftJsonOptions options) { throw null; } - } - public static partial class NewtonsoftJsonMvcBuilderExtensions - { - public static Microsoft.Extensions.DependencyInjection.IMvcBuilder AddNewtonsoftJson(this Microsoft.Extensions.DependencyInjection.IMvcBuilder builder) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IMvcBuilder AddNewtonsoftJson(this Microsoft.Extensions.DependencyInjection.IMvcBuilder builder, System.Action setupAction) { throw null; } - } - public static partial class NewtonsoftJsonMvcCoreBuilderExtensions - { - public static Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder AddNewtonsoftJson(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder AddNewtonsoftJson(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder, System.Action setupAction) { throw null; } - } -} diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/ref/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/ref/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj deleted file mode 100644 index 0f66178b6d..0000000000 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/ref/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/ref/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.netcoreapp3.0.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/ref/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.netcoreapp3.0.cs deleted file mode 100644 index a22420cffc..0000000000 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/ref/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.netcoreapp3.0.cs +++ /dev/null @@ -1,45 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Mvc.ApplicationParts -{ - public static partial class AssemblyPartExtensions - { - public static System.Collections.Generic.IEnumerable GetReferencePaths(this Microsoft.AspNetCore.Mvc.ApplicationParts.AssemblyPart assemblyPart) { throw null; } - } -} -namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation -{ - public partial class FileProviderRazorProjectItem : Microsoft.AspNetCore.Razor.Language.RazorProjectItem - { - public FileProviderRazorProjectItem(Microsoft.Extensions.FileProviders.IFileInfo fileInfo, string basePath, string filePath, string root) { } - public FileProviderRazorProjectItem(Microsoft.Extensions.FileProviders.IFileInfo fileInfo, string basePath, string filePath, string root, string fileKind) { } - public override string BasePath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override bool Exists { get { throw null; } } - public Microsoft.Extensions.FileProviders.IFileInfo FileInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override string FileKind { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override string FilePath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override string PhysicalPath { get { throw null; } } - public override string RelativePhysicalPath { get { throw null; } } - public override System.IO.Stream Read() { throw null; } - } - public partial class MvcRazorRuntimeCompilationOptions - { - public MvcRazorRuntimeCompilationOptions() { } - public System.Collections.Generic.IList AdditionalReferencePaths { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Collections.Generic.IList FileProviders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class RazorRuntimeCompilationMvcBuilderExtensions - { - public static Microsoft.Extensions.DependencyInjection.IMvcBuilder AddRazorRuntimeCompilation(this Microsoft.Extensions.DependencyInjection.IMvcBuilder builder) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IMvcBuilder AddRazorRuntimeCompilation(this Microsoft.Extensions.DependencyInjection.IMvcBuilder builder, System.Action setupAction) { throw null; } - } - public static partial class RazorRuntimeCompilationMvcCoreBuilderExtensions - { - public static Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder AddRazorRuntimeCompilation(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder AddRazorRuntimeCompilation(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder, System.Action setupAction) { throw null; } - } -} diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs index b66e0df3c9..eb84d85728 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/test/AssemblyPartExtensionTest.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts { public class AssemblyPartExtensionTest { - [Fact(Skip = "Deps file generation is incorrect, investigation ongoing.")] + [Fact] public void GetReferencePaths_ReturnsReferencesFromDependencyContext_IfPreserveCompilationContextIsSet() { // Arrange diff --git a/src/Mvc/Mvc.Razor/ref/Directory.Build.props b/src/Mvc/Mvc.Razor/ref/Directory.Build.props deleted file mode 100644 index ea5de23302..0000000000 --- a/src/Mvc/Mvc.Razor/ref/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - $(NoWarn);CS0169 - - \ No newline at end of file diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs index 453edf2999..4802d223e7 100644 --- a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs @@ -1,13 +1,6 @@ // 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.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] - namespace Microsoft.AspNetCore.Mvc.ApplicationParts { internal partial class RazorCompiledItemFeatureProvider @@ -16,6 +9,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationParts public void PopulateFeature(System.Collections.Generic.IEnumerable parts, Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeature feature) { } } } + namespace Microsoft.AspNetCore.Mvc.Razor { public partial class RazorPageActivator : Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator @@ -24,14 +18,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor } internal partial class DefaultTagHelperFactory : Microsoft.AspNetCore.Mvc.Razor.ITagHelperFactory { - private readonly Microsoft.AspNetCore.Mvc.Razor.ITagHelperActivator _activator; - private static readonly System.Func> _createActivateInfo; - private readonly System.Func[]> _getPropertiesToActivate; - private readonly System.Collections.Concurrent.ConcurrentDictionary[]> _injectActions; public DefaultTagHelperFactory(Microsoft.AspNetCore.Mvc.Razor.ITagHelperActivator activator) { } - private static Microsoft.Extensions.Internal.PropertyActivator CreateActivateInfo(System.Reflection.PropertyInfo property) { throw null; } public TTagHelper CreateTagHelper(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) where TTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper { throw null; } - private static void InitializeTagHelper(TTagHelper tagHelper, Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) where TTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper { } } public partial class RazorView { @@ -39,22 +27,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor } internal partial class RazorPagePropertyActivator { - private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _metadataProvider; - private readonly System.Func _nestedFactory; - private readonly Microsoft.Extensions.Internal.PropertyActivator[] _propertyActivators; - private readonly System.Func _rootFactory; - private readonly System.Type _viewDataDictionaryType; public RazorPagePropertyActivator(System.Type pageType, System.Type declaredModelType, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.Razor.RazorPagePropertyActivator.PropertyValueAccessors propertyValueAccessors) { } public void Activate(object page, Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) { } - private static Microsoft.Extensions.Internal.PropertyActivator CreateActivateInfo(System.Reflection.PropertyInfo property, Microsoft.AspNetCore.Mvc.Razor.RazorPagePropertyActivator.PropertyValueAccessors valueAccessors) { throw null; } internal Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary CreateViewDataDictionary(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) { throw null; } public partial class PropertyValueAccessors { - private System.Func _DiagnosticSourceAccessor_k__BackingField; - private System.Func _HtmlEncoderAccessor_k__BackingField; - private System.Func _JsonHelperAccessor_k__BackingField; - private System.Func _ModelExpressionProviderAccessor_k__BackingField; - private System.Func _UrlHelperAccessor_k__BackingField; public PropertyValueAccessors() { } public System.Func DiagnosticSourceAccessor { get { throw null; } set { } } public System.Func HtmlEncoderAccessor { get { throw null; } set { } } @@ -69,7 +46,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor } internal static partial class RazorFileHierarchy { - private const string ViewStartFileName = "_ViewStart.cshtml"; public static System.Collections.Generic.IEnumerable GetViewStartPaths(string path) { throw null; } } internal partial class RazorViewEngineOptionsSetup @@ -79,12 +55,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor } internal partial class DefaultViewCompiler : Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler { - private readonly System.Collections.Generic.Dictionary> _compiledViews; - private readonly Microsoft.Extensions.Logging.ILogger _logger; - private readonly System.Collections.Concurrent.ConcurrentDictionary _normalizedPathCache; public DefaultViewCompiler(System.Collections.Generic.IList compiledViews, Microsoft.Extensions.Logging.ILogger logger) { } public System.Threading.Tasks.Task CompileAsync(string relativePath) { throw null; } - private string GetNormalizedPath(string relativePath) { throw null; } } internal static partial class ViewPath { @@ -97,14 +69,11 @@ namespace Microsoft.AspNetCore.Mvc.Razor } internal partial class TagHelperComponentManager : Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentManager { - private readonly System.Collections.Generic.ICollection _Components_k__BackingField; public TagHelperComponentManager(System.Collections.Generic.IEnumerable tagHelperComponents) { } public System.Collections.Generic.ICollection Components { get { throw null; } } } internal static partial class Resources { - private static System.Resources.ResourceManager s_resourceManager; - private static System.Globalization.CultureInfo _Culture_k__BackingField; internal static string ArgumentCannotBeNullOrEmpty { get { throw null; } } internal static string CompilationFailed { get { throw null; } } internal static string Compilation_MissingReferences { get { throw null; } } @@ -155,20 +124,22 @@ namespace Microsoft.AspNetCore.Mvc.Razor internal static string FormatViewContextMustBeSet(object p0, object p1) { throw null; } internal static string FormatViewLocationFormatsIsRequired(object p0) { throw null; } internal static string GetResourceString(string resourceKey, string defaultValue = null) { throw null; } - private static string GetResourceString(string resourceKey, string[] formatterNames) { throw null; } - } - internal partial class DefaultRazorPageFactoryProvider : Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider - { - private readonly Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompilerProvider _viewCompilerProvider; - public DefaultRazorPageFactoryProvider(Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompilerProvider viewCompilerProvider) { } - private Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler Compiler { get { throw null; } } - public Microsoft.AspNetCore.Mvc.Razor.RazorPageFactoryResult CreateFactory(string relativePath) { throw null; } } public partial class RazorViewEngine : Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine { internal System.Collections.Generic.IEnumerable GetViewLocationFormats(Microsoft.AspNetCore.Mvc.Razor.ViewLocationExpanderContext context) { throw null; } } } + +namespace Microsoft.AspNetCore.Mvc.Razor.Compilation +{ + internal partial class DefaultRazorPageFactoryProvider : Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider + { + public DefaultRazorPageFactoryProvider(Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompilerProvider viewCompilerProvider) { } + public Microsoft.AspNetCore.Mvc.Razor.RazorPageFactoryResult CreateFactory(string relativePath) { throw null; } + } +} + namespace Microsoft.AspNetCore.Mvc.Razor.Infrastructure { internal static partial class CryptographyAlgorithms @@ -178,66 +149,51 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Infrastructure internal partial class DefaultFileVersionProvider : Microsoft.AspNetCore.Mvc.ViewFeatures.IFileVersionProvider { - private static readonly char[] QueryStringAndFragmentTokens; - private const string VersionKey = "v"; - private readonly Microsoft.Extensions.Caching.Memory.IMemoryCache _Cache_k__BackingField; - private readonly Microsoft.Extensions.FileProviders.IFileProvider _FileProvider_k__BackingField; public DefaultFileVersionProvider(Microsoft.AspNetCore.Hosting.IWebHostEnvironment hostingEnvironment, Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider cacheProvider) { } public Microsoft.Extensions.Caching.Memory.IMemoryCache Cache { get { throw null; } } public Microsoft.Extensions.FileProviders.IFileProvider FileProvider { get { throw null; } } public string AddFileVersionToPath(Microsoft.AspNetCore.Http.PathString requestPathBase, string path) { throw null; } - private static string GetHashForFile(Microsoft.Extensions.FileProviders.IFileInfo fileInfo) { throw null; } } internal partial class DefaultTagHelperActivator : Microsoft.AspNetCore.Mvc.Razor.ITagHelperActivator { - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.ITypeActivatorCache _typeActivatorCache; public DefaultTagHelperActivator(Microsoft.AspNetCore.Mvc.Infrastructure.ITypeActivatorCache typeActivatorCache) { } public TTagHelper Create(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) where TTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper { throw null; } } public sealed partial class TagHelperMemoryCacheProvider { - private Microsoft.Extensions.Caching.Memory.IMemoryCache _Cache_k__BackingField; public TagHelperMemoryCacheProvider() { } public Microsoft.Extensions.Caching.Memory.IMemoryCache Cache { get { throw null; } internal set { } } } } + namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers { internal partial class TagHelperComponentPropertyActivator : Microsoft.AspNetCore.Mvc.Razor.TagHelpers.ITagHelperComponentPropertyActivator { - private static readonly System.Func> _createActivateInfo; - private readonly System.Func[]> _getPropertiesToActivate; - private readonly System.Collections.Concurrent.ConcurrentDictionary[]> _propertiesToActivate; public TagHelperComponentPropertyActivator() { } public void Activate(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context, Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent tagHelperComponent) { } - private static Microsoft.Extensions.Internal.PropertyActivator CreateActivateInfo(System.Reflection.PropertyInfo property) { throw null; } - private static Microsoft.Extensions.Internal.PropertyActivator[] GetPropertiesToActivate(System.Type type) { throw null; } } } + namespace Microsoft.AspNetCore.Mvc.Razor.Compilation { internal partial class DefaultViewCompilerProvider : Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompilerProvider { - private readonly Microsoft.AspNetCore.Mvc.Razor.Compilation.DefaultViewCompiler _compiler; public DefaultViewCompilerProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationPartManager, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } public Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler GetCompiler() { throw null; } } internal partial class DefaultViewCompiler : Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompiler { - private readonly System.Collections.Generic.Dictionary> _compiledViews; - private readonly Microsoft.Extensions.Logging.ILogger _logger; - private readonly System.Collections.Concurrent.ConcurrentDictionary _normalizedPathCache; public DefaultViewCompiler(System.Collections.Generic.IList compiledViews, Microsoft.Extensions.Logging.ILogger logger) { } public System.Threading.Tasks.Task CompileAsync(string relativePath) { throw null; } - private string GetNormalizedPath(string relativePath) { throw null; } } } + namespace Microsoft.Extensions.DependencyInjection { internal partial class MvcRazorMvcViewOptionsSetup { - private readonly Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine _razorViewEngine; public MvcRazorMvcViewOptionsSetup(Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine razorViewEngine) { } public void Configure(Microsoft.AspNetCore.Mvc.MvcViewOptions options) { } } -} \ No newline at end of file +} diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj index 3141b53f1a..8f1bd18e12 100644 --- a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.csproj @@ -2,15 +2,14 @@ netcoreapp3.0 - false - - - - - + + + + + diff --git a/src/Mvc/Mvc.RazorPages/ref/Directory.Build.props b/src/Mvc/Mvc.RazorPages/ref/Directory.Build.props deleted file mode 100644 index da31f31a30..0000000000 --- a/src/Mvc/Mvc.RazorPages/ref/Directory.Build.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - $(NoWarn);CS0169 - - - - - - - diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.Manual.cs similarity index 55% rename from src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs rename to src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.Manual.cs index 912d7222b0..332ae04278 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.Manual.cs +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.Manual.cs @@ -1,19 +1,10 @@ // 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.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] - -namespace Microsoft.AspNetCore.Builder +namespace Microsoft.AspNetCore.Mvc.ApplicationModels { internal partial class CompiledPageRouteModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelProvider { - private static readonly string RazorPageDocumentKind; - private static readonly string RouteTemplateKey; - private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _applicationManager; - private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _pagesOptions; - private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelFactory _routeModelFactory; public CompiledPageRouteModelProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager, Microsoft.Extensions.Options.IOptions pagesOptionsAccessor, Microsoft.Extensions.Logging.ILogger logger) { } public int Order { get { throw null; } } internal static string GetRouteTemplate(Microsoft.AspNetCore.Mvc.Razor.Compilation.CompiledViewDescriptor viewDescriptor) { throw null; } @@ -21,9 +12,37 @@ namespace Microsoft.AspNetCore.Builder public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } } -} -namespace Microsoft.AspNetCore.Mvc.ApplicationModels -{ + internal partial class DefaultPageApplicationModelPartsProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelPartsProvider + { + public DefaultPageApplicationModelPartsProvider(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider) { } + public Microsoft.AspNetCore.Mvc.ApplicationModels.PageHandlerModel CreateHandlerModel(System.Reflection.MethodInfo method) { throw null; } + public Microsoft.AspNetCore.Mvc.ApplicationModels.PageParameterModel CreateParameterModel(System.Reflection.ParameterInfo parameter) { throw null; } + public Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel CreatePropertyModel(System.Reflection.PropertyInfo property) { throw null; } + public bool IsHandler(System.Reflection.MethodInfo methodInfo) { throw null; } + internal static bool TryParseHandlerMethod(string methodName, out string httpMethod, out string handler) { throw null; } + } + public partial class PageConventionCollection : System.Collections.ObjectModel.Collection + { + internal PageConventionCollection(System.IServiceProvider serviceProvider) { } + internal Microsoft.AspNetCore.Mvc.MvcOptions MvcOptions { get { throw null; } } + internal static void EnsureValidFolderPath(string folderPath) { } + internal static void EnsureValidPageName(string pageName, string argumentName = "pageName") { } + internal static bool PathBelongsToFolder(string folderPath, string viewEnginePath) { throw null; } + } + internal static partial class CompiledPageActionDescriptorBuilder + { + public static Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor Build(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel applicationModel, Microsoft.AspNetCore.Mvc.Filters.FilterCollection globalFilters) { throw null; } + internal static Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageBoundPropertyDescriptor[] CreateBoundProperties(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel applicationModel) { throw null; } + internal static Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor[] CreateHandlerMethods(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel applicationModel) { throw null; } + internal static Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerParameterDescriptor[] CreateHandlerParameters(Microsoft.AspNetCore.Mvc.ApplicationModels.PageHandlerModel handlerModel) { throw null; } + } + internal partial class AutoValidateAntiforgeryPageApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider + { + public AutoValidateAntiforgeryPageApplicationModelProvider() { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } + } // https://github.com/dotnet/arcade/issues/2066 [System.Diagnostics.DebuggerDisplayAttribute("PageParameterModel: Name={ParameterName}")] public partial class PageParameterModel : Microsoft.AspNetCore.Mvc.ApplicationModels.ParameterModelBase, Microsoft.AspNetCore.Mvc.ApplicationModels.IBindingModel, Microsoft.AspNetCore.Mvc.ApplicationModels.ICommonModel, Microsoft.AspNetCore.Mvc.ApplicationModels.IPropertyModel @@ -51,26 +70,13 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels } internal partial class PageRouteModelFactory { - private static readonly string IndexFileName; - private readonly Microsoft.Extensions.Logging.ILogger _logger; - private readonly string _normalizedAreaRootDirectory; - private readonly string _normalizedRootDirectory; - private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _options; - private static readonly System.Action _unsupportedAreaPath; public PageRouteModelFactory(Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions options, Microsoft.Extensions.Logging.ILogger logger) { } - private static string CreateAreaRoute(string areaName, string viewEnginePath) { throw null; } public Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel CreateAreaRouteModel(string relativePath, string routeTemplate) { throw null; } public Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel CreateRouteModel(string relativePath, string routeTemplate) { throw null; } - private static Microsoft.AspNetCore.Mvc.ApplicationModels.SelectorModel CreateSelectorModel(string prefix, string routeTemplate) { throw null; } - private string GetViewEnginePath(string rootDirectory, string path) { throw null; } - private static string NormalizeDirectory(string directory) { throw null; } - private static void PopulateRouteModel(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModel model, string pageRoute, string routeTemplate) { } internal bool TryParseAreaPath(string relativePath, out (string areaName, string viewEnginePath) result) { throw null; } } internal partial class AuthorizationPageApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider { - private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; - private readonly Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider _policyProvider; public AuthorizationPageApplicationModelProvider(Microsoft.AspNetCore.Authorization.IAuthorizationPolicyProvider policyProvider, Microsoft.Extensions.Options.IOptions mvcOptions) { } public int Order { get { throw null; } } public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } @@ -78,13 +84,6 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels } internal partial class DefaultPageApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider { - private const string ModelPropertyName = "Model"; - private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandleOptionsRequestsPageFilter _handleOptionsRequestsFilter; - private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _modelMetadataProvider; - private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelPartsProvider _pageApplicationModelPartsProvider; - private readonly Microsoft.AspNetCore.Mvc.Filters.PageHandlerPageFilter _pageHandlerPageFilter; - private readonly Microsoft.AspNetCore.Mvc.Filters.PageHandlerResultFilter _pageHandlerResultFilter; - private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _razorPagesOptions; public DefaultPageApplicationModelProvider(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.Extensions.Options.IOptions razorPagesOptions, Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelPartsProvider pageApplicationModelPartsProvider) { } public int Order { get { throw null; } } protected virtual Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel CreateModel(Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor actionDescriptor, System.Reflection.TypeInfo pageTypeInfo) { throw null; } @@ -96,7 +95,6 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels } internal partial class TempDataFilterPageApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider { - private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer _tempDataSerializer; public TempDataFilterPageApplicationModelProvider(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer) { } public int Order { get { throw null; } } public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } @@ -111,31 +109,57 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels } internal partial class ResponseCacheFilterApplicationModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageApplicationModelProvider { - private readonly Microsoft.Extensions.Logging.ILoggerFactory _loggerFactory; - private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; public ResponseCacheFilterApplicationModelProvider(Microsoft.Extensions.Options.IOptions mvcOptionsAccessor, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } public int Order { get { throw null; } } public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModelProviderContext context) { } } - internal partial class CompiledPageRouteModelProvider : Microsoft.AspNetCore.Mvc.ApplicationModels.IPageRouteModelProvider - { - private static readonly string RazorPageDocumentKind; - private static readonly string RouteTemplateKey; - private readonly Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager _applicationManager; - private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _pagesOptions; - private readonly Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelFactory _routeModelFactory; - public CompiledPageRouteModelProvider(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager, Microsoft.Extensions.Options.IOptions pagesOptionsAccessor, Microsoft.Extensions.Logging.ILogger logger) { } - public int Order { get { throw null; } } - private void CreateModels(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } - private System.Collections.Generic.IEnumerable GetViewDescriptors(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager) { throw null; } - protected virtual Microsoft.AspNetCore.Mvc.Razor.Compilation.ViewsFeature GetViewFeature(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager applicationManager) { throw null; } - public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } - public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.PageRouteModelProviderContext context) { } - } } namespace Microsoft.AspNetCore.Mvc.Filters { + internal partial class PageViewDataAttributeFilterFactory : Microsoft.AspNetCore.Mvc.Filters.IFilterFactory, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata + { + public PageViewDataAttributeFilterFactory(System.Collections.Generic.IReadOnlyList properties) { } + public bool IsReusable { get { throw null; } } + public System.Collections.Generic.IReadOnlyList Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata CreateInstance(System.IServiceProvider serviceProvider) { throw null; } + } + internal partial class PageResponseCacheFilter : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IPageFilter, Microsoft.AspNetCore.Mvc.Filters.IResponseCacheFilter + { + public PageResponseCacheFilter(Microsoft.AspNetCore.Mvc.CacheProfile cacheProfile, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public int Duration { get { throw null; } set { } } + public Microsoft.AspNetCore.Mvc.ResponseCacheLocation Location { get { throw null; } set { } } + public bool NoStore { get { throw null; } set { } } + public string VaryByHeader { get { throw null; } set { } } + public string[] VaryByQueryKeys { get { throw null; } set { } } + public void OnPageHandlerExecuted(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext context) { } + public void OnPageHandlerExecuting(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext context) { } + public void OnPageHandlerSelected(Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext context) { } + } + internal partial class PageViewDataAttributeFilter : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IPageFilter, Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.IViewDataValuesProviderFeature + { + public PageViewDataAttributeFilter(System.Collections.Generic.IReadOnlyList properties) { } + public System.Collections.Generic.IReadOnlyList Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object Subject { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public void OnPageHandlerExecuted(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext context) { } + public void OnPageHandlerExecuting(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext context) { } + public void OnPageHandlerSelected(Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext context) { } + public void ProvideViewDataValues(Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary viewData) { } + } + internal partial class PageSaveTempDataPropertyFilterFactory : Microsoft.AspNetCore.Mvc.Filters.IFilterFactory, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata + { + public PageSaveTempDataPropertyFilterFactory(System.Collections.Generic.IReadOnlyList properties) { } + public bool IsReusable { get { throw null; } } + public System.Collections.Generic.IReadOnlyList Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata CreateInstance(System.IServiceProvider serviceProvider) { throw null; } + } + internal partial class PageSaveTempDataPropertyFilter : Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataPropertyFilterBase, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IPageFilter + { + public PageSaveTempDataPropertyFilter(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory factory) : base (default(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory)) { } + public void OnPageHandlerExecuted(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext context) { } + public void OnPageHandlerExecuting(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext context) { } + public void OnPageHandlerSelected(Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext context) { } + } internal partial class PageHandlerPageFilter : Microsoft.AspNetCore.Mvc.Filters.IAsyncPageFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter { public PageHandlerPageFilter() { } @@ -152,6 +176,88 @@ namespace Microsoft.AspNetCore.Mvc.Filters } namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure { + internal partial class DynamicPageRouteValueTransformerMetadata : Microsoft.AspNetCore.Routing.IDynamicEndpointMetadata + { + public DynamicPageRouteValueTransformerMetadata(System.Type selectorType) { } + public bool IsDynamic { get { throw null; } } + public System.Type SelectorType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class DefaultPageModelActivatorProvider : Microsoft.AspNetCore.Mvc.RazorPages.IPageModelActivatorProvider + { + public DefaultPageModelActivatorProvider() { } + public virtual System.Func CreateActivator(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } + public virtual System.Action CreateReleaser(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } + } + internal partial class PageLoaderMatcherPolicy : Microsoft.AspNetCore.Routing.MatcherPolicy, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy + { + public PageLoaderMatcherPolicy(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageLoader loader) { } + public override int Order { get { throw null; } } + public bool AppliesToEndpoints(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } + public System.Threading.Tasks.Task ApplyAsync(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidates) { throw null; } + } + internal partial class DefaultPageActivatorProvider : Microsoft.AspNetCore.Mvc.RazorPages.IPageActivatorProvider + { + public DefaultPageActivatorProvider() { } + public System.Func CreateActivator(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } + public System.Action CreateReleaser(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } + } + internal partial class DynamicPageEndpointMatcherPolicy : Microsoft.AspNetCore.Routing.MatcherPolicy, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy + { + public DynamicPageEndpointMatcherPolicy(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.DynamicPageEndpointSelector selector, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageLoader loader, Microsoft.AspNetCore.Routing.Matching.EndpointMetadataComparer comparer) { } + public override int Order { get { throw null; } } + public bool AppliesToEndpoints(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } + public System.Threading.Tasks.Task ApplyAsync(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidates) { throw null; } + } + internal partial class PageActionInvoker : Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker, Microsoft.AspNetCore.Mvc.Abstractions.IActionInvoker + { + public PageActionInvoker(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector handlerMethodSelector, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.RazorPages.PageContext pageContext, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filterMetadata, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry cacheEntry, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelperOptions htmlHelperOptions) : base (default(System.Diagnostics.DiagnosticListener), default(Microsoft.Extensions.Logging.ILogger), default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor), default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper), default(Microsoft.AspNetCore.Mvc.ActionContext), default(Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[]), default(System.Collections.Generic.IList)) { } + internal Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry CacheEntry { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.Mvc.RazorPages.PageContext PageContext { get { throw null; } } + protected override System.Threading.Tasks.Task InvokeInnerFilterAsync() { throw null; } + protected override System.Threading.Tasks.Task InvokeResultAsync(Microsoft.AspNetCore.Mvc.IActionResult result) { throw null; } + protected override void ReleaseResources() { } + } + internal static partial class ExecutorFactory + { + public static Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerExecutorDelegate CreateExecutor(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor handlerDescriptor) { throw null; } + } + internal partial class DefaultPageLoader : Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageLoader + { + public DefaultPageLoader(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actionDescriptorCollectionProvider, System.Collections.Generic.IEnumerable applicationModelProviders, Microsoft.AspNetCore.Mvc.Razor.Compilation.IViewCompilerProvider viewCompilerProvider, Microsoft.AspNetCore.Mvc.Routing.ActionEndpointFactory endpointFactory, Microsoft.Extensions.Options.IOptions pageOptions, Microsoft.Extensions.Options.IOptions mvcOptions) { } + internal static void ApplyConventions(Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection conventions, Microsoft.AspNetCore.Mvc.ApplicationModels.PageApplicationModel pageApplicationModel) { } + public override System.Threading.Tasks.Task LoadAsync(Microsoft.AspNetCore.Mvc.RazorPages.PageActionDescriptor actionDescriptor) { throw null; } + } + internal partial class PageActionEndpointDataSource : Microsoft.AspNetCore.Mvc.Routing.ActionEndpointDataSourceBase + { + public PageActionEndpointDataSource(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider actions, Microsoft.AspNetCore.Mvc.Routing.ActionEndpointFactory endpointFactory) : base (default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider)) { } + public bool CreateInertEndpoints { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Builder.PageActionEndpointConventionBuilder DefaultBuilder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + protected override System.Collections.Generic.List CreateEndpoints(System.Collections.Generic.IReadOnlyList actions, System.Collections.Generic.IReadOnlyList> conventions) { throw null; } + } + internal partial class DynamicPageEndpointSelector : System.IDisposable + { + public DynamicPageEndpointSelector(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionEndpointDataSource dataSource) { } + protected DynamicPageEndpointSelector(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource) { } + public void Dispose() { } + public System.Collections.Generic.IReadOnlyList SelectEndpoints(Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } + } + internal partial class DefaultPageModelFactoryProvider : Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider + { + public DefaultPageModelFactoryProvider(Microsoft.AspNetCore.Mvc.RazorPages.IPageModelActivatorProvider modelActivator) { } + public System.Action CreateModelDisposer(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor descriptor) { throw null; } + public System.Func CreateModelFactory(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor descriptor) { throw null; } + } + internal partial class DefaultPageFactoryProvider : Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider + { + public DefaultPageFactoryProvider(Microsoft.AspNetCore.Mvc.RazorPages.IPageActivatorProvider pageActivator, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory urlHelperFactory, Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper jsonHelper, System.Diagnostics.DiagnosticListener diagnosticListener, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider modelExpressionProvider) { } + public System.Action CreatePageDisposer(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor descriptor) { throw null; } + public System.Func CreatePageFactory(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } + } + internal partial class DefaultPageHandlerMethodSelector : Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector + { + public DefaultPageHandlerMethodSelector() { } + public Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor Select(Microsoft.AspNetCore.Mvc.RazorPages.PageContext context) { throw null; } + } internal sealed partial class HandleOptionsRequestsPageFilter : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter, Microsoft.AspNetCore.Mvc.Filters.IPageFilter { public HandleOptionsRequestsPageFilter() { } @@ -161,97 +267,8 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure public void OnPageHandlerSelected(Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext context) { } } internal delegate System.Threading.Tasks.Task PageHandlerExecutorDelegate(object handler, object[] arguments); - internal partial class PageActionInvoker : Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker, Microsoft.AspNetCore.Mvc.Abstractions.IActionInvoker - { - private readonly Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor _actionDescriptor; - private System.Collections.Generic.Dictionary _arguments; - private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor _handler; - private Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext _handlerExecutedContext; - private Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutingContext _handlerExecutingContext; - private Microsoft.AspNetCore.Mvc.Filters.PageHandlerSelectedContext _handlerSelectedContext; - private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelperOptions _htmlHelperOptions; - private Microsoft.AspNetCore.Mvc.RazorPages.PageBase _page; - private readonly Microsoft.AspNetCore.Mvc.RazorPages.PageContext _pageContext; - private object _pageModel; - private readonly Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder _parameterBinder; - private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector _selector; - private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory _tempDataFactory; - private Microsoft.AspNetCore.Mvc.Rendering.ViewContext _viewContext; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry _CacheEntry_k__BackingField; - public PageActionInvoker(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector handlerMethodSelector, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.RazorPages.PageContext pageContext, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filterMetadata, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry cacheEntry, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelperOptions htmlHelperOptions) : base (default(System.Diagnostics.DiagnosticListener), default(Microsoft.Extensions.Logging.ILogger), default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor), default(Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper), default(Microsoft.AspNetCore.Mvc.ActionContext), default(Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[]), default(System.Collections.Generic.IList)) { } - internal Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry CacheEntry { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - private bool HasPageModel { get { throw null; } } - internal Microsoft.AspNetCore.Mvc.RazorPages.PageContext PageContext { get { throw null; } } - private System.Threading.Tasks.Task BindArgumentsAsync() { throw null; } - protected override System.Threading.Tasks.Task InvokeInnerFilterAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - private System.Threading.Tasks.Task InvokeNextPageFilterAwaitedAsync() { throw null; } - protected override System.Threading.Tasks.Task InvokeResultAsync(Microsoft.AspNetCore.Mvc.IActionResult result) { throw null; } - private System.Threading.Tasks.Task Next(ref Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvoker.State next, ref Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvoker.Scope scope, ref object state, ref bool isCompleted) { throw null; } - private static object[] PrepareArguments(System.Collections.Generic.IDictionary argumentsInDictionary, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor handler) { throw null; } - protected override void ReleaseResources() { } - private static void Rethrow(Microsoft.AspNetCore.Mvc.Filters.PageHandlerExecutedContext context) { } - private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor SelectHandler() { throw null; } - private enum Scope - { - Invoker = 0, - Page = 1, - } - private enum State - { - PageBegin = 0, - PageSelectHandlerBegin = 1, - PageSelectHandlerNext = 2, - PageSelectHandlerAsyncBegin = 3, - PageSelectHandlerAsyncEnd = 4, - PageSelectHandlerSync = 5, - PageSelectHandlerEnd = 6, - PageNext = 7, - PageAsyncBegin = 8, - PageAsyncEnd = 9, - PageSyncBegin = 10, - PageSyncEnd = 11, - PageInside = 12, - PageEnd = 13, - } - } internal partial class PageActionInvokerCacheEntry { - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor _ActionDescriptor_k__BackingField; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly Microsoft.AspNetCore.Mvc.Filters.FilterItem[] _CacheableFilters_k__BackingField; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate[] _HandlerBinders_k__BackingField; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerExecutorDelegate[] _HandlerExecutors_k__BackingField; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly System.Func _ModelFactory_k__BackingField; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly System.Func _PageFactory_k__BackingField; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly System.Func _PropertyBinder_k__BackingField; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly System.Action _ReleaseModel_k__BackingField; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly System.Action _ReleasePage_k__BackingField; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly System.Func _ViewDataFactory_k__BackingField; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly System.Collections.Generic.IReadOnlyList> _ViewStartFactories_k__BackingField; public PageActionInvokerCacheEntry(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor, System.Func viewDataFactory, System.Func pageFactory, System.Action releasePage, System.Func modelFactory, System.Action releaseModel, System.Func propertyBinder, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerExecutorDelegate[] handlerExecutors, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate[] handlerBinders, System.Collections.Generic.IReadOnlyList> viewStartFactories, Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cacheableFilters) { } public Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor ActionDescriptor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public Microsoft.AspNetCore.Mvc.Filters.FilterItem[] CacheableFilters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } @@ -267,47 +284,14 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure } internal partial class PageActionInvokerProvider : Microsoft.AspNetCore.Mvc.Abstractions.IActionInvokerProvider { - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor _actionContextAccessor; - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider _collectionProvider; - private volatile Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerProvider.InnerCache _currentCache; - private readonly System.Diagnostics.DiagnosticListener _diagnosticListener; - private readonly Microsoft.AspNetCore.Mvc.Filters.IFilterProvider[] _filterProviders; - private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageLoader _loader; - private readonly Microsoft.Extensions.Logging.ILogger _logger; - private readonly Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper _mapper; - private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory _modelBinderFactory; - private readonly Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider _modelFactoryProvider; - private readonly Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider _modelMetadataProvider; - private readonly Microsoft.AspNetCore.Mvc.MvcOptions _mvcOptions; - private readonly Microsoft.AspNetCore.Mvc.MvcViewOptions _mvcViewOptions; - private readonly Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider _pageFactoryProvider; - private readonly Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder _parameterBinder; - private readonly Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider _razorPageFactoryProvider; - private readonly Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector _selector; - private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory _tempDataFactory; - private readonly System.Collections.Generic.IReadOnlyList _valueProviderFactories; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly int _Order_k__BackingField; public PageActionInvokerProvider(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageLoader loader, Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider pageFactoryProvider, Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider modelFactoryProvider, Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider razorPageFactoryProvider, Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, System.Collections.Generic.IEnumerable filterProviders, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory, Microsoft.Extensions.Options.IOptions mvcOptions, Microsoft.Extensions.Options.IOptions mvcViewOptions, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector selector, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper) { } public PageActionInvokerProvider(Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageLoader loader, Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider pageFactoryProvider, Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider modelFactoryProvider, Microsoft.AspNetCore.Mvc.Razor.IRazorPageFactoryProvider razorPageFactoryProvider, Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider collectionProvider, System.Collections.Generic.IEnumerable filterProviders, Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory, Microsoft.Extensions.Options.IOptions mvcOptions, Microsoft.Extensions.Options.IOptions mvcViewOptions, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector selector, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper mapper, Microsoft.AspNetCore.Mvc.Infrastructure.IActionContextAccessor actionContextAccessor) { } - private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerProvider.InnerCache CurrentCache { get { throw null; } } public int Order { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvoker CreateActionInvoker(Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry cacheEntry, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata[] filters) { throw null; } - private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageActionInvokerCacheEntry CreateCacheEntry(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context, Microsoft.AspNetCore.Mvc.Filters.FilterItem[] cachedFilters) { throw null; } - private Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate[] GetHandlerBinders(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } - private static Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerExecutorDelegate[] GetHandlerExecutors(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } internal System.Collections.Generic.List> GetViewStartFactories(Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor descriptor) { throw null; } public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context) { } public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.Abstractions.ActionInvokerProviderContext context) { } internal partial class InnerCache { - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly System.Collections.Concurrent.ConcurrentDictionary _Entries_k__BackingField; - [System.Diagnostics.DebuggerBrowsableAttribute(System.Diagnostics.DebuggerBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - private readonly int _Version_k__BackingField; public InnerCache(int version) { } public System.Collections.Concurrent.ConcurrentDictionary Entries { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public int Version { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } @@ -319,14 +303,6 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure internal static readonly System.Func NullPropertyBinder = (context, arguments) => System.Threading.Tasks.Task.CompletedTask; public static Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageHandlerBinderDelegate CreateHandlerBinder(Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor handler, Microsoft.AspNetCore.Mvc.MvcOptions mvcOptions) { throw null; } public static System.Func CreatePropertyBinder(Microsoft.AspNetCore.Mvc.ModelBinding.ParameterBinder parameterBinder, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinderFactory modelBinderFactory, Microsoft.AspNetCore.Mvc.RazorPages.CompiledPageActionDescriptor actionDescriptor) { throw null; } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - private readonly partial struct BinderItem - { - private readonly object _dummy; - public BinderItem(Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder modelBinder, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata) { throw null; } - public Microsoft.AspNetCore.Mvc.ModelBinding.IModelBinder ModelBinder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata ModelMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } } internal delegate System.Threading.Tasks.Task PageHandlerBinderDelegate(Microsoft.AspNetCore.Mvc.RazorPages.PageContext pageContext, System.Collections.Generic.IDictionary arguments); } @@ -334,9 +310,35 @@ namespace Microsoft.Extensions.DependencyInjection { internal partial class RazorPagesRazorViewEngineOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions { - private readonly Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions _pagesOptions; public RazorPagesRazorViewEngineOptionsSetup(Microsoft.Extensions.Options.IOptions pagesOptions) { } - private static string CombinePath(string path1, string path2) { throw null; } public void Configure(Microsoft.AspNetCore.Mvc.Razor.RazorViewEngineOptions options) { } } + internal partial class RazorPagesOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions + { + public RazorPagesOptionsSetup(System.IServiceProvider serviceProvider) { } + public void Configure(Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions options) { } + } +} +namespace Microsoft.AspNetCore.Mvc.RazorPages +{ + public partial class RazorPagesOptions : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable + { + public Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection Conventions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } + } + internal static partial class PageLoggerExtensions + { + public const string PageFilter = "Page Filter"; + public static void AfterExecutingMethodOnFilter(this Microsoft.Extensions.Logging.ILogger logger, string filterType, string methodName, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filter) { } + public static void BeforeExecutingMethodOnFilter(this Microsoft.Extensions.Logging.ILogger logger, string filterType, string methodName, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filter) { } + public static void ExecutedHandlerMethod(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.RazorPages.PageContext context, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor handler, Microsoft.AspNetCore.Mvc.IActionResult result) { } + public static void ExecutedImplicitHandlerMethod(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.IActionResult result) { } + public static void ExecutedPageFactory(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.RazorPages.PageContext context) { } + public static void ExecutedPageModelFactory(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.RazorPages.PageContext context) { } + public static void ExecutingHandlerMethod(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.RazorPages.PageContext context, Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.HandlerMethodDescriptor handler, object[] arguments) { } + public static void ExecutingImplicitHandlerMethod(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.RazorPages.PageContext context) { } + public static void ExecutingPageFactory(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.RazorPages.PageContext context) { } + public static void ExecutingPageModelFactory(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.RazorPages.PageContext context) { } + public static void NotMostEffectiveFilter(this Microsoft.Extensions.Logging.ILogger logger, System.Type policyType) { } + public static void PageFilterShortCircuited(this Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata filter) { } + } } \ No newline at end of file diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.csproj index c21c532d01..bfe0a5bc98 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.csproj +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.csproj @@ -2,11 +2,11 @@ netcoreapp3.0 - false - - + + + diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs index 6bf3847a86..ce11586131 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp3.0.cs @@ -637,7 +637,6 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages public partial class RazorPagesOptions : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable { public RazorPagesOptions() { } - public Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection Conventions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public string RootDirectory { get { throw null; } set { } } System.Collections.Generic.IEnumerator System.Collections.Generic.IEnumerable.GetEnumerator() { throw null; } System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } @@ -694,7 +693,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure } public partial class PageResultExecutor : Microsoft.AspNetCore.Mvc.ViewFeatures.ViewExecutor { - public PageResultExecutor(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory writerFactory, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine compositeViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine razorViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator razorPageActivator, System.Diagnostics.DiagnosticListener diagnosticListener, System.Text.Encodings.Web.HtmlEncoder htmlEncoder) : base (default(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory), default(Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine), default(System.Diagnostics.DiagnosticListener)) { } + public PageResultExecutor(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory writerFactory, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine compositeViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine razorViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator razorPageActivator, System.Diagnostics.DiagnosticListener diagnosticListener, System.Text.Encodings.Web.HtmlEncoder htmlEncoder) : base (default(Microsoft.Extensions.Options.IOptions), default(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory), default(Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine), default(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory), default(System.Diagnostics.DiagnosticListener), default(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider)) { } public virtual System.Threading.Tasks.Task ExecuteAsync(Microsoft.AspNetCore.Mvc.RazorPages.PageContext pageContext, Microsoft.AspNetCore.Mvc.RazorPages.PageResult result) { throw null; } } public partial class PageViewLocationExpander : Microsoft.AspNetCore.Mvc.Razor.IViewLocationExpander diff --git a/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj index 1f7fe61e41..0986fbcdb7 100644 --- a/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj +++ b/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj @@ -11,8 +11,6 @@ - - diff --git a/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.Manual.cs b/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.Manual.cs new file mode 100644 index 0000000000..6db1949701 --- /dev/null +++ b/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.Manual.cs @@ -0,0 +1,114 @@ +// 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. + +namespace Microsoft.AspNetCore.Mvc.TagHelpers +{ + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("script", Attributes="asp-append-version")] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("script", Attributes="asp-fallback-src")] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("script", Attributes="asp-fallback-src-exclude")] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("script", Attributes="asp-fallback-src-include")] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("script", Attributes="asp-fallback-test")] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("script", Attributes="asp-src-exclude")] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("script", Attributes="asp-src-include")] + public partial class ScriptTagHelper : Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper + { + internal Microsoft.AspNetCore.Mvc.ViewFeatures.IFileVersionProvider FileVersionProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class ModeAttributes + { + public ModeAttributes(TMode mode, string[] attributes) { } + public string[] Attributes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public TMode Mode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public partial class CacheTagHelperMemoryCacheFactory + { + internal CacheTagHelperMemoryCacheFactory(Microsoft.Extensions.Caching.Memory.IMemoryCache cache) { } + } + internal static partial class AttributeMatcher + { + public static bool TryDetermineMode(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, System.Collections.Generic.IReadOnlyList> modeInfos, System.Func compare, out TMode result) { throw null; } + } + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("link", Attributes="asp-append-version", TagStructure=Microsoft.AspNetCore.Razor.TagHelpers.TagStructure.WithoutEndTag)] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("link", Attributes="asp-fallback-href", TagStructure=Microsoft.AspNetCore.Razor.TagHelpers.TagStructure.WithoutEndTag)] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("link", Attributes="asp-fallback-href-exclude", TagStructure=Microsoft.AspNetCore.Razor.TagHelpers.TagStructure.WithoutEndTag)] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("link", Attributes="asp-fallback-href-include", TagStructure=Microsoft.AspNetCore.Razor.TagHelpers.TagStructure.WithoutEndTag)] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("link", Attributes="asp-fallback-test-class", TagStructure=Microsoft.AspNetCore.Razor.TagHelpers.TagStructure.WithoutEndTag)] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("link", Attributes="asp-fallback-test-property", TagStructure=Microsoft.AspNetCore.Razor.TagHelpers.TagStructure.WithoutEndTag)] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("link", Attributes="asp-fallback-test-value", TagStructure=Microsoft.AspNetCore.Razor.TagHelpers.TagStructure.WithoutEndTag)] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("link", Attributes="asp-href-exclude", TagStructure=Microsoft.AspNetCore.Razor.TagHelpers.TagStructure.WithoutEndTag)] + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("link", Attributes="asp-href-include", TagStructure=Microsoft.AspNetCore.Razor.TagHelpers.TagStructure.WithoutEndTag)] + public partial class LinkTagHelper : Microsoft.AspNetCore.Mvc.Razor.TagHelpers.UrlResolutionTagHelper + { + internal Microsoft.AspNetCore.Mvc.ViewFeatures.IFileVersionProvider FileVersionProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public partial class CacheTagHelper : Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelperBase + { + internal Microsoft.Extensions.Caching.Memory.MemoryCacheEntryOptions GetMemoryCacheEntryOptions() { throw null; } + } + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("distributed-cache", Attributes="name")] + public partial class DistributedCacheTagHelper : Microsoft.AspNetCore.Mvc.TagHelpers.CacheTagHelperBase + { + internal Microsoft.Extensions.Caching.Distributed.DistributedCacheEntryOptions GetDistributedCacheEntryOptions() { throw null; } + } + public partial class GlobbingUrlBuilder + { + internal System.Func MatcherBuilder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal static partial class JavaScriptResources + { + public static string GetEmbeddedJavaScript(string resourceName) { throw null; } + internal static string GetEmbeddedJavaScript(string resourceName, System.Func getManifestResourceStream, System.Collections.Concurrent.ConcurrentDictionary cache) { throw null; } + } + internal static partial class Resources + { + internal static string AnchorTagHelper_CannotOverrideHref { get { throw null; } } + internal static string ArgumentCannotContainHtmlSpace { get { throw null; } } + internal static string CannotDetermineAttributeFor { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static string FormActionTagHelper_CannotOverrideFormAction { get { throw null; } } + internal static string FormTagHelper_CannotOverrideAction { get { throw null; } } + internal static string InputTagHelper_InvalidExpressionResult { get { throw null; } } + internal static string InputTagHelper_InvalidStringResult { get { throw null; } } + internal static string InputTagHelper_ValueRequired { get { throw null; } } + internal static string InvalidEnumArgument { get { throw null; } } + internal static string PartialTagHelper_InvalidModelAttributes { get { throw null; } } + internal static string PropertyOfTypeCannotBeNull { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string TagHelperOutput_AttributeDoesNotExist { get { throw null; } } + internal static string TagHelpers_NoProvidedMetadata { get { throw null; } } + internal static string ViewEngine_FallbackViewNotFound { get { throw null; } } + internal static string ViewEngine_PartialViewNotFound { get { throw null; } } + internal static string FormatAnchorTagHelper_CannotOverrideHref(object p0, object p1, object p2, object p3, object p4, object p5, object p6, object p7, object p8, object p9, object p10, object p11) { throw null; } + internal static string FormatCannotDetermineAttributeFor(object p0, object p1) { throw null; } + internal static string FormatFormActionTagHelper_CannotOverrideFormAction(object p0, object p1, object p2, object p3, object p4, object p5, object p6, object p7, object p8, object p9) { throw null; } + internal static string FormatFormTagHelper_CannotOverrideAction(object p0, object p1, object p2, object p3, object p4, object p5, object p6, object p7, object p8, object p9) { throw null; } + internal static string FormatInputTagHelper_InvalidExpressionResult(object p0, object p1, object p2, object p3, object p4, object p5, object p6) { throw null; } + internal static string FormatInputTagHelper_InvalidStringResult(object p0, object p1, object p2) { throw null; } + internal static string FormatInputTagHelper_ValueRequired(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatInvalidEnumArgument(object p0, object p1, object p2) { throw null; } + internal static string FormatPartialTagHelper_InvalidModelAttributes(object p0, object p1, object p2) { throw null; } + internal static string FormatPropertyOfTypeCannotBeNull(object p0, object p1) { throw null; } + internal static string FormatTagHelperOutput_AttributeDoesNotExist(object p0, object p1) { throw null; } + internal static string FormatTagHelpers_NoProvidedMetadata(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatViewEngine_FallbackViewNotFound(object p0, object p1) { throw null; } + internal static string FormatViewEngine_PartialViewNotFound(object p0, object p1) { throw null; } + } + [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("partial", Attributes="name", TagStructure=Microsoft.AspNetCore.Razor.TagHelpers.TagStructure.WithoutEndTag)] + public partial class PartialTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper + { + internal object ResolveModel() { throw null; } + } + internal partial class CurrentValues + { + public CurrentValues(System.Collections.Generic.ICollection values) { } + public System.Collections.Generic.ICollection Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.ICollection ValuesAndEncodedValues { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } +} +namespace Microsoft.AspNetCore.Mvc.TagHelpers.Cache +{ + public partial class CacheTagKey : System.IEquatable + { + internal string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } +} \ No newline at end of file diff --git a/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.csproj index 54c737be53..1f48fbdb09 100644 --- a/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.csproj +++ b/src/Mvc/Mvc.TagHelpers/ref/Microsoft.AspNetCore.Mvc.TagHelpers.csproj @@ -2,16 +2,16 @@ netcoreapp3.0 - false - - - - - - - + + + + + + + + diff --git a/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.csproj deleted file mode 100644 index b5e0c8a5df..0000000000 --- a/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - diff --git a/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.netcoreapp3.0.cs b/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.netcoreapp3.0.cs deleted file mode 100644 index 069eae8180..0000000000 --- a/src/Mvc/Mvc.Testing/ref/Microsoft.AspNetCore.Mvc.Testing.netcoreapp3.0.cs +++ /dev/null @@ -1,65 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Mvc.Testing -{ - public partial class WebApplicationFactoryClientOptions - { - public WebApplicationFactoryClientOptions() { } - public bool AllowAutoRedirect { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Uri BaseAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool HandleCookies { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int MaxAutomaticRedirections { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - [System.AttributeUsageAttribute(System.AttributeTargets.Assembly, Inherited=false, AllowMultiple=true)] - public sealed partial class WebApplicationFactoryContentRootAttribute : System.Attribute - { - public WebApplicationFactoryContentRootAttribute(string key, string contentRootPath, string contentRootTest, string priority) { } - public string ContentRootPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ContentRootTest { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int Priority { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - public partial class WebApplicationFactory : System.IDisposable where TEntryPoint : class - { - public WebApplicationFactory() { } - public Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions ClientOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Collections.Generic.IReadOnlyList> Factories { get { throw null; } } - public Microsoft.AspNetCore.TestHost.TestServer Server { get { throw null; } } - public virtual System.IServiceProvider Services { get { throw null; } } - protected virtual void ConfigureClient(System.Net.Http.HttpClient client) { } - protected virtual void ConfigureWebHost(Microsoft.AspNetCore.Hosting.IWebHostBuilder builder) { } - public System.Net.Http.HttpClient CreateClient() { throw null; } - public System.Net.Http.HttpClient CreateClient(Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryClientOptions options) { throw null; } - public System.Net.Http.HttpClient CreateDefaultClient(params System.Net.Http.DelegatingHandler[] handlers) { throw null; } - public System.Net.Http.HttpClient CreateDefaultClient(System.Uri baseAddress, params System.Net.Http.DelegatingHandler[] handlers) { throw null; } - protected virtual Microsoft.Extensions.Hosting.IHost CreateHost(Microsoft.Extensions.Hosting.IHostBuilder builder) { throw null; } - protected virtual Microsoft.Extensions.Hosting.IHostBuilder CreateHostBuilder() { throw null; } - protected virtual Microsoft.AspNetCore.TestHost.TestServer CreateServer(Microsoft.AspNetCore.Hosting.IWebHostBuilder builder) { throw null; } - protected virtual Microsoft.AspNetCore.Hosting.IWebHostBuilder CreateWebHostBuilder() { throw null; } - public void Dispose() { } - protected virtual void Dispose(bool disposing) { } - ~WebApplicationFactory() { } - protected virtual System.Collections.Generic.IEnumerable GetTestAssemblies() { throw null; } - public Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory WithWebHostBuilder(System.Action configuration) { throw null; } - } -} -namespace Microsoft.AspNetCore.Mvc.Testing.Handlers -{ - public partial class CookieContainerHandler : System.Net.Http.DelegatingHandler - { - public CookieContainerHandler() { } - public CookieContainerHandler(System.Net.CookieContainer cookieContainer) { } - public System.Net.CookieContainer Container { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task SendAsync(System.Net.Http.HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { throw null; } - } - public partial class RedirectHandler : System.Net.Http.DelegatingHandler - { - public RedirectHandler() { } - public RedirectHandler(int maxRedirects) { } - public int MaxRedirects { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task SendAsync(System.Net.Http.HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { throw null; } - } -} diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props b/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props deleted file mode 100644 index ea5de23302..0000000000 --- a/src/Mvc/Mvc.ViewFeatures/ref/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - $(NoWarn);CS0169 - - \ No newline at end of file diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs index f5f2f9d984..d98b825fdf 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs @@ -1,16 +1,80 @@ // 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.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] - +namespace Microsoft.AspNetCore.Components +{ + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct ServerComponent + { + private object _dummy; + private int _dummyPrimitive; + public ServerComponent(int sequence, string assemblyName, string typeName, System.Guid invocationId) { throw null; } + public string AssemblyName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Guid InvocationId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int Sequence { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string TypeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct ServerComponentMarker + { + public const string ServerMarkerType = "server"; + private object _dummy; + private int _dummyPrimitive; + public string Descriptor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string PrerenderId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int? Sequence { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Components.ServerComponentMarker GetEndRecord() { throw null; } + public static Microsoft.AspNetCore.Components.ServerComponentMarker NonPrerendered(int sequence, string descriptor) { throw null; } + public static Microsoft.AspNetCore.Components.ServerComponentMarker Prerendered(int sequence, string descriptor) { throw null; } + } + internal static partial class ServerComponentSerializationSettings + { + public static readonly System.TimeSpan DataExpiration; + public const string DataProtectionProviderPurpose = "Microsoft.AspNetCore.Components.ComponentDescriptorSerializer,V1"; + public static readonly System.Text.Json.JsonSerializerOptions JsonSerializationOptions; + } +} +namespace Microsoft.AspNetCore.Mvc.ViewComponents +{ + internal partial class DefaultViewComponentActivator : Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentActivator + { + public DefaultViewComponentActivator(Microsoft.AspNetCore.Mvc.Infrastructure.ITypeActivatorCache typeActivatorCache) { } + public object Create(Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext context) { throw null; } + public void Release(Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext context, object viewComponent) { } + } + public partial class DefaultViewComponentHelper : Microsoft.AspNetCore.Mvc.IViewComponentHelper, Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware + { + internal System.Collections.Generic.IDictionary GetArgumentDictionary(Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentDescriptor descriptor, object arguments) { throw null; } + } + internal partial class DefaultViewComponentInvokerFactory : Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvokerFactory + { + public DefaultViewComponentInvokerFactory(Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentFactory viewComponentFactory, Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentInvokerCache viewComponentInvokerCache, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvoker CreateInstance(Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext context) { throw null; } + } + internal partial class ViewComponentInvokerCache + { + public ViewComponentInvokerCache(Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentDescriptorCollectionProvider collectionProvider) { } + internal Microsoft.Extensions.Internal.ObjectMethodExecutor GetViewComponentMethodExecutor(Microsoft.AspNetCore.Mvc.ViewComponents.ViewComponentContext viewComponentContext) { throw null; } + } +} namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { + internal partial class PagedBufferedTextWriter : System.IO.TextWriter + { + public PagedBufferedTextWriter(System.Buffers.ArrayPool pool, System.IO.TextWriter inner) { } + public override System.Text.Encoding Encoding { get { throw null; } } + protected override void Dispose(bool disposing) { } + public override void Flush() { } + public override System.Threading.Tasks.Task FlushAsync() { throw null; } + public override void Write(char value) { } + public override void Write(char[] buffer) { } + public override void Write(char[] buffer, int index, int count) { } + public override void Write(string value) { } + public override System.Threading.Tasks.Task WriteAsync(char value) { throw null; } + public override System.Threading.Tasks.Task WriteAsync(char[] buffer, int index, int count) { throw null; } + public override System.Threading.Tasks.Task WriteAsync(string value) { throw null; } + } internal partial class CharArrayBufferSource : Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ICharBufferSource { public static readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.CharArrayBufferSource Instance; @@ -26,13 +90,8 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers internal partial class PagedCharBuffer { public const int PageSize = 1024; - private int _charIndex; - private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ICharBufferSource _BufferSource_k__BackingField; - private char[] _CurrentPage_k__BackingField; - private readonly System.Collections.Generic.List _Pages_k__BackingField; public PagedCharBuffer(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ICharBufferSource bufferSource) { } public Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ICharBufferSource BufferSource { get { throw null; } } - private char[] CurrentPage { get { throw null; } set { } } public int Length { get { throw null; } } public System.Collections.Generic.List Pages { get { throw null; } } public void Append(char value) { } @@ -40,8 +99,6 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers public void Append(string value) { } public void Clear() { } public void Dispose() { } - private char[] GetCurrentPage() { throw null; } - private char[] NewPage() { throw null; } } internal partial class ViewBuffer : Microsoft.AspNetCore.Html.IHtmlContentBuilder { @@ -49,47 +106,25 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers public static readonly int TagHelperPageSize; public static readonly int ViewComponentPageSize; public static readonly int ViewPageSize; - private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.IViewBufferScope _bufferScope; - private Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage _currentPage; - private System.Collections.Generic.List _multiplePages; - private readonly string _name; - private readonly int _pageSize; public ViewBuffer(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.IViewBufferScope bufferScope, string name, int pageSize) { } public int Count { get { throw null; } } public Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage this[int index] { get { throw null; } } - private void AddPage(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage page) { } public Microsoft.AspNetCore.Html.IHtmlContentBuilder Append(string unencoded) { throw null; } public Microsoft.AspNetCore.Html.IHtmlContentBuilder AppendHtml(Microsoft.AspNetCore.Html.IHtmlContent content) { throw null; } public Microsoft.AspNetCore.Html.IHtmlContentBuilder AppendHtml(string encoded) { throw null; } - private Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage AppendNewPage() { throw null; } - private void AppendValue(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue value) { } public Microsoft.AspNetCore.Html.IHtmlContentBuilder Clear() { throw null; } public void CopyTo(Microsoft.AspNetCore.Html.IHtmlContentBuilder destination) { } - private string DebuggerToString() { throw null; } - private Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferPage GetCurrentPage() { throw null; } public void MoveTo(Microsoft.AspNetCore.Html.IHtmlContentBuilder destination) { } - private void MoveTo(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer destination) { } public void WriteTo(System.IO.TextWriter writer, System.Text.Encodings.Web.HtmlEncoder encoder) { } public System.Threading.Tasks.Task WriteToAsync(System.IO.TextWriter writer, System.Text.Encodings.Web.HtmlEncoder encoder) { throw null; } - private partial class EncodingWrapper - { - private readonly string _unencoded; - public EncodingWrapper(string unencoded) { } - public void WriteTo(System.IO.TextWriter writer, System.Text.Encodings.Web.HtmlEncoder encoder) { } - } } internal partial class ViewBufferTextWriter : System.IO.TextWriter { - private readonly System.Text.Encodings.Web.HtmlEncoder _htmlEncoder; - private readonly System.IO.TextWriter _inner; - private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer _Buffer_k__BackingField; - private readonly System.Text.Encoding _Encoding_k__BackingField; - private bool _Flushed_k__BackingField; public ViewBufferTextWriter(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer buffer, System.Text.Encoding encoding) { } public ViewBufferTextWriter(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer buffer, System.Text.Encoding encoding, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, System.IO.TextWriter inner) { } public Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBuffer Buffer { get { throw null; } } public override System.Text.Encoding Encoding { get { throw null; } } - public bool Flushed { get { throw null; } private set { } } + public bool Flushed { get { throw null; } } public override void Flush() { } public override System.Threading.Tasks.Task FlushAsync() { throw null; } public void Write(Microsoft.AspNetCore.Html.IHtmlContent value) { } @@ -111,8 +146,6 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers } internal partial class ViewBufferPage { - private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue[] _Buffer_k__BackingField; - private int _Count_k__BackingField; public ViewBufferPage(Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue[] buffer) { } public Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.ViewBufferValue[] Buffer { get { throw null; } } public int Capacity { get { throw null; } } @@ -123,6 +156,71 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers } namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { + internal partial class AutoValidateAntiforgeryTokenAuthorizationFilter : Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.ValidateAntiforgeryTokenAuthorizationFilter + { + public AutoValidateAntiforgeryTokenAuthorizationFilter(Microsoft.AspNetCore.Antiforgery.IAntiforgery antiforgery, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) : base (default(Microsoft.AspNetCore.Antiforgery.IAntiforgery), default(Microsoft.Extensions.Logging.ILoggerFactory)) { } + protected override bool ShouldValidate(Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext context) { throw null; } + } + internal partial class ControllerSaveTempDataPropertyFilterFactory : Microsoft.AspNetCore.Mvc.Filters.IFilterFactory, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata + { + public ControllerSaveTempDataPropertyFilterFactory(System.Collections.Generic.IReadOnlyList properties) { } + public bool IsReusable { get { throw null; } } + public System.Collections.Generic.IReadOnlyList TempDataProperties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata CreateInstance(System.IServiceProvider serviceProvider) { throw null; } + } + internal partial class ControllerViewDataAttributeFilter : Microsoft.AspNetCore.Mvc.Filters.IActionFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.IViewDataValuesProviderFeature + { + public ControllerViewDataAttributeFilter(System.Collections.Generic.IReadOnlyList properties) { } + public System.Collections.Generic.IReadOnlyList Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public object Subject { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public void OnActionExecuted(Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext context) { } + public void OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext context) { } + public void ProvideViewDataValues(Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary viewData) { } + } + internal partial class ControllerViewDataAttributeFilterFactory : Microsoft.AspNetCore.Mvc.Filters.IFilterFactory, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata + { + public ControllerViewDataAttributeFilterFactory(System.Collections.Generic.IReadOnlyList properties) { } + public bool IsReusable { get { throw null; } } + public System.Collections.Generic.IReadOnlyList Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata CreateInstance(System.IServiceProvider serviceProvider) { throw null; } + } + internal partial class SaveTempDataFilter : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IResourceFilter, Microsoft.AspNetCore.Mvc.Filters.IResultFilter + { + internal static readonly object SaveTempDataFilterContextKey; + public SaveTempDataFilter(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory factory) { } + public void OnResourceExecuted(Microsoft.AspNetCore.Mvc.Filters.ResourceExecutedContext context) { } + public void OnResourceExecuting(Microsoft.AspNetCore.Mvc.Filters.ResourceExecutingContext context) { } + public void OnResultExecuted(Microsoft.AspNetCore.Mvc.Filters.ResultExecutedContext context) { } + public void OnResultExecuting(Microsoft.AspNetCore.Mvc.Filters.ResultExecutingContext context) { } + internal partial class SaveTempDataContext + { + public SaveTempDataContext() { } + public System.Collections.Generic.IList Filters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool RequestHasUnhandledException { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory TempDataDictionaryFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool TempDataSaved { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + } + internal partial class ControllerSaveTempDataPropertyFilter : Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.SaveTempDataPropertyFilterBase, Microsoft.AspNetCore.Mvc.Filters.IActionFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata + { + public ControllerSaveTempDataPropertyFilter(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory factory) : base (default(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory)) { } + public void OnActionExecuted(Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext context) { } + public void OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext context) { } + } + internal partial class TempDataApplicationModelProvider + { + public TempDataApplicationModelProvider(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer) { } + public int Order { get { throw null; } } + public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + } + internal partial class ValidateAntiforgeryTokenAuthorizationFilter : Microsoft.AspNetCore.Mvc.Filters.IAsyncAuthorizationFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.ViewFeatures.IAntiforgeryPolicy + { + public ValidateAntiforgeryTokenAuthorizationFilter(Microsoft.AspNetCore.Antiforgery.IAntiforgery antiforgery, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task OnAuthorizationAsync(Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext context) { throw null; } + protected virtual bool ShouldValidate(Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext context) { throw null; } + } internal partial class ViewDataAttributeApplicationModelProvider { public ViewDataAttributeApplicationModelProvider() { } @@ -145,9 +243,6 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters internal abstract partial class SaveTempDataPropertyFilterBase : Microsoft.AspNetCore.Mvc.ViewFeatures.Filters.ISaveTempDataCallback { protected readonly Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory _tempDataFactory; - private readonly System.Collections.Generic.IDictionary _OriginalValues_k__BackingField; - private System.Collections.Generic.IReadOnlyList _Properties_k__BackingField; - private object _Subject_k__BackingField; public SaveTempDataPropertyFilterBase(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory) { } public System.Collections.Generic.IDictionary OriginalValues { get { throw null; } } public System.Collections.Generic.IReadOnlyList Properties { get { throw null; } set { } } @@ -155,12 +250,9 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters public static System.Collections.Generic.IReadOnlyList GetTempDataProperties(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer, System.Type type) { throw null; } public void OnTempDataSaving(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary tempData) { } protected void SetPropertyValues(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary tempData) { } - private static bool ValidateProperty(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer, System.Collections.Generic.List errorMessages, System.Reflection.PropertyInfo property) { throw null; } } internal readonly partial struct LifecycleProperty { - private readonly object _dummy; - private readonly int _dummyPrimitive; public LifecycleProperty(System.Reflection.PropertyInfo propertyInfo, string key) { throw null; } public string Key { get { throw null; } } public System.Reflection.PropertyInfo PropertyInfo { get { throw null; } } @@ -170,13 +262,225 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters } namespace Microsoft.AspNetCore.Mvc.ViewFeatures { - internal partial class TempDataApplicationModelProvider + internal static partial class CachedExpressionCompiler { - private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer _tempDataSerializer; - public TempDataApplicationModelProvider(Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure.TempDataSerializer tempDataSerializer) { } - public int Order { get { throw null; } } - public void OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } - public void OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApplicationModels.ApplicationModelProviderContext context) { } + public static System.Func Process(System.Linq.Expressions.Expression> expression) { throw null; } + } + internal static partial class DefaultDisplayTemplates + { + public static Microsoft.AspNetCore.Html.IHtmlContent BooleanTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent CollectionTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent DecimalTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent EmailAddressTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent HiddenInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent HtmlTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent ObjectTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent StringTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + internal static System.Collections.Generic.List TriStateValues(bool? value) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent UrlTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + } + internal static partial class DefaultEditorTemplates + { + public static Microsoft.AspNetCore.Html.IHtmlContent BooleanTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent CollectionTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent DateInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent DateTimeLocalInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent DateTimeOffsetTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent DecimalTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent EmailAddressInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent FileCollectionInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent FileInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent HiddenInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent MonthInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent MultilineTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent NumberInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent ObjectTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent PasswordTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent PhoneNumberInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent StringTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent TimeInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent UrlInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + public static Microsoft.AspNetCore.Html.IHtmlContent WeekInputTemplate(Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper htmlHelper) { throw null; } + } + internal static partial class ExpressionHelper + { + public static string GetExpressionText(System.Linq.Expressions.LambdaExpression expression, System.Collections.Concurrent.ConcurrentDictionary expressionTextCache) { throw null; } + public static string GetUncachedExpressionText(System.Linq.Expressions.LambdaExpression expression) { throw null; } + public static bool IsSingleArgumentIndexer(System.Linq.Expressions.Expression expression) { throw null; } + } + internal static partial class ExpressionMetadataProvider + { + public static Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer FromLambdaExpression(System.Linq.Expressions.Expression> expression, Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary viewData, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider) { throw null; } + public static Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer FromStringExpression(string expression, Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary viewData, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider) { throw null; } + } + internal partial class HtmlAttributePropertyHelper : Microsoft.Extensions.Internal.PropertyHelper + { + public HtmlAttributePropertyHelper(System.Reflection.PropertyInfo property) : base (default(System.Reflection.PropertyInfo)) { } + public override string Name { get { throw null; } protected set { } } + public static new Microsoft.Extensions.Internal.PropertyHelper[] GetProperties(System.Type type) { throw null; } + } + internal partial class HttpNavigationManager : Microsoft.AspNetCore.Components.NavigationManager, Microsoft.AspNetCore.Components.Routing.IHostEnvironmentNavigationManager + { + public HttpNavigationManager() { } + void Microsoft.AspNetCore.Components.Routing.IHostEnvironmentNavigationManager.Initialize(string baseUri, string uri) { } + protected override void NavigateToCore(string uri, bool forceLoad) { } + } + internal partial class LambdaExpressionComparer : System.Collections.Generic.IEqualityComparer + { + public static readonly Microsoft.AspNetCore.Mvc.ViewFeatures.LambdaExpressionComparer Instance; + public LambdaExpressionComparer() { } + public bool Equals(System.Linq.Expressions.LambdaExpression lambdaExpression1, System.Linq.Expressions.LambdaExpression lambdaExpression2) { throw null; } + public int GetHashCode(System.Linq.Expressions.LambdaExpression lambdaExpression) { throw null; } + } + internal partial class MemberExpressionCacheKeyComparer : System.Collections.Generic.IEqualityComparer + { + public static readonly Microsoft.AspNetCore.Mvc.ViewFeatures.MemberExpressionCacheKeyComparer Instance; + public MemberExpressionCacheKeyComparer() { } + public bool Equals(Microsoft.AspNetCore.Mvc.ViewFeatures.MemberExpressionCacheKey x, Microsoft.AspNetCore.Mvc.ViewFeatures.MemberExpressionCacheKey y) { throw null; } + public int GetHashCode(Microsoft.AspNetCore.Mvc.ViewFeatures.MemberExpressionCacheKey obj) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct MemberExpressionCacheKey + { + public MemberExpressionCacheKey(System.Type modelType, System.Linq.Expressions.MemberExpression memberExpression) { throw null; } + public MemberExpressionCacheKey(System.Type modelType, System.Reflection.MemberInfo[] members) { throw null; } + public System.Linq.Expressions.MemberExpression MemberExpression { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Reflection.MemberInfo[] Members { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Type ModelType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Mvc.ViewFeatures.MemberExpressionCacheKey.Enumerator GetEnumerator() { throw null; } + public Microsoft.AspNetCore.Mvc.ViewFeatures.MemberExpressionCacheKey MakeCacheable() { throw null; } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public partial struct Enumerator + { + private readonly System.Reflection.MemberInfo[] _members; + private int _index; + public Enumerator(in Microsoft.AspNetCore.Mvc.ViewFeatures.MemberExpressionCacheKey key) { throw null; } + public System.Reflection.MemberInfo Current { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool MoveNext() { throw null; } + } + } + internal static partial class Resources + { + internal static string ArgumentCannotBeNullOrEmpty { get { throw null; } } + internal static string ArgumentPropertyUnexpectedType { get { throw null; } } + internal static string Common_PartialViewNotFound { get { throw null; } } + internal static string Common_PropertyNotFound { get { throw null; } } + internal static string Common_TriState_False { get { throw null; } } + internal static string Common_TriState_NotSet { get { throw null; } } + internal static string Common_TriState_True { get { throw null; } } + internal static string CreateModelExpression_NullModelMetadata { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static string DeserializingTempData { get { throw null; } } + internal static string Dictionary_DuplicateKey { get { throw null; } } + internal static string DynamicViewData_ViewDataNull { get { throw null; } } + internal static string ExpressionHelper_InvalidIndexerExpression { get { throw null; } } + internal static string HtmlGenerator_FieldNameCannotBeNullOrEmpty { get { throw null; } } + internal static string HtmlHelper_MissingSelectData { get { throw null; } } + internal static string HtmlHelper_NotContextualized { get { throw null; } } + internal static string HtmlHelper_NullModelMetadata { get { throw null; } } + internal static string HtmlHelper_SelectExpressionNotEnumerable { get { throw null; } } + internal static string HtmlHelper_TextAreaParameterOutOfRange { get { throw null; } } + internal static string HtmlHelper_TypeNotSupported_ForGetEnumSelectList { get { throw null; } } + internal static string HtmlHelper_WrongSelectDataType { get { throw null; } } + internal static string PropertyOfTypeCannotBeNull { get { throw null; } } + internal static string RemoteAttribute_NoUrlFound { get { throw null; } } + internal static string RemoteAttribute_RemoteValidationFailed { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string SerializingTempData { get { throw null; } } + internal static string TempDataProperties_InvalidType { get { throw null; } } + internal static string TempDataProperties_PublicGetterSetter { get { throw null; } } + internal static string TempData_CannotDeserializeType { get { throw null; } } + internal static string TempData_CannotSerializeType { get { throw null; } } + internal static string TemplatedExpander_PopulateValuesMustBeInvokedFirst { get { throw null; } } + internal static string TemplatedExpander_ValueFactoryCannotReturnNull { get { throw null; } } + internal static string TemplatedViewLocationExpander_NoReplacementToken { get { throw null; } } + internal static string TemplateHelpers_NoTemplate { get { throw null; } } + internal static string TemplateHelpers_TemplateLimitations { get { throw null; } } + internal static string Templates_TypeMustImplementIEnumerable { get { throw null; } } + internal static string TypeMethodMustReturnNotNullValue { get { throw null; } } + internal static string TypeMustDeriveFromType { get { throw null; } } + internal static string UnobtrusiveJavascript_ValidationParameterCannotBeEmpty { get { throw null; } } + internal static string UnobtrusiveJavascript_ValidationParameterMustBeLegal { get { throw null; } } + internal static string UnobtrusiveJavascript_ValidationTypeCannotBeEmpty { get { throw null; } } + internal static string UnobtrusiveJavascript_ValidationTypeMustBeLegal { get { throw null; } } + internal static string UnobtrusiveJavascript_ValidationTypeMustBeUnique { get { throw null; } } + internal static string ValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated { get { throw null; } } + internal static string ViewComponentResult_NameOrTypeMustBeSet { get { throw null; } } + internal static string ViewComponent_AmbiguousMethods { get { throw null; } } + internal static string ViewComponent_AmbiguousTypeMatch { get { throw null; } } + internal static string ViewComponent_AmbiguousTypeMatch_Item { get { throw null; } } + internal static string ViewComponent_AsyncMethod_ShouldReturnTask { get { throw null; } } + internal static string ViewComponent_CannotFindComponent { get { throw null; } } + internal static string ViewComponent_CannotFindMethod { get { throw null; } } + internal static string ViewComponent_InvalidReturnValue { get { throw null; } } + internal static string ViewComponent_IViewComponentFactory_ReturnedNull { get { throw null; } } + internal static string ViewComponent_MustReturnValue { get { throw null; } } + internal static string ViewComponent_SyncMethod_CannotReturnTask { get { throw null; } } + internal static string ViewComponent_SyncMethod_ShouldReturnValue { get { throw null; } } + internal static string ViewData_ModelCannotBeNull { get { throw null; } } + internal static string ViewData_WrongTModelType { get { throw null; } } + internal static string ViewEnginesAreRequired { get { throw null; } } + internal static string ViewEngine_PartialViewNotFound { get { throw null; } } + internal static string ViewEngine_ViewNotFound { get { throw null; } } + internal static string FormatArgumentPropertyUnexpectedType(object p0, object p1, object p2) { throw null; } + internal static string FormatCommon_PartialViewNotFound(object p0, object p1) { throw null; } + internal static string FormatCommon_PropertyNotFound(object p0, object p1) { throw null; } + internal static string FormatCreateModelExpression_NullModelMetadata(object p0, object p1) { throw null; } + internal static string FormatDictionary_DuplicateKey(object p0) { throw null; } + internal static string FormatExpressionHelper_InvalidIndexerExpression(object p0, object p1) { throw null; } + internal static string FormatHtmlGenerator_FieldNameCannotBeNullOrEmpty(object p0, object p1, object p2, object p3, object p4) { throw null; } + internal static string FormatHtmlHelper_MissingSelectData(object p0, object p1) { throw null; } + internal static string FormatHtmlHelper_NullModelMetadata(object p0) { throw null; } + internal static string FormatHtmlHelper_SelectExpressionNotEnumerable(object p0) { throw null; } + internal static string FormatHtmlHelper_TypeNotSupported_ForGetEnumSelectList(object p0, object p1, object p2) { throw null; } + internal static string FormatHtmlHelper_WrongSelectDataType(object p0, object p1, object p2) { throw null; } + internal static string FormatPropertyOfTypeCannotBeNull(object p0, object p1) { throw null; } + internal static string FormatRemoteAttribute_RemoteValidationFailed(object p0) { throw null; } + internal static string FormatTempDataProperties_InvalidType(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatTempDataProperties_PublicGetterSetter(object p0, object p1, object p2) { throw null; } + internal static string FormatTempData_CannotDeserializeType(object p0) { throw null; } + internal static string FormatTempData_CannotSerializeType(object p0, object p1) { throw null; } + internal static string FormatTemplatedExpander_PopulateValuesMustBeInvokedFirst(object p0, object p1) { throw null; } + internal static string FormatTemplatedViewLocationExpander_NoReplacementToken(object p0) { throw null; } + internal static string FormatTemplateHelpers_NoTemplate(object p0) { throw null; } + internal static string FormatTemplates_TypeMustImplementIEnumerable(object p0, object p1, object p2) { throw null; } + internal static string FormatTypeMethodMustReturnNotNullValue(object p0, object p1) { throw null; } + internal static string FormatTypeMustDeriveFromType(object p0, object p1) { throw null; } + internal static string FormatUnobtrusiveJavascript_ValidationParameterCannotBeEmpty(object p0) { throw null; } + internal static string FormatUnobtrusiveJavascript_ValidationParameterMustBeLegal(object p0, object p1) { throw null; } + internal static string FormatUnobtrusiveJavascript_ValidationTypeCannotBeEmpty(object p0) { throw null; } + internal static string FormatUnobtrusiveJavascript_ValidationTypeMustBeLegal(object p0, object p1) { throw null; } + internal static string FormatUnobtrusiveJavascript_ValidationTypeMustBeUnique(object p0) { throw null; } + internal static string FormatValueInterfaceAbstractOrOpenGenericTypesCannotBeActivated(object p0, object p1) { throw null; } + internal static string FormatViewComponentResult_NameOrTypeMustBeSet(object p0, object p1) { throw null; } + internal static string FormatViewComponent_AmbiguousMethods(object p0, object p1, object p2) { throw null; } + internal static string FormatViewComponent_AmbiguousTypeMatch(object p0, object p1, object p2) { throw null; } + internal static string FormatViewComponent_AmbiguousTypeMatch_Item(object p0, object p1) { throw null; } + internal static string FormatViewComponent_AsyncMethod_ShouldReturnTask(object p0, object p1, object p2) { throw null; } + internal static string FormatViewComponent_CannotFindComponent(object p0, object p1, object p2, object p3) { throw null; } + internal static string FormatViewComponent_CannotFindMethod(object p0, object p1, object p2) { throw null; } + internal static string FormatViewComponent_InvalidReturnValue(object p0, object p1, object p2) { throw null; } + internal static string FormatViewComponent_IViewComponentFactory_ReturnedNull(object p0) { throw null; } + internal static string FormatViewComponent_SyncMethod_CannotReturnTask(object p0, object p1, object p2) { throw null; } + internal static string FormatViewComponent_SyncMethod_ShouldReturnValue(object p0, object p1) { throw null; } + internal static string FormatViewData_ModelCannotBeNull(object p0) { throw null; } + internal static string FormatViewData_WrongTModelType(object p0, object p1) { throw null; } + internal static string FormatViewEnginesAreRequired(object p0, object p1, object p2) { throw null; } + internal static string FormatViewEngine_PartialViewNotFound(object p0, object p1) { throw null; } + internal static string FormatViewEngine_ViewNotFound(object p0, object p1) { throw null; } + } + internal partial class ServerComponentInvocationSequence + { + public ServerComponentInvocationSequence() { } + public System.Guid Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int Next() { throw null; } + } + internal partial class ServerComponentSerializer + { + public ServerComponentSerializer(Microsoft.AspNetCore.DataProtection.IDataProtectionProvider dataProtectionProvider) { } + internal System.Collections.Generic.IEnumerable GetEpilogue(Microsoft.AspNetCore.Components.ServerComponentMarker record) { throw null; } + internal System.Collections.Generic.IEnumerable GetPreamble(Microsoft.AspNetCore.Components.ServerComponentMarker record) { throw null; } + public Microsoft.AspNetCore.Components.ServerComponentMarker SerializeInvocation(Microsoft.AspNetCore.Mvc.ViewFeatures.ServerComponentInvocationSequence invocationId, System.Type type, bool prerendered) { throw null; } } internal partial class NullView : Microsoft.AspNetCore.Mvc.ViewEngines.IView { @@ -187,33 +491,35 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures } internal partial class TemplateRenderer { - private const string DisplayTemplateViewPath = "DisplayTemplates"; - private const string EditorTemplateViewPath = "EditorTemplates"; public const string IEnumerableOfIFormFileName = "IEnumerable`IFormFile"; - private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.IViewBufferScope _bufferScope; - private static readonly System.Collections.Generic.Dictionary> _defaultDisplayActions; - private static readonly System.Collections.Generic.Dictionary> _defaultEditorActions; - private readonly bool _readOnly; - private readonly string _templateName; - private readonly Microsoft.AspNetCore.Mvc.Rendering.ViewContext _viewContext; - private readonly Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary _viewData; - private readonly Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine _viewEngine; public TemplateRenderer(Microsoft.AspNetCore.Mvc.ViewEngines.IViewEngine viewEngine, Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers.IViewBufferScope bufferScope, Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext, Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary viewData, string templateName, bool readOnly) { } - private System.Collections.Generic.Dictionary> GetDefaultActions() { throw null; } public static System.Collections.Generic.IEnumerable GetTypeNames(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata, System.Type fieldType) { throw null; } - private System.Collections.Generic.IEnumerable GetViewNames() { throw null; } - private static Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper MakeHtmlHelper(Microsoft.AspNetCore.Mvc.Rendering.ViewContext viewContext, Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary viewData) { throw null; } public Microsoft.AspNetCore.Html.IHtmlContent Render() { throw null; } } internal static partial class FormatWeekHelper { public static string GetFormattedWeek(Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExplorer modelExplorer) { throw null; } } + internal partial class UnsupportedJavaScriptRuntime : Microsoft.JSInterop.IJSRuntime + { + public UnsupportedJavaScriptRuntime() { } + public System.Threading.Tasks.ValueTask InvokeAsync(string identifier, System.Threading.CancellationToken cancellationToken, object[] args) { throw null; } + System.Threading.Tasks.ValueTask Microsoft.JSInterop.IJSRuntime.InvokeAsync(string identifier, object[] args) { throw null; } + } + public partial class ViewDataDictionary : System.Collections.Generic.ICollection>, System.Collections.Generic.IDictionary, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + { + internal ViewDataDictionary(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider) { } + internal System.Collections.Generic.IDictionary Data { get { throw null; } } + } internal static partial class ViewDataDictionaryFactory { public static System.Func CreateFactory(System.Reflection.TypeInfo modelType) { throw null; } public static System.Func CreateNestedFactory(System.Reflection.TypeInfo modelType) { throw null; } } + public partial class ViewDataDictionary : Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary + { + internal ViewDataDictionary(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider) : base (default(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider), default(Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary)) { } + } } namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure { @@ -222,29 +528,35 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Infrastructure public DefaultTempDataSerializer() { } public override bool CanSerializeType(System.Type type) { throw null; } public override System.Collections.Generic.IDictionary Deserialize(byte[] value) { throw null; } - private static object DeserializeArray(in System.Text.Json.JsonElement arrayElement) { throw null; } - private System.Collections.Generic.IDictionary DeserializeDictionary(System.Text.Json.JsonElement rootElement) { throw null; } - private static object DeserializeDictionaryEntry(in System.Text.Json.JsonElement objectElement) { throw null; } public override byte[] Serialize(System.Collections.Generic.IDictionary values) { throw null; } } } +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.RazorComponents +{ + internal partial class StaticComponentRenderer + { + public StaticComponentRenderer(System.Text.Encodings.Web.HtmlEncoder encoder) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task> PrerenderComponentAsync(Microsoft.AspNetCore.Components.ParameterView parameters, Microsoft.AspNetCore.Http.HttpContext httpContext, System.Type componentType) { throw null; } + } +} namespace Microsoft.AspNetCore.Mvc.Rendering { internal partial class SystemTextJsonHelper : Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper { - private readonly System.Text.Json.JsonSerializerOptions _htmlSafeJsonSerializerOptions; public SystemTextJsonHelper(Microsoft.Extensions.Options.IOptions options) { } - private static System.Text.Json.JsonSerializerOptions GetHtmlSafeSerializerOptions(System.Text.Json.JsonSerializerOptions serializerOptions) { throw null; } public Microsoft.AspNetCore.Html.IHtmlContent Serialize(object value) { throw null; } } } namespace Microsoft.Extensions.DependencyInjection { + public static partial class MvcViewFeaturesMvcCoreBuilderExtensions + { + internal static void AddViewComponentApplicationPartsProviders(Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartManager manager) { } + internal static void AddViewServices(Microsoft.Extensions.DependencyInjection.IServiceCollection services) { } + } internal partial class MvcViewOptionsSetup { - private readonly Microsoft.Extensions.Options.IOptions _dataAnnotationsLocalizationOptions; - private readonly Microsoft.Extensions.Localization.IStringLocalizerFactory _stringLocalizerFactory; - private readonly Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; public MvcViewOptionsSetup(Microsoft.Extensions.Options.IOptions dataAnnotationLocalizationOptions, Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider) { } public MvcViewOptionsSetup(Microsoft.Extensions.Options.IOptions dataAnnotationOptions, Microsoft.AspNetCore.Mvc.DataAnnotations.IValidationAttributeAdapterProvider validationAttributeAdapterProvider, Microsoft.Extensions.Localization.IStringLocalizerFactory stringLocalizerFactory) { } public void Configure(Microsoft.AspNetCore.Mvc.MvcViewOptions options) { } @@ -254,4 +566,23 @@ namespace Microsoft.Extensions.DependencyInjection public TempDataMvcOptionsSetup() { } public void Configure(Microsoft.AspNetCore.Mvc.MvcOptions options) { } } +} +namespace Microsoft.AspNetCore.Components.Rendering +{ + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct ComponentRenderedText + { + public ComponentRenderedText(int componentId, System.Collections.Generic.IEnumerable tokens) { throw null; } + public int ComponentId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IEnumerable Tokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class HtmlRenderer : Microsoft.AspNetCore.Components.RenderTree.Renderer + { + public HtmlRenderer(System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, System.Func htmlEncoder) : base (default(System.IServiceProvider), default(Microsoft.Extensions.Logging.ILoggerFactory)) { } + public override Microsoft.AspNetCore.Components.Dispatcher Dispatcher { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + protected override void HandleException(System.Exception exception) { } + public System.Threading.Tasks.Task RenderComponentAsync(System.Type componentType, Microsoft.AspNetCore.Components.ParameterView initialParameters) { throw null; } + public System.Threading.Tasks.Task RenderComponentAsync(Microsoft.AspNetCore.Components.ParameterView initialParameters) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; } + protected override System.Threading.Tasks.Task UpdateDisplayAsync(in Microsoft.AspNetCore.Components.RenderTree.RenderBatch renderBatch) { throw null; } + } } \ No newline at end of file diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj index 3746041b8b..88ff1d6461 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -2,20 +2,19 @@ netcoreapp3.0 - false - - - - - - - - - - + + + + + + + + + + diff --git a/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj index 17a5090169..afd82bddb0 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -34,7 +34,6 @@ - diff --git a/src/Mvc/Mvc/ref/Microsoft.AspNetCore.Mvc.csproj b/src/Mvc/Mvc/ref/Microsoft.AspNetCore.Mvc.csproj index 1d94cff584..2f5127fe09 100644 --- a/src/Mvc/Mvc/ref/Microsoft.AspNetCore.Mvc.csproj +++ b/src/Mvc/Mvc/ref/Microsoft.AspNetCore.Mvc.csproj @@ -2,20 +2,19 @@ netcoreapp3.0 - false - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Mvc/test/WebSites/Directory.Build.props b/src/Mvc/test/WebSites/Directory.Build.props index 74f5a5de5a..16d5bfcfea 100644 --- a/src/Mvc/test/WebSites/Directory.Build.props +++ b/src/Mvc/test/WebSites/Directory.Build.props @@ -4,11 +4,4 @@ - - - - - diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index 6e78a1593e..e425aa51e2 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -4,7 +4,7 @@ DependsOnTargets="PrepareForTest" Condition="$(DesignTimeBuild) != true"> - + GetChildContentAsync(bool useCachedResult, System.Text.Encodings.Web.HtmlEncoder encoder) { throw null; } + } +} diff --git a/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj b/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj index b93f53387b..a7a39e6233 100644 --- a/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj +++ b/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj @@ -2,13 +2,12 @@ netcoreapp3.0 - false - - - + + + diff --git a/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.Manual.cs b/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.Manual.cs new file mode 100644 index 0000000000..3d7f56290c --- /dev/null +++ b/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.Manual.cs @@ -0,0 +1,10 @@ +// 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. + +namespace Microsoft.AspNetCore.Razor.TagHelpers +{ + public partial class TagHelperOutput : Microsoft.AspNetCore.Html.IHtmlContent, Microsoft.AspNetCore.Html.IHtmlContentContainer + { + internal TagHelperOutput(string tagName) { } + } +} diff --git a/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj b/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj index 2138edbbf9..15a0a08863 100644 --- a/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj +++ b/src/Razor/Razor/ref/Microsoft.AspNetCore.Razor.csproj @@ -2,12 +2,12 @@ netcoreapp3.0 - false - - - + + + + diff --git a/src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.csproj b/src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.csproj deleted file mode 100644 index 3cf6d51079..0000000000 --- a/src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - netcoreapp3.0 - - - - - - diff --git a/src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.netcoreapp3.0.cs b/src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.netcoreapp3.0.cs deleted file mode 100644 index 7fa9e147ab..0000000000 --- a/src/Security/Authentication/Certificate/ref/Microsoft.AspNetCore.Authentication.Certificate.netcoreapp3.0.cs +++ /dev/null @@ -1,59 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Authentication.Certificate -{ - public static partial class CertificateAuthenticationDefaults - { - public const string AuthenticationScheme = "Certificate"; - } - public partial class CertificateAuthenticationEvents - { - public CertificateAuthenticationEvents() { } - public System.Func OnAuthenticationFailed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnCertificateValidated { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task AuthenticationFailed(Microsoft.AspNetCore.Authentication.Certificate.CertificateAuthenticationFailedContext context) { throw null; } - public virtual System.Threading.Tasks.Task CertificateValidated(Microsoft.AspNetCore.Authentication.Certificate.CertificateValidatedContext context) { throw null; } - } - public partial class CertificateAuthenticationFailedContext : Microsoft.AspNetCore.Authentication.ResultContext - { - public CertificateAuthenticationFailedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.Certificate.CertificateAuthenticationOptions options) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.Certificate.CertificateAuthenticationOptions)) { } - public System.Exception Exception { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class CertificateAuthenticationOptions : Microsoft.AspNetCore.Authentication.AuthenticationSchemeOptions - { - public CertificateAuthenticationOptions() { } - public Microsoft.AspNetCore.Authentication.Certificate.CertificateTypes AllowedCertificateTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public new Microsoft.AspNetCore.Authentication.Certificate.CertificateAuthenticationEvents Events { get { throw null; } set { } } - public System.Security.Cryptography.X509Certificates.X509RevocationFlag RevocationFlag { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Security.Cryptography.X509Certificates.X509RevocationMode RevocationMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ValidateCertificateUse { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool ValidateValidityPeriod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - [System.FlagsAttribute] - public enum CertificateTypes - { - Chained = 1, - SelfSigned = 2, - All = 3, - } - public partial class CertificateValidatedContext : Microsoft.AspNetCore.Authentication.ResultContext - { - public CertificateValidatedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.Certificate.CertificateAuthenticationOptions options) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.Certificate.CertificateAuthenticationOptions)) { } - public System.Security.Cryptography.X509Certificates.X509Certificate2 ClientCertificate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public static partial class X509Certificate2Extensions - { - public static bool IsSelfSigned(this System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { throw null; } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class CertificateAuthenticationAppBuilderExtensions - { - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddCertificate(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddCertificate(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddCertificate(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddCertificate(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, System.Action configureOptions) { throw null; } - } -} diff --git a/src/Security/Authentication/Cookies/ref/Microsoft.AspNetCore.Authentication.Cookies.csproj b/src/Security/Authentication/Cookies/ref/Microsoft.AspNetCore.Authentication.Cookies.csproj index 30f48fd466..9ce1cdafdc 100644 --- a/src/Security/Authentication/Cookies/ref/Microsoft.AspNetCore.Authentication.Cookies.csproj +++ b/src/Security/Authentication/Cookies/ref/Microsoft.AspNetCore.Authentication.Cookies.csproj @@ -2,11 +2,9 @@ netcoreapp3.0 - false - - + diff --git a/src/Security/Authentication/Core/ref/Microsoft.AspNetCore.Authentication.csproj b/src/Security/Authentication/Core/ref/Microsoft.AspNetCore.Authentication.csproj index d210d921c5..e82c5941f5 100644 --- a/src/Security/Authentication/Core/ref/Microsoft.AspNetCore.Authentication.csproj +++ b/src/Security/Authentication/Core/ref/Microsoft.AspNetCore.Authentication.csproj @@ -2,17 +2,15 @@ netcoreapp3.0 - false - - - - - - - - + + + + + + + diff --git a/src/Security/Authentication/Facebook/ref/Microsoft.AspNetCore.Authentication.Facebook.csproj b/src/Security/Authentication/Facebook/ref/Microsoft.AspNetCore.Authentication.Facebook.csproj deleted file mode 100644 index 1ca1d64597..0000000000 --- a/src/Security/Authentication/Facebook/ref/Microsoft.AspNetCore.Authentication.Facebook.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - netcoreapp3.0 - - - - - - diff --git a/src/Security/Authentication/Facebook/ref/Microsoft.AspNetCore.Authentication.Facebook.netcoreapp3.0.cs b/src/Security/Authentication/Facebook/ref/Microsoft.AspNetCore.Authentication.Facebook.netcoreapp3.0.cs deleted file mode 100644 index 32da964494..0000000000 --- a/src/Security/Authentication/Facebook/ref/Microsoft.AspNetCore.Authentication.Facebook.netcoreapp3.0.cs +++ /dev/null @@ -1,41 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Authentication.Facebook -{ - public static partial class FacebookDefaults - { - public const string AuthenticationScheme = "Facebook"; - public static readonly string AuthorizationEndpoint; - public static readonly string DisplayName; - public static readonly string TokenEndpoint; - public static readonly string UserInformationEndpoint; - } - public partial class FacebookHandler : Microsoft.AspNetCore.Authentication.OAuth.OAuthHandler - { - public FacebookHandler(Microsoft.Extensions.Options.IOptionsMonitor options, Microsoft.Extensions.Logging.ILoggerFactory logger, System.Text.Encodings.Web.UrlEncoder encoder, Microsoft.AspNetCore.Authentication.ISystemClock clock) : base (default(Microsoft.Extensions.Options.IOptionsMonitor), default(Microsoft.Extensions.Logging.ILoggerFactory), default(System.Text.Encodings.Web.UrlEncoder), default(Microsoft.AspNetCore.Authentication.ISystemClock)) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task CreateTicketAsync(System.Security.Claims.ClaimsIdentity identity, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties, Microsoft.AspNetCore.Authentication.OAuth.OAuthTokenResponse tokens) { throw null; } - protected override string FormatScope() { throw null; } - protected override string FormatScope(System.Collections.Generic.IEnumerable scopes) { throw null; } - } - public partial class FacebookOptions : Microsoft.AspNetCore.Authentication.OAuth.OAuthOptions - { - public FacebookOptions() { } - public string AppId { get { throw null; } set { } } - public string AppSecret { get { throw null; } set { } } - public System.Collections.Generic.ICollection Fields { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool SendAppSecretProof { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public override void Validate() { } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class FacebookAuthenticationOptionsExtensions - { - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddFacebook(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddFacebook(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddFacebook(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddFacebook(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, string displayName, System.Action configureOptions) { throw null; } - } -} diff --git a/src/Security/Authentication/Google/ref/Microsoft.AspNetCore.Authentication.Google.csproj b/src/Security/Authentication/Google/ref/Microsoft.AspNetCore.Authentication.Google.csproj deleted file mode 100644 index 117e3a54ed..0000000000 --- a/src/Security/Authentication/Google/ref/Microsoft.AspNetCore.Authentication.Google.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - netcoreapp3.0 - - - - - - diff --git a/src/Security/Authentication/Google/ref/Microsoft.AspNetCore.Authentication.Google.netcoreapp3.0.cs b/src/Security/Authentication/Google/ref/Microsoft.AspNetCore.Authentication.Google.netcoreapp3.0.cs deleted file mode 100644 index 1346c4378a..0000000000 --- a/src/Security/Authentication/Google/ref/Microsoft.AspNetCore.Authentication.Google.netcoreapp3.0.cs +++ /dev/null @@ -1,52 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Authentication.Google -{ - public partial class GoogleChallengeProperties : Microsoft.AspNetCore.Authentication.OAuth.OAuthChallengeProperties - { - public static readonly string AccessTypeKey; - public static readonly string ApprovalPromptKey; - public static readonly string IncludeGrantedScopesKey; - public static readonly string LoginHintKey; - public static readonly string PromptParameterKey; - public GoogleChallengeProperties() { } - public GoogleChallengeProperties(System.Collections.Generic.IDictionary items) { } - public GoogleChallengeProperties(System.Collections.Generic.IDictionary items, System.Collections.Generic.IDictionary parameters) { } - public string AccessType { get { throw null; } set { } } - public string ApprovalPrompt { get { throw null; } set { } } - public bool? IncludeGrantedScopes { get { throw null; } set { } } - public string LoginHint { get { throw null; } set { } } - public string Prompt { get { throw null; } set { } } - } - public static partial class GoogleDefaults - { - public const string AuthenticationScheme = "Google"; - public static readonly string AuthorizationEndpoint; - public static readonly string DisplayName; - public static readonly string TokenEndpoint; - public static readonly string UserInformationEndpoint; - } - public partial class GoogleHandler : Microsoft.AspNetCore.Authentication.OAuth.OAuthHandler - { - public GoogleHandler(Microsoft.Extensions.Options.IOptionsMonitor options, Microsoft.Extensions.Logging.ILoggerFactory logger, System.Text.Encodings.Web.UrlEncoder encoder, Microsoft.AspNetCore.Authentication.ISystemClock clock) : base (default(Microsoft.Extensions.Options.IOptionsMonitor), default(Microsoft.Extensions.Logging.ILoggerFactory), default(System.Text.Encodings.Web.UrlEncoder), default(Microsoft.AspNetCore.Authentication.ISystemClock)) { } - protected override string BuildChallengeUrl(Microsoft.AspNetCore.Authentication.AuthenticationProperties properties, string redirectUri) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task CreateTicketAsync(System.Security.Claims.ClaimsIdentity identity, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties, Microsoft.AspNetCore.Authentication.OAuth.OAuthTokenResponse tokens) { throw null; } - } - public partial class GoogleOptions : Microsoft.AspNetCore.Authentication.OAuth.OAuthOptions - { - public GoogleOptions() { } - public string AccessType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class GoogleExtensions - { - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddGoogle(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddGoogle(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddGoogle(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddGoogle(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, string displayName, System.Action configureOptions) { throw null; } - } -} diff --git a/src/Security/Authentication/JwtBearer/ref/Microsoft.AspNetCore.Authentication.JwtBearer.csproj b/src/Security/Authentication/JwtBearer/ref/Microsoft.AspNetCore.Authentication.JwtBearer.csproj deleted file mode 100644 index f42ba44fe1..0000000000 --- a/src/Security/Authentication/JwtBearer/ref/Microsoft.AspNetCore.Authentication.JwtBearer.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - diff --git a/src/Security/Authentication/JwtBearer/ref/Microsoft.AspNetCore.Authentication.JwtBearer.netcoreapp3.0.cs b/src/Security/Authentication/JwtBearer/ref/Microsoft.AspNetCore.Authentication.JwtBearer.netcoreapp3.0.cs deleted file mode 100644 index 8864d2ebad..0000000000 --- a/src/Security/Authentication/JwtBearer/ref/Microsoft.AspNetCore.Authentication.JwtBearer.netcoreapp3.0.cs +++ /dev/null @@ -1,98 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Authentication.JwtBearer -{ - public partial class AuthenticationFailedContext : Microsoft.AspNetCore.Authentication.ResultContext - { - public AuthenticationFailedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions options) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions)) { } - public System.Exception Exception { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class ForbiddenContext : Microsoft.AspNetCore.Authentication.ResultContext - { - public ForbiddenContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions options) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions)) { } - } - public partial class JwtBearerChallengeContext : Microsoft.AspNetCore.Authentication.PropertiesContext - { - public JwtBearerChallengeContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions options, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public System.Exception AuthenticateFailure { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Error { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ErrorDescription { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ErrorUri { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool Handled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public void HandleResponse() { } - } - public static partial class JwtBearerDefaults - { - public const string AuthenticationScheme = "Bearer"; - } - public partial class JwtBearerEvents - { - public JwtBearerEvents() { } - public System.Func OnAuthenticationFailed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnChallenge { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnForbidden { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnMessageReceived { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnTokenValidated { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task AuthenticationFailed(Microsoft.AspNetCore.Authentication.JwtBearer.AuthenticationFailedContext context) { throw null; } - public virtual System.Threading.Tasks.Task Challenge(Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerChallengeContext context) { throw null; } - public virtual System.Threading.Tasks.Task Forbidden(Microsoft.AspNetCore.Authentication.JwtBearer.ForbiddenContext context) { throw null; } - public virtual System.Threading.Tasks.Task MessageReceived(Microsoft.AspNetCore.Authentication.JwtBearer.MessageReceivedContext context) { throw null; } - public virtual System.Threading.Tasks.Task TokenValidated(Microsoft.AspNetCore.Authentication.JwtBearer.TokenValidatedContext context) { throw null; } - } - public partial class JwtBearerHandler : Microsoft.AspNetCore.Authentication.AuthenticationHandler - { - public JwtBearerHandler(Microsoft.Extensions.Options.IOptionsMonitor options, Microsoft.Extensions.Logging.ILoggerFactory logger, System.Text.Encodings.Web.UrlEncoder encoder, Microsoft.AspNetCore.Authentication.ISystemClock clock) : base (default(Microsoft.Extensions.Options.IOptionsMonitor), default(Microsoft.Extensions.Logging.ILoggerFactory), default(System.Text.Encodings.Web.UrlEncoder), default(Microsoft.AspNetCore.Authentication.ISystemClock)) { } - protected new Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerEvents Events { get { throw null; } set { } } - protected override System.Threading.Tasks.Task CreateEventsAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task HandleAuthenticateAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task HandleChallengeAsync(Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) { throw null; } - protected override System.Threading.Tasks.Task HandleForbiddenAsync(Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) { throw null; } - } - public partial class JwtBearerOptions : Microsoft.AspNetCore.Authentication.AuthenticationSchemeOptions - { - public JwtBearerOptions() { } - public string Audience { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Authority { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.Http.HttpMessageHandler BackchannelHttpHandler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan BackchannelTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Challenge { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectConfiguration Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.IConfigurationManager ConfigurationManager { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public new Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerEvents Events { get { throw null; } set { } } - public bool IncludeErrorDetails { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string MetadataAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RefreshOnIssuerKeyNotFound { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RequireHttpsMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SaveToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IList SecurityTokenValidators { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.IdentityModel.Tokens.TokenValidationParameters TokenValidationParameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class JwtBearerPostConfigureOptions : Microsoft.Extensions.Options.IPostConfigureOptions - { - public JwtBearerPostConfigureOptions() { } - public void PostConfigure(string name, Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions options) { } - } - public partial class MessageReceivedContext : Microsoft.AspNetCore.Authentication.ResultContext - { - public MessageReceivedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions options) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions)) { } - public string Token { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class TokenValidatedContext : Microsoft.AspNetCore.Authentication.ResultContext - { - public TokenValidatedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions options) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.JwtBearer.JwtBearerOptions)) { } - public Microsoft.IdentityModel.Tokens.SecurityToken SecurityToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class JwtBearerExtensions - { - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddJwtBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddJwtBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddJwtBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddJwtBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, string displayName, System.Action configureOptions) { throw null; } - } -} diff --git a/src/Security/Authentication/MicrosoftAccount/ref/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj b/src/Security/Authentication/MicrosoftAccount/ref/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj deleted file mode 100644 index 335dce5f91..0000000000 --- a/src/Security/Authentication/MicrosoftAccount/ref/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - netcoreapp3.0 - - - - - - diff --git a/src/Security/Authentication/MicrosoftAccount/ref/Microsoft.AspNetCore.Authentication.MicrosoftAccount.netcoreapp3.0.cs b/src/Security/Authentication/MicrosoftAccount/ref/Microsoft.AspNetCore.Authentication.MicrosoftAccount.netcoreapp3.0.cs deleted file mode 100644 index 4337321df7..0000000000 --- a/src/Security/Authentication/MicrosoftAccount/ref/Microsoft.AspNetCore.Authentication.MicrosoftAccount.netcoreapp3.0.cs +++ /dev/null @@ -1,49 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Authentication.MicrosoftAccount -{ - public static partial class MicrosoftAccountDefaults - { - public const string AuthenticationScheme = "Microsoft"; - public static readonly string AuthorizationEndpoint; - public static readonly string DisplayName; - public static readonly string TokenEndpoint; - public static readonly string UserInformationEndpoint; - } - public partial class MicrosoftAccountHandler : Microsoft.AspNetCore.Authentication.OAuth.OAuthHandler - { - public MicrosoftAccountHandler(Microsoft.Extensions.Options.IOptionsMonitor options, Microsoft.Extensions.Logging.ILoggerFactory logger, System.Text.Encodings.Web.UrlEncoder encoder, Microsoft.AspNetCore.Authentication.ISystemClock clock) : base (default(Microsoft.Extensions.Options.IOptionsMonitor), default(Microsoft.Extensions.Logging.ILoggerFactory), default(System.Text.Encodings.Web.UrlEncoder), default(Microsoft.AspNetCore.Authentication.ISystemClock)) { } - protected override string BuildChallengeUrl(Microsoft.AspNetCore.Authentication.AuthenticationProperties properties, string redirectUri) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task CreateTicketAsync(System.Security.Claims.ClaimsIdentity identity, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties, Microsoft.AspNetCore.Authentication.OAuth.OAuthTokenResponse tokens) { throw null; } - } - public partial class MicrosoftAccountOptions : Microsoft.AspNetCore.Authentication.OAuth.OAuthOptions - { - public MicrosoftAccountOptions() { } - } - public partial class MicrosoftChallengeProperties : Microsoft.AspNetCore.Authentication.OAuth.OAuthChallengeProperties - { - public static readonly string DomainHintKey; - public static readonly string LoginHintKey; - public static readonly string PromptKey; - public static readonly string ResponseModeKey; - public MicrosoftChallengeProperties() { } - public MicrosoftChallengeProperties(System.Collections.Generic.IDictionary items) { } - public MicrosoftChallengeProperties(System.Collections.Generic.IDictionary items, System.Collections.Generic.IDictionary parameters) { } - public string DomainHint { get { throw null; } set { } } - public string LoginHint { get { throw null; } set { } } - public string Prompt { get { throw null; } set { } } - public string ResponseMode { get { throw null; } set { } } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class MicrosoftAccountExtensions - { - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddMicrosoftAccount(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddMicrosoftAccount(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddMicrosoftAccount(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddMicrosoftAccount(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, string displayName, System.Action configureOptions) { throw null; } - } -} diff --git a/src/Security/Authentication/Negotiate/ref/Microsoft.AspNetCore.Authentication.Negotiate.csproj b/src/Security/Authentication/Negotiate/ref/Microsoft.AspNetCore.Authentication.Negotiate.csproj deleted file mode 100644 index 9aae0adc89..0000000000 --- a/src/Security/Authentication/Negotiate/ref/Microsoft.AspNetCore.Authentication.Negotiate.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - diff --git a/src/Security/Authentication/Negotiate/ref/Microsoft.AspNetCore.Authentication.Negotiate.netcoreapp3.0.cs b/src/Security/Authentication/Negotiate/ref/Microsoft.AspNetCore.Authentication.Negotiate.netcoreapp3.0.cs deleted file mode 100644 index 5821e59a77..0000000000 --- a/src/Security/Authentication/Negotiate/ref/Microsoft.AspNetCore.Authentication.Negotiate.netcoreapp3.0.cs +++ /dev/null @@ -1,69 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Authentication.Negotiate -{ - public partial class AuthenticatedContext : Microsoft.AspNetCore.Authentication.ResultContext - { - public AuthenticatedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.Negotiate.NegotiateOptions options) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.Negotiate.NegotiateOptions)) { } - } - public partial class AuthenticationFailedContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public AuthenticationFailedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.Negotiate.NegotiateOptions options) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.Negotiate.NegotiateOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public System.Exception Exception { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class ChallengeContext : Microsoft.AspNetCore.Authentication.PropertiesContext - { - public ChallengeContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.Negotiate.NegotiateOptions options, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.Negotiate.NegotiateOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public bool Handled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public void HandleResponse() { } - } - public static partial class NegotiateDefaults - { - public const string AuthenticationScheme = "Negotiate"; - } - public partial class NegotiateEvents - { - public NegotiateEvents() { } - public System.Func OnAuthenticated { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnAuthenticationFailed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnChallenge { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task Authenticated(Microsoft.AspNetCore.Authentication.Negotiate.AuthenticatedContext context) { throw null; } - public virtual System.Threading.Tasks.Task AuthenticationFailed(Microsoft.AspNetCore.Authentication.Negotiate.AuthenticationFailedContext context) { throw null; } - public virtual System.Threading.Tasks.Task Challenge(Microsoft.AspNetCore.Authentication.Negotiate.ChallengeContext context) { throw null; } - } - public partial class NegotiateHandler : Microsoft.AspNetCore.Authentication.AuthenticationHandler, Microsoft.AspNetCore.Authentication.IAuthenticationHandler, Microsoft.AspNetCore.Authentication.IAuthenticationRequestHandler - { - public NegotiateHandler(Microsoft.Extensions.Options.IOptionsMonitor options, Microsoft.Extensions.Logging.ILoggerFactory logger, System.Text.Encodings.Web.UrlEncoder encoder, Microsoft.AspNetCore.Authentication.ISystemClock clock) : base (default(Microsoft.Extensions.Options.IOptionsMonitor), default(Microsoft.Extensions.Logging.ILoggerFactory), default(System.Text.Encodings.Web.UrlEncoder), default(Microsoft.AspNetCore.Authentication.ISystemClock)) { } - protected new Microsoft.AspNetCore.Authentication.Negotiate.NegotiateEvents Events { get { throw null; } set { } } - protected override System.Threading.Tasks.Task CreateEventsAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task HandleAuthenticateAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task HandleChallengeAsync(Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task HandleRequestAsync() { throw null; } - } - public partial class NegotiateOptions : Microsoft.AspNetCore.Authentication.AuthenticationSchemeOptions - { - public NegotiateOptions() { } - public new Microsoft.AspNetCore.Authentication.Negotiate.NegotiateEvents Events { get { throw null; } set { } } - public bool PersistKerberosCredentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool PersistNtlmCredentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class PostConfigureNegotiateOptions : Microsoft.Extensions.Options.IPostConfigureOptions - { - public PostConfigureNegotiateOptions(System.Collections.Generic.IEnumerable serverAuthServices, Microsoft.Extensions.Logging.ILogger logger) { } - public void PostConfigure(string name, Microsoft.AspNetCore.Authentication.Negotiate.NegotiateOptions options) { } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class NegotiateExtensions - { - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddNegotiate(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddNegotiate(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddNegotiate(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddNegotiate(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, string displayName, System.Action configureOptions) { throw null; } - } -} diff --git a/src/Security/Authentication/OAuth/ref/Microsoft.AspNetCore.Authentication.OAuth.csproj b/src/Security/Authentication/OAuth/ref/Microsoft.AspNetCore.Authentication.OAuth.csproj index 1806276892..585acc7eff 100644 --- a/src/Security/Authentication/OAuth/ref/Microsoft.AspNetCore.Authentication.OAuth.csproj +++ b/src/Security/Authentication/OAuth/ref/Microsoft.AspNetCore.Authentication.OAuth.csproj @@ -2,11 +2,9 @@ netcoreapp3.0 - false - - + diff --git a/src/Security/Authentication/OpenIdConnect/ref/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj b/src/Security/Authentication/OpenIdConnect/ref/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj deleted file mode 100644 index 40acfd4743..0000000000 --- a/src/Security/Authentication/OpenIdConnect/ref/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - diff --git a/src/Security/Authentication/OpenIdConnect/ref/Microsoft.AspNetCore.Authentication.OpenIdConnect.netcoreapp3.0.cs b/src/Security/Authentication/OpenIdConnect/ref/Microsoft.AspNetCore.Authentication.OpenIdConnect.netcoreapp3.0.cs deleted file mode 100644 index 998956d2ed..0000000000 --- a/src/Security/Authentication/OpenIdConnect/ref/Microsoft.AspNetCore.Authentication.OpenIdConnect.netcoreapp3.0.cs +++ /dev/null @@ -1,202 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Authentication -{ - public static partial class ClaimActionCollectionUniqueExtensions - { - public static void MapUniqueJsonKey(this Microsoft.AspNetCore.Authentication.OAuth.Claims.ClaimActionCollection collection, string claimType, string jsonKey) { } - public static void MapUniqueJsonKey(this Microsoft.AspNetCore.Authentication.OAuth.Claims.ClaimActionCollection collection, string claimType, string jsonKey, string valueType) { } - } -} -namespace Microsoft.AspNetCore.Authentication.OpenIdConnect -{ - public partial class AuthenticationFailedContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public AuthenticationFailedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions options) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public System.Exception Exception { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class AuthorizationCodeReceivedContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public AuthorizationCodeReceivedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions options, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public System.Net.Http.HttpClient Backchannel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool HandledCodeRedemption { get { throw null; } } - public System.IdentityModel.Tokens.Jwt.JwtSecurityToken JwtSecurityToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage TokenEndpointRequest { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage TokenEndpointResponse { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public void HandleCodeRedemption() { } - public void HandleCodeRedemption(Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage tokenEndpointResponse) { } - public void HandleCodeRedemption(string accessToken, string idToken) { } - } - public partial class MessageReceivedContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public MessageReceivedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions options, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Token { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class OpenIdConnectChallengeProperties : Microsoft.AspNetCore.Authentication.OAuth.OAuthChallengeProperties - { - public static readonly string MaxAgeKey; - public static readonly string PromptKey; - public OpenIdConnectChallengeProperties() { } - public OpenIdConnectChallengeProperties(System.Collections.Generic.IDictionary items) { } - public OpenIdConnectChallengeProperties(System.Collections.Generic.IDictionary items, System.Collections.Generic.IDictionary parameters) { } - public System.TimeSpan? MaxAge { get { throw null; } set { } } - public string Prompt { get { throw null; } set { } } - } - public static partial class OpenIdConnectDefaults - { - public static readonly string AuthenticationPropertiesKey; - public const string AuthenticationScheme = "OpenIdConnect"; - public static readonly string CookieNoncePrefix; - public static readonly string DisplayName; - public static readonly string RedirectUriForCodePropertiesKey; - public static readonly string UserstatePropertiesKey; - } - public partial class OpenIdConnectEvents : Microsoft.AspNetCore.Authentication.RemoteAuthenticationEvents - { - public OpenIdConnectEvents() { } - public System.Func OnAuthenticationFailed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnAuthorizationCodeReceived { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnMessageReceived { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnRedirectToIdentityProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnRedirectToIdentityProviderForSignOut { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnRemoteSignOut { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnSignedOutCallbackRedirect { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnTokenResponseReceived { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnTokenValidated { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnUserInformationReceived { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task AuthenticationFailed(Microsoft.AspNetCore.Authentication.OpenIdConnect.AuthenticationFailedContext context) { throw null; } - public virtual System.Threading.Tasks.Task AuthorizationCodeReceived(Microsoft.AspNetCore.Authentication.OpenIdConnect.AuthorizationCodeReceivedContext context) { throw null; } - public virtual System.Threading.Tasks.Task MessageReceived(Microsoft.AspNetCore.Authentication.OpenIdConnect.MessageReceivedContext context) { throw null; } - public virtual System.Threading.Tasks.Task RedirectToIdentityProvider(Microsoft.AspNetCore.Authentication.OpenIdConnect.RedirectContext context) { throw null; } - public virtual System.Threading.Tasks.Task RedirectToIdentityProviderForSignOut(Microsoft.AspNetCore.Authentication.OpenIdConnect.RedirectContext context) { throw null; } - public virtual System.Threading.Tasks.Task RemoteSignOut(Microsoft.AspNetCore.Authentication.OpenIdConnect.RemoteSignOutContext context) { throw null; } - public virtual System.Threading.Tasks.Task SignedOutCallbackRedirect(Microsoft.AspNetCore.Authentication.OpenIdConnect.RemoteSignOutContext context) { throw null; } - public virtual System.Threading.Tasks.Task TokenResponseReceived(Microsoft.AspNetCore.Authentication.OpenIdConnect.TokenResponseReceivedContext context) { throw null; } - public virtual System.Threading.Tasks.Task TokenValidated(Microsoft.AspNetCore.Authentication.OpenIdConnect.TokenValidatedContext context) { throw null; } - public virtual System.Threading.Tasks.Task UserInformationReceived(Microsoft.AspNetCore.Authentication.OpenIdConnect.UserInformationReceivedContext context) { throw null; } - } - public partial class OpenIdConnectHandler : Microsoft.AspNetCore.Authentication.RemoteAuthenticationHandler, Microsoft.AspNetCore.Authentication.IAuthenticationHandler, Microsoft.AspNetCore.Authentication.IAuthenticationSignOutHandler - { - public OpenIdConnectHandler(Microsoft.Extensions.Options.IOptionsMonitor options, Microsoft.Extensions.Logging.ILoggerFactory logger, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, System.Text.Encodings.Web.UrlEncoder encoder, Microsoft.AspNetCore.Authentication.ISystemClock clock) : base (default(Microsoft.Extensions.Options.IOptionsMonitor), default(Microsoft.Extensions.Logging.ILoggerFactory), default(System.Text.Encodings.Web.UrlEncoder), default(Microsoft.AspNetCore.Authentication.ISystemClock)) { } - protected System.Net.Http.HttpClient Backchannel { get { throw null; } } - protected new Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents Events { get { throw null; } set { } } - protected System.Text.Encodings.Web.HtmlEncoder HtmlEncoder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - protected override System.Threading.Tasks.Task CreateEventsAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected virtual System.Threading.Tasks.Task GetUserInformationAsync(Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage message, System.IdentityModel.Tokens.Jwt.JwtSecurityToken jwt, System.Security.Claims.ClaimsPrincipal principal, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task HandleChallengeAsync(Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task HandleRemoteAuthenticateAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected virtual System.Threading.Tasks.Task HandleRemoteSignOutAsync() { throw null; } - public override System.Threading.Tasks.Task HandleRequestAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected virtual System.Threading.Tasks.Task HandleSignOutCallbackAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected virtual System.Threading.Tasks.Task RedeemAuthorizationCodeAsync(Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage tokenEndpointRequest) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task SignOutAsync(Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) { throw null; } - } - public partial class OpenIdConnectOptions : Microsoft.AspNetCore.Authentication.RemoteAuthenticationOptions - { - public OpenIdConnectOptions() { } - public Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectRedirectBehavior AuthenticationMethod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Authority { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Authentication.OAuth.Claims.ClaimActionCollection ClaimActions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ClientId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ClientSecret { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectConfiguration Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.IConfigurationManager ConfigurationManager { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool DisableTelemetry { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public new Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectEvents Events { get { throw null; } set { } } - public bool GetClaimsFromUserInfoEndpoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan? MaxAge { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string MetadataAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.CookieBuilder NonceCookie { get { throw null; } set { } } - public string Prompt { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectProtocolValidator ProtocolValidator { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RefreshOnIssuerKeyNotFound { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.PathString RemoteSignOutPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RequireHttpsMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Resource { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ResponseMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ResponseType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.ICollection Scope { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.IdentityModel.Tokens.ISecurityTokenValidator SecurityTokenValidator { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.PathString SignedOutCallbackPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string SignedOutRedirectUri { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string SignOutScheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SkipUnrecognizedRequests { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Authentication.ISecureDataFormat StateDataFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Authentication.ISecureDataFormat StringDataFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Tokens.TokenValidationParameters TokenValidationParameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool UsePkce { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool UseTokenLifetime { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public override void Validate() { } - } - public partial class OpenIdConnectPostConfigureOptions : Microsoft.Extensions.Options.IPostConfigureOptions - { - public OpenIdConnectPostConfigureOptions(Microsoft.AspNetCore.DataProtection.IDataProtectionProvider dataProtection) { } - public void PostConfigure(string name, Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions options) { } - } - public enum OpenIdConnectRedirectBehavior - { - RedirectGet = 0, - FormPost = 1, - } - public partial class RedirectContext : Microsoft.AspNetCore.Authentication.PropertiesContext - { - public RedirectContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions options, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public bool Handled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public void HandleResponse() { } - } - public partial class RemoteSignOutContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public RemoteSignOutContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions options, Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage message) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class TokenResponseReceivedContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public TokenResponseReceivedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions options, System.Security.Claims.ClaimsPrincipal user, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage TokenEndpointResponse { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class TokenValidatedContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public TokenValidatedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions options, System.Security.Claims.ClaimsPrincipal principal, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public string Nonce { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.IdentityModel.Tokens.Jwt.JwtSecurityToken SecurityToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage TokenEndpointResponse { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class UserInformationReceivedContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public UserInformationReceivedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions options, System.Security.Claims.ClaimsPrincipal principal, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.OpenIdConnect.OpenIdConnectOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Text.Json.JsonDocument User { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.AspNetCore.Authentication.OpenIdConnect.Claims -{ - public partial class UniqueJsonKeyClaimAction : Microsoft.AspNetCore.Authentication.OAuth.Claims.JsonKeyClaimAction - { - public UniqueJsonKeyClaimAction(string claimType, string valueType, string jsonKey) : base (default(string), default(string), default(string)) { } - public override void Run(System.Text.Json.JsonElement userData, System.Security.Claims.ClaimsIdentity identity, string issuer) { } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class OpenIdConnectExtensions - { - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddOpenIdConnect(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddOpenIdConnect(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddOpenIdConnect(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddOpenIdConnect(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, string displayName, System.Action configureOptions) { throw null; } - } -} diff --git a/src/Security/Authentication/Twitter/ref/Microsoft.AspNetCore.Authentication.Twitter.csproj b/src/Security/Authentication/Twitter/ref/Microsoft.AspNetCore.Authentication.Twitter.csproj deleted file mode 100644 index aed02b9723..0000000000 --- a/src/Security/Authentication/Twitter/ref/Microsoft.AspNetCore.Authentication.Twitter.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - netcoreapp3.0 - - - - - - diff --git a/src/Security/Authentication/Twitter/ref/Microsoft.AspNetCore.Authentication.Twitter.netcoreapp3.0.cs b/src/Security/Authentication/Twitter/ref/Microsoft.AspNetCore.Authentication.Twitter.netcoreapp3.0.cs deleted file mode 100644 index 4a9a392607..0000000000 --- a/src/Security/Authentication/Twitter/ref/Microsoft.AspNetCore.Authentication.Twitter.netcoreapp3.0.cs +++ /dev/null @@ -1,89 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Authentication.Twitter -{ - public partial class AccessToken : Microsoft.AspNetCore.Authentication.Twitter.RequestToken - { - public AccessToken() { } - public string ScreenName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string UserId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class RequestToken - { - public RequestToken() { } - public bool CallbackConfirmed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Authentication.AuthenticationProperties Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Token { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string TokenSecret { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class RequestTokenSerializer : Microsoft.AspNetCore.Authentication.IDataSerializer - { - public RequestTokenSerializer() { } - public virtual Microsoft.AspNetCore.Authentication.Twitter.RequestToken Deserialize(byte[] data) { throw null; } - public static Microsoft.AspNetCore.Authentication.Twitter.RequestToken Read(System.IO.BinaryReader reader) { throw null; } - public virtual byte[] Serialize(Microsoft.AspNetCore.Authentication.Twitter.RequestToken model) { throw null; } - public static void Write(System.IO.BinaryWriter writer, Microsoft.AspNetCore.Authentication.Twitter.RequestToken token) { } - } - public partial class TwitterCreatingTicketContext : Microsoft.AspNetCore.Authentication.ResultContext - { - public TwitterCreatingTicketContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.Twitter.TwitterOptions options, System.Security.Claims.ClaimsPrincipal principal, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties, string userId, string screenName, string accessToken, string accessTokenSecret, System.Text.Json.JsonElement user) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.Twitter.TwitterOptions)) { } - public string AccessToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string AccessTokenSecret { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ScreenName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Text.Json.JsonElement User { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string UserId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - public static partial class TwitterDefaults - { - public const string AuthenticationScheme = "Twitter"; - public static readonly string DisplayName; - } - public partial class TwitterEvents : Microsoft.AspNetCore.Authentication.RemoteAuthenticationEvents - { - public TwitterEvents() { } - public System.Func OnCreatingTicket { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func, System.Threading.Tasks.Task> OnRedirectToAuthorizationEndpoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task CreatingTicket(Microsoft.AspNetCore.Authentication.Twitter.TwitterCreatingTicketContext context) { throw null; } - public virtual System.Threading.Tasks.Task RedirectToAuthorizationEndpoint(Microsoft.AspNetCore.Authentication.RedirectContext context) { throw null; } - } - public partial class TwitterHandler : Microsoft.AspNetCore.Authentication.RemoteAuthenticationHandler - { - public TwitterHandler(Microsoft.Extensions.Options.IOptionsMonitor options, Microsoft.Extensions.Logging.ILoggerFactory logger, System.Text.Encodings.Web.UrlEncoder encoder, Microsoft.AspNetCore.Authentication.ISystemClock clock) : base (default(Microsoft.Extensions.Options.IOptionsMonitor), default(Microsoft.Extensions.Logging.ILoggerFactory), default(System.Text.Encodings.Web.UrlEncoder), default(Microsoft.AspNetCore.Authentication.ISystemClock)) { } - protected new Microsoft.AspNetCore.Authentication.Twitter.TwitterEvents Events { get { throw null; } set { } } - protected override System.Threading.Tasks.Task CreateEventsAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected virtual System.Threading.Tasks.Task CreateTicketAsync(System.Security.Claims.ClaimsIdentity identity, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties, Microsoft.AspNetCore.Authentication.Twitter.AccessToken token, System.Text.Json.JsonElement user) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task HandleChallengeAsync(Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task HandleRemoteAuthenticateAsync() { throw null; } - } - public partial class TwitterOptions : Microsoft.AspNetCore.Authentication.RemoteAuthenticationOptions - { - public TwitterOptions() { } - public Microsoft.AspNetCore.Authentication.OAuth.Claims.ClaimActionCollection ClaimActions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string ConsumerKey { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ConsumerSecret { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public new Microsoft.AspNetCore.Authentication.Twitter.TwitterEvents Events { get { throw null; } set { } } - public bool RetrieveUserDetails { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.CookieBuilder StateCookie { get { throw null; } set { } } - public Microsoft.AspNetCore.Authentication.ISecureDataFormat StateDataFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public override void Validate() { } - } - public partial class TwitterPostConfigureOptions : Microsoft.Extensions.Options.IPostConfigureOptions - { - public TwitterPostConfigureOptions(Microsoft.AspNetCore.DataProtection.IDataProtectionProvider dataProtection) { } - public void PostConfigure(string name, Microsoft.AspNetCore.Authentication.Twitter.TwitterOptions options) { } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class TwitterExtensions - { - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddTwitter(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddTwitter(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddTwitter(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddTwitter(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, string displayName, System.Action configureOptions) { throw null; } - } -} diff --git a/src/Security/Authentication/WsFederation/ref/Microsoft.AspNetCore.Authentication.WsFederation.csproj b/src/Security/Authentication/WsFederation/ref/Microsoft.AspNetCore.Authentication.WsFederation.csproj deleted file mode 100644 index a71b3d432d..0000000000 --- a/src/Security/Authentication/WsFederation/ref/Microsoft.AspNetCore.Authentication.WsFederation.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - diff --git a/src/Security/Authentication/WsFederation/ref/Microsoft.AspNetCore.Authentication.WsFederation.netcoreapp3.0.cs b/src/Security/Authentication/WsFederation/ref/Microsoft.AspNetCore.Authentication.WsFederation.netcoreapp3.0.cs deleted file mode 100644 index 3ff5d598c0..0000000000 --- a/src/Security/Authentication/WsFederation/ref/Microsoft.AspNetCore.Authentication.WsFederation.netcoreapp3.0.cs +++ /dev/null @@ -1,116 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Authentication.WsFederation -{ - public partial class AuthenticationFailedContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public AuthenticationFailedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions options) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public System.Exception Exception { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.WsFederation.WsFederationMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class MessageReceivedContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public MessageReceivedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions options, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public Microsoft.IdentityModel.Protocols.WsFederation.WsFederationMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class RedirectContext : Microsoft.AspNetCore.Authentication.PropertiesContext - { - public RedirectContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions options, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public bool Handled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.IdentityModel.Protocols.WsFederation.WsFederationMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public void HandleResponse() { } - } - public partial class RemoteSignOutContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public RemoteSignOutContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions options, Microsoft.IdentityModel.Protocols.WsFederation.WsFederationMessage message) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public Microsoft.IdentityModel.Protocols.WsFederation.WsFederationMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class SecurityTokenReceivedContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public SecurityTokenReceivedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions options, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public Microsoft.IdentityModel.Protocols.WsFederation.WsFederationMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class SecurityTokenValidatedContext : Microsoft.AspNetCore.Authentication.RemoteAuthenticationContext - { - public SecurityTokenValidatedContext(Microsoft.AspNetCore.Http.HttpContext context, Microsoft.AspNetCore.Authentication.AuthenticationScheme scheme, Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions options, System.Security.Claims.ClaimsPrincipal principal, Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) : base (default(Microsoft.AspNetCore.Http.HttpContext), default(Microsoft.AspNetCore.Authentication.AuthenticationScheme), default(Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions), default(Microsoft.AspNetCore.Authentication.AuthenticationProperties)) { } - public Microsoft.IdentityModel.Protocols.WsFederation.WsFederationMessage ProtocolMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Tokens.SecurityToken SecurityToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public static partial class WsFederationDefaults - { - public const string AuthenticationScheme = "WsFederation"; - public const string DisplayName = "WsFederation"; - public static readonly string UserstatePropertiesKey; - } - public partial class WsFederationEvents : Microsoft.AspNetCore.Authentication.RemoteAuthenticationEvents - { - public WsFederationEvents() { } - public System.Func OnAuthenticationFailed { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnMessageReceived { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnRedirectToIdentityProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnRemoteSignOut { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnSecurityTokenReceived { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func OnSecurityTokenValidated { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public virtual System.Threading.Tasks.Task AuthenticationFailed(Microsoft.AspNetCore.Authentication.WsFederation.AuthenticationFailedContext context) { throw null; } - public virtual System.Threading.Tasks.Task MessageReceived(Microsoft.AspNetCore.Authentication.WsFederation.MessageReceivedContext context) { throw null; } - public virtual System.Threading.Tasks.Task RedirectToIdentityProvider(Microsoft.AspNetCore.Authentication.WsFederation.RedirectContext context) { throw null; } - public virtual System.Threading.Tasks.Task RemoteSignOut(Microsoft.AspNetCore.Authentication.WsFederation.RemoteSignOutContext context) { throw null; } - public virtual System.Threading.Tasks.Task SecurityTokenReceived(Microsoft.AspNetCore.Authentication.WsFederation.SecurityTokenReceivedContext context) { throw null; } - public virtual System.Threading.Tasks.Task SecurityTokenValidated(Microsoft.AspNetCore.Authentication.WsFederation.SecurityTokenValidatedContext context) { throw null; } - } - public partial class WsFederationHandler : Microsoft.AspNetCore.Authentication.RemoteAuthenticationHandler, Microsoft.AspNetCore.Authentication.IAuthenticationHandler, Microsoft.AspNetCore.Authentication.IAuthenticationSignOutHandler - { - public WsFederationHandler(Microsoft.Extensions.Options.IOptionsMonitor options, Microsoft.Extensions.Logging.ILoggerFactory logger, System.Text.Encodings.Web.UrlEncoder encoder, Microsoft.AspNetCore.Authentication.ISystemClock clock) : base (default(Microsoft.Extensions.Options.IOptionsMonitor), default(Microsoft.Extensions.Logging.ILoggerFactory), default(System.Text.Encodings.Web.UrlEncoder), default(Microsoft.AspNetCore.Authentication.ISystemClock)) { } - protected new Microsoft.AspNetCore.Authentication.WsFederation.WsFederationEvents Events { get { throw null; } set { } } - protected override System.Threading.Tasks.Task CreateEventsAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task HandleChallengeAsync(Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected override System.Threading.Tasks.Task HandleRemoteAuthenticateAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - protected virtual System.Threading.Tasks.Task HandleRemoteSignOutAsync() { throw null; } - public override System.Threading.Tasks.Task HandleRequestAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public virtual System.Threading.Tasks.Task SignOutAsync(Microsoft.AspNetCore.Authentication.AuthenticationProperties properties) { throw null; } - } - public partial class WsFederationOptions : Microsoft.AspNetCore.Authentication.RemoteAuthenticationOptions - { - public WsFederationOptions() { } - public bool AllowUnsolicitedLogins { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.WsFederation.WsFederationConfiguration Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Protocols.IConfigurationManager ConfigurationManager { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public new Microsoft.AspNetCore.Authentication.WsFederation.WsFederationEvents Events { get { throw null; } set { } } - public string MetadataAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RefreshOnIssuerKeyNotFound { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.PathString RemoteSignOutPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RequireHttpsMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public new bool SaveTokens { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.ICollection SecurityTokenHandlers { get { throw null; } set { } } - public string SignOutScheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string SignOutWreply { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SkipUnrecognizedRequests { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Authentication.ISecureDataFormat StateDataFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.IdentityModel.Tokens.TokenValidationParameters TokenValidationParameters { get { throw null; } set { } } - public bool UseTokenLifetime { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Wreply { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Wtrealm { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public override void Validate() { } - } - public partial class WsFederationPostConfigureOptions : Microsoft.Extensions.Options.IPostConfigureOptions - { - public WsFederationPostConfigureOptions(Microsoft.AspNetCore.DataProtection.IDataProtectionProvider dataProtection) { } - public void PostConfigure(string name, Microsoft.AspNetCore.Authentication.WsFederation.WsFederationOptions options) { } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class WsFederationExtensions - { - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddWsFederation(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddWsFederation(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddWsFederation(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddWsFederation(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string authenticationScheme, string displayName, System.Action configureOptions) { throw null; } - } -} diff --git a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.Manual.cs b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.Manual.cs deleted file mode 100644 index 84fc42f7ab..0000000000 --- a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.Manual.cs +++ /dev/null @@ -1,10 +0,0 @@ - -// 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.Runtime.CompilerServices; -using Microsoft.AspNetCore.Authorization; - -// Microsoft.AspNetCore.Metadata -[assembly: TypeForwardedTo(typeof(IAuthorizeData))] -[assembly: TypeForwardedTo(typeof(IAllowAnonymous))] diff --git a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj index 88480c4611..ae688e7e5f 100644 --- a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj +++ b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj @@ -2,21 +2,19 @@ netstandard2.0;netcoreapp3.0 - false - - - - - + + + + - - - - + + + + diff --git a/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj b/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj index 9cde58e848..573b63b82f 100644 --- a/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj +++ b/src/Security/Authorization/Policy/ref/Microsoft.AspNetCore.Authorization.Policy.csproj @@ -2,14 +2,12 @@ netcoreapp3.0 - false - - - - - + + + + diff --git a/src/Security/CookiePolicy/ref/Microsoft.AspNetCore.CookiePolicy.csproj b/src/Security/CookiePolicy/ref/Microsoft.AspNetCore.CookiePolicy.csproj index 7f243e54d6..a872eb5721 100644 --- a/src/Security/CookiePolicy/ref/Microsoft.AspNetCore.CookiePolicy.csproj +++ b/src/Security/CookiePolicy/ref/Microsoft.AspNetCore.CookiePolicy.csproj @@ -2,13 +2,11 @@ netcoreapp3.0 - false - - - - + + + diff --git a/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj b/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj index fc5f7fded5..0a620e7a33 100644 --- a/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj +++ b/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj @@ -3,6 +3,8 @@ netcoreapp3.0 aspnet-Identity.ExternalClaims-E95BE154-CB1B-4633-A2E0-B2DF12FE8BD3 true + + false @@ -26,5 +28,7 @@ + + diff --git a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj index d5dd2d3c17..e385177ae9 100644 --- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj +++ b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj @@ -22,11 +22,6 @@ - - - diff --git a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj index c97c8dfe9b..53a0961aa8 100644 --- a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj +++ b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj @@ -2,26 +2,24 @@ netstandard2.0;netstandard2.1;netcoreapp3.0 - false - - - - - + + + + - - - + + + - - - + + + diff --git a/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.Manual.cs b/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.Manual.cs new file mode 100644 index 0000000000..dd69420724 --- /dev/null +++ b/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.Manual.cs @@ -0,0 +1,1005 @@ +// 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. + +namespace Microsoft.AspNetCore.HttpSys.Internal +{ + internal static partial class Constants + { + internal const string Chunked = "chunked"; + internal const string Close = "close"; + internal const string DefaultServerAddress = "http://localhost:5000"; + internal const string HttpScheme = "http"; + internal const string HttpsScheme = "https"; + internal const string SchemeDelimiter = "://"; + internal static System.Version V1_0; + internal static System.Version V1_1; + internal static System.Version V2; + internal const string Zero = "0"; + } + internal enum HttpSysRequestHeader + { + CacheControl = 0, + Connection = 1, + Date = 2, + KeepAlive = 3, + Pragma = 4, + Trailer = 5, + TransferEncoding = 6, + Upgrade = 7, + Via = 8, + Warning = 9, + Allow = 10, + ContentLength = 11, + ContentType = 12, + ContentEncoding = 13, + ContentLanguage = 14, + ContentLocation = 15, + ContentMd5 = 16, + ContentRange = 17, + Expires = 18, + LastModified = 19, + Accept = 20, + AcceptCharset = 21, + AcceptEncoding = 22, + AcceptLanguage = 23, + Authorization = 24, + Cookie = 25, + Expect = 26, + From = 27, + Host = 28, + IfMatch = 29, + IfModifiedSince = 30, + IfNoneMatch = 31, + IfRange = 32, + IfUnmodifiedSince = 33, + MaxForwards = 34, + ProxyAuthorization = 35, + Referer = 36, + Range = 37, + Te = 38, + Translate = 39, + UserAgent = 40, + } + internal partial class SocketAddress + { + internal const int IPv4AddressSize = 16; + internal const int IPv6AddressSize = 28; + public SocketAddress(System.Net.Sockets.AddressFamily family, int size) { } + internal byte[] Buffer { get { throw null; } } + internal System.Net.Sockets.AddressFamily Family { get { throw null; } } + internal int Size { get { throw null; } } + public override bool Equals(object comparand) { throw null; } + public override int GetHashCode() { throw null; } + internal System.Net.IPAddress GetIPAddress() { throw null; } + internal string GetIPAddressString() { throw null; } + internal int GetPort() { throw null; } + public override string ToString() { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct CookedUrl + { + internal CookedUrl(Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_COOKED_URL nativeCookedUrl) { throw null; } + internal string GetAbsPath() { throw null; } + internal string GetFullUrl() { throw null; } + internal string GetHost() { throw null; } + internal string GetQueryString() { throw null; } + } + internal enum SslStatus : byte + { + Insecure = (byte)0, + NoClientCert = (byte)1, + ClientCert = (byte)2, + } + internal partial class SafeNativeOverlapped : System.Runtime.InteropServices.SafeHandle + { + internal static readonly Microsoft.AspNetCore.HttpSys.Internal.SafeNativeOverlapped Zero; + internal SafeNativeOverlapped() : base (default(System.IntPtr), default(bool)) { } + internal unsafe SafeNativeOverlapped(System.Threading.ThreadPoolBoundHandle boundHandle, System.Threading.NativeOverlapped* handle) : base (default(System.IntPtr), default(bool)) { } + public override bool IsInvalid { get { throw null; } } + public void ReinitializeNativeOverlapped() { } + protected override bool ReleaseHandle() { throw null; } + } + internal static unsafe partial class HttpApiTypes + { + internal static readonly string[] HttpVerbs; + internal const int MaxTimeout = 6; + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct FromFileHandle + { + internal ulong offset; + internal ulong count; + internal System.IntPtr fileHandle; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct FromMemory + { + internal System.IntPtr pBuffer; + internal uint BufferLength; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTPAPI_VERSION + { + internal ushort HttpApiMajorVersion; + internal ushort HttpApiMinorVersion; + } + internal enum HTTP_API_VERSION + { + Invalid = 0, + Version10 = 1, + Version20 = 2, + } + internal enum HTTP_AUTH_STATUS + { + HttpAuthStatusSuccess = 0, + HttpAuthStatusNotAuthenticated = 1, + HttpAuthStatusFailure = 2, + } + [System.FlagsAttribute] + internal enum HTTP_AUTH_TYPES : uint + { + NONE = (uint)0, + HTTP_AUTH_ENABLE_BASIC = (uint)1, + HTTP_AUTH_ENABLE_DIGEST = (uint)2, + HTTP_AUTH_ENABLE_NTLM = (uint)4, + HTTP_AUTH_ENABLE_NEGOTIATE = (uint)8, + HTTP_AUTH_ENABLE_KERBEROS = (uint)16, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_BINDING_INFO + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_FLAGS Flags; + internal System.IntPtr RequestQueueHandle; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_CACHE_POLICY + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_CACHE_POLICY_TYPE Policy; + internal uint SecondsToLive; + } + internal enum HTTP_CACHE_POLICY_TYPE + { + HttpCachePolicyNocache = 0, + HttpCachePolicyUserInvalidates = 1, + HttpCachePolicyTimeToLive = 2, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_CONNECTION_LIMIT_INFO + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_FLAGS Flags; + internal uint MaxConnections; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_COOKED_URL + { + internal ushort FullUrlLength; + internal ushort HostLength; + internal ushort AbsPathLength; + internal ushort QueryStringLength; + internal ushort* pFullUrl; + internal ushort* pHost; + internal ushort* pAbsPath; + internal ushort* pQueryString; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Explicit)] + internal partial struct HTTP_DATA_CHUNK + { + [System.Runtime.InteropServices.FieldOffset(0)] + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_DATA_CHUNK_TYPE DataChunkType; + [System.Runtime.InteropServices.FieldOffset(8)] + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.FromMemory fromMemory; + [System.Runtime.InteropServices.FieldOffset(8)] + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.FromFileHandle fromFile; + } + internal enum HTTP_DATA_CHUNK_TYPE + { + HttpDataChunkFromMemory = 0, + HttpDataChunkFromFileHandle = 1, + HttpDataChunkFromFragmentCache = 2, + HttpDataChunkMaximum = 3, + } + [System.FlagsAttribute] + internal enum HTTP_FLAGS : uint + { + NONE = (uint)0, + HTTP_INITIALIZE_SERVER = (uint)1, + HTTP_PROPERTY_FLAG_PRESENT = (uint)1, + HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY = (uint)1, + HTTP_RECEIVE_SECURE_CHANNEL_TOKEN = (uint)1, + HTTP_SEND_REQUEST_FLAG_MORE_DATA = (uint)1, + HTTP_SEND_RESPONSE_FLAG_DISCONNECT = (uint)1, + HTTP_SEND_RESPONSE_FLAG_MORE_DATA = (uint)2, + HTTP_INITIALIZE_CBT = (uint)4, + HTTP_SEND_RESPONSE_FLAG_BUFFER_DATA = (uint)4, + HTTP_SEND_RESPONSE_FLAG_RAW_HEADER = (uint)4, + HTTP_SEND_RESPONSE_FLAG_OPAQUE = (uint)64, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_KNOWN_HEADER + { + internal ushort RawValueLength; + internal byte* pRawValue; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_MULTIPLE_KNOWN_HEADERS + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_RESPONSE_HEADER_ID.Enum HeaderId; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_RESPONSE_INFO_FLAGS Flags; + internal ushort KnownHeaderCount; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER* KnownHeaders; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_QOS_SETTING_INFO + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_QOS_SETTING_TYPE QosType; + internal System.IntPtr QosSetting; + } + internal enum HTTP_QOS_SETTING_TYPE + { + HttpQosSettingTypeBandwidth = 0, + HttpQosSettingTypeConnectionLimit = 1, + HttpQosSettingTypeFlowRate = 2, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_REQUEST + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_REQUEST_FLAGS Flags; + internal ulong ConnectionId; + internal ulong RequestId; + internal ulong UrlContext; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_VERSION Version; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_VERB Verb; + internal ushort UnknownVerbLength; + internal ushort RawUrlLength; + internal byte* pUnknownVerb; + internal byte* pRawUrl; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_COOKED_URL CookedUrl; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_TRANSPORT_ADDRESS Address; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_REQUEST_HEADERS Headers; + internal ulong BytesReceived; + internal ushort EntityChunkCount; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_DATA_CHUNK* pEntityChunks; + internal ulong RawConnectionId; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_SSL_INFO* pSslInfo; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_REQUEST_AUTH_INFO + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_AUTH_STATUS AuthStatus; + internal uint SecStatus; + internal uint Flags; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_REQUEST_AUTH_TYPE AuthType; + internal System.IntPtr AccessToken; + internal uint ContextAttributes; + internal uint PackedContextLength; + internal uint PackedContextType; + internal System.IntPtr PackedContext; + internal uint MutualAuthDataLength; + internal char* pMutualAuthData; + } + internal enum HTTP_REQUEST_AUTH_TYPE + { + HttpRequestAuthTypeNone = 0, + HttpRequestAuthTypeBasic = 1, + HttpRequestAuthTypeDigest = 2, + HttpRequestAuthTypeNTLM = 3, + HttpRequestAuthTypeNegotiate = 4, + HttpRequestAuthTypeKerberos = 5, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_REQUEST_CHANNEL_BIND_STATUS + { + internal System.IntPtr ServiceName; + internal System.IntPtr ChannelToken; + internal uint ChannelTokenSize; + internal uint Flags; + } + [System.FlagsAttribute] + internal enum HTTP_REQUEST_FLAGS + { + None = 0, + MoreEntityBodyExists = 1, + IPRouted = 2, + Http2 = 4, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_REQUEST_HEADERS + { + internal ushort UnknownHeaderCount; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_UNKNOWN_HEADER* pUnknownHeaders; + internal ushort TrailerCount; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_UNKNOWN_HEADER* pTrailers; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_02; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_03; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_04; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_05; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_06; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_07; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_08; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_09; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_10; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_11; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_12; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_13; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_14; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_15; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_16; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_17; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_18; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_19; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_20; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_21; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_22; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_23; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_24; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_25; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_26; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_27; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_28; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_29; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_30; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_31; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_32; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_33; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_34; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_35; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_36; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_37; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_38; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_39; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_40; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_41; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_REQUEST_INFO + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_REQUEST_INFO_TYPE InfoType; + internal uint InfoLength; + internal void* pInfo; + } + internal enum HTTP_REQUEST_INFO_TYPE + { + HttpRequestInfoTypeAuth = 0, + HttpRequestInfoTypeChannelBind = 1, + HttpRequestInfoTypeSslProtocol = 2, + HttpRequestInfoTypeSslTokenBinding = 3, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_REQUEST_TOKEN_BINDING_INFO + { + public byte* TokenBinding; + public uint TokenBindingSize; + public byte* TlsUnique; + public uint TlsUniqueSize; + public char* KeyType; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_REQUEST_V2 + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_REQUEST Request; + internal ushort RequestInfoCount; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_REQUEST_INFO* pRequestInfo; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_RESPONSE + { + internal uint Flags; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_VERSION Version; + internal ushort StatusCode; + internal ushort ReasonLength; + internal byte* pReason; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_RESPONSE_HEADERS Headers; + internal ushort EntityChunkCount; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_DATA_CHUNK* pEntityChunks; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_RESPONSE_HEADERS + { + internal ushort UnknownHeaderCount; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_UNKNOWN_HEADER* pUnknownHeaders; + internal ushort TrailerCount; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_UNKNOWN_HEADER* pTrailers; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_02; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_03; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_04; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_05; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_06; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_07; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_08; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_09; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_10; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_11; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_12; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_13; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_14; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_15; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_16; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_17; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_18; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_19; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_20; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_21; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_22; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_23; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_24; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_25; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_26; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_27; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_28; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_29; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_KNOWN_HEADER KnownHeaders_30; + } + internal static partial class HTTP_RESPONSE_HEADER_ID + { + internal static int IndexOfKnownHeader(string HeaderName) { throw null; } + internal enum Enum + { + HttpHeaderCacheControl = 0, + HttpHeaderConnection = 1, + HttpHeaderDate = 2, + HttpHeaderKeepAlive = 3, + HttpHeaderPragma = 4, + HttpHeaderTrailer = 5, + HttpHeaderTransferEncoding = 6, + HttpHeaderUpgrade = 7, + HttpHeaderVia = 8, + HttpHeaderWarning = 9, + HttpHeaderAllow = 10, + HttpHeaderContentLength = 11, + HttpHeaderContentType = 12, + HttpHeaderContentEncoding = 13, + HttpHeaderContentLanguage = 14, + HttpHeaderContentLocation = 15, + HttpHeaderContentMd5 = 16, + HttpHeaderContentRange = 17, + HttpHeaderExpires = 18, + HttpHeaderLastModified = 19, + HttpHeaderAcceptRanges = 20, + HttpHeaderAge = 21, + HttpHeaderEtag = 22, + HttpHeaderLocation = 23, + HttpHeaderProxyAuthenticate = 24, + HttpHeaderRetryAfter = 25, + HttpHeaderServer = 26, + HttpHeaderSetCookie = 27, + HttpHeaderVary = 28, + HttpHeaderWwwAuthenticate = 29, + HttpHeaderResponseMaximum = 30, + HttpHeaderMaximum = 41, + } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_RESPONSE_INFO + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_RESPONSE_INFO_TYPE Type; + internal uint Length; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_MULTIPLE_KNOWN_HEADERS* pInfo; + } + internal enum HTTP_RESPONSE_INFO_FLAGS : uint + { + None = (uint)0, + PreserveOrder = (uint)1, + } + internal enum HTTP_RESPONSE_INFO_TYPE + { + HttpResponseInfoTypeMultipleKnownHeaders = 0, + HttpResponseInfoTypeAuthenticationProperty = 1, + HttpResponseInfoTypeQosProperty = 2, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_RESPONSE_V2 + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_RESPONSE Response_V1; + internal ushort ResponseInfoCount; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_RESPONSE_INFO* pResponseInfo; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_SERVER_AUTHENTICATION_BASIC_PARAMS + { + ushort RealmLength; + char* Realm; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_SERVER_AUTHENTICATION_DIGEST_PARAMS + { + internal ushort DomainNameLength; + internal char* DomainName; + internal ushort RealmLength; + internal char* Realm; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_SERVER_AUTHENTICATION_INFO + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_FLAGS Flags; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_AUTH_TYPES AuthSchemes; + internal bool ReceiveMutualAuth; + internal bool ReceiveContextHandle; + internal bool DisableNTLMCredentialCaching; + internal ulong ExFlags; + Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_SERVER_AUTHENTICATION_DIGEST_PARAMS DigestParams; + Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_SERVER_AUTHENTICATION_BASIC_PARAMS BasicParams; + } + internal enum HTTP_SERVER_PROPERTY + { + HttpServerAuthenticationProperty = 0, + HttpServerLoggingProperty = 1, + HttpServerQosProperty = 2, + HttpServerTimeoutsProperty = 3, + HttpServerQueueLengthProperty = 4, + HttpServerStateProperty = 5, + HttpServer503VerbosityProperty = 6, + HttpServerBindingProperty = 7, + HttpServerExtendedAuthenticationProperty = 8, + HttpServerListenEndpointProperty = 9, + HttpServerChannelBindProperty = 10, + HttpServerProtectionLevelProperty = 11, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_SERVICE_BINDING_BASE + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_SERVICE_BINDING_TYPE Type; + } + internal enum HTTP_SERVICE_BINDING_TYPE : uint + { + HttpServiceBindingTypeNone = (uint)0, + HttpServiceBindingTypeW = (uint)1, + HttpServiceBindingTypeA = (uint)2, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_SSL_CLIENT_CERT_INFO + { + internal uint CertFlags; + internal uint CertEncodedSize; + internal byte* pCertEncoded; + internal void* Token; + internal byte CertDeniedByMapper; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_SSL_INFO + { + internal ushort ServerCertKeySize; + internal ushort ConnectionKeySize; + internal uint ServerCertIssuerSize; + internal uint ServerCertSubjectSize; + internal byte* pServerCertIssuer; + internal byte* pServerCertSubject; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_SSL_CLIENT_CERT_INFO* pClientCertInfo; + internal uint SslClientCertNegotiated; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_SSL_PROTOCOL_INFO + { + internal System.Security.Authentication.SslProtocols Protocol; + internal System.Security.Authentication.CipherAlgorithmType CipherType; + internal uint CipherStrength; + internal System.Security.Authentication.HashAlgorithmType HashType; + internal uint HashStrength; + internal System.Security.Authentication.ExchangeAlgorithmType KeyExchangeType; + internal uint KeyExchangeStrength; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_TIMEOUT_LIMIT_INFO + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_FLAGS Flags; + internal ushort EntityBody; + internal ushort DrainEntityBody; + internal ushort RequestQueue; + internal ushort IdleConnection; + internal ushort HeaderWait; + internal uint MinSendRate; + } + internal enum HTTP_TIMEOUT_TYPE + { + EntityBody = 0, + DrainEntityBody = 1, + RequestQueue = 2, + IdleConnection = 3, + HeaderWait = 4, + MinSendRate = 5, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_TRANSPORT_ADDRESS + { + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.SOCKADDR* pRemoteAddress; + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.SOCKADDR* pLocalAddress; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_UNKNOWN_HEADER + { + internal ushort NameLength; + internal ushort RawValueLength; + internal byte* pName; + internal byte* pRawValue; + } + internal enum HTTP_VERB + { + HttpVerbUnparsed = 0, + HttpVerbUnknown = 1, + HttpVerbInvalid = 2, + HttpVerbOPTIONS = 3, + HttpVerbGET = 4, + HttpVerbHEAD = 5, + HttpVerbPOST = 6, + HttpVerbPUT = 7, + HttpVerbDELETE = 8, + HttpVerbTRACE = 9, + HttpVerbCONNECT = 10, + HttpVerbTRACK = 11, + HttpVerbMOVE = 12, + HttpVerbCOPY = 13, + HttpVerbPROPFIND = 14, + HttpVerbPROPPATCH = 15, + HttpVerbMKCOL = 16, + HttpVerbLOCK = 17, + HttpVerbUNLOCK = 18, + HttpVerbSEARCH = 19, + HttpVerbMaximum = 20, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct HTTP_VERSION + { + internal ushort MajorVersion; + internal ushort MinorVersion; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct SOCKADDR + { + internal ushort sa_family; + internal byte sa_data; + internal byte sa_data_02; + internal byte sa_data_03; + internal byte sa_data_04; + internal byte sa_data_05; + internal byte sa_data_06; + internal byte sa_data_07; + internal byte sa_data_08; + internal byte sa_data_09; + internal byte sa_data_10; + internal byte sa_data_11; + internal byte sa_data_12; + internal byte sa_data_13; + internal byte sa_data_14; + } + } + [System.CodeDom.Compiler.GeneratedCodeAttribute("TextTemplatingFileGenerator", "")] + internal partial class RequestHeaders : Microsoft.AspNetCore.Http.IHeaderDictionary, System.Collections.Generic.ICollection>, System.Collections.Generic.IDictionary, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + { + internal RequestHeaders(Microsoft.AspNetCore.HttpSys.Internal.NativeRequestContext requestMemoryBlob) { } + internal Microsoft.Extensions.Primitives.StringValues Accept { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues AcceptCharset { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues AcceptEncoding { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues AcceptLanguage { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Allow { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Authorization { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues CacheControl { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Connection { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues ContentEncoding { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues ContentLanguage { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues ContentLength { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues ContentLocation { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues ContentMd5 { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues ContentRange { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues ContentType { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Cookie { get { throw null; } set { } } + public int Count { get { throw null; } } + internal Microsoft.Extensions.Primitives.StringValues Date { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Expect { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Expires { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues From { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Host { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues IfMatch { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues IfModifiedSince { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues IfNoneMatch { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues IfRange { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues IfUnmodifiedSince { get { throw null; } set { } } + public bool IsReadOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } + public Microsoft.Extensions.Primitives.StringValues this[string key] { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues KeepAlive { get { throw null; } set { } } + public System.Collections.Generic.ICollection Keys { get { throw null; } } + internal Microsoft.Extensions.Primitives.StringValues LastModified { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues MaxForwards { get { throw null; } set { } } + long? Microsoft.AspNetCore.Http.IHeaderDictionary.ContentLength { get { throw null; } set { } } + Microsoft.Extensions.Primitives.StringValues Microsoft.AspNetCore.Http.IHeaderDictionary.this[string key] { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Pragma { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues ProxyAuthorization { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Range { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Referer { get { throw null; } set { } } + bool System.Collections.Generic.ICollection>.IsReadOnly { get { throw null; } } + Microsoft.Extensions.Primitives.StringValues System.Collections.Generic.IDictionary.this[string key] { get { throw null; } set { } } + System.Collections.Generic.ICollection System.Collections.Generic.IDictionary.Values { get { throw null; } } + internal Microsoft.Extensions.Primitives.StringValues Te { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Trailer { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues TransferEncoding { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Translate { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Upgrade { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues UserAgent { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Via { get { throw null; } set { } } + internal Microsoft.Extensions.Primitives.StringValues Warning { get { throw null; } set { } } + public bool ContainsKey(string key) { throw null; } + public System.Collections.Generic.IEnumerable GetValues(string key) { throw null; } + public bool Remove(string key) { throw null; } + void System.Collections.Generic.ICollection>.Add(System.Collections.Generic.KeyValuePair item) { } + void System.Collections.Generic.ICollection>.Clear() { } + bool System.Collections.Generic.ICollection>.Contains(System.Collections.Generic.KeyValuePair item) { throw null; } + void System.Collections.Generic.ICollection>.CopyTo(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { } + bool System.Collections.Generic.ICollection>.Remove(System.Collections.Generic.KeyValuePair item) { throw null; } + void System.Collections.Generic.IDictionary.Add(string key, Microsoft.Extensions.Primitives.StringValues value) { } + System.Collections.Generic.IEnumerator> System.Collections.Generic.IEnumerable>.GetEnumerator() { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + public bool TryGetValue(string key, out Microsoft.Extensions.Primitives.StringValues value) { throw null; } + } + internal partial class NativeRequestContext : System.IDisposable + { + internal unsafe NativeRequestContext(Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_REQUEST* request) { } + internal unsafe NativeRequestContext(Microsoft.AspNetCore.HttpSys.Internal.SafeNativeOverlapped nativeOverlapped, int bufferAlignment, Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_REQUEST* nativeRequest, byte[] backingBuffer, ulong requestId) { } + internal ulong ConnectionId { get { throw null; } } + internal bool IsHttp2 { get { throw null; } } + internal Microsoft.AspNetCore.HttpSys.Internal.SafeNativeOverlapped NativeOverlapped { get { throw null; } } + internal unsafe Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_REQUEST* NativeRequest { get { throw null; } } + internal unsafe Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_REQUEST_V2* NativeRequestV2 { get { throw null; } } + internal ulong RequestId { get { throw null; } set { } } + internal uint Size { get { throw null; } } + internal Microsoft.AspNetCore.HttpSys.Internal.SslStatus SslStatus { get { throw null; } } + internal ushort UnknownHeaderCount { get { throw null; } } + internal ulong UrlContext { get { throw null; } } + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_VERB VerbId { get { throw null; } } + internal bool CheckAuthenticated() { throw null; } + public virtual void Dispose() { } + internal uint GetChunks(ref int dataChunkIndex, ref uint dataChunkOffset, byte[] buffer, int offset, int size) { throw null; } + internal Microsoft.AspNetCore.HttpSys.Internal.CookedUrl GetCookedUrl() { throw null; } + internal string GetKnownHeader(Microsoft.AspNetCore.HttpSys.Internal.HttpSysRequestHeader header) { throw null; } + internal Microsoft.AspNetCore.HttpSys.Internal.SocketAddress GetLocalEndPoint() { throw null; } + internal string GetRawUrl() { throw null; } + internal System.Span GetRawUrlInBytes() { throw null; } + internal Microsoft.AspNetCore.HttpSys.Internal.SocketAddress GetRemoteEndPoint() { throw null; } + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_SSL_PROTOCOL_INFO GetTlsHandshake() { throw null; } + internal void GetUnknownHeaders(System.Collections.Generic.IDictionary unknownHeaders) { } + internal System.Security.Principal.WindowsPrincipal GetUser() { throw null; } + internal string GetVerb() { throw null; } + internal System.Version GetVersion() { throw null; } + internal void ReleasePins() { } + } + internal partial class HeaderCollection : Microsoft.AspNetCore.Http.IHeaderDictionary, System.Collections.Generic.ICollection>, System.Collections.Generic.IDictionary, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + { + public HeaderCollection() { } + public HeaderCollection(System.Collections.Generic.IDictionary store) { } + public long? ContentLength { get { throw null; } set { } } + public int Count { get { throw null; } } + public bool IsReadOnly { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } + public Microsoft.Extensions.Primitives.StringValues this[string key] { get { throw null; } set { } } + public System.Collections.Generic.ICollection Keys { get { throw null; } } + Microsoft.Extensions.Primitives.StringValues System.Collections.Generic.IDictionary.this[string key] { get { throw null; } set { } } + public System.Collections.Generic.ICollection Values { get { throw null; } } + public void Add(System.Collections.Generic.KeyValuePair item) { } + public void Add(string key, Microsoft.Extensions.Primitives.StringValues value) { } + public void Append(string key, string value) { } + public void Clear() { } + public bool Contains(System.Collections.Generic.KeyValuePair item) { throw null; } + public bool ContainsKey(string key) { throw null; } + public void CopyTo(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { } + public System.Collections.Generic.IEnumerator> GetEnumerator() { throw null; } + public System.Collections.Generic.IEnumerable GetValues(string key) { throw null; } + public bool Remove(System.Collections.Generic.KeyValuePair item) { throw null; } + public bool Remove(string key) { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + public bool TryGetValue(string key, out Microsoft.Extensions.Primitives.StringValues value) { throw null; } + public static void ValidateHeaderCharacters(Microsoft.Extensions.Primitives.StringValues headerValues) { } + public static void ValidateHeaderCharacters(string headerCharacters) { } + } +} +namespace Microsoft.AspNetCore.Server.HttpSys +{ + internal partial class ResponseBody : System.IO.Stream + { + internal ResponseBody(Microsoft.AspNetCore.Server.HttpSys.RequestContext requestContext) { } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanWrite { get { throw null; } } + internal bool IsDisposed { get { throw null; } } + public override long Length { get { throw null; } } + public override long Position { get { throw null; } set { } } + internal Microsoft.AspNetCore.Server.HttpSys.RequestContext RequestContext { get { throw null; } } + internal bool ThrowWriteExceptions { get { throw null; } } + internal void Abort(bool dispose = true) { } + public override System.IAsyncResult BeginRead(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + public override System.IAsyncResult BeginWrite(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + internal void CancelLastWrite() { } + protected override void Dispose(bool disposing) { } + public override int EndRead(System.IAsyncResult asyncResult) { throw null; } + public override void EndWrite(System.IAsyncResult asyncResult) { } + public override void Flush() { } + public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + internal System.Threading.Tasks.Task SendFileAsyncCore(string fileName, long offset, long? count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override void SetLength(long value) { } + internal void SwitchToOpaqueMode() { } + public override void Write(byte[] buffer, int offset, int count) { } + public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + } + internal partial class ResponseStreamAsyncResult : System.IAsyncResult, System.IDisposable + { + internal ResponseStreamAsyncResult(Microsoft.AspNetCore.Server.HttpSys.ResponseBody responseStream, System.ArraySegment data, bool chunked, System.Threading.CancellationToken cancellationToken) { } + internal ResponseStreamAsyncResult(Microsoft.AspNetCore.Server.HttpSys.ResponseBody responseStream, System.IO.FileStream fileStream, long offset, long count, bool chunked, System.Threading.CancellationToken cancellationToken) { } + internal ResponseStreamAsyncResult(Microsoft.AspNetCore.Server.HttpSys.ResponseBody responseStream, System.Threading.CancellationToken cancellationToken) { } + public object AsyncState { get { throw null; } } + public System.Threading.WaitHandle AsyncWaitHandle { get { throw null; } } + internal uint BytesSent { get { throw null; } set { } } + public bool CompletedSynchronously { get { throw null; } } + internal ushort DataChunkCount { get { throw null; } } + internal unsafe Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_DATA_CHUNK* DataChunks { get { throw null; } } + internal bool EndCalled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool IsCompleted { get { throw null; } } + internal Microsoft.AspNetCore.HttpSys.Internal.SafeNativeOverlapped NativeOverlapped { get { throw null; } } + internal System.Threading.Tasks.Task Task { get { throw null; } } + internal void Cancel(bool dispose) { } + internal void Complete() { } + public void Dispose() { } + internal void Fail(System.Exception ex) { } + internal void FailSilently() { } + internal void IOCompleted(uint errorCode) { } + internal void IOCompleted(uint errorCode, uint numBytes) { } + } + internal sealed partial class HttpServerSessionHandle : Microsoft.Win32.SafeHandles.CriticalHandleZeroOrMinusOneIsInvalid + { + internal HttpServerSessionHandle(ulong id) { } + internal ulong DangerousGetServerSessionId() { throw null; } + protected override bool ReleaseHandle() { throw null; } + } + internal partial class ServerSession : System.IDisposable + { + internal ServerSession() { } + public Microsoft.AspNetCore.Server.HttpSys.HttpServerSessionHandle Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void Dispose() { } + } + internal partial class UrlGroup : System.IDisposable + { + internal UrlGroup(Microsoft.AspNetCore.Server.HttpSys.ServerSession serverSession, Microsoft.Extensions.Logging.ILogger logger) { } + internal ulong Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void Dispose() { } + internal void RegisterPrefix(string uriPrefix, int contextId) { } + internal void SetMaxConnections(long maxConnections) { } + internal void SetProperty(Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_SERVER_PROPERTY property, System.IntPtr info, uint infosize, bool throwOnError = true) { } + internal bool UnregisterPrefix(string uriPrefix) { throw null; } + } + internal partial class RequestQueue + { + internal RequestQueue(Microsoft.AspNetCore.Server.HttpSys.UrlGroup urlGroup, Microsoft.Extensions.Logging.ILogger logger) { } + internal System.Threading.ThreadPoolBoundHandle BoundHandle { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal System.Runtime.InteropServices.SafeHandle Handle { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal void AttachToUrlGroup() { } + internal void DetachFromUrlGroup() { } + public void Dispose() { } + internal void SetLengthLimit(long length) { } + internal void SetRejectionVerbosity(Microsoft.AspNetCore.Server.HttpSys.Http503VerbosityLevel verbosity) { } + } + internal enum BoundaryType + { + None = 0, + Chunked = 1, + ContentLength = 2, + Close = 3, + PassThrough = 4, + Invalid = 5, + } + internal sealed partial class Request + { + internal Request(Microsoft.AspNetCore.Server.HttpSys.RequestContext requestContext, Microsoft.AspNetCore.HttpSys.Internal.NativeRequestContext nativeRequestContext) { } + public System.IO.Stream Body { get { throw null; } } + public System.Security.Authentication.CipherAlgorithmType CipherAlgorithm { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int CipherStrength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public long ConnectionId { get { throw null; } } + public long? ContentLength { get { throw null; } } + public bool HasEntityBody { get { throw null; } } + public System.Security.Authentication.HashAlgorithmType HashAlgorithm { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int HashStrength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool HasRequestBodyStarted { get { throw null; } } + public Microsoft.AspNetCore.HttpSys.Internal.RequestHeaders Headers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal bool IsHeadMethod { get { throw null; } } + public bool IsHttps { get { throw null; } } + internal bool IsUpgradable { get { throw null; } } + public System.Security.Authentication.ExchangeAlgorithmType KeyExchangeAlgorithm { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int KeyExchangeStrength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_VERB KnownMethod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Net.IPAddress LocalIpAddress { get { throw null; } } + public int LocalPort { get { throw null; } } + public long? MaxRequestBodySize { get { throw null; } set { } } + public string Method { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string PathBase { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Security.Authentication.SslProtocols Protocol { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Version ProtocolVersion { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string QueryString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string RawUrl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Net.IPAddress RemoteIpAddress { get { throw null; } } + public int RemotePort { get { throw null; } } + internal ulong RequestId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string Scheme { get { throw null; } } + internal ulong UConnectionId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal System.Security.Principal.WindowsPrincipal User { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal void Dispose() { } + internal uint GetChunks(ref int dataChunkIndex, ref uint dataChunkOffset, byte[] buffer, int offset, int size) { throw null; } + internal void SwitchToOpaqueMode() { } + } + internal sealed partial class Response + { + internal Response(Microsoft.AspNetCore.Server.HttpSys.RequestContext requestContext) { } + public Microsoft.AspNetCore.Server.HttpSys.AuthenticationSchemes AuthenticationChallenges { get { throw null; } set { } } + public System.IO.Stream Body { get { throw null; } } + internal bool BodyIsFinished { get { throw null; } } + internal Microsoft.AspNetCore.Server.HttpSys.BoundaryType BoundaryType { get { throw null; } } + public System.TimeSpan? CacheTtl { get { throw null; } set { } } + public long? ContentLength { get { throw null; } set { } } + internal long ExpectedBodyLength { get { throw null; } } + internal bool HasComputedHeaders { get { throw null; } } + public bool HasStarted { get { throw null; } } + public Microsoft.AspNetCore.HttpSys.Internal.HeaderCollection Headers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string ReasonPhrase { get { throw null; } set { } } + public int StatusCode { get { throw null; } set { } } + internal void Abort() { } + internal void CancelLastWrite() { } + internal Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_FLAGS ComputeHeaders(long writeCount, bool endOfRequest = false) { throw null; } + internal void Dispose() { } + public System.Threading.Tasks.Task SendFileAsync(string path, long offset, long? count, System.Threading.CancellationToken cancel) { throw null; } + internal uint SendHeaders(Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_DATA_CHUNK[] dataChunks, Microsoft.AspNetCore.Server.HttpSys.ResponseStreamAsyncResult asyncResult, Microsoft.AspNetCore.HttpSys.Internal.HttpApiTypes.HTTP_FLAGS flags, bool isOpaqueUpgrade) { throw null; } + internal void SendOpaqueUpgrade() { } + internal void SwitchToOpaqueMode() { } + } + internal partial class DisconnectListener + { + internal DisconnectListener(Microsoft.AspNetCore.Server.HttpSys.RequestQueue requestQueue, Microsoft.Extensions.Logging.ILogger logger) { } + internal System.Threading.CancellationToken GetTokenForConnection(ulong connectionId) { throw null; } + } + internal partial class HttpSysListener : System.IDisposable + { + internal static readonly bool SkipIOCPCallbackOnSuccess; + public HttpSysListener(Microsoft.AspNetCore.Server.HttpSys.HttpSysOptions options, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + internal Microsoft.AspNetCore.Server.HttpSys.DisconnectListener DisconnectListener { get { throw null; } } + public bool IsListening { get { throw null; } } + internal Microsoft.Extensions.Logging.ILogger Logger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Server.HttpSys.HttpSysOptions Options { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.Server.HttpSys.RequestQueue RequestQueue { get { throw null; } } + internal Microsoft.AspNetCore.Server.HttpSys.UrlGroup UrlGroup { get { throw null; } } + public System.Threading.Tasks.Task AcceptAsync() { throw null; } + internal void SendError(ulong requestId, int httpStatusCode, System.Collections.Generic.IList authChallenges = null) { } + public void Start() { } + public void Dispose() { } + internal bool ValidateAuth(Microsoft.AspNetCore.HttpSys.Internal.NativeRequestContext requestMemory) { throw null; } + internal bool ValidateRequest(Microsoft.AspNetCore.HttpSys.Internal.NativeRequestContext requestMemory) { throw null; } + internal enum State + { + Stopped = 0, + Started = 1, + Disposed = 2, + } + } + internal sealed partial class RequestContext : System.IDisposable + { + internal RequestContext(Microsoft.AspNetCore.Server.HttpSys.HttpSysListener server, Microsoft.AspNetCore.HttpSys.Internal.NativeRequestContext memoryBlob) { } + internal bool AllowSynchronousIO { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Threading.CancellationToken DisconnectToken { get { throw null; } } + public bool IsUpgradableRequest { get { throw null; } } + internal Microsoft.Extensions.Logging.ILogger Logger { get { throw null; } } + public Microsoft.AspNetCore.Server.HttpSys.Request Request { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Server.HttpSys.Response Response { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.Server.HttpSys.HttpSysListener Server { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Guid TraceIdentifier { get { throw null; } } + public System.Security.Principal.WindowsPrincipal User { get { throw null; } } + public void Abort() { } + public void Dispose() { } + internal void ForceCancelRequest() { } + internal System.Threading.CancellationTokenRegistration RegisterForCancellation(System.Threading.CancellationToken cancellationToken) { throw null; } + internal bool TryGetChannelBinding(ref System.Security.Authentication.ExtendedProtection.ChannelBinding value) { throw null; } + public System.Threading.Tasks.Task UpgradeAsync() { throw null; } + } + internal partial class MessagePump : Microsoft.AspNetCore.Hosting.Server.IServer, System.IDisposable + { + public MessagePump(Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Authentication.IAuthenticationSchemeProvider authentication) { } + public Microsoft.AspNetCore.Http.Features.IFeatureCollection Features { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.Server.HttpSys.HttpSysListener Listener { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void Dispose() { } + public System.Threading.Tasks.Task StartAsync(Microsoft.AspNetCore.Hosting.Server.IHttpApplication application, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + } +} diff --git a/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.csproj b/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.csproj index 2b92e312fd..dc24081d16 100644 --- a/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.csproj +++ b/src/Servers/HttpSys/ref/Microsoft.AspNetCore.Server.HttpSys.csproj @@ -2,16 +2,16 @@ netcoreapp3.0 - false - - - - - - - + + + + + + + + diff --git a/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.Manual.cs b/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.Manual.cs index ab9860b033..e196d65197 100644 --- a/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.Manual.cs +++ b/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.Manual.cs @@ -1,8 +1,28 @@ // 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.Runtime.CompilerServices; -using Microsoft.AspNetCore.Http.Features; - -[assembly: TypeForwardedTo(typeof(IServerVariablesFeature))] - +namespace Microsoft.AspNetCore.Server.IIS +{ + internal static partial class CoreStrings + { + internal static string BadRequest { get { throw null; } } + internal static string BadRequest_RequestBodyTooLarge { get { throw null; } } + internal static string CannotUpgradeNonUpgradableRequest { get { throw null; } } + internal static string ConnectionAbortedByApplication { get { throw null; } } + internal static string ConnectionOrStreamAbortedByCancellationToken { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static string MaxRequestBodySizeCannotBeModifiedAfterRead { get { throw null; } } + internal static string MaxRequestBodySizeCannotBeModifiedForUpgradedRequests { get { throw null; } } + internal static string MaxRequestLimitWarning { get { throw null; } } + internal static string NonNegativeNumberOrNullRequired { get { throw null; } } + internal static string ParameterReadOnlyAfterResponseStarted { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string ResponseStreamWasUpgraded { get { throw null; } } + internal static string SynchronousReadsDisallowed { get { throw null; } } + internal static string SynchronousWritesDisallowed { get { throw null; } } + internal static string UnhandledApplicationException { get { throw null; } } + internal static string UpgradeCannotBeCalledMultipleTimes { get { throw null; } } + internal static string WritingToResponseBodyAfterResponseCompleted { get { throw null; } } + internal static string FormatParameterReadOnlyAfterResponseStarted(object name) { throw null; } + } +} \ No newline at end of file diff --git a/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj index 95c9adfce8..1d9b09bf2b 100644 --- a/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj @@ -2,20 +2,19 @@ netcoreapp3.0 - false - - - - - - - - - - + + + + + + + + + + diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj index d1b825a185..651cdf6975 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj @@ -15,11 +15,6 @@ - - - diff --git a/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.Manual.cs b/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.Manual.cs new file mode 100644 index 0000000000..b2eb6c120c --- /dev/null +++ b/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.Manual.cs @@ -0,0 +1,18 @@ +// 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. + +namespace Microsoft.AspNetCore.Builder +{ + public partial class IISOptions + { + internal bool ForwardWindowsAuthentication { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } +} +namespace Microsoft.AspNetCore.Server.IISIntegration +{ + internal partial class IISSetupFilter : Microsoft.AspNetCore.Hosting.IStartupFilter + { + internal IISSetupFilter(string pairingToken, Microsoft.AspNetCore.Http.PathString pathBase, bool isWebsocketsSupported) { } + public System.Action Configure(System.Action next) { throw null; } + } +} diff --git a/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj index 7574056789..06ef7bbeac 100644 --- a/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Servers/IIS/IISIntegration/ref/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -2,20 +2,20 @@ netcoreapp3.0 - false - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Servers/Kestrel/Core/ref/Directory.Build.props b/src/Servers/Kestrel/Core/ref/Directory.Build.props deleted file mode 100644 index ea5de23302..0000000000 --- a/src/Servers/Kestrel/Core/ref/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - $(NoWarn);CS0169 - - \ No newline at end of file diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs index 3027febf33..cdd28e0d0d 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs @@ -1,17 +1,1953 @@ // 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.Runtime.CompilerServices; +namespace Microsoft.AspNetCore.Server.Kestrel.Core +{ + public partial class KestrelServer : Microsoft.AspNetCore.Hosting.Server.IServer, System.IDisposable + { + internal KestrelServer(Microsoft.AspNetCore.Connections.IConnectionListenerFactory transportFactory, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.ServiceContext serviceContext) { } + } + public sealed partial class BadHttpRequestException : System.IO.IOException + { + internal Microsoft.Extensions.Primitives.StringValues AllowedHeader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason Reason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]internal static Microsoft.AspNetCore.Server.Kestrel.Core.BadHttpRequestException GetException(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason reason) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]internal static Microsoft.AspNetCore.Server.Kestrel.Core.BadHttpRequestException GetException(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason reason, string detail) { throw null; } + [System.Diagnostics.StackTraceHiddenAttribute] + internal static void Throw(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason reason) { } + [System.Diagnostics.StackTraceHiddenAttribute] + internal static void Throw(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason reason, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod method) { } + [System.Diagnostics.StackTraceHiddenAttribute] + internal static void Throw(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason reason, Microsoft.Extensions.Primitives.StringValues detail) { } + [System.Diagnostics.StackTraceHiddenAttribute] + internal static void Throw(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason reason, string detail) { } + } + internal sealed partial class LocalhostListenOptions : Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions + { + internal LocalhostListenOptions(int port) : base (default(System.Net.IPEndPoint)) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + internal override System.Threading.Tasks.Task BindAsync(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.AddressBindContext context) { throw null; } + internal Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions Clone(System.Net.IPAddress address) { throw null; } + internal override string GetDisplayName() { throw null; } + } + internal sealed partial class AnyIPListenOptions : Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions + { + internal AnyIPListenOptions(int port) : base (default(System.Net.IPEndPoint)) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + internal override System.Threading.Tasks.Task BindAsync(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.AddressBindContext context) { throw null; } + } + public partial class KestrelServerOptions + { + internal System.Security.Cryptography.X509Certificates.X509Certificate2 DefaultCertificate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal bool IsDevCertLoaded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal System.Collections.Generic.List ListenOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal void ApplyDefaultCert(Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions httpsOptions) { } + internal void ApplyEndpointDefaults(Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions listenOptions) { } + internal void ApplyHttpsDefaults(Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions httpsOptions) { } + } + internal static partial class CoreStrings + { + internal static string AddressBindingFailed { get { throw null; } } + internal static string ArgumentOutOfRange { get { throw null; } } + internal static string AuthenticationFailed { get { throw null; } } + internal static string AuthenticationTimedOut { get { throw null; } } + internal static string BadRequest { get { throw null; } } + internal static string BadRequest_BadChunkSizeData { get { throw null; } } + internal static string BadRequest_BadChunkSuffix { get { throw null; } } + internal static string BadRequest_ChunkedRequestIncomplete { get { throw null; } } + internal static string BadRequest_FinalTransferCodingNotChunked { get { throw null; } } + internal static string BadRequest_HeadersExceedMaxTotalSize { get { throw null; } } + internal static string BadRequest_InvalidCharactersInHeaderName { get { throw null; } } + internal static string BadRequest_InvalidContentLength_Detail { get { throw null; } } + internal static string BadRequest_InvalidHostHeader { get { throw null; } } + internal static string BadRequest_InvalidHostHeader_Detail { get { throw null; } } + internal static string BadRequest_InvalidRequestHeadersNoCRLF { get { throw null; } } + internal static string BadRequest_InvalidRequestHeader_Detail { get { throw null; } } + internal static string BadRequest_InvalidRequestLine { get { throw null; } } + internal static string BadRequest_InvalidRequestLine_Detail { get { throw null; } } + internal static string BadRequest_InvalidRequestTarget_Detail { get { throw null; } } + internal static string BadRequest_LengthRequired { get { throw null; } } + internal static string BadRequest_LengthRequiredHttp10 { get { throw null; } } + internal static string BadRequest_MalformedRequestInvalidHeaders { get { throw null; } } + internal static string BadRequest_MethodNotAllowed { get { throw null; } } + internal static string BadRequest_MissingHostHeader { get { throw null; } } + internal static string BadRequest_MultipleContentLengths { get { throw null; } } + internal static string BadRequest_MultipleHostHeaders { get { throw null; } } + internal static string BadRequest_RequestBodyTimeout { get { throw null; } } + internal static string BadRequest_RequestBodyTooLarge { get { throw null; } } + internal static string BadRequest_RequestHeadersTimeout { get { throw null; } } + internal static string BadRequest_RequestLineTooLong { get { throw null; } } + internal static string BadRequest_TooManyHeaders { get { throw null; } } + internal static string BadRequest_UnexpectedEndOfRequestContent { get { throw null; } } + internal static string BadRequest_UnrecognizedHTTPVersion { get { throw null; } } + internal static string BadRequest_UpgradeRequestCannotHavePayload { get { throw null; } } + internal static string BigEndianNotSupported { get { throw null; } } + internal static string BindingToDefaultAddress { get { throw null; } } + internal static string BindingToDefaultAddresses { get { throw null; } } + internal static string CannotUpgradeNonUpgradableRequest { get { throw null; } } + internal static string CertNotFoundInStore { get { throw null; } } + internal static string ConcurrentTimeoutsNotSupported { get { throw null; } } + internal static string ConfigureHttpsFromMethodCall { get { throw null; } } + internal static string ConfigurePathBaseFromMethodCall { get { throw null; } } + internal static string ConnectionAbortedByApplication { get { throw null; } } + internal static string ConnectionAbortedByClient { get { throw null; } } + internal static string ConnectionAbortedDuringServerShutdown { get { throw null; } } + internal static string ConnectionOrStreamAbortedByCancellationToken { get { throw null; } } + internal static string ConnectionShutdownError { get { throw null; } } + internal static string ConnectionTimedBecauseResponseMininumDataRateNotSatisfied { get { throw null; } } + internal static string ConnectionTimedOutByServer { get { throw null; } } + internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal static string DynamicPortOnLocalhostNotSupported { get { throw null; } } + internal static string EndpointAlreadyInUse { get { throw null; } } + internal static string EndPointHttp2NotNegotiated { get { throw null; } } + internal static string EndpointMissingUrl { get { throw null; } } + internal static string EndPointRequiresAtLeastOneProtocol { get { throw null; } } + internal static string FallbackToIPv4Any { get { throw null; } } + internal static string GreaterThanZeroRequired { get { throw null; } } + internal static string HeaderNotAllowedOnResponse { get { throw null; } } + internal static string HeadersAreReadOnly { get { throw null; } } + internal static string HPackErrorDynamicTableSizeUpdateNotAtBeginningOfHeaderBlock { get { throw null; } } + internal static string HPackErrorDynamicTableSizeUpdateTooLarge { get { throw null; } } + internal static string HPackErrorIncompleteHeaderBlock { get { throw null; } } + internal static string HPackErrorIndexOutOfRange { get { throw null; } } + internal static string HPackErrorIntegerTooBig { get { throw null; } } + internal static string HPackErrorNotEnoughBuffer { get { throw null; } } + internal static string HPackHuffmanError { get { throw null; } } + internal static string HPackHuffmanErrorDestinationTooSmall { get { throw null; } } + internal static string HPackHuffmanErrorEOS { get { throw null; } } + internal static string HPackHuffmanErrorIncomplete { get { throw null; } } + internal static string HPackStringLengthTooLarge { get { throw null; } } + internal static string Http2ConnectionFaulted { get { throw null; } } + internal static string Http2ErrorConnectionSpecificHeaderField { get { throw null; } } + internal static string Http2ErrorConnectMustNotSendSchemeOrPath { get { throw null; } } + internal static string Http2ErrorContinuationWithNoHeaders { get { throw null; } } + internal static string Http2ErrorDuplicatePseudoHeaderField { get { throw null; } } + internal static string Http2ErrorFlowControlWindowExceeded { get { throw null; } } + internal static string Http2ErrorFrameOverLimit { get { throw null; } } + internal static string Http2ErrorHeaderNameUppercase { get { throw null; } } + internal static string Http2ErrorHeadersInterleaved { get { throw null; } } + internal static string Http2ErrorHeadersWithTrailersNoEndStream { get { throw null; } } + internal static string Http2ErrorInitialWindowSizeInvalid { get { throw null; } } + internal static string Http2ErrorInvalidPreface { get { throw null; } } + internal static string Http2ErrorMaxStreams { get { throw null; } } + internal static string Http2ErrorMethodInvalid { get { throw null; } } + internal static string Http2ErrorMinTlsVersion { get { throw null; } } + internal static string Http2ErrorMissingMandatoryPseudoHeaderFields { get { throw null; } } + internal static string Http2ErrorPaddingTooLong { get { throw null; } } + internal static string Http2ErrorPseudoHeaderFieldAfterRegularHeaders { get { throw null; } } + internal static string Http2ErrorPushPromiseReceived { get { throw null; } } + internal static string Http2ErrorResponsePseudoHeaderField { get { throw null; } } + internal static string Http2ErrorSettingsAckLengthNotZero { get { throw null; } } + internal static string Http2ErrorSettingsLengthNotMultipleOfSix { get { throw null; } } + internal static string Http2ErrorSettingsParameterOutOfRange { get { throw null; } } + internal static string Http2ErrorStreamAborted { get { throw null; } } + internal static string Http2ErrorStreamClosed { get { throw null; } } + internal static string Http2ErrorStreamHalfClosedRemote { get { throw null; } } + internal static string Http2ErrorStreamIdEven { get { throw null; } } + internal static string Http2ErrorStreamIdle { get { throw null; } } + internal static string Http2ErrorStreamIdNotZero { get { throw null; } } + internal static string Http2ErrorStreamIdZero { get { throw null; } } + internal static string Http2ErrorStreamSelfDependency { get { throw null; } } + internal static string Http2ErrorTrailerNameUppercase { get { throw null; } } + internal static string Http2ErrorTrailersContainPseudoHeaderField { get { throw null; } } + internal static string Http2ErrorUnexpectedFrameLength { get { throw null; } } + internal static string Http2ErrorUnknownPseudoHeaderField { get { throw null; } } + internal static string Http2ErrorWindowUpdateIncrementZero { get { throw null; } } + internal static string Http2ErrorWindowUpdateSizeInvalid { get { throw null; } } + internal static string Http2MinDataRateNotSupported { get { throw null; } } + internal static string HTTP2NoTlsOsx { get { throw null; } } + internal static string HTTP2NoTlsWin7 { get { throw null; } } + internal static string Http2StreamAborted { get { throw null; } } + internal static string Http2StreamErrorAfterHeaders { get { throw null; } } + internal static string Http2StreamErrorLessDataThanLength { get { throw null; } } + internal static string Http2StreamErrorMoreDataThanLength { get { throw null; } } + internal static string Http2StreamErrorPathInvalid { get { throw null; } } + internal static string Http2StreamErrorSchemeMismatch { get { throw null; } } + internal static string Http2StreamResetByApplication { get { throw null; } } + internal static string Http2StreamResetByClient { get { throw null; } } + internal static string Http2TellClientToCalmDown { get { throw null; } } + internal static string InvalidAsciiOrControlChar { get { throw null; } } + internal static string InvalidContentLength_InvalidNumber { get { throw null; } } + internal static string InvalidEmptyHeaderName { get { throw null; } } + internal static string InvalidServerCertificateEku { get { throw null; } } + internal static string InvalidUrl { get { throw null; } } + internal static string KeyAlreadyExists { get { throw null; } } + internal static string MaxRequestBodySizeCannotBeModifiedAfterRead { get { throw null; } } + internal static string MaxRequestBodySizeCannotBeModifiedForUpgradedRequests { get { throw null; } } + internal static string MaxRequestBufferSmallerThanRequestHeaderBuffer { get { throw null; } } + internal static string MaxRequestBufferSmallerThanRequestLineBuffer { get { throw null; } } + internal static string MinimumGracePeriodRequired { get { throw null; } } + internal static string MultipleCertificateSources { get { throw null; } } + internal static string NetworkInterfaceBindingFailed { get { throw null; } } + internal static string NoCertSpecifiedNoDevelopmentCertificateFound { get { throw null; } } + internal static string NonNegativeNumberOrNullRequired { get { throw null; } } + internal static string NonNegativeNumberRequired { get { throw null; } } + internal static string NonNegativeTimeSpanRequired { get { throw null; } } + internal static string OverridingWithKestrelOptions { get { throw null; } } + internal static string OverridingWithPreferHostingUrls { get { throw null; } } + internal static string ParameterReadOnlyAfterResponseStarted { get { throw null; } } + internal static string PositiveFiniteTimeSpanRequired { get { throw null; } } + internal static string PositiveNumberOrNullMinDataRateRequired { get { throw null; } } + internal static string PositiveNumberOrNullRequired { get { throw null; } } + internal static string PositiveNumberRequired { get { throw null; } } + internal static string PositiveTimeSpanRequired { get { throw null; } } + internal static string PositiveTimeSpanRequired1 { get { throw null; } } + internal static string ProtocolSelectionFailed { get { throw null; } } + internal static string RequestProcessingAborted { get { throw null; } } + internal static string RequestProcessingEndError { get { throw null; } } + internal static string RequestTrailersNotAvailable { get { throw null; } } + internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } + internal static string ResponseStreamWasUpgraded { get { throw null; } } + internal static string ServerAlreadyStarted { get { throw null; } } + internal static string ServerCertificateRequired { get { throw null; } } + internal static string ServerShutdownDuringConnectionInitialization { get { throw null; } } + internal static string StartAsyncBeforeGetMemory { get { throw null; } } + internal static string SynchronousReadsDisallowed { get { throw null; } } + internal static string SynchronousWritesDisallowed { get { throw null; } } + internal static string TooFewBytesWritten { get { throw null; } } + internal static string TooManyBytesWritten { get { throw null; } } + internal static string UnableToConfigureHttpsBindings { get { throw null; } } + internal static string UnhandledApplicationException { get { throw null; } } + internal static string UnixSocketPathMustBeAbsolute { get { throw null; } } + internal static string UnknownTransportMode { get { throw null; } } + internal static string UnsupportedAddressScheme { get { throw null; } } + internal static string UpgradeCannotBeCalledMultipleTimes { get { throw null; } } + internal static string UpgradedConnectionLimitReached { get { throw null; } } + internal static string WritingToResponseBodyAfterResponseCompleted { get { throw null; } } + internal static string WritingToResponseBodyNotSupported { get { throw null; } } + internal static string FormatAddressBindingFailed(object address) { throw null; } + internal static string FormatArgumentOutOfRange(object min, object max) { throw null; } + internal static string FormatBadRequest_FinalTransferCodingNotChunked(object detail) { throw null; } + internal static string FormatBadRequest_InvalidContentLength_Detail(object detail) { throw null; } + internal static string FormatBadRequest_InvalidHostHeader_Detail(object detail) { throw null; } + internal static string FormatBadRequest_InvalidRequestHeader_Detail(object detail) { throw null; } + internal static string FormatBadRequest_InvalidRequestLine_Detail(object detail) { throw null; } + internal static string FormatBadRequest_InvalidRequestTarget_Detail(object detail) { throw null; } + internal static string FormatBadRequest_LengthRequired(object detail) { throw null; } + internal static string FormatBadRequest_LengthRequiredHttp10(object detail) { throw null; } + internal static string FormatBadRequest_UnrecognizedHTTPVersion(object detail) { throw null; } + internal static string FormatBindingToDefaultAddress(object address) { throw null; } + internal static string FormatBindingToDefaultAddresses(object address0, object address1) { throw null; } + internal static string FormatCertNotFoundInStore(object subject, object storeLocation, object storeName, object allowInvalid) { throw null; } + internal static string FormatConfigureHttpsFromMethodCall(object methodName) { throw null; } + internal static string FormatConfigurePathBaseFromMethodCall(object methodName) { throw null; } + internal static string FormatEndpointAlreadyInUse(object endpoint) { throw null; } + internal static string FormatEndpointMissingUrl(object endpointName) { throw null; } + internal static string FormatFallbackToIPv4Any(object port) { throw null; } + internal static string FormatHeaderNotAllowedOnResponse(object name, object statusCode) { throw null; } + internal static string FormatHPackErrorDynamicTableSizeUpdateTooLarge(object size, object maxSize) { throw null; } + internal static string FormatHPackErrorIndexOutOfRange(object index) { throw null; } + internal static string FormatHPackStringLengthTooLarge(object length, object maxStringLength) { throw null; } + internal static string FormatHttp2ErrorFrameOverLimit(object size, object limit) { throw null; } + internal static string FormatHttp2ErrorHeadersInterleaved(object frameType, object streamId, object headersStreamId) { throw null; } + internal static string FormatHttp2ErrorMethodInvalid(object method) { throw null; } + internal static string FormatHttp2ErrorMinTlsVersion(object protocol) { throw null; } + internal static string FormatHttp2ErrorPaddingTooLong(object frameType) { throw null; } + internal static string FormatHttp2ErrorSettingsParameterOutOfRange(object parameter) { throw null; } + internal static string FormatHttp2ErrorStreamAborted(object frameType, object streamId) { throw null; } + internal static string FormatHttp2ErrorStreamClosed(object frameType, object streamId) { throw null; } + internal static string FormatHttp2ErrorStreamHalfClosedRemote(object frameType, object streamId) { throw null; } + internal static string FormatHttp2ErrorStreamIdEven(object frameType, object streamId) { throw null; } + internal static string FormatHttp2ErrorStreamIdle(object frameType, object streamId) { throw null; } + internal static string FormatHttp2ErrorStreamIdNotZero(object frameType) { throw null; } + internal static string FormatHttp2ErrorStreamIdZero(object frameType) { throw null; } + internal static string FormatHttp2ErrorStreamSelfDependency(object frameType, object streamId) { throw null; } + internal static string FormatHttp2ErrorUnexpectedFrameLength(object frameType, object expectedLength) { throw null; } + internal static string FormatHttp2StreamErrorPathInvalid(object path) { throw null; } + internal static string FormatHttp2StreamErrorSchemeMismatch(object requestScheme, object transportScheme) { throw null; } + internal static string FormatHttp2StreamResetByApplication(object errorCode) { throw null; } + internal static string FormatInvalidAsciiOrControlChar(object character) { throw null; } + internal static string FormatInvalidContentLength_InvalidNumber(object value) { throw null; } + internal static string FormatInvalidServerCertificateEku(object thumbprint) { throw null; } + internal static string FormatInvalidUrl(object url) { throw null; } + internal static string FormatMaxRequestBufferSmallerThanRequestHeaderBuffer(object requestBufferSize, object requestHeaderSize) { throw null; } + internal static string FormatMaxRequestBufferSmallerThanRequestLineBuffer(object requestBufferSize, object requestLineSize) { throw null; } + internal static string FormatMinimumGracePeriodRequired(object heartbeatInterval) { throw null; } + internal static string FormatMultipleCertificateSources(object endpointName) { throw null; } + internal static string FormatNetworkInterfaceBindingFailed(object address, object interfaceName, object error) { throw null; } + internal static string FormatOverridingWithKestrelOptions(object addresses, object methodName) { throw null; } + internal static string FormatOverridingWithPreferHostingUrls(object settingName, object addresses) { throw null; } + internal static string FormatParameterReadOnlyAfterResponseStarted(object name) { throw null; } + internal static string FormatTooFewBytesWritten(object written, object expected) { throw null; } + internal static string FormatTooManyBytesWritten(object written, object expected) { throw null; } + internal static string FormatUnknownTransportMode(object mode) { throw null; } + internal static string FormatUnsupportedAddressScheme(object address) { throw null; } + internal static string FormatWritingToResponseBodyNotSupported(object statusCode) { throw null; } + } -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] + public partial class ListenOptions : Microsoft.AspNetCore.Connections.IConnectionBuilder + { + internal readonly System.Collections.Generic.List> _middleware; + internal ListenOptions(System.Net.IPEndPoint endPoint) { } + internal ListenOptions(string socketPath) { } + internal ListenOptions(ulong fileHandle) { } + internal ListenOptions(ulong fileHandle, Microsoft.AspNetCore.Connections.FileHandleType handleType) { } + public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions KestrelServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } + internal System.Net.EndPoint EndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal bool IsHttp { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal bool IsTls { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal string Scheme { get { throw null; } } + internal virtual string GetDisplayName() { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + internal virtual System.Threading.Tasks.Task BindAsync(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.AddressBindContext context) { throw null; } + } +} +namespace Microsoft.AspNetCore.Server.Kestrel.Https.Internal +{ + internal partial class HttpsConnectionMiddleware + { + public HttpsConnectionMiddleware(Microsoft.AspNetCore.Connections.ConnectionDelegate next, Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions options) { } + public HttpsConnectionMiddleware(Microsoft.AspNetCore.Connections.ConnectionDelegate next, Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions options, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } + public System.Threading.Tasks.Task OnConnectionAsync(Microsoft.AspNetCore.Connections.ConnectionContext context) { throw null; } + } +} +namespace Microsoft.AspNetCore.Server.Kestrel.Https +{ + public static partial class CertificateLoader + { + internal static bool DoesCertificateHaveAnAccessiblePrivateKey(System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { throw null; } + internal static bool IsCertificateAllowedForServerAuth(System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { throw null; } + } +} namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal { + internal static partial class MemoryPoolExtensions + { + public static int GetMinimumAllocSize(this System.Buffers.MemoryPool pool) { throw null; } + public static int GetMinimumSegmentSize(this System.Buffers.MemoryPool pool) { throw null; } + } + internal partial class DuplexPipeStreamAdapter : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.DuplexPipeStream, System.IO.Pipelines.IDuplexPipe where TStream : System.IO.Stream + { + public DuplexPipeStreamAdapter(System.IO.Pipelines.IDuplexPipe duplexPipe, System.Func createStream) : base (default(System.IO.Pipelines.PipeReader), default(System.IO.Pipelines.PipeWriter), default(bool)) { } + public DuplexPipeStreamAdapter(System.IO.Pipelines.IDuplexPipe duplexPipe, System.IO.Pipelines.StreamPipeReaderOptions readerOptions, System.IO.Pipelines.StreamPipeWriterOptions writerOptions, System.Func createStream) : base (default(System.IO.Pipelines.PipeReader), default(System.IO.Pipelines.PipeWriter), default(bool)) { } + public System.IO.Pipelines.PipeReader Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.IO.Pipelines.PipeWriter Output { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public TStream Stream { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + protected override void Dispose(bool disposing) { } + public override System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } + } + internal partial class DuplexPipeStream : System.IO.Stream + { + public DuplexPipeStream(System.IO.Pipelines.PipeReader input, System.IO.Pipelines.PipeWriter output, bool throwOnCancelled = false) { } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanWrite { get { throw null; } } + public override long Length { get { throw null; } } + public override long Position { get { throw null; } set { } } + public override System.IAsyncResult BeginRead(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + public override System.IAsyncResult BeginWrite(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + public void CancelPendingRead() { } + public override int EndRead(System.IAsyncResult asyncResult) { throw null; } + public override void EndWrite(System.IAsyncResult asyncResult) { } + public override void Flush() { } + public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public override System.Threading.Tasks.ValueTask ReadAsync(System.Memory destination, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public override void SetLength(long value) { } + public override void Write(byte[] buffer, int offset, int count) { } + public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override System.Threading.Tasks.ValueTask WriteAsync(System.ReadOnlyMemory source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + } + internal partial class ConnectionLimitMiddleware + { + internal ConnectionLimitMiddleware(Microsoft.AspNetCore.Connections.ConnectionDelegate next, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ResourceCounter concurrentConnectionCounter, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace trace) { } + public ConnectionLimitMiddleware(Microsoft.AspNetCore.Connections.ConnectionDelegate next, long connectionLimit, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace trace) { } + public System.Threading.Tasks.Task OnConnectionAsync(Microsoft.AspNetCore.Connections.ConnectionContext connection) { throw null; } + } + internal static partial class HttpConnectionBuilderExtensions + { + public static Microsoft.AspNetCore.Connections.IConnectionBuilder UseHttpServer(this Microsoft.AspNetCore.Connections.IConnectionBuilder builder, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.ServiceContext serviceContext, Microsoft.AspNetCore.Hosting.Server.IHttpApplication application, Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols protocols) { throw null; } + } + internal partial class HttpConnection : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutHandler + { + public HttpConnection(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext context) { } + internal void Initialize(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.IRequestProcessor requestProcessor) { } + public void OnTimeout(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason reason) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task ProcessRequestsAsync(Microsoft.AspNetCore.Hosting.Server.IHttpApplication httpApplication) { throw null; } + } + internal partial class ConnectionDispatcher + { + public ConnectionDispatcher(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.ServiceContext serviceContext, Microsoft.AspNetCore.Connections.ConnectionDelegate connectionDelegate) { } + public System.Threading.Tasks.Task StartAcceptingConnections(Microsoft.AspNetCore.Connections.IConnectionListener listener) { throw null; } + } + internal partial class ServerAddressesFeature : Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature + { + public ServerAddressesFeature() { } + public System.Collections.Generic.ICollection Addresses { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool PreferHostingUrls { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class AddressBindContext + { + public AddressBindContext() { } + public System.Collections.Generic.ICollection Addresses { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Func CreateBinding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Collections.Generic.List ListenOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.Extensions.Logging.ILogger Logger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions ServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class AddressBinder + { + public AddressBinder() { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public static System.Threading.Tasks.Task BindAsync(Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature addresses, Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions serverOptions, Microsoft.Extensions.Logging.ILogger logger, System.Func createBinding) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + internal static System.Threading.Tasks.Task BindEndpointAsync(Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions endpoint, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.AddressBindContext context) { throw null; } + internal static Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions ParseAddress(string address, out bool https) { throw null; } + protected internal static bool TryCreateIPEndPoint(Microsoft.AspNetCore.Http.BindingAddress address, out System.Net.IPEndPoint endpoint) { throw null; } + } + internal partial class EndpointConfig + { + public EndpointConfig() { } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.CertificateConfig Certificate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.Extensions.Configuration.IConfigurationSection ConfigSection { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols? Protocols { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Url { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class EndpointDefaults + { + public EndpointDefaults() { } + public Microsoft.Extensions.Configuration.IConfigurationSection ConfigSection { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols? Protocols { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class CertificateConfig + { + public CertificateConfig(Microsoft.Extensions.Configuration.IConfigurationSection configSection) { } + public bool? AllowInvalid { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.Extensions.Configuration.IConfigurationSection ConfigSection { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsFileCert { get { throw null; } } + public bool IsStoreCert { get { throw null; } } + public string Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Password { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Store { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Subject { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial class ConfigurationReader + { + public ConfigurationReader(Microsoft.Extensions.Configuration.IConfiguration configuration) { } + public System.Collections.Generic.IDictionary Certificates { get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.EndpointDefaults EndpointDefaults { get { throw null; } } + public System.Collections.Generic.IEnumerable Endpoints { get { throw null; } } + } + internal partial class HttpConnectionContext + { + public HttpConnectionContext() { } + public Microsoft.AspNetCore.Connections.ConnectionContext ConnectionContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Http.Features.IFeatureCollection ConnectionFeatures { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string ConnectionId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.IPEndPoint LocalEndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Buffers.MemoryPool MemoryPool { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols Protocols { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.IPEndPoint RemoteEndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.ServiceContext ServiceContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl TimeoutControl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.IO.Pipelines.IDuplexPipe Transport { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal partial interface IRequestProcessor + { + void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException ex); + void HandleReadDataRateTimeout(); + void HandleRequestHeadersTimeout(); + void OnInputOrOutputCompleted(); + System.Threading.Tasks.Task ProcessRequestsAsync(Microsoft.AspNetCore.Hosting.Server.IHttpApplication application); + void StopProcessingNextRequest(); + void Tick(System.DateTimeOffset now); + } internal partial class KestrelServerOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions { - private System.IServiceProvider _services; public KestrelServerOptionsSetup(System.IServiceProvider services) { } public void Configure(Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions options) { } } + internal partial class ServiceContext + { + public ServiceContext() { } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ConnectionManager ConnectionManager { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.DateHeaderValueManager DateHeaderValueManager { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.Heartbeat Heartbeat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpParser HttpParser { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace Log { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.IO.Pipelines.PipeScheduler Scheduler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions ServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ISystemClock SystemClock { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } +} + +namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http +{ + internal sealed partial class Http1ContentLengthMessageBody : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1MessageBody + { + public Http1ContentLengthMessageBody(bool keepAlive, long contentLength, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection context) : base (default(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection)) { } + public override void AdvanceTo(System.SequencePosition consumed) { } + public override void AdvanceTo(System.SequencePosition consumed, System.SequencePosition examined) { } + public override void CancelPendingRead() { } + public override void Complete(System.Exception exception) { } + public override System.Threading.Tasks.Task ConsumeAsync() { throw null; } + protected override void OnReadStarting() { } + protected override System.Threading.Tasks.Task OnStopAsync() { throw null; } + public override System.Threading.Tasks.ValueTask ReadAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public override System.Threading.Tasks.ValueTask ReadAsyncInternal(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public override bool TryRead(out System.IO.Pipelines.ReadResult readResult) { throw null; } + public override bool TryReadInternal(out System.IO.Pipelines.ReadResult readResult) { throw null; } + } + internal static partial class ReasonPhrases + { + public static byte[] ToStatusBytes(int statusCode, string reasonPhrase = null) { throw null; } + } + internal static partial class PathNormalizer + { + public unsafe static bool ContainsDotSegments(byte* start, byte* end) { throw null; } + public static string DecodePath(System.Span path, bool pathEncoded, string rawTarget, int queryLength) { throw null; } + public unsafe static int RemoveDotSegments(byte* start, byte* end) { throw null; } + public static int RemoveDotSegments(System.Span input) { throw null; } + } + internal enum RequestRejectionReason + { + UnrecognizedHTTPVersion = 0, + InvalidRequestLine = 1, + InvalidRequestHeader = 2, + InvalidRequestHeadersNoCRLF = 3, + MalformedRequestInvalidHeaders = 4, + InvalidContentLength = 5, + MultipleContentLengths = 6, + UnexpectedEndOfRequestContent = 7, + BadChunkSuffix = 8, + BadChunkSizeData = 9, + ChunkedRequestIncomplete = 10, + InvalidRequestTarget = 11, + InvalidCharactersInHeaderName = 12, + RequestLineTooLong = 13, + HeadersExceedMaxTotalSize = 14, + TooManyHeaders = 15, + RequestBodyTooLarge = 16, + RequestHeadersTimeout = 17, + RequestBodyTimeout = 18, + FinalTransferCodingNotChunked = 19, + LengthRequired = 20, + LengthRequiredHttp10 = 21, + OptionsMethodRequired = 22, + ConnectMethodRequired = 23, + MissingHostHeader = 24, + MultipleHostHeaders = 25, + InvalidHostHeader = 26, + UpgradeRequestCannotHavePayload = 27, + RequestBodyExceedsContentLength = 28, + } + internal static partial class ChunkWriter + { + public static int BeginChunkBytes(int dataCount, System.Span span) { throw null; } + internal static int GetPrefixBytesForChunk(int length, out bool sliceOneByte) { throw null; } + internal static int WriteBeginChunkBytes(this ref System.Buffers.BufferWriter start, int dataCount) { throw null; } + internal static void WriteEndChunkBytes(this ref System.Buffers.BufferWriter start) { } + } + internal sealed partial class HttpRequestPipeReader : System.IO.Pipelines.PipeReader + { + public HttpRequestPipeReader() { } + public void Abort(System.Exception error = null) { } + public override void AdvanceTo(System.SequencePosition consumed) { } + public override void AdvanceTo(System.SequencePosition consumed, System.SequencePosition examined) { } + public override void CancelPendingRead() { } + public override void Complete(System.Exception exception = null) { } + public override System.Threading.Tasks.ValueTask ReadAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public void StartAcceptingReads(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody body) { } + public void StopAcceptingReads() { } + public override bool TryRead(out System.IO.Pipelines.ReadResult result) { throw null; } + } + internal sealed partial class HttpRequestStream : System.IO.Stream + { + public HttpRequestStream(Microsoft.AspNetCore.Http.Features.IHttpBodyControlFeature bodyControl, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpRequestPipeReader pipeReader) { } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanWrite { get { throw null; } } + public override long Length { get { throw null; } } + public override long Position { get { throw null; } set { } } + public override int WriteTimeout { get { throw null; } set { } } + public override System.IAsyncResult BeginRead(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + public override System.Threading.Tasks.Task CopyToAsync(System.IO.Stream destination, int bufferSize, System.Threading.CancellationToken cancellationToken) { throw null; } + public override int EndRead(System.IAsyncResult asyncResult) { throw null; } + public override void Flush() { } + public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override System.Threading.Tasks.ValueTask ReadAsync(System.Memory destination, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public override void SetLength(long value) { } + public override void Write(byte[] buffer, int offset, int count) { } + public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + } + internal abstract partial class Http1MessageBody : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody + { + protected bool _completed; + protected readonly Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection _context; + protected Http1MessageBody(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection context) : base (default(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpProtocol)) { } + protected void CheckCompletedReadResult(System.IO.Pipelines.ReadResult result) { } + public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody For(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion httpVersion, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpRequestHeaders headers, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection context) { throw null; } + protected override System.Threading.Tasks.Task OnConsumeAsync() { throw null; } + public abstract System.Threading.Tasks.ValueTask ReadAsyncInternal(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + protected void ThrowIfCompleted() { } + public abstract bool TryReadInternal(out System.IO.Pipelines.ReadResult readResult); + } + internal partial interface IHttpOutputAborter + { + void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason); + } + internal partial class Http1OutputProducer : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpOutputAborter, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpOutputProducer, System.IDisposable + { + public Http1OutputProducer(System.IO.Pipelines.PipeWriter pipeWriter, string connectionId, Microsoft.AspNetCore.Connections.ConnectionContext connectionContext, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace log, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl timeoutControl, Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinResponseDataRateFeature minResponseDataRateFeature, System.Buffers.MemoryPool memoryPool) { } + public void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException error) { } + public void Advance(int bytes) { } + public void CancelPendingFlush() { } + public void Dispose() { } + public System.Threading.Tasks.ValueTask FirstWriteAsync(int statusCode, string reasonPhrase, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders responseHeaders, bool autoChunk, System.ReadOnlySpan buffer, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.ValueTask FirstWriteChunkedAsync(int statusCode, string reasonPhrase, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders responseHeaders, bool autoChunk, System.ReadOnlySpan buffer, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.ValueTask FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public System.Memory GetMemory(int sizeHint = 0) { throw null; } + public System.Span GetSpan(int sizeHint = 0) { throw null; } + public void Reset() { } + public void Stop() { } + public System.Threading.Tasks.ValueTask Write100ContinueAsync() { throw null; } + public System.Threading.Tasks.ValueTask WriteChunkAsync(System.ReadOnlySpan buffer, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.Task WriteDataAsync(System.ReadOnlySpan buffer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public System.Threading.Tasks.ValueTask WriteDataToPipeAsync(System.ReadOnlySpan buffer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public void WriteResponseHeaders(int statusCode, string reasonPhrase, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders responseHeaders, bool autoChunk, bool appComplete) { } + public System.Threading.Tasks.ValueTask WriteStreamSuffixAsync() { throw null; } + } + internal sealed partial class HttpResponseStream : System.IO.Stream + { + public HttpResponseStream(Microsoft.AspNetCore.Http.Features.IHttpBodyControlFeature bodyControl, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponsePipeWriter pipeWriter) { } + public override bool CanRead { get { throw null; } } + public override bool CanSeek { get { throw null; } } + public override bool CanWrite { get { throw null; } } + public override long Length { get { throw null; } } + public override long Position { get { throw null; } set { } } + public override int ReadTimeout { get { throw null; } set { } } + public override System.IAsyncResult BeginWrite(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } + public override void EndWrite(System.IAsyncResult asyncResult) { } + public override void Flush() { } + public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public override void SetLength(long value) { } + public override void Write(byte[] buffer, int offset, int count) { } + public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + public override System.Threading.Tasks.ValueTask WriteAsync(System.ReadOnlyMemory source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + } + internal sealed partial class HttpResponsePipeWriter : System.IO.Pipelines.PipeWriter + { + public HttpResponsePipeWriter(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpResponseControl pipeControl) { } + public void Abort() { } + public override void Advance(int bytes) { } + public override void CancelPendingFlush() { } + public override void Complete(System.Exception exception = null) { } + public override System.Threading.Tasks.ValueTask FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public override System.Memory GetMemory(int sizeHint = 0) { throw null; } + public override System.Span GetSpan(int sizeHint = 0) { throw null; } + public void StartAcceptingWrites() { } + public System.Threading.Tasks.Task StopAcceptingWritesAsync() { throw null; } + public override System.Threading.Tasks.ValueTask WriteAsync(System.ReadOnlyMemory source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + } + internal partial class DateHeaderValueManager : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IHeartbeatHandler + { + public DateHeaderValueManager() { } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.DateHeaderValueManager.DateHeaderValues GetDateHeaderValues() { throw null; } + public void OnHeartbeat(System.DateTimeOffset now) { } + public partial class DateHeaderValues + { + public byte[] Bytes; + public string String; + public DateHeaderValues() { } + } + } + [System.FlagsAttribute] + internal enum ConnectionOptions + { + None = 0, + Close = 1, + KeepAlive = 2, + Upgrade = 4, + } + internal abstract partial class HttpHeaders : Microsoft.AspNetCore.Http.IHeaderDictionary, System.Collections.Generic.ICollection>, System.Collections.Generic.IDictionary, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + { + protected System.Collections.Generic.Dictionary MaybeUnknown; + protected long _bits; + protected long? _contentLength; + protected bool _isReadOnly; + protected HttpHeaders() { } + public long? ContentLength { get { throw null; } set { } } + public int Count { get { throw null; } } + Microsoft.Extensions.Primitives.StringValues Microsoft.AspNetCore.Http.IHeaderDictionary.this[string key] { get { throw null; } set { } } + bool System.Collections.Generic.ICollection>.IsReadOnly { get { throw null; } } + Microsoft.Extensions.Primitives.StringValues System.Collections.Generic.IDictionary.this[string key] { get { throw null; } set { } } + System.Collections.Generic.ICollection System.Collections.Generic.IDictionary.Keys { get { throw null; } } + System.Collections.Generic.ICollection System.Collections.Generic.IDictionary.Values { get { throw null; } } + protected System.Collections.Generic.Dictionary Unknown { get { throw null; } } + protected virtual bool AddValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]protected static Microsoft.Extensions.Primitives.StringValues AppendValue(Microsoft.Extensions.Primitives.StringValues existing, string append) { throw null; } + protected virtual void ClearFast() { } + protected virtual bool CopyToFast(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { throw null; } + protected virtual int GetCountFast() { throw null; } + protected virtual System.Collections.Generic.IEnumerator> GetEnumeratorFast() { throw null; } + public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.TransferCoding GetFinalTransferCoding(Microsoft.Extensions.Primitives.StringValues transferEncoding) { throw null; } + public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.ConnectionOptions ParseConnection(Microsoft.Extensions.Primitives.StringValues connection) { throw null; } + protected virtual bool RemoveFast(string key) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]protected bool RemoveUnknown(string key) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Reset() { } + public void SetReadOnly() { } + protected virtual void SetValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { } + void System.Collections.Generic.ICollection>.Add(System.Collections.Generic.KeyValuePair item) { } + void System.Collections.Generic.ICollection>.Clear() { } + bool System.Collections.Generic.ICollection>.Contains(System.Collections.Generic.KeyValuePair item) { throw null; } + void System.Collections.Generic.ICollection>.CopyTo(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { } + bool System.Collections.Generic.ICollection>.Remove(System.Collections.Generic.KeyValuePair item) { throw null; } + void System.Collections.Generic.IDictionary.Add(string key, Microsoft.Extensions.Primitives.StringValues value) { } + bool System.Collections.Generic.IDictionary.ContainsKey(string key) { throw null; } + bool System.Collections.Generic.IDictionary.Remove(string key) { throw null; } + bool System.Collections.Generic.IDictionary.TryGetValue(string key, out Microsoft.Extensions.Primitives.StringValues value) { throw null; } + System.Collections.Generic.IEnumerator> System.Collections.Generic.IEnumerable>.GetEnumerator() { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + protected static void ThrowArgumentException() { } + protected static void ThrowDuplicateKeyException() { } + protected static void ThrowHeadersReadOnlyException() { } + protected static void ThrowKeyNotFoundException() { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]protected bool TryGetUnknown(string key, ref Microsoft.Extensions.Primitives.StringValues value) { throw null; } + protected virtual bool TryGetValueFast(string key, out Microsoft.Extensions.Primitives.StringValues value) { throw null; } + public static void ValidateHeaderNameCharacters(string headerCharacters) { } + public static void ValidateHeaderValueCharacters(Microsoft.Extensions.Primitives.StringValues headerValues) { } + public static void ValidateHeaderValueCharacters(string headerCharacters) { } + } + internal abstract partial class HttpProtocol : Microsoft.AspNetCore.Http.Features.IEndpointFeature, Microsoft.AspNetCore.Http.Features.IFeatureCollection, Microsoft.AspNetCore.Http.Features.IHttpBodyControlFeature, Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature, Microsoft.AspNetCore.Http.Features.IHttpMaxRequestBodySizeFeature, Microsoft.AspNetCore.Http.Features.IHttpRequestFeature, Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature, Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature, Microsoft.AspNetCore.Http.Features.IHttpRequestTrailersFeature, Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature, Microsoft.AspNetCore.Http.Features.IHttpResponseFeature, Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature, Microsoft.AspNetCore.Http.Features.IRequestBodyPipeFeature, Microsoft.AspNetCore.Http.Features.IRouteValuesFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpResponseControl, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable + { + protected System.Exception _applicationException; + protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.BodyControl _bodyControl; + protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion _httpVersion; + protected volatile bool _keepAlive; + protected string _methodText; + protected string _parsedPath; + protected string _parsedQueryString; + protected string _parsedRawTarget; + protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestProcessingStatus _requestProcessingStatus; + public HttpProtocol(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext context) { } + public bool AllowSynchronousIO { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Http.Features.IFeatureCollection ConnectionFeatures { get { throw null; } } + protected string ConnectionId { get { throw null; } } + public string ConnectionIdFeature { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool HasFlushedHeaders { get { throw null; } } + public bool HasResponseCompleted { get { throw null; } } + public bool HasResponseStarted { get { throw null; } } + public bool HasStartedConsumingRequestBody { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpRequestHeaders HttpRequestHeaders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpResponseControl HttpResponseControl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders HttpResponseHeaders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public string HttpVersion { get { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]set { } } + public bool IsUpgradableRequest { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsUpgraded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Net.IPAddress LocalIpAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int LocalPort { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace Log { get { throw null; } } + public long? MaxRequestBodySize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod Method { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + Microsoft.AspNetCore.Http.Endpoint Microsoft.AspNetCore.Http.Features.IEndpointFeature.Endpoint { get { throw null; } set { } } + bool Microsoft.AspNetCore.Http.Features.IFeatureCollection.IsReadOnly { get { throw null; } } + object Microsoft.AspNetCore.Http.Features.IFeatureCollection.this[System.Type key] { get { throw null; } set { } } + int Microsoft.AspNetCore.Http.Features.IFeatureCollection.Revision { get { throw null; } } + bool Microsoft.AspNetCore.Http.Features.IHttpBodyControlFeature.AllowSynchronousIO { get { throw null; } set { } } + string Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.ConnectionId { get { throw null; } set { } } + System.Net.IPAddress Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.LocalIpAddress { get { throw null; } set { } } + int Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.LocalPort { get { throw null; } set { } } + System.Net.IPAddress Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.RemoteIpAddress { get { throw null; } set { } } + int Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.RemotePort { get { throw null; } set { } } + bool Microsoft.AspNetCore.Http.Features.IHttpMaxRequestBodySizeFeature.IsReadOnly { get { throw null; } } + long? Microsoft.AspNetCore.Http.Features.IHttpMaxRequestBodySizeFeature.MaxRequestBodySize { get { throw null; } set { } } + System.IO.Stream Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Body { get { throw null; } set { } } + Microsoft.AspNetCore.Http.IHeaderDictionary Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Headers { get { throw null; } set { } } + string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Method { get { throw null; } set { } } + string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Path { get { throw null; } set { } } + string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.PathBase { get { throw null; } set { } } + string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Protocol { get { throw null; } set { } } + string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.QueryString { get { throw null; } set { } } + string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.RawTarget { get { throw null; } set { } } + string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Scheme { get { throw null; } set { } } + string Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature.TraceIdentifier { get { throw null; } set { } } + System.Threading.CancellationToken Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature.RequestAborted { get { throw null; } set { } } + bool Microsoft.AspNetCore.Http.Features.IHttpRequestTrailersFeature.Available { get { throw null; } } + Microsoft.AspNetCore.Http.IHeaderDictionary Microsoft.AspNetCore.Http.Features.IHttpRequestTrailersFeature.Trailers { get { throw null; } } + System.IO.Stream Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.Stream { get { throw null; } } + System.IO.Pipelines.PipeWriter Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.Writer { get { throw null; } } + System.IO.Stream Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.Body { get { throw null; } set { } } + bool Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.HasStarted { get { throw null; } } + Microsoft.AspNetCore.Http.IHeaderDictionary Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.Headers { get { throw null; } set { } } + string Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.ReasonPhrase { get { throw null; } set { } } + int Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.StatusCode { get { throw null; } set { } } + bool Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature.IsUpgradableRequest { get { throw null; } } + System.IO.Pipelines.PipeReader Microsoft.AspNetCore.Http.Features.IRequestBodyPipeFeature.Reader { get { throw null; } } + Microsoft.AspNetCore.Routing.RouteValueDictionary Microsoft.AspNetCore.Http.Features.IRouteValuesFeature.RouteValues { get { throw null; } set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate MinRequestBodyDataRate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpOutputProducer Output { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public string Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string PathBase { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string QueryString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string RawTarget { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string ReasonPhrase { get { throw null; } set { } } + public System.Net.IPAddress RemoteIpAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int RemotePort { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Threading.CancellationToken RequestAborted { get { throw null; } set { } } + public System.IO.Stream RequestBody { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.IO.Pipelines.PipeReader RequestBodyPipeReader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Http.IHeaderDictionary RequestHeaders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Http.IHeaderDictionary RequestTrailers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool RequestTrailersAvailable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.IO.Stream ResponseBody { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.IO.Pipelines.PipeWriter ResponseBodyPipeWriter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Http.IHeaderDictionary ResponseHeaders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseTrailers ResponseTrailers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public string Scheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + protected Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions ServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.ServiceContext ServiceContext { get { throw null; } } + public int StatusCode { get { throw null; } set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl TimeoutControl { get { throw null; } } + public string TraceIdentifier { get { throw null; } set { } } + protected void AbortRequest() { } + public void Advance(int bytes) { } + protected abstract void ApplicationAbort(); + protected virtual bool BeginRead(out System.Threading.Tasks.ValueTask awaitable) { throw null; } + protected virtual void BeginRequestProcessing() { } + public void CancelPendingFlush() { } + public System.Threading.Tasks.Task CompleteAsync(System.Exception exception = null) { throw null; } + protected abstract Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody CreateMessageBody(); + protected abstract string CreateRequestId(); + protected System.Threading.Tasks.Task FireOnCompleted() { throw null; } + protected System.Threading.Tasks.Task FireOnStarting() { throw null; } + public System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public System.Threading.Tasks.ValueTask FlushPipeAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Memory GetMemory(int sizeHint = 0) { throw null; } + public System.Span GetSpan(int sizeHint = 0) { throw null; } + public void HandleNonBodyResponseWrite() { } + public void InitializeBodyControl(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody messageBody) { } + public System.Threading.Tasks.Task InitializeResponseAsync(int firstWriteByteCount) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)][System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task InitializeResponseAwaited(System.Threading.Tasks.Task startingTask, int firstWriteByteCount) { throw null; } + TFeature Microsoft.AspNetCore.Http.Features.IFeatureCollection.Get() { throw null; } + void Microsoft.AspNetCore.Http.Features.IFeatureCollection.Set(TFeature feature) { } + void Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature.Abort() { } + System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.CompleteAsync() { throw null; } + void Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.DisableBuffering() { } + System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.SendFileAsync(string path, long offset, long? count, System.Threading.CancellationToken cancellation) { throw null; } + System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.StartAsync(System.Threading.CancellationToken cancellationToken) { throw null; } + void Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.OnCompleted(System.Func callback, object state) { } + void Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.OnStarting(System.Func callback, object state) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature.UpgradeAsync() { throw null; } + public void OnCompleted(System.Func callback, object state) { } + protected virtual void OnErrorAfterResponseStarted() { } + public void OnHeader(System.Span name, System.Span value) { } + public void OnHeadersComplete() { } + protected virtual void OnRequestProcessingEnded() { } + protected virtual void OnRequestProcessingEnding() { } + protected abstract void OnReset(); + public void OnStarting(System.Func callback, object state) { } + public void OnTrailer(System.Span name, System.Span value) { } + public void OnTrailersComplete() { } + protected void PoisonRequestBodyStream(System.Exception abortReason) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task ProcessRequestsAsync(Microsoft.AspNetCore.Hosting.Server.IHttpApplication application) { throw null; } + public void ProduceContinue() { } + protected System.Threading.Tasks.Task ProduceEnd() { throw null; } + public void ReportApplicationError(System.Exception ex) { } + public void Reset() { } + internal void ResetFeatureCollection() { } + protected void ResetHttp1Features() { } + protected void ResetHttp2Features() { } + internal void ResetState() { } + public void SetBadRequestState(Microsoft.AspNetCore.Server.Kestrel.Core.BadHttpRequestException ex) { } + System.Collections.Generic.IEnumerator> System.Collections.Generic.IEnumerable>.GetEnumerator() { throw null; } + System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } + [System.Diagnostics.StackTraceHiddenAttribute] + public void ThrowRequestTargetRejected(System.Span target) { } + protected abstract bool TryParseRequest(System.IO.Pipelines.ReadResult result, out bool endConnection); + protected System.Threading.Tasks.Task TryProduceInvalidRequestResponse() { throw null; } + protected bool VerifyResponseContentLength(out System.Exception ex) { throw null; } + public System.Threading.Tasks.Task WriteAsync(System.ReadOnlyMemory data, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.ValueTask WriteAsyncAwaited(System.Threading.Tasks.Task initializeTask, System.ReadOnlyMemory data, System.Threading.CancellationToken cancellationToken) { throw null; } + public System.Threading.Tasks.ValueTask WritePipeAsync(System.ReadOnlyMemory data, System.Threading.CancellationToken cancellationToken) { throw null; } + } + internal sealed partial class HttpRequestHeaders : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpHeaders + { + public HttpRequestHeaders(bool reuseHeaderValues = true) { } + public bool HasConnection { get { throw null; } } + public bool HasTransferEncoding { get { throw null; } } + public Microsoft.Extensions.Primitives.StringValues HeaderAccept { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAcceptCharset { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAcceptEncoding { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAcceptLanguage { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlRequestHeaders { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlRequestMethod { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAllow { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAuthorization { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderCacheControl { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderConnection { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentEncoding { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentLanguage { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentLength { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentLocation { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentMD5 { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentRange { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentType { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderCookie { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderCorrelationContext { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderDate { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderDNT { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderExpect { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderExpires { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderFrom { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderHost { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderIfMatch { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderIfModifiedSince { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderIfNoneMatch { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderIfRange { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderIfUnmodifiedSince { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderKeepAlive { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderLastModified { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderMaxForwards { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderOrigin { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderPragma { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderProxyAuthorization { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderRange { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderReferer { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderRequestId { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderTE { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderTraceParent { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderTraceState { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderTrailer { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderTransferEncoding { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderTranslate { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderUpgrade { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderUpgradeInsecureRequests { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderUserAgent { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderVia { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderWarning { get { throw null; } set { } } + public int HostCount { get { throw null; } } + protected override bool AddValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { throw null; } + public void Append(System.Span name, System.Span value) { } + protected override void ClearFast() { } + protected override bool CopyToFast(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { throw null; } + protected override int GetCountFast() { throw null; } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpRequestHeaders.Enumerator GetEnumerator() { throw null; } + protected override System.Collections.Generic.IEnumerator> GetEnumeratorFast() { throw null; } + public void OnHeadersComplete() { } + protected override bool RemoveFast(string key) { throw null; } + protected override void SetValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { } + protected override bool TryGetValueFast(string key, out Microsoft.Extensions.Primitives.StringValues value) { throw null; } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public partial struct Enumerator : System.Collections.Generic.IEnumerator>, System.Collections.IEnumerator, System.IDisposable + { + private readonly Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpRequestHeaders _collection; + private readonly long _bits; + private int _next; + private System.Collections.Generic.KeyValuePair _current; + private readonly bool _hasUnknown; + private System.Collections.Generic.Dictionary.Enumerator _unknownEnumerator; + internal Enumerator(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpRequestHeaders collection) { throw null; } + public System.Collections.Generic.KeyValuePair Current { get { throw null; } } + object System.Collections.IEnumerator.Current { get { throw null; } } + public void Dispose() { } + public bool MoveNext() { throw null; } + public void Reset() { } + } + } + internal sealed partial class HttpResponseHeaders : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpHeaders + { + public HttpResponseHeaders() { } + public bool HasConnection { get { throw null; } } + public bool HasDate { get { throw null; } } + public bool HasServer { get { throw null; } } + public bool HasTransferEncoding { get { throw null; } } + public Microsoft.Extensions.Primitives.StringValues HeaderAcceptRanges { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlAllowCredentials { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlAllowHeaders { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlAllowMethods { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlAllowOrigin { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlExposeHeaders { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlMaxAge { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAge { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderAllow { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderCacheControl { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderConnection { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentEncoding { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentLanguage { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentLength { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentLocation { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentMD5 { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentRange { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderContentType { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderDate { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderETag { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderExpires { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderKeepAlive { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderLastModified { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderLocation { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderPragma { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderProxyAuthenticate { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderRetryAfter { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderServer { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderSetCookie { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderTrailer { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderTransferEncoding { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderUpgrade { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderVary { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderVia { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderWarning { get { throw null; } set { } } + public Microsoft.Extensions.Primitives.StringValues HeaderWWWAuthenticate { get { throw null; } set { } } + protected override bool AddValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { throw null; } + protected override void ClearFast() { } + internal void CopyTo(ref System.Buffers.BufferWriter buffer) { } + internal void CopyToFast(ref System.Buffers.BufferWriter output) { } + protected override bool CopyToFast(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { throw null; } + protected override int GetCountFast() { throw null; } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders.Enumerator GetEnumerator() { throw null; } + protected override System.Collections.Generic.IEnumerator> GetEnumeratorFast() { throw null; } + protected override bool RemoveFast(string key) { throw null; } + public void SetRawConnection(Microsoft.Extensions.Primitives.StringValues value, byte[] raw) { } + public void SetRawDate(Microsoft.Extensions.Primitives.StringValues value, byte[] raw) { } + public void SetRawServer(Microsoft.Extensions.Primitives.StringValues value, byte[] raw) { } + public void SetRawTransferEncoding(Microsoft.Extensions.Primitives.StringValues value, byte[] raw) { } + protected override void SetValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { } + protected override bool TryGetValueFast(string key, out Microsoft.Extensions.Primitives.StringValues value) { throw null; } + [System.Runtime.CompilerServices.CompilerGeneratedAttribute] + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public partial struct Enumerator : System.Collections.Generic.IEnumerator>, System.Collections.IEnumerator, System.IDisposable + { + private readonly Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders _collection; + private readonly long _bits; + private int _next; + private System.Collections.Generic.KeyValuePair _current; + private readonly bool _hasUnknown; + private System.Collections.Generic.Dictionary.Enumerator _unknownEnumerator; + internal Enumerator(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders collection) { throw null; } + public System.Collections.Generic.KeyValuePair Current { get { throw null; } } + object System.Collections.IEnumerator.Current { get { throw null; } } + public void Dispose() { } + public bool MoveNext() { throw null; } + public void Reset() { } + } + } + internal partial class HttpResponseTrailers : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpHeaders + { + public HttpResponseTrailers() { } + public Microsoft.Extensions.Primitives.StringValues HeaderETag { get { throw null; } set { } } + protected override bool AddValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { throw null; } + protected override void ClearFast() { } + protected override bool CopyToFast(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { throw null; } + protected override int GetCountFast() { throw null; } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseTrailers.Enumerator GetEnumerator() { throw null; } + protected override System.Collections.Generic.IEnumerator> GetEnumeratorFast() { throw null; } + protected override bool RemoveFast(string key) { throw null; } + protected override void SetValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { } + protected override bool TryGetValueFast(string key, out Microsoft.Extensions.Primitives.StringValues value) { throw null; } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public partial struct Enumerator : System.Collections.Generic.IEnumerator>, System.Collections.IEnumerator, System.IDisposable + { + private readonly Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseTrailers _collection; + private readonly long _bits; + private int _next; + private System.Collections.Generic.KeyValuePair _current; + private readonly bool _hasUnknown; + private System.Collections.Generic.Dictionary.Enumerator _unknownEnumerator; + internal Enumerator(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseTrailers collection) { throw null; } + public System.Collections.Generic.KeyValuePair Current { get { throw null; } } + object System.Collections.IEnumerator.Current { get { throw null; } } + public void Dispose() { } + public bool MoveNext() { throw null; } + public void Reset() { } + } + } + internal partial class Http1Connection : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpProtocol, Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinRequestBodyDataRateFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinResponseDataRateFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.IRequestProcessor + { + protected readonly long _keepAliveTicks; + public Http1Connection(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext context) : base (default(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext)) { } + public System.IO.Pipelines.PipeReader Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Buffers.MemoryPool MemoryPool { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinRequestBodyDataRateFeature.MinDataRate { get { throw null; } set { } } + Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinResponseDataRateFeature.MinDataRate { get { throw null; } set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate MinResponseDataRate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool RequestTimedOut { get { throw null; } } + public void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason) { } + protected override void ApplicationAbort() { } + protected override bool BeginRead(out System.Threading.Tasks.ValueTask awaitable) { throw null; } + protected override void BeginRequestProcessing() { } + protected override Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody CreateMessageBody() { throw null; } + protected override string CreateRequestId() { throw null; } + internal void EnsureHostHeaderExists() { } + public void HandleReadDataRateTimeout() { } + public void HandleRequestHeadersTimeout() { } + void Microsoft.AspNetCore.Server.Kestrel.Core.Internal.IRequestProcessor.Tick(System.DateTimeOffset now) { } + public void OnInputOrOutputCompleted() { } + protected override void OnRequestProcessingEnded() { } + protected override void OnRequestProcessingEnding() { } + protected override void OnReset() { } + public void OnStartLine(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod method, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion version, System.Span target, System.Span path, System.Span query, System.Span customMethod, bool pathEncoded) { } + public void ParseRequest(in System.Buffers.ReadOnlySequence buffer, out System.SequencePosition consumed, out System.SequencePosition examined) { throw null; } + public void SendTimeoutResponse() { } + public void StopProcessingNextRequest() { } + public bool TakeMessageHeaders(in System.Buffers.ReadOnlySequence buffer, bool trailers, out System.SequencePosition consumed, out System.SequencePosition examined) { throw null; } + public bool TakeStartLine(in System.Buffers.ReadOnlySequence buffer, out System.SequencePosition consumed, out System.SequencePosition examined) { throw null; } + protected override bool TryParseRequest(System.IO.Pipelines.ReadResult result, out bool endConnection) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct Http1ParsingHandler : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpHeadersHandler, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpRequestLineHandler + { + public readonly Http1Connection Connection; + public readonly bool Trailers; + public Http1ParsingHandler(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection connection) { throw null; } + public Http1ParsingHandler(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection connection, bool trailers) { throw null; } + public void OnHeader(System.Span name, System.Span value) { } + public void OnHeadersComplete() { } + public void OnStartLine(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod method, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion version, System.Span target, System.Span path, System.Span query, System.Span customMethod, bool pathEncoded) { } + } + internal partial interface IHttpOutputProducer + { + void Advance(int bytes); + void CancelPendingFlush(); + System.Threading.Tasks.ValueTask FirstWriteAsync(int statusCode, string reasonPhrase, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders responseHeaders, bool autoChunk, System.ReadOnlySpan data, System.Threading.CancellationToken cancellationToken); + System.Threading.Tasks.ValueTask FirstWriteChunkedAsync(int statusCode, string reasonPhrase, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders responseHeaders, bool autoChunk, System.ReadOnlySpan data, System.Threading.CancellationToken cancellationToken); + System.Threading.Tasks.ValueTask FlushAsync(System.Threading.CancellationToken cancellationToken); + System.Memory GetMemory(int sizeHint = 0); + System.Span GetSpan(int sizeHint = 0); + void Reset(); + void Stop(); + System.Threading.Tasks.ValueTask Write100ContinueAsync(); + System.Threading.Tasks.ValueTask WriteChunkAsync(System.ReadOnlySpan data, System.Threading.CancellationToken cancellationToken); + System.Threading.Tasks.Task WriteDataAsync(System.ReadOnlySpan data, System.Threading.CancellationToken cancellationToken); + System.Threading.Tasks.ValueTask WriteDataToPipeAsync(System.ReadOnlySpan data, System.Threading.CancellationToken cancellationToken); + void WriteResponseHeaders(int statusCode, string reasonPhrase, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders responseHeaders, bool autoChunk, bool appCompleted); + System.Threading.Tasks.ValueTask WriteStreamSuffixAsync(); + } + internal partial interface IHttpResponseControl + { + void Advance(int bytes); + void CancelPendingFlush(); + System.Threading.Tasks.Task CompleteAsync(System.Exception exception = null); + System.Threading.Tasks.ValueTask FlushPipeAsync(System.Threading.CancellationToken cancellationToken); + System.Memory GetMemory(int sizeHint = 0); + System.Span GetSpan(int sizeHint = 0); + void ProduceContinue(); + System.Threading.Tasks.ValueTask WritePipeAsync(System.ReadOnlyMemory source, System.Threading.CancellationToken cancellationToken); + } + internal abstract partial class MessageBody + { + protected long _alreadyTimedBytes; + protected bool _backpressure; + protected long _examinedUnconsumedBytes; + protected bool _timingEnabled; + protected MessageBody(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpProtocol context) { } + public virtual bool IsEmpty { get { throw null; } } + protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace Log { get { throw null; } } + public bool RequestKeepAlive { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public bool RequestUpgrade { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } + public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody ZeroContentLengthClose { get { throw null; } } + public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody ZeroContentLengthKeepAlive { get { throw null; } } + protected void AddAndCheckConsumedBytes(long consumedBytes) { } + public abstract void AdvanceTo(System.SequencePosition consumed); + public abstract void AdvanceTo(System.SequencePosition consumed, System.SequencePosition examined); + public abstract void CancelPendingRead(); + public abstract void Complete(System.Exception exception); + public virtual System.Threading.Tasks.Task ConsumeAsync() { throw null; } + protected void CountBytesRead(long bytesInReadResult) { } + protected long OnAdvance(System.IO.Pipelines.ReadResult readResult, System.SequencePosition consumed, System.SequencePosition examined) { throw null; } + protected virtual System.Threading.Tasks.Task OnConsumeAsync() { throw null; } + protected virtual void OnDataRead(long bytesRead) { } + protected virtual void OnReadStarted() { } + protected virtual void OnReadStarting() { } + protected virtual System.Threading.Tasks.Task OnStopAsync() { throw null; } + public abstract System.Threading.Tasks.ValueTask ReadAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); + protected System.Threading.Tasks.ValueTask StartTimingReadAsync(System.Threading.Tasks.ValueTask readAwaitable, System.Threading.CancellationToken cancellationToken) { throw null; } + public virtual System.Threading.Tasks.Task StopAsync() { throw null; } + protected void StopTimingRead(long bytesInReadResult) { } + protected void TryProduceContinue() { } + public abstract bool TryRead(out System.IO.Pipelines.ReadResult readResult); + protected void TryStart() { } + protected void TryStop() { } + } + internal enum RequestProcessingStatus + { + RequestPending = 0, + ParsingRequestLine = 1, + ParsingHeaders = 2, + AppStarted = 3, + HeadersCommitted = 4, + HeadersFlushed = 5, + ResponseCompleted = 6, + } + [System.FlagsAttribute] + internal enum TransferCoding + { + None = 0, + Chunked = 1, + Other = 2, + } +} + +namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 +{ + internal static partial class Http2FrameReader + { + public const int HeaderLength = 9; + public const int SettingSize = 6; + public static int GetPayloadFieldsLength(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame) { throw null; } + public static bool ReadFrame(in System.Buffers.ReadOnlySequence readableBuffer, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame, uint maxFrameSize, out System.Buffers.ReadOnlySequence framePayload) { throw null; } + public static System.Collections.Generic.IList ReadSettings(in System.Buffers.ReadOnlySequence payload) { throw null; } + } + internal static partial class Bitshifter + { + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static uint ReadUInt24BigEndian(System.ReadOnlySpan source) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static uint ReadUInt31BigEndian(System.ReadOnlySpan source) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void WriteUInt24BigEndian(System.Span destination, uint value) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void WriteUInt31BigEndian(System.Span destination, uint value) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void WriteUInt31BigEndian(System.Span destination, uint value, bool preserveHighestBit) { } + } + internal partial class Http2Connection : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpHeadersHandler, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.IHttp2StreamLifetimeHandler, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.IRequestProcessor + { + public Http2Connection(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext context) { } + public static byte[] ClientPreface { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public Microsoft.AspNetCore.Http.Features.IFeatureCollection ConnectionFeatures { get { throw null; } } + public string ConnectionId { get { throw null; } } + public System.IO.Pipelines.PipeReader Input { get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerLimits Limits { get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace Log { get { throw null; } } + internal Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2PeerSettings ServerSettings { get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ISystemClock SystemClock { get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl TimeoutControl { get { throw null; } } + public void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException ex) { } + public void DecrementActiveClientStreamCount() { } + public void HandleReadDataRateTimeout() { } + public void HandleRequestHeadersTimeout() { } + public void IncrementActiveClientStreamCount() { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task ProcessRequestsAsync(Microsoft.AspNetCore.Hosting.Server.IHttpApplication application) { throw null; } + void Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.IHttp2StreamLifetimeHandler.OnStreamCompleted(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Stream stream) { } + void Microsoft.AspNetCore.Server.Kestrel.Core.Internal.IRequestProcessor.Tick(System.DateTimeOffset now) { } + public void OnHeader(System.Span name, System.Span value) { } + public void OnHeadersComplete() { } + public void OnInputOrOutputCompleted() { } + public void StopProcessingNextRequest() { } + public void StopProcessingNextRequest(bool serverInitiated) { } + } + internal partial interface IHttp2StreamLifetimeHandler + { + void DecrementActiveClientStreamCount(); + void OnStreamCompleted(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Stream stream); + } + internal partial class Http2FrameWriter + { + public Http2FrameWriter(System.IO.Pipelines.PipeWriter outputPipeWriter, Microsoft.AspNetCore.Connections.ConnectionContext connectionContext, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Connection http2Connection, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.OutputFlowControl connectionOutputFlowControl, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl timeoutControl, Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate minResponseDataRate, string connectionId, System.Buffers.MemoryPool memoryPool, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace log) { } + public void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException error) { } + public void AbortPendingStreamDataWrites(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.StreamOutputFlowControl flowControl) { } + public void Complete() { } + public System.Threading.Tasks.ValueTask FlushAsync(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpOutputAborter outputAborter, System.Threading.CancellationToken cancellationToken) { throw null; } + public bool TryUpdateConnectionWindow(int bytes) { throw null; } + public bool TryUpdateStreamWindow(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.StreamOutputFlowControl flowControl, int bytes) { throw null; } + public void UpdateMaxFrameSize(uint maxFrameSize) { } + public System.Threading.Tasks.ValueTask Write100ContinueAsync(int streamId) { throw null; } + public System.Threading.Tasks.ValueTask WriteDataAsync(int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.StreamOutputFlowControl flowControl, in System.Buffers.ReadOnlySequence data, bool endStream) { throw null; } + public System.Threading.Tasks.ValueTask WriteGoAwayAsync(int lastStreamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode errorCode) { throw null; } + internal static void WriteHeader(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame, System.IO.Pipelines.PipeWriter output) { } + public System.Threading.Tasks.ValueTask WritePingAsync(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2PingFrameFlags flags, in System.Buffers.ReadOnlySequence payload) { throw null; } + public void WriteResponseHeaders(int streamId, int statusCode, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2HeadersFrameFlags headerFrameFlags, Microsoft.AspNetCore.Http.IHeaderDictionary headers) { } + public System.Threading.Tasks.ValueTask WriteResponseTrailers(int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseTrailers headers) { throw null; } + public System.Threading.Tasks.ValueTask WriteRstStreamAsync(int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode errorCode) { throw null; } + internal static void WriteSettings(System.Collections.Generic.IList settings, System.Span destination) { } + public System.Threading.Tasks.ValueTask WriteSettingsAckAsync() { throw null; } + public System.Threading.Tasks.ValueTask WriteSettingsAsync(System.Collections.Generic.IList settings) { throw null; } + public System.Threading.Tasks.ValueTask WriteWindowUpdateAsync(int streamId, int sizeIncrement) { throw null; } + } + internal abstract partial class Http2Stream : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpProtocol, Microsoft.AspNetCore.Http.Features.IHttpResetFeature, Microsoft.AspNetCore.Http.Features.IHttpResponseTrailersFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttp2StreamIdFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinRequestBodyDataRateFeature, System.Threading.IThreadPoolWorkItem + { + public Http2Stream(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2StreamContext context) : base (default(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext)) { } + internal long DrainExpirationTicks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool EndStreamReceived { get { throw null; } } + public long? InputRemaining { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } + Microsoft.AspNetCore.Http.IHeaderDictionary Microsoft.AspNetCore.Http.Features.IHttpResponseTrailersFeature.Trailers { get { throw null; } set { } } + int Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttp2StreamIdFeature.StreamId { get { throw null; } } + Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinRequestBodyDataRateFeature.MinDataRate { get { throw null; } set { } } + public bool ReceivedEmptyRequestBody { get { throw null; } } + public System.IO.Pipelines.Pipe RequestBodyPipe { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool RequestBodyStarted { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + internal bool RstStreamReceived { get { throw null; } } + public int StreamId { get { throw null; } } + public void Abort(System.IO.IOException abortReason) { } + public void AbortRstStreamReceived() { } + protected override void ApplicationAbort() { } + protected override Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody CreateMessageBody() { throw null; } + protected override string CreateRequestId() { throw null; } + public void DecrementActiveClientStreamCount() { } + public abstract void Execute(); + void Microsoft.AspNetCore.Http.Features.IHttpResetFeature.Reset(int errorCode) { } + public System.Threading.Tasks.Task OnDataAsync(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame dataFrame, in System.Buffers.ReadOnlySequence payload) { throw null; } + public void OnDataRead(int bytesRead) { } + public void OnEndStreamReceived() { } + protected override void OnErrorAfterResponseStarted() { } + protected override void OnRequestProcessingEnded() { } + protected override void OnReset() { } + internal void ResetAndAbort(Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode error) { } + protected override bool TryParseRequest(System.IO.Pipelines.ReadResult result, out bool endConnection) { throw null; } + public bool TryUpdateOutputWindow(int bytes) { throw null; } + } + internal sealed partial class Http2StreamContext : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext + { + public Http2StreamContext() { } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2PeerSettings ClientPeerSettings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.InputFlowControl ConnectionInputFlowControl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.OutputFlowControl ConnectionOutputFlowControl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2FrameWriter FrameWriter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2PeerSettings ServerPeerSettings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int StreamId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.IHttp2StreamLifetimeHandler StreamLifetimeHandler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + internal sealed partial class Http2ConnectionErrorException : System.Exception + { + public Http2ConnectionErrorException(string message, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode errorCode) { } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode ErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + [System.FlagsAttribute] + internal enum Http2ContinuationFrameFlags : byte + { + NONE = (byte)0, + END_HEADERS = (byte)4, + } + [System.FlagsAttribute] + internal enum Http2DataFrameFlags : byte + { + NONE = (byte)0, + END_STREAM = (byte)1, + PADDED = (byte)8, + } + internal enum Http2ErrorCode : uint + { + NO_ERROR = (uint)0, + PROTOCOL_ERROR = (uint)1, + INTERNAL_ERROR = (uint)2, + FLOW_CONTROL_ERROR = (uint)3, + SETTINGS_TIMEOUT = (uint)4, + STREAM_CLOSED = (uint)5, + FRAME_SIZE_ERROR = (uint)6, + REFUSED_STREAM = (uint)7, + CANCEL = (uint)8, + COMPRESSION_ERROR = (uint)9, + CONNECT_ERROR = (uint)10, + ENHANCE_YOUR_CALM = (uint)11, + INADEQUATE_SECURITY = (uint)12, + HTTP_1_1_REQUIRED = (uint)13, + } + internal partial class Http2Frame + { + public Http2Frame() { } + public bool ContinuationEndHeaders { get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ContinuationFrameFlags ContinuationFlags { get { throw null; } set { } } + public bool DataEndStream { get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2DataFrameFlags DataFlags { get { throw null; } set { } } + public bool DataHasPadding { get { throw null; } } + public byte DataPadLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int DataPayloadLength { get { throw null; } } + public byte Flags { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode GoAwayErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int GoAwayLastStreamId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool HeadersEndHeaders { get { throw null; } } + public bool HeadersEndStream { get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2HeadersFrameFlags HeadersFlags { get { throw null; } set { } } + public bool HeadersHasPadding { get { throw null; } } + public bool HeadersHasPriority { get { throw null; } } + public byte HeadersPadLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int HeadersPayloadLength { get { throw null; } } + public byte HeadersPriorityWeight { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int HeadersStreamDependency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int PayloadLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool PingAck { get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2PingFrameFlags PingFlags { get { throw null; } set { } } + public bool PriorityIsExclusive { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int PriorityStreamDependency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public byte PriorityWeight { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode RstStreamErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool SettingsAck { get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2SettingsFrameFlags SettingsFlags { get { throw null; } set { } } + public int StreamId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2FrameType Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int WindowUpdateSizeIncrement { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public void PrepareContinuation(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ContinuationFrameFlags flags, int streamId) { } + public void PrepareData(int streamId, byte? padLength = default(byte?)) { } + public void PrepareGoAway(int lastStreamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode errorCode) { } + public void PrepareHeaders(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2HeadersFrameFlags flags, int streamId) { } + public void PreparePing(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2PingFrameFlags flags) { } + public void PreparePriority(int streamId, int streamDependency, bool exclusive, byte weight) { } + public void PrepareRstStream(int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode errorCode) { } + public void PrepareSettings(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2SettingsFrameFlags flags) { } + public void PrepareWindowUpdate(int streamId, int sizeIncrement) { } + internal object ShowFlags() { throw null; } + public override string ToString() { throw null; } + } + internal enum Http2FrameType : byte + { + DATA = (byte)0, + HEADERS = (byte)1, + PRIORITY = (byte)2, + RST_STREAM = (byte)3, + SETTINGS = (byte)4, + PUSH_PROMISE = (byte)5, + PING = (byte)6, + GOAWAY = (byte)7, + WINDOW_UPDATE = (byte)8, + CONTINUATION = (byte)9, + } + [System.FlagsAttribute] + internal enum Http2HeadersFrameFlags : byte + { + NONE = (byte)0, + END_STREAM = (byte)1, + END_HEADERS = (byte)4, + PADDED = (byte)8, + PRIORITY = (byte)32, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct Http2PeerSetting + { + private readonly int _dummyPrimitive; + public Http2PeerSetting(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2SettingsParameter parameter, uint value) { throw null; } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2SettingsParameter Parameter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public uint Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class Http2PeerSettings + { + public const bool DefaultEnablePush = true; + public const uint DefaultHeaderTableSize = (uint)4096; + public const uint DefaultInitialWindowSize = (uint)65535; + public const uint DefaultMaxConcurrentStreams = (uint)4294967295; + public const uint DefaultMaxFrameSize = (uint)16384; + public const uint DefaultMaxHeaderListSize = (uint)4294967295; + internal const int MaxAllowedMaxFrameSize = 16777215; + public const uint MaxWindowSize = (uint)2147483647; + internal const int MinAllowedMaxFrameSize = 16384; + public Http2PeerSettings() { } + public bool EnablePush { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public uint HeaderTableSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public uint InitialWindowSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public uint MaxConcurrentStreams { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public uint MaxFrameSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public uint MaxHeaderListSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal System.Collections.Generic.IList GetNonProtocolDefaults() { throw null; } + public void Update(System.Collections.Generic.IList settings) { } + } + [System.FlagsAttribute] + internal enum Http2PingFrameFlags : byte + { + NONE = (byte)0, + ACK = (byte)1, + } + [System.FlagsAttribute] + internal enum Http2SettingsFrameFlags : byte + { + NONE = (byte)0, + ACK = (byte)1, + } + internal enum Http2SettingsParameter : ushort + { + SETTINGS_HEADER_TABLE_SIZE = (ushort)1, + SETTINGS_ENABLE_PUSH = (ushort)2, + SETTINGS_MAX_CONCURRENT_STREAMS = (ushort)3, + SETTINGS_INITIAL_WINDOW_SIZE = (ushort)4, + SETTINGS_MAX_FRAME_SIZE = (ushort)5, + SETTINGS_MAX_HEADER_LIST_SIZE = (ushort)6, + } + internal sealed partial class Http2StreamErrorException : System.Exception + { + public Http2StreamErrorException(int streamId, string message, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode errorCode) { } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode ErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public int StreamId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } +} + +namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl +{ + internal partial class OutputFlowControlAwaitable : System.Runtime.CompilerServices.ICriticalNotifyCompletion, System.Runtime.CompilerServices.INotifyCompletion + { + public OutputFlowControlAwaitable() { } + public bool IsCompleted { get { throw null; } } + public void Complete() { } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.OutputFlowControlAwaitable GetAwaiter() { throw null; } + public void GetResult() { } + public void OnCompleted(System.Action continuation) { } + public void UnsafeOnCompleted(System.Action continuation) { } + } + internal partial class StreamOutputFlowControl + { + public StreamOutputFlowControl(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.OutputFlowControl connectionLevelFlowControl, uint initialWindowSize) { } + public int Available { get { throw null; } } + public bool IsAborted { get { throw null; } } + public void Abort() { } + public void Advance(int bytes) { } + public int AdvanceUpToAndWait(long bytes, out Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.OutputFlowControlAwaitable awaitable) { throw null; } + public bool TryUpdateWindow(int bytes) { throw null; } + } + internal partial class OutputFlowControl + { + public OutputFlowControl(uint initialWindowSize) { } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.OutputFlowControlAwaitable AvailabilityAwaitable { get { throw null; } } + public int Available { get { throw null; } } + public bool IsAborted { get { throw null; } } + public void Abort() { } + public void Advance(int bytes) { } + public bool TryUpdateWindow(int bytes) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal partial struct FlowControl + { + private int _dummyPrimitive; + public FlowControl(uint initialWindowSize) { throw null; } + public int Available { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public bool IsAborted { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void Abort() { } + public void Advance(int bytes) { } + public bool TryUpdateWindow(int bytes) { throw null; } + } + internal partial class InputFlowControl + { + public InputFlowControl(uint initialWindowSize, uint minWindowSizeIncrement) { } + public bool IsAvailabilityLow { get { throw null; } } + public int Abort() { throw null; } + public void StopWindowUpdates() { } + public bool TryAdvance(int bytes) { throw null; } + public bool TryUpdateWindow(int bytes, out int updateSize) { throw null; } + } +} + +namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack +{ + internal sealed partial class HuffmanDecodingException : System.Exception + { + public HuffmanDecodingException(string message) { } + } + internal static partial class IntegerEncoder + { + public static bool Encode(int i, int n, System.Span buffer, out int length) { throw null; } + } + internal partial class IntegerDecoder + { + public IntegerDecoder() { } + public bool BeginTryDecode(byte b, int prefixLength, out int result) { throw null; } + public static void ThrowIntegerTooBigException() { } + public bool TryDecode(byte b, out int result) { throw null; } + } + internal partial class Huffman + { + public Huffman() { } + public static int Decode(System.ReadOnlySpan src, System.Span dst) { throw null; } + internal static int DecodeValue(uint data, int validBits, out int decodedBits) { throw null; } + public static (uint encoded, int bitLength) Encode(int data) { throw null; } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal readonly partial struct HeaderField + { + public const int RfcOverhead = 32; + public HeaderField(System.Span name, System.Span value) { throw null; } + public int Length { get { throw null; } } + public byte[] Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public byte[] Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public static int GetLength(int nameLength, int valueLength) { throw null; } + } + internal partial class HPackEncoder + { + public HPackEncoder() { } + public bool BeginEncode(System.Collections.Generic.IEnumerable> headers, System.Span buffer, out int length) { throw null; } + public bool BeginEncode(int statusCode, System.Collections.Generic.IEnumerable> headers, System.Span buffer, out int length) { throw null; } + public bool Encode(System.Span buffer, out int length) { throw null; } + } + internal partial class DynamicTable + { + public DynamicTable(int maxSize) { } + public int Count { get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack.HeaderField this[int index] { get { throw null; } } + public int MaxSize { get { throw null; } } + public int Size { get { throw null; } } + public void Insert(System.Span name, System.Span value) { } + public void Resize(int maxSize) { } + } + internal partial class HPackDecoder + { + public HPackDecoder(int maxDynamicTableSize, int maxRequestHeaderFieldSize) { } + internal HPackDecoder(int maxDynamicTableSize, int maxRequestHeaderFieldSize, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack.DynamicTable dynamicTable) { } + public void Decode(in System.Buffers.ReadOnlySequence data, bool endHeaders, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpHeadersHandler handler) { } + } + internal sealed partial class HPackDecodingException : System.Exception + { + public HPackDecodingException(string message) { } + public HPackDecodingException(string message, System.Exception innerException) { } + } + internal sealed partial class HPackEncodingException : System.Exception + { + public HPackEncodingException(string message) { } + public HPackEncodingException(string message, System.Exception innerException) { } + } +} + +namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure +{ + internal static partial class Constants + { + public static readonly string DefaultServerAddress; + public static readonly string DefaultServerHttpsAddress; + public const int MaxExceptionDetailSize = 128; + public const string PipeDescriptorPrefix = "pipefd:"; + public static readonly System.TimeSpan RequestBodyDrainTimeout; + public const string ServerName = "Kestrel"; + public const string SocketDescriptorPrefix = "sockfd:"; + public const string UnixPipeHostPrefix = "unix:/"; + } + internal static partial class HttpUtilities + { + public const string Http10Version = "HTTP/1.0"; + public const string Http11Version = "HTTP/1.1"; + public const string Http2Version = "HTTP/2"; + public const string HttpsUriScheme = "https://"; + public const string HttpUriScheme = "http://"; + public static string GetAsciiOrUTF8StringNonNullCharacters(this System.Span span) { throw null; } + public static string GetAsciiStringEscaped(this System.Span span, int maxChars) { throw null; } + public static string GetAsciiStringNonNullCharacters(this System.Span span) { throw null; } + public static string GetHeaderName(this System.Span span) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GetKnownHttpScheme(this System.Span span, out Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpScheme knownScheme) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal unsafe static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod GetKnownMethod(byte* data, int length, out int methodLength) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GetKnownMethod(this System.Span span, out Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod method, out int length) { throw null; } + public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod GetKnownMethod(string value) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal unsafe static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion GetKnownVersion(byte* location, int length) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GetKnownVersion(this System.Span span, out Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion knownVersion, out byte length) { throw null; } + public static bool IsHostHeaderValid(string hostText) { throw null; } + public static string MethodToString(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod method) { throw null; } + public static string SchemeToString(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpScheme scheme) { throw null; } + public static string VersionToString(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion httpVersion) { throw null; } + } + internal abstract partial class WriteOnlyStream : System.IO.Stream + { + protected WriteOnlyStream() { } + public override bool CanRead { get { throw null; } } + public override bool CanWrite { get { throw null; } } + public override int ReadTimeout { get { throw null; } set { } } + public override int Read(byte[] buffer, int offset, int count) { throw null; } + public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + } + internal sealed partial class ThrowingWasUpgradedWriteOnlyStream : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.WriteOnlyStream + { + public ThrowingWasUpgradedWriteOnlyStream() { } + public override bool CanSeek { get { throw null; } } + public override long Length { get { throw null; } } + public override long Position { get { throw null; } set { } } + public override void Flush() { } + public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } + public override void SetLength(long value) { } + public override void Write(byte[] buffer, int offset, int count) { } + public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } + } + internal partial class Disposable : System.IDisposable + { + public Disposable(System.Action dispose) { } + public void Dispose() { } + protected virtual void Dispose(bool disposing) { } + } + internal sealed partial class DebuggerWrapper : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IDebugger + { + public bool IsAttached { get { throw null; } } + public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IDebugger Singleton { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + internal partial class SystemClock : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ISystemClock + { + public SystemClock() { } + public System.DateTimeOffset UtcNow { get { throw null; } } + public long UtcNowTicks { get { throw null; } } + public System.DateTimeOffset UtcNowUnsynchronized { get { throw null; } } + } + internal partial class HeartbeatManager : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IHeartbeatHandler, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ISystemClock + { + public HeartbeatManager(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ConnectionManager connectionManager) { } + public System.DateTimeOffset UtcNow { get { throw null; } } + public long UtcNowTicks { get { throw null; } } + public System.DateTimeOffset UtcNowUnsynchronized { get { throw null; } } + public void OnHeartbeat(System.DateTimeOffset now) { } + } + + internal partial class StringUtilities + { + public StringUtilities() { } + public static bool BytesOrdinalEqualsStringAndAscii(string previousValue, System.Span newValue) { throw null; } + public static string ConcatAsHexSuffix(string str, char separator, uint number) { throw null; } + public unsafe static bool TryGetAsciiString(byte* input, char* output, int count) { throw null; } + } + internal partial class TimeoutControl : Microsoft.AspNetCore.Server.Kestrel.Core.Features.IConnectionTimeoutFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl + { + public TimeoutControl(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutHandler timeoutHandler) { } + internal Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IDebugger Debugger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason TimerReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void BytesRead(long count) { } + public void BytesWrittenToBuffer(Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate minRate, long count) { } + public void CancelTimeout() { } + internal void Initialize(long nowTicks) { } + public void InitializeHttp2(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.InputFlowControl connectionInputFlowControl) { } + void Microsoft.AspNetCore.Server.Kestrel.Core.Features.IConnectionTimeoutFeature.ResetTimeout(System.TimeSpan timeSpan) { } + void Microsoft.AspNetCore.Server.Kestrel.Core.Features.IConnectionTimeoutFeature.SetTimeout(System.TimeSpan timeSpan) { } + public void ResetTimeout(long ticks, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason timeoutReason) { } + public void SetTimeout(long ticks, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason timeoutReason) { } + public void StartRequestBody(Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate minRate) { } + public void StartTimingRead() { } + public void StartTimingWrite() { } + public void StopRequestBody() { } + public void StopTimingRead() { } + public void StopTimingWrite() { } + public void Tick(System.DateTimeOffset now) { } + } + internal partial class KestrelTrace : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace, Microsoft.Extensions.Logging.ILogger + { + public KestrelTrace(Microsoft.Extensions.Logging.ILogger logger) { } + public virtual void ApplicationAbortedConnection(string connectionId, string traceIdentifier) { } + public virtual void ApplicationError(string connectionId, string traceIdentifier, System.Exception ex) { } + public virtual void ApplicationNeverCompleted(string connectionId) { } + public virtual System.IDisposable BeginScope(TState state) { throw null; } + public virtual void ConnectionAccepted(string connectionId) { } + public virtual void ConnectionBadRequest(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.BadHttpRequestException ex) { } + public virtual void ConnectionDisconnect(string connectionId) { } + public virtual void ConnectionHeadResponseBodyWrite(string connectionId, long count) { } + public virtual void ConnectionKeepAlive(string connectionId) { } + public virtual void ConnectionPause(string connectionId) { } + public virtual void ConnectionRejected(string connectionId) { } + public virtual void ConnectionResume(string connectionId) { } + public virtual void ConnectionStart(string connectionId) { } + public virtual void ConnectionStop(string connectionId) { } + public virtual void HeartbeatSlow(System.TimeSpan interval, System.DateTimeOffset now) { } + public virtual void HPackDecodingError(string connectionId, int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack.HPackDecodingException ex) { } + public virtual void HPackEncodingError(string connectionId, int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack.HPackEncodingException ex) { } + public virtual void Http2ConnectionClosed(string connectionId, int highestOpenedStreamId) { } + public virtual void Http2ConnectionClosing(string connectionId) { } + public virtual void Http2ConnectionError(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ConnectionErrorException ex) { } + public void Http2FrameReceived(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame) { } + public void Http2FrameSending(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame) { } + public virtual void Http2StreamError(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2StreamErrorException ex) { } + public void Http2StreamResetAbort(string traceIdentifier, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode error, Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason) { } + public virtual bool IsEnabled(Microsoft.Extensions.Logging.LogLevel logLevel) { throw null; } + public virtual void Log(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, TState state, System.Exception exception, System.Func formatter) { } + public virtual void NotAllConnectionsAborted() { } + public virtual void NotAllConnectionsClosedGracefully() { } + public virtual void RequestBodyDone(string connectionId, string traceIdentifier) { } + public virtual void RequestBodyDrainTimedOut(string connectionId, string traceIdentifier) { } + public virtual void RequestBodyMinimumDataRateNotSatisfied(string connectionId, string traceIdentifier, double rate) { } + public virtual void RequestBodyNotEntirelyRead(string connectionId, string traceIdentifier) { } + public virtual void RequestBodyStart(string connectionId, string traceIdentifier) { } + public virtual void RequestProcessingError(string connectionId, System.Exception ex) { } + public virtual void ResponseMinimumDataRateNotSatisfied(string connectionId, string traceIdentifier) { } + } + internal partial class BodyControl + { + public BodyControl(Microsoft.AspNetCore.Http.Features.IHttpBodyControlFeature bodyControl, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpResponseControl responseControl) { } + public void Abort(System.Exception error) { } + public (System.IO.Stream request, System.IO.Stream response, System.IO.Pipelines.PipeReader reader, System.IO.Pipelines.PipeWriter writer) Start(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody body) { throw null; } + public System.Threading.Tasks.Task StopAsync() { throw null; } + public System.IO.Stream Upgrade() { throw null; } + } + internal partial class ConnectionManager + { + public ConnectionManager(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace trace, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ResourceCounter upgradedConnections) { } + public ConnectionManager(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace trace, long? upgradedConnectionLimit) { } + public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ResourceCounter UpgradedConnectionCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task AbortAllConnectionsAsync() { throw null; } + public void AddConnection(long id, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.KestrelConnection connection) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task CloseAllConnectionsAsync(System.Threading.CancellationToken token) { throw null; } + public void RemoveConnection(long id) { } + public void Walk(System.Action callback) { } + } + internal partial class Heartbeat : System.IDisposable + { + public static readonly System.TimeSpan Interval; + public Heartbeat(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IHeartbeatHandler[] callbacks, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ISystemClock systemClock, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IDebugger debugger, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace trace) { } + public void Dispose() { } + internal void OnHeartbeat() { } + public void Start() { } + } + internal partial interface IDebugger + { + bool IsAttached { get; } + } + internal partial interface IHeartbeatHandler + { + void OnHeartbeat(System.DateTimeOffset now); + } + internal partial interface IKestrelTrace : Microsoft.Extensions.Logging.ILogger + { + void ApplicationAbortedConnection(string connectionId, string traceIdentifier); + void ApplicationError(string connectionId, string traceIdentifier, System.Exception ex); + void ApplicationNeverCompleted(string connectionId); + void ConnectionAccepted(string connectionId); + void ConnectionBadRequest(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.BadHttpRequestException ex); + void ConnectionDisconnect(string connectionId); + void ConnectionHeadResponseBodyWrite(string connectionId, long count); + void ConnectionKeepAlive(string connectionId); + void ConnectionPause(string connectionId); + void ConnectionRejected(string connectionId); + void ConnectionResume(string connectionId); + void ConnectionStart(string connectionId); + void ConnectionStop(string connectionId); + void HeartbeatSlow(System.TimeSpan interval, System.DateTimeOffset now); + void HPackDecodingError(string connectionId, int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack.HPackDecodingException ex); + void HPackEncodingError(string connectionId, int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack.HPackEncodingException ex); + void Http2ConnectionClosed(string connectionId, int highestOpenedStreamId); + void Http2ConnectionClosing(string connectionId); + void Http2ConnectionError(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ConnectionErrorException ex); + void Http2FrameReceived(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame); + void Http2FrameSending(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame); + void Http2StreamError(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2StreamErrorException ex); + void Http2StreamResetAbort(string traceIdentifier, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode error, Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason); + void NotAllConnectionsAborted(); + void NotAllConnectionsClosedGracefully(); + void RequestBodyDone(string connectionId, string traceIdentifier); + void RequestBodyDrainTimedOut(string connectionId, string traceIdentifier); + void RequestBodyMinimumDataRateNotSatisfied(string connectionId, string traceIdentifier, double rate); + void RequestBodyNotEntirelyRead(string connectionId, string traceIdentifier); + void RequestBodyStart(string connectionId, string traceIdentifier); + void RequestProcessingError(string connectionId, System.Exception ex); + void ResponseMinimumDataRateNotSatisfied(string connectionId, string traceIdentifier); + } + internal partial interface ISystemClock + { + System.DateTimeOffset UtcNow { get; } + long UtcNowTicks { get; } + System.DateTimeOffset UtcNowUnsynchronized { get; } + } + internal partial interface ITimeoutControl + { + Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason TimerReason { get; } + void BytesRead(long count); + void BytesWrittenToBuffer(Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate minRate, long count); + void CancelTimeout(); + void InitializeHttp2(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.InputFlowControl connectionInputFlowControl); + void ResetTimeout(long ticks, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason timeoutReason); + void SetTimeout(long ticks, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason timeoutReason); + void StartRequestBody(Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate minRate); + void StartTimingRead(); + void StartTimingWrite(); + void StopRequestBody(); + void StopTimingRead(); + void StopTimingWrite(); + } + internal partial interface ITimeoutHandler + { + void OnTimeout(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason reason); + } + internal partial class KestrelConnection : Microsoft.AspNetCore.Connections.Features.IConnectionCompleteFeature, Microsoft.AspNetCore.Connections.Features.IConnectionHeartbeatFeature, Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeNotificationFeature, System.Threading.IThreadPoolWorkItem + { + public KestrelConnection(long id, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.ServiceContext serviceContext, Microsoft.AspNetCore.Connections.ConnectionDelegate connectionDelegate, Microsoft.AspNetCore.Connections.ConnectionContext connectionContext, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace logger) { } + public System.Threading.CancellationToken ConnectionClosedRequested { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public System.Threading.Tasks.Task ExecutionTask { get { throw null; } } + public Microsoft.AspNetCore.Connections.ConnectionContext TransportConnection { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public void Complete() { } + [System.Diagnostics.DebuggerStepThroughAttribute] + internal System.Threading.Tasks.Task ExecuteAsync() { throw null; } + public System.Threading.Tasks.Task FireOnCompletedAsync() { throw null; } + void Microsoft.AspNetCore.Connections.Features.IConnectionCompleteFeature.OnCompleted(System.Func callback, object state) { } + public void OnHeartbeat(System.Action action, object state) { } + public void RequestClose() { } + void System.Threading.IThreadPoolWorkItem.Execute() { } + public void TickHeartbeat() { } + } + internal abstract partial class ResourceCounter + { + protected ResourceCounter() { } + public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ResourceCounter Unlimited { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ResourceCounter Quota(long amount) { throw null; } + public abstract void ReleaseOne(); + public abstract bool TryLockOne(); + internal partial class FiniteCounter : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ResourceCounter + { + public FiniteCounter(long max) { } + internal long Count { get { throw null; } set { } } + public override void ReleaseOne() { } + public override bool TryLockOne() { throw null; } + } + } + internal enum TimeoutReason + { + None = 0, + KeepAlive = 1, + RequestHeaders = 2, + ReadDataRate = 3, + WriteDataRate = 4, + RequestBodyDrain = 5, + TimeoutFeature = 6, + } +} +namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure +{ + [System.Diagnostics.Tracing.EventSourceAttribute(Name="Microsoft-AspNetCore-Server-Kestrel")] + internal sealed partial class KestrelEventSource : System.Diagnostics.Tracing.EventSource + { + public static readonly Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.KestrelEventSource Log; + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)][System.Diagnostics.Tracing.EventAttribute(5, Level=System.Diagnostics.Tracing.EventLevel.Verbose)] + public void ConnectionRejected(string connectionId) { } + [System.Diagnostics.Tracing.NonEventAttribute] + public void ConnectionStart(Microsoft.AspNetCore.Connections.ConnectionContext connection) { } + [System.Diagnostics.Tracing.NonEventAttribute] + public void ConnectionStop(Microsoft.AspNetCore.Connections.ConnectionContext connection) { } + [System.Diagnostics.Tracing.NonEventAttribute] + public void RequestStart(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpProtocol httpProtocol) { } + [System.Diagnostics.Tracing.NonEventAttribute] + public void RequestStop(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpProtocol httpProtocol) { } + } +} +namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.PipeWriterHelpers +{ + internal sealed partial class ConcurrentPipeWriter : System.IO.Pipelines.PipeWriter + { + public ConcurrentPipeWriter(System.IO.Pipelines.PipeWriter innerPipeWriter, System.Buffers.MemoryPool pool, object sync) { } + public void Abort() { } + public override void Advance(int bytes) { } + public override void CancelPendingFlush() { } + public override void Complete(System.Exception exception = null) { } + public override System.Threading.Tasks.ValueTask FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public override System.Memory GetMemory(int sizeHint = 0) { throw null; } + public override System.Span GetSpan(int sizeHint = 0) { throw null; } + } +} +namespace System.Buffers +{ + internal static partial class BufferExtensions + { + public static System.ArraySegment GetArray(this System.Memory buffer) { throw null; } + public static System.ArraySegment GetArray(this System.ReadOnlyMemory memory) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.ReadOnlySpan ToSpan(this in System.Buffers.ReadOnlySequence buffer) { throw null; } + internal static void WriteAsciiNoValidation(this ref System.Buffers.BufferWriter buffer, string data) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static void WriteNumeric(this ref System.Buffers.BufferWriter buffer, ulong number) { } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + internal ref partial struct BufferWriter where T : System.Buffers.IBufferWriter + { + private T _output; + private System.Span _span; + private int _buffered; + private long _bytesCommitted; + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public BufferWriter(T output) { throw null; } + public long BytesCommitted { get { throw null; } } + public System.Span Span { get { throw null; } } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Advance(int count) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Commit() { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Ensure(int count = 1) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Write(System.ReadOnlySpan source) { } + } +} + +namespace System.Diagnostics +{ + [System.AttributeUsageAttribute(System.AttributeTargets.Class | System.AttributeTargets.Constructor | System.AttributeTargets.Method | System.AttributeTargets.Struct, Inherited=false)] + internal sealed partial class StackTraceHiddenAttribute : System.Attribute + { + public StackTraceHiddenAttribute() { } + } } diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index 760057395e..e916789879 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -2,20 +2,19 @@ netcoreapp3.0 - false - - - - - - - - - - + + + + + + + + + + diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs index b9f222f076..1bb12c2437 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs @@ -145,7 +145,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core public System.IServiceProvider ApplicationServices { get { throw null; } } public ulong FileHandle { get { throw null; } } public System.Net.IPEndPoint IPEndPoint { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions KestrelServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols Protocols { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public string SocketPath { get { throw null; } } public Microsoft.AspNetCore.Connections.ConnectionDelegate Build() { throw null; } diff --git a/src/Servers/Kestrel/Kestrel/ref/Microsoft.AspNetCore.Server.Kestrel.csproj b/src/Servers/Kestrel/Kestrel/ref/Microsoft.AspNetCore.Server.Kestrel.csproj index 821e25a7e9..aacd51d878 100644 --- a/src/Servers/Kestrel/Kestrel/ref/Microsoft.AspNetCore.Server.Kestrel.csproj +++ b/src/Servers/Kestrel/Kestrel/ref/Microsoft.AspNetCore.Server.Kestrel.csproj @@ -2,13 +2,11 @@ netcoreapp3.0 - false - - - - + + + diff --git a/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj b/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj deleted file mode 100644 index ad0383f2be..0000000000 --- a/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - - diff --git a/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.netcoreapp3.0.cs b/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.netcoreapp3.0.cs deleted file mode 100644 index f24337e79d..0000000000 --- a/src/Servers/Kestrel/Transport.Libuv/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.netcoreapp3.0.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Hosting -{ - public static partial class WebHostBuilderLibuvExtensions - { - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseLibuv(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder) { throw null; } - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseLibuv(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder, System.Action configureOptions) { throw null; } - } -} -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv -{ - public partial class LibuvTransportOptions - { - public LibuvTransportOptions() { } - public long? MaxReadBufferSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public long? MaxWriteBufferSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool NoDelay { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int ThreadCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} diff --git a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Manual.cs b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Manual.cs new file mode 100644 index 0000000000..9e17979a05 --- /dev/null +++ b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Manual.cs @@ -0,0 +1,94 @@ +// 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. + +namespace System.Buffers +{ + internal partial class DiagnosticMemoryPool : System.Buffers.MemoryPool + { public DiagnosticMemoryPool(System.Buffers.MemoryPool pool, bool allowLateReturn = false, bool rentTracking = false) { } + public bool IsDisposed { get { throw null; } } + public override int MaxBufferSize { get { throw null; } } + protected override void Dispose(bool disposing) { } + public override System.Buffers.IMemoryOwner Rent(int size = -1) { throw null; } + internal void ReportException(System.Exception exception) { } + internal void Return(System.Buffers.DiagnosticPoolBlock block) { } + public System.Threading.Tasks.Task WhenAllBlocksReturnedAsync(System.TimeSpan timeout) { throw null; } + } + internal sealed partial class DiagnosticPoolBlock : System.Buffers.MemoryManager + { + internal DiagnosticPoolBlock(System.Buffers.DiagnosticMemoryPool pool, System.Buffers.IMemoryOwner memoryOwner) { } + public System.Diagnostics.StackTrace Leaser { get { throw null; } set { } } + public override System.Memory Memory { get { throw null; } } + protected override void Dispose(bool disposing) { } + public override System.Span GetSpan() { throw null; } + public override System.Buffers.MemoryHandle Pin(int byteOffset = 0) { throw null; } + public void Track() { } + protected override bool TryGetArray(out System.ArraySegment segment) { throw null; } + public override void Unpin() { } + } + internal sealed partial class MemoryPoolBlock : System.Buffers.IMemoryOwner + { + internal MemoryPoolBlock(System.Buffers.SlabMemoryPool pool, System.Buffers.MemoryPoolSlab slab, int offset, int length) { } + public System.Memory Memory { get { throw null; } } + public System.Buffers.SlabMemoryPool Pool { get { throw null; } } + public System.Buffers.MemoryPoolSlab Slab { get { throw null; } } + public void Dispose() { } + ~MemoryPoolBlock() { } + public void Lease() { } + } + internal partial class MemoryPoolSlab : System.IDisposable + { + public MemoryPoolSlab(byte[] data) { } + public byte[] Array { get { throw null; } } + public bool IsActive { get { throw null; } } + public System.IntPtr NativePointer { get { throw null; } } + public static System.Buffers.MemoryPoolSlab Create(int length) { throw null; } + public void Dispose() { } + protected void Dispose(bool disposing) { } + ~MemoryPoolSlab() { } + } + internal partial class MemoryPoolThrowHelper + { + public MemoryPoolThrowHelper() { } + public static void ThrowArgumentOutOfRangeException(int sourceLength, int offset) { } + public static void ThrowArgumentOutOfRangeException_BufferRequestTooLarge(int maxSize) { } + public static void ThrowInvalidOperationException_BlockDoubleDispose(System.Buffers.DiagnosticPoolBlock block) { } + public static void ThrowInvalidOperationException_BlockIsBackedByDisposedSlab(System.Buffers.DiagnosticPoolBlock block) { } + public static void ThrowInvalidOperationException_BlockReturnedToDisposedPool(System.Buffers.DiagnosticPoolBlock block) { } + public static void ThrowInvalidOperationException_BlocksWereNotReturnedInTime(int returned, int total, System.Buffers.DiagnosticPoolBlock[] blocks) { } + public static void ThrowInvalidOperationException_DisposingPoolWithActiveBlocks(int returned, int total, System.Buffers.DiagnosticPoolBlock[] blocks) { } + public static void ThrowInvalidOperationException_DoubleDispose() { } + public static void ThrowInvalidOperationException_PinCountZero(System.Buffers.DiagnosticPoolBlock block) { } + public static void ThrowInvalidOperationException_ReturningPinnedBlock(System.Buffers.DiagnosticPoolBlock block) { } + public static void ThrowObjectDisposedException(System.Buffers.MemoryPoolThrowHelper.ExceptionArgument argument) { } + internal enum ExceptionArgument + { + size = 0, + offset = 1, + length = 2, + MemoryPoolBlock = 3, + MemoryPool = 4, + } + } + internal sealed partial class SlabMemoryPool : System.Buffers.MemoryPool + { + public SlabMemoryPool() { } + public static int BlockSize { get { throw null; } } + public override int MaxBufferSize { get { throw null; } } + protected override void Dispose(bool disposing) { } + internal void RefreshBlock(System.Buffers.MemoryPoolSlab slab, int offset, int length) { } + public override System.Buffers.IMemoryOwner Rent(int size = -1) { throw null; } + internal void Return(System.Buffers.MemoryPoolBlock block) { } + } + internal static partial class SlabMemoryPoolFactory + { + public static System.Buffers.MemoryPool Create() { throw null; } + public static System.Buffers.MemoryPool CreateSlabMemoryPool() { throw null; } + } +} +namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets +{ + public partial class SocketTransportOptions + { + internal System.Func> MemoryPoolFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } +} \ No newline at end of file diff --git a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj index 3b493ee96f..e7f64184eb 100644 --- a/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj +++ b/src/Servers/Kestrel/Transport.Sockets/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj @@ -2,13 +2,13 @@ netcoreapp3.0 - false - - - - + + + + + diff --git a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj index 25f206d9c5..eb8d5f9d98 100644 --- a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj +++ b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj @@ -9,11 +9,6 @@ - - - diff --git a/src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.csproj b/src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.csproj deleted file mode 100644 index 3e4c1252c0..0000000000 --- a/src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - netstandard2.0;netstandard2.1 - - - - - - - - - - - - - - - - - - - diff --git a/src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.netcoreapp3.0.cs b/src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.netcoreapp3.0.cs deleted file mode 100644 index 419936b5de..0000000000 --- a/src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.netcoreapp3.0.cs +++ /dev/null @@ -1,168 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.SignalR.Client -{ - public partial class HubConnection - { - public static readonly System.TimeSpan DefaultHandshakeTimeout; - public static readonly System.TimeSpan DefaultKeepAliveInterval; - public static readonly System.TimeSpan DefaultServerTimeout; - public HubConnection(Microsoft.AspNetCore.SignalR.Client.IConnectionFactory connectionFactory, Microsoft.AspNetCore.SignalR.Protocol.IHubProtocol protocol, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public HubConnection(Microsoft.AspNetCore.SignalR.Client.IConnectionFactory connectionFactory, Microsoft.AspNetCore.SignalR.Protocol.IHubProtocol protocol, System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public HubConnection(Microsoft.AspNetCore.SignalR.Client.IConnectionFactory connectionFactory, Microsoft.AspNetCore.SignalR.Protocol.IHubProtocol protocol, System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.SignalR.Client.IRetryPolicy reconnectPolicy) { } - public string ConnectionId { get { throw null; } } - public System.TimeSpan HandshakeTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan KeepAliveInterval { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan ServerTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.SignalR.Client.HubConnectionState State { get { throw null; } } - public event System.Func Closed { add { } remove { } } - public event System.Func Reconnected { add { } remove { } } - public event System.Func Reconnecting { add { } remove { } } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task DisposeAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task InvokeCoreAsync(string methodName, System.Type returnType, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.IDisposable On(string methodName, System.Type[] parameterTypes, System.Func handler, object state) { throw null; } - public void Remove(string methodName) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task SendCoreAsync(string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task> StreamAsChannelCoreAsync(string methodName, System.Type returnType, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.Collections.Generic.IAsyncEnumerable StreamAsyncCore(string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class HubConnectionBuilder : Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder, Microsoft.AspNetCore.SignalR.ISignalRBuilder - { - public HubConnectionBuilder() { } - public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.SignalR.Client.HubConnection Build() { throw null; } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public override bool Equals(object obj) { throw null; } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public override int GetHashCode() { throw null; } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public new System.Type GetType() { throw null; } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public override string ToString() { throw null; } - } - public static partial class HubConnectionBuilderExtensions - { - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder ConfigureLogging(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, System.Action configureLogging) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithAutomaticReconnect(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithAutomaticReconnect(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, Microsoft.AspNetCore.SignalR.Client.IRetryPolicy retryPolicy) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithAutomaticReconnect(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, System.TimeSpan[] reconnectDelays) { throw null; } - } - public static partial class HubConnectionExtensions - { - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeCoreAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task InvokeCoreAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Type[] parameterTypes, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task> StreamAsChannelCoreAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public enum HubConnectionState - { - Disconnected = 0, - Connected = 1, - Connecting = 2, - Reconnecting = 3, - } - public partial interface IConnectionFactory - { - System.Threading.Tasks.Task ConnectAsync(Microsoft.AspNetCore.Connections.TransferFormat transferFormat, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); - System.Threading.Tasks.Task DisposeAsync(Microsoft.AspNetCore.Connections.ConnectionContext connection); - } - public partial interface IHubConnectionBuilder : Microsoft.AspNetCore.SignalR.ISignalRBuilder - { - Microsoft.AspNetCore.SignalR.Client.HubConnection Build(); - } - public partial interface IRetryPolicy - { - System.TimeSpan? NextRetryDelay(Microsoft.AspNetCore.SignalR.Client.RetryContext retryContext); - } - public sealed partial class RetryContext - { - public RetryContext() { } - public System.TimeSpan ElapsedTime { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public long PreviousRetryCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Exception RetryReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} diff --git a/src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.netstandard2.0.cs b/src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.netstandard2.0.cs deleted file mode 100644 index a361a4ed03..0000000000 --- a/src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.netstandard2.0.cs +++ /dev/null @@ -1,162 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.SignalR.Client -{ - public partial class HubConnection - { - public static readonly System.TimeSpan DefaultHandshakeTimeout; - public static readonly System.TimeSpan DefaultKeepAliveInterval; - public static readonly System.TimeSpan DefaultServerTimeout; - public HubConnection(Microsoft.AspNetCore.Connections.IConnectionFactory connectionFactory, Microsoft.AspNetCore.SignalR.Protocol.IHubProtocol protocol, System.Net.EndPoint endPoint, System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public HubConnection(Microsoft.AspNetCore.Connections.IConnectionFactory connectionFactory, Microsoft.AspNetCore.SignalR.Protocol.IHubProtocol protocol, System.Net.EndPoint endPoint, System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.SignalR.Client.IRetryPolicy reconnectPolicy) { } - public string ConnectionId { get { throw null; } } - public System.TimeSpan HandshakeTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan KeepAliveInterval { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan ServerTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.SignalR.Client.HubConnectionState State { get { throw null; } } - public event System.Func Closed { add { } remove { } } - public event System.Func Reconnected { add { } remove { } } - public event System.Func Reconnecting { add { } remove { } } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task DisposeAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task InvokeCoreAsync(string methodName, System.Type returnType, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.IDisposable On(string methodName, System.Type[] parameterTypes, System.Func handler, object state) { throw null; } - public void Remove(string methodName) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task SendCoreAsync(string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task> StreamAsChannelCoreAsync(string methodName, System.Type returnType, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.Collections.Generic.IAsyncEnumerable StreamAsyncCore(string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class HubConnectionBuilder : Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder, Microsoft.AspNetCore.SignalR.ISignalRBuilder - { - public HubConnectionBuilder() { } - public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.SignalR.Client.HubConnection Build() { throw null; } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public override bool Equals(object obj) { throw null; } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public override int GetHashCode() { throw null; } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public new System.Type GetType() { throw null; } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public override string ToString() { throw null; } - } - public static partial class HubConnectionBuilderExtensions - { - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder ConfigureLogging(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, System.Action configureLogging) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithAutomaticReconnect(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithAutomaticReconnect(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, Microsoft.AspNetCore.SignalR.Client.IRetryPolicy retryPolicy) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithAutomaticReconnect(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, System.TimeSpan[] reconnectDelays) { throw null; } - } - public static partial class HubConnectionExtensions - { - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeCoreAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task InvokeCoreAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Type[] parameterTypes, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task> StreamAsChannelCoreAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public enum HubConnectionState - { - Disconnected = 0, - Connected = 1, - Connecting = 2, - Reconnecting = 3, - } - public partial interface IHubConnectionBuilder : Microsoft.AspNetCore.SignalR.ISignalRBuilder - { - Microsoft.AspNetCore.SignalR.Client.HubConnection Build(); - } - public partial interface IRetryPolicy - { - System.TimeSpan? NextRetryDelay(Microsoft.AspNetCore.SignalR.Client.RetryContext retryContext); - } - public sealed partial class RetryContext - { - public RetryContext() { } - public System.TimeSpan ElapsedTime { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public long PreviousRetryCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Exception RetryReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} diff --git a/src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.netstandard2.1.cs b/src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.netstandard2.1.cs deleted file mode 100644 index a361a4ed03..0000000000 --- a/src/SignalR/clients/csharp/Client.Core/ref/Microsoft.AspNetCore.SignalR.Client.Core.netstandard2.1.cs +++ /dev/null @@ -1,162 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.SignalR.Client -{ - public partial class HubConnection - { - public static readonly System.TimeSpan DefaultHandshakeTimeout; - public static readonly System.TimeSpan DefaultKeepAliveInterval; - public static readonly System.TimeSpan DefaultServerTimeout; - public HubConnection(Microsoft.AspNetCore.Connections.IConnectionFactory connectionFactory, Microsoft.AspNetCore.SignalR.Protocol.IHubProtocol protocol, System.Net.EndPoint endPoint, System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public HubConnection(Microsoft.AspNetCore.Connections.IConnectionFactory connectionFactory, Microsoft.AspNetCore.SignalR.Protocol.IHubProtocol protocol, System.Net.EndPoint endPoint, System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.SignalR.Client.IRetryPolicy reconnectPolicy) { } - public string ConnectionId { get { throw null; } } - public System.TimeSpan HandshakeTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan KeepAliveInterval { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.TimeSpan ServerTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.SignalR.Client.HubConnectionState State { get { throw null; } } - public event System.Func Closed { add { } remove { } } - public event System.Func Reconnected { add { } remove { } } - public event System.Func Reconnecting { add { } remove { } } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task DisposeAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task InvokeCoreAsync(string methodName, System.Type returnType, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.IDisposable On(string methodName, System.Type[] parameterTypes, System.Func handler, object state) { throw null; } - public void Remove(string methodName) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task SendCoreAsync(string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task StopAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task> StreamAsChannelCoreAsync(string methodName, System.Type returnType, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.Collections.Generic.IAsyncEnumerable StreamAsyncCore(string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class HubConnectionBuilder : Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder, Microsoft.AspNetCore.SignalR.ISignalRBuilder - { - public HubConnectionBuilder() { } - public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.SignalR.Client.HubConnection Build() { throw null; } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public override bool Equals(object obj) { throw null; } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public override int GetHashCode() { throw null; } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public new System.Type GetType() { throw null; } - [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] - public override string ToString() { throw null; } - } - public static partial class HubConnectionBuilderExtensions - { - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder ConfigureLogging(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, System.Action configureLogging) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithAutomaticReconnect(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithAutomaticReconnect(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, Microsoft.AspNetCore.SignalR.Client.IRetryPolicy retryPolicy) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithAutomaticReconnect(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, System.TimeSpan[] reconnectDelays) { throw null; } - } - public static partial class HubConnectionExtensions - { - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task InvokeCoreAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task InvokeCoreAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Type[] parameterTypes, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Action handler) { throw null; } - public static System.IDisposable On(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Func handler) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task SendAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Threading.Tasks.Task> StreamAsChannelAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task> StreamAsChannelCoreAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, object arg10, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, object arg9, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, object arg8, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, object arg7, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, object arg6, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, object arg5, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, object arg4, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, object arg3, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, object arg2, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, object arg1, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public static System.Collections.Generic.IAsyncEnumerable StreamAsync(this Microsoft.AspNetCore.SignalR.Client.HubConnection hubConnection, string methodName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public enum HubConnectionState - { - Disconnected = 0, - Connected = 1, - Connecting = 2, - Reconnecting = 3, - } - public partial interface IHubConnectionBuilder : Microsoft.AspNetCore.SignalR.ISignalRBuilder - { - Microsoft.AspNetCore.SignalR.Client.HubConnection Build(); - } - public partial interface IRetryPolicy - { - System.TimeSpan? NextRetryDelay(Microsoft.AspNetCore.SignalR.Client.RetryContext retryContext); - } - public sealed partial class RetryContext - { - public RetryContext() { } - public System.TimeSpan ElapsedTime { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public long PreviousRetryCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Exception RetryReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} diff --git a/src/SignalR/clients/csharp/Client/ref/Microsoft.AspNetCore.SignalR.Client.csproj b/src/SignalR/clients/csharp/Client/ref/Microsoft.AspNetCore.SignalR.Client.csproj deleted file mode 100644 index 0b7e13daf9..0000000000 --- a/src/SignalR/clients/csharp/Client/ref/Microsoft.AspNetCore.SignalR.Client.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netstandard2.0 - - - - - - - diff --git a/src/SignalR/clients/csharp/Client/ref/Microsoft.AspNetCore.SignalR.Client.netstandard2.0.cs b/src/SignalR/clients/csharp/Client/ref/Microsoft.AspNetCore.SignalR.Client.netstandard2.0.cs deleted file mode 100644 index 1fb111784b..0000000000 --- a/src/SignalR/clients/csharp/Client/ref/Microsoft.AspNetCore.SignalR.Client.netstandard2.0.cs +++ /dev/null @@ -1,17 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.SignalR.Client -{ - public static partial class HubConnectionBuilderHttpExtensions - { - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithUrl(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, string url) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithUrl(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, string url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithUrl(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, string url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports, System.Action configureHttpConnection) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithUrl(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, string url, System.Action configureHttpConnection) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithUrl(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, System.Uri url) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithUrl(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, System.Uri url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithUrl(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, System.Uri url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports, System.Action configureHttpConnection) { throw null; } - public static Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder WithUrl(this Microsoft.AspNetCore.SignalR.Client.IHubConnectionBuilder hubConnectionBuilder, System.Uri url, System.Action configureHttpConnection) { throw null; } - } -} diff --git a/src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj b/src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj index 8280917fc7..ab1821d40e 100644 --- a/src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj +++ b/src/SignalR/clients/csharp/Client/test/FunctionalTests/Microsoft.AspNetCore.SignalR.Client.FunctionalTests.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + + false diff --git a/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj b/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj index cc45556edd..28eb9c9a1c 100644 --- a/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj +++ b/src/SignalR/clients/csharp/Client/test/UnitTests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + + false diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.csproj b/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.csproj deleted file mode 100644 index df0c10a3eb..0000000000 --- a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netstandard2.0;netstandard2.1 - - - - - - - - - - - - - - diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netstandard2.0.cs b/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netstandard2.0.cs deleted file mode 100644 index c83eff7848..0000000000 --- a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netstandard2.0.cs +++ /dev/null @@ -1,56 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Http.Connections.Client -{ - public partial class HttpConnection : Microsoft.AspNetCore.Connections.ConnectionContext, Microsoft.AspNetCore.Connections.Features.IConnectionInherentKeepAliveFeature - { - public HttpConnection(Microsoft.AspNetCore.Http.Connections.Client.HttpConnectionOptions httpConnectionOptions, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public HttpConnection(System.Uri url) { } - public HttpConnection(System.Uri url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports) { } - public HttpConnection(System.Uri url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public override string ConnectionId { get { throw null; } set { } } - public override Microsoft.AspNetCore.Http.Features.IFeatureCollection Features { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override System.Collections.Generic.IDictionary Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - bool Microsoft.AspNetCore.Connections.Features.IConnectionInherentKeepAliveFeature.HasInherentKeepAlive { get { throw null; } } - public override System.IO.Pipelines.IDuplexPipe Transport { get { throw null; } set { } } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task StartAsync(Microsoft.AspNetCore.Connections.TransferFormat transferFormat, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class HttpConnectionFactory : Microsoft.AspNetCore.Connections.IConnectionFactory - { - public HttpConnectionFactory(Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.ValueTask ConnectAsync(System.Net.EndPoint endPoint, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class HttpConnectionOptions - { - public HttpConnectionOptions() { } - public System.Func> AccessTokenProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Security.Cryptography.X509Certificates.X509CertificateCollection ClientCertificates { get { throw null; } set { } } - public System.TimeSpan CloseTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.CookieContainer Cookies { get { throw null; } set { } } - public System.Net.ICredentials Credentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Connections.TransferFormat DefaultTransferFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IDictionary Headers { get { throw null; } set { } } - public System.Func HttpMessageHandlerFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.IWebProxy Proxy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SkipNegotiation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.Connections.HttpTransportType Transports { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Uri Url { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool? UseDefaultCredentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Action WebSocketConfiguration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class NoTransportSupportedException : System.Exception - { - public NoTransportSupportedException(string message) { } - } - public partial class TransportFailedException : System.Exception - { - public TransportFailedException(string transportType, string message, System.Exception innerException = null) { } - public string TransportType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netstandard2.1.cs b/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netstandard2.1.cs deleted file mode 100644 index c83eff7848..0000000000 --- a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netstandard2.1.cs +++ /dev/null @@ -1,56 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Http.Connections.Client -{ - public partial class HttpConnection : Microsoft.AspNetCore.Connections.ConnectionContext, Microsoft.AspNetCore.Connections.Features.IConnectionInherentKeepAliveFeature - { - public HttpConnection(Microsoft.AspNetCore.Http.Connections.Client.HttpConnectionOptions httpConnectionOptions, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public HttpConnection(System.Uri url) { } - public HttpConnection(System.Uri url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports) { } - public HttpConnection(System.Uri url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public override string ConnectionId { get { throw null; } set { } } - public override Microsoft.AspNetCore.Http.Features.IFeatureCollection Features { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override System.Collections.Generic.IDictionary Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - bool Microsoft.AspNetCore.Connections.Features.IConnectionInherentKeepAliveFeature.HasInherentKeepAlive { get { throw null; } } - public override System.IO.Pipelines.IDuplexPipe Transport { get { throw null; } set { } } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task StartAsync(Microsoft.AspNetCore.Connections.TransferFormat transferFormat, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class HttpConnectionFactory : Microsoft.AspNetCore.Connections.IConnectionFactory - { - public HttpConnectionFactory(Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.ValueTask ConnectAsync(System.Net.EndPoint endPoint, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class HttpConnectionOptions - { - public HttpConnectionOptions() { } - public System.Func> AccessTokenProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Security.Cryptography.X509Certificates.X509CertificateCollection ClientCertificates { get { throw null; } set { } } - public System.TimeSpan CloseTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.CookieContainer Cookies { get { throw null; } set { } } - public System.Net.ICredentials Credentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Connections.TransferFormat DefaultTransferFormat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IDictionary Headers { get { throw null; } set { } } - public System.Func HttpMessageHandlerFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.IWebProxy Proxy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SkipNegotiation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.Connections.HttpTransportType Transports { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Uri Url { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool? UseDefaultCredentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Action WebSocketConfiguration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class NoTransportSupportedException : System.Exception - { - public NoTransportSupportedException(string message) { } - } - public partial class TransportFailedException : System.Exception - { - public TransportFailedException(string transportType, string message, System.Exception innerException = null) { } - public string TransportType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj index eb6dcab8f2..5e18e95ff0 100644 --- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj @@ -7,6 +7,8 @@ true + + false @@ -35,19 +37,14 @@ + + - - - - - diff --git a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj index 12cd68e60b..eb8738fdb1 100644 --- a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj +++ b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj @@ -2,16 +2,14 @@ netstandard2.0;netcoreapp3.0 - false - - - + + - + diff --git a/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj b/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj index 09619247c7..89200c226d 100644 --- a/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj +++ b/src/SignalR/common/Http.Connections/ref/Microsoft.AspNetCore.Http.Connections.csproj @@ -2,18 +2,17 @@ netcoreapp3.0 - false - - - - - - - - - + + + + + + + + + diff --git a/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj b/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj index 01f0769245..ffd6604c73 100644 --- a/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj +++ b/src/SignalR/common/Http.Connections/test/Microsoft.AspNetCore.Http.Connections.Tests.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + + false diff --git a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj index 9b5134468f..d150b07760 100644 --- a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj +++ b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj @@ -2,15 +2,13 @@ netstandard2.0;netcoreapp3.0 - false - - + - + diff --git a/src/SignalR/common/Protocols.MessagePack/ref/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj b/src/SignalR/common/Protocols.MessagePack/ref/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj deleted file mode 100644 index 99f48f00d8..0000000000 --- a/src/SignalR/common/Protocols.MessagePack/ref/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netstandard2.0 - - - - - - - diff --git a/src/SignalR/common/Protocols.MessagePack/ref/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.netstandard2.0.cs b/src/SignalR/common/Protocols.MessagePack/ref/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.netstandard2.0.cs deleted file mode 100644 index 70f7ce9d02..0000000000 --- a/src/SignalR/common/Protocols.MessagePack/ref/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.netstandard2.0.cs +++ /dev/null @@ -1,34 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.SignalR -{ - public partial class MessagePackHubProtocolOptions - { - public MessagePackHubProtocolOptions() { } - public System.Collections.Generic.IList FormatterResolvers { get { throw null; } set { } } - } -} -namespace Microsoft.AspNetCore.SignalR.Protocol -{ - public partial class MessagePackHubProtocol : Microsoft.AspNetCore.SignalR.Protocol.IHubProtocol - { - public MessagePackHubProtocol() { } - public MessagePackHubProtocol(Microsoft.Extensions.Options.IOptions options) { } - public string Name { get { throw null; } } - public Microsoft.AspNetCore.Connections.TransferFormat TransferFormat { get { throw null; } } - public int Version { get { throw null; } } - public System.ReadOnlyMemory GetMessageBytes(Microsoft.AspNetCore.SignalR.Protocol.HubMessage message) { throw null; } - public bool IsVersionSupported(int version) { throw null; } - public bool TryParseMessage(ref System.Buffers.ReadOnlySequence input, Microsoft.AspNetCore.SignalR.IInvocationBinder binder, out Microsoft.AspNetCore.SignalR.Protocol.HubMessage message) { throw null; } - public void WriteMessage(Microsoft.AspNetCore.SignalR.Protocol.HubMessage message, System.Buffers.IBufferWriter output) { } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class MessagePackProtocolDependencyInjectionExtensions - { - public static TBuilder AddMessagePackProtocol(this TBuilder builder) where TBuilder : Microsoft.AspNetCore.SignalR.ISignalRBuilder { throw null; } - public static TBuilder AddMessagePackProtocol(this TBuilder builder, System.Action configure) where TBuilder : Microsoft.AspNetCore.SignalR.ISignalRBuilder { throw null; } - } -} diff --git a/src/SignalR/common/Protocols.NewtonsoftJson/ref/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj b/src/SignalR/common/Protocols.NewtonsoftJson/ref/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj deleted file mode 100644 index cd39d0046a..0000000000 --- a/src/SignalR/common/Protocols.NewtonsoftJson/ref/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netstandard2.0 - - - - - - - diff --git a/src/SignalR/common/Protocols.NewtonsoftJson/ref/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.netstandard2.0.cs b/src/SignalR/common/Protocols.NewtonsoftJson/ref/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.netstandard2.0.cs deleted file mode 100644 index e04928abf7..0000000000 --- a/src/SignalR/common/Protocols.NewtonsoftJson/ref/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.netstandard2.0.cs +++ /dev/null @@ -1,35 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.SignalR -{ - public partial class NewtonsoftJsonHubProtocolOptions - { - public NewtonsoftJsonHubProtocolOptions() { } - public Newtonsoft.Json.JsonSerializerSettings PayloadSerializerSettings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.AspNetCore.SignalR.Protocol -{ - public partial class NewtonsoftJsonHubProtocol : Microsoft.AspNetCore.SignalR.Protocol.IHubProtocol - { - public NewtonsoftJsonHubProtocol() { } - public NewtonsoftJsonHubProtocol(Microsoft.Extensions.Options.IOptions options) { } - public string Name { get { throw null; } } - public Newtonsoft.Json.JsonSerializer PayloadSerializer { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Connections.TransferFormat TransferFormat { get { throw null; } } - public int Version { get { throw null; } } - public System.ReadOnlyMemory GetMessageBytes(Microsoft.AspNetCore.SignalR.Protocol.HubMessage message) { throw null; } - public bool IsVersionSupported(int version) { throw null; } - public bool TryParseMessage(ref System.Buffers.ReadOnlySequence input, Microsoft.AspNetCore.SignalR.IInvocationBinder binder, out Microsoft.AspNetCore.SignalR.Protocol.HubMessage message) { throw null; } - public void WriteMessage(Microsoft.AspNetCore.SignalR.Protocol.HubMessage message, System.Buffers.IBufferWriter output) { } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class NewtonsoftJsonProtocolDependencyInjectionExtensions - { - public static TBuilder AddNewtonsoftJsonProtocol(this TBuilder builder) where TBuilder : Microsoft.AspNetCore.SignalR.ISignalRBuilder { throw null; } - public static TBuilder AddNewtonsoftJsonProtocol(this TBuilder builder, System.Action configure) where TBuilder : Microsoft.AspNetCore.SignalR.ISignalRBuilder { throw null; } - } -} diff --git a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj index 95fdf6b70e..c4ab0ed06d 100644 --- a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj +++ b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj @@ -2,18 +2,20 @@ netstandard2.0;netcoreapp3.0 - false - - - - + + + + + - - + + + + diff --git a/src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj b/src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj index cfef1f1d74..209f58c0c0 100644 --- a/src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj +++ b/src/SignalR/common/SignalR.Common/test/Microsoft.AspNetCore.SignalR.Common.Tests.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + + false diff --git a/src/SignalR/common/testassets/Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj b/src/SignalR/common/testassets/Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj index 4330ae9b16..5a0b032969 100644 --- a/src/SignalR/common/testassets/Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj +++ b/src/SignalR/common/testassets/Tests.Utils/Microsoft.AspNetCore.SignalR.Tests.Utils.csproj @@ -4,6 +4,8 @@ netcoreapp3.0 Microsoft.AspNetCore.SignalR.Tests $(DefineConstants);TESTUTILS + + false @@ -21,6 +23,8 @@ + + diff --git a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj index c007a68669..5c1b1bcd44 100644 --- a/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj +++ b/src/SignalR/perf/Microbenchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks.csproj @@ -3,6 +3,8 @@ Exe netcoreapp3.0 + + false diff --git a/src/SignalR/samples/ClientSample/ClientSample.csproj b/src/SignalR/samples/ClientSample/ClientSample.csproj index 2ba102d8ae..486c2dd3eb 100644 --- a/src/SignalR/samples/ClientSample/ClientSample.csproj +++ b/src/SignalR/samples/ClientSample/ClientSample.csproj @@ -3,6 +3,8 @@ netcoreapp3.0;net461 Exe + + false @@ -14,6 +16,8 @@ + + diff --git a/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj b/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj index 726a267d4c..b5f86fe0ee 100644 --- a/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj +++ b/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj @@ -3,10 +3,14 @@ netcoreapp3.0 Exe + + false + + diff --git a/src/SignalR/samples/SignalRSamples/SignalRSamples.csproj b/src/SignalR/samples/SignalRSamples/SignalRSamples.csproj index 64b4d62744..ee593bf9fb 100644 --- a/src/SignalR/samples/SignalRSamples/SignalRSamples.csproj +++ b/src/SignalR/samples/SignalRSamples/SignalRSamples.csproj @@ -3,6 +3,8 @@ netcoreapp3.0 false + + false @@ -20,6 +22,8 @@ + + diff --git a/src/SignalR/server/Core/ref/Microsoft.AspNetCore.SignalR.Core.csproj b/src/SignalR/server/Core/ref/Microsoft.AspNetCore.SignalR.Core.csproj index f5ec5324f3..0f4afe5f2a 100644 --- a/src/SignalR/server/Core/ref/Microsoft.AspNetCore.SignalR.Core.csproj +++ b/src/SignalR/server/Core/ref/Microsoft.AspNetCore.SignalR.Core.csproj @@ -2,15 +2,17 @@ netcoreapp3.0 - false - - - - - - + + + + + + + + + diff --git a/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.csproj b/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.csproj index 82457dcd45..5954efb978 100644 --- a/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.csproj +++ b/src/SignalR/server/SignalR/ref/Microsoft.AspNetCore.SignalR.csproj @@ -2,12 +2,10 @@ netcoreapp3.0 - false - - - + + diff --git a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj index 527ae19b19..169fa1db2f 100644 --- a/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj +++ b/src/SignalR/server/SignalR/test/Microsoft.AspNetCore.SignalR.Tests.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + + false @@ -26,4 +28,4 @@ - \ No newline at end of file + diff --git a/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj b/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj index f0dcb08acc..dc4c86d256 100644 --- a/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj +++ b/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj @@ -5,6 +5,8 @@ netcoreapp3.0 true false + + false @@ -23,6 +25,8 @@ + + diff --git a/src/SignalR/server/StackExchangeRedis/ref/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj b/src/SignalR/server/StackExchangeRedis/ref/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj deleted file mode 100644 index 4ce5052d11..0000000000 --- a/src/SignalR/server/StackExchangeRedis/ref/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netcoreapp3.0 - - - - - - - - - diff --git a/src/SignalR/server/StackExchangeRedis/ref/Microsoft.AspNetCore.SignalR.StackExchangeRedis.netcoreapp3.0.cs b/src/SignalR/server/StackExchangeRedis/ref/Microsoft.AspNetCore.SignalR.StackExchangeRedis.netcoreapp3.0.cs deleted file mode 100644 index 5610a42318..0000000000 --- a/src/SignalR/server/StackExchangeRedis/ref/Microsoft.AspNetCore.SignalR.StackExchangeRedis.netcoreapp3.0.cs +++ /dev/null @@ -1,41 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.SignalR.StackExchangeRedis -{ - public partial class RedisHubLifetimeManager : Microsoft.AspNetCore.SignalR.HubLifetimeManager, System.IDisposable where THub : Microsoft.AspNetCore.SignalR.Hub - { - public RedisHubLifetimeManager(Microsoft.Extensions.Logging.ILogger> logger, Microsoft.Extensions.Options.IOptions options, Microsoft.AspNetCore.SignalR.IHubProtocolResolver hubProtocolResolver) { } - public override System.Threading.Tasks.Task AddToGroupAsync(string connectionId, string groupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public void Dispose() { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.Task OnConnectedAsync(Microsoft.AspNetCore.SignalR.HubConnectionContext connection) { throw null; } - public override System.Threading.Tasks.Task OnDisconnectedAsync(Microsoft.AspNetCore.SignalR.HubConnectionContext connection) { throw null; } - public override System.Threading.Tasks.Task RemoveFromGroupAsync(string connectionId, string groupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task SendAllAsync(string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task SendAllExceptAsync(string methodName, object[] args, System.Collections.Generic.IReadOnlyList excludedConnectionIds, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task SendConnectionAsync(string connectionId, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task SendConnectionsAsync(System.Collections.Generic.IReadOnlyList connectionIds, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task SendGroupAsync(string groupName, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task SendGroupExceptAsync(string groupName, string methodName, object[] args, System.Collections.Generic.IReadOnlyList excludedConnectionIds, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task SendGroupsAsync(System.Collections.Generic.IReadOnlyList groupNames, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task SendUserAsync(string userId, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.Task SendUsersAsync(System.Collections.Generic.IReadOnlyList userIds, string methodName, object[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class RedisOptions - { - public RedisOptions() { } - public StackExchange.Redis.ConfigurationOptions Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func> ConnectionFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} -namespace Microsoft.Extensions.DependencyInjection -{ - public static partial class StackExchangeRedisDependencyInjectionExtensions - { - public static Microsoft.AspNetCore.SignalR.ISignalRServerBuilder AddStackExchangeRedis(this Microsoft.AspNetCore.SignalR.ISignalRServerBuilder signalrBuilder) { throw null; } - public static Microsoft.AspNetCore.SignalR.ISignalRServerBuilder AddStackExchangeRedis(this Microsoft.AspNetCore.SignalR.ISignalRServerBuilder signalrBuilder, System.Action configure) { throw null; } - public static Microsoft.AspNetCore.SignalR.ISignalRServerBuilder AddStackExchangeRedis(this Microsoft.AspNetCore.SignalR.ISignalRServerBuilder signalrBuilder, string redisConnectionString) { throw null; } - public static Microsoft.AspNetCore.SignalR.ISignalRServerBuilder AddStackExchangeRedis(this Microsoft.AspNetCore.SignalR.ISignalRServerBuilder signalrBuilder, string redisConnectionString, System.Action configure) { throw null; } - } -} diff --git a/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj b/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj index 8172acf1f6..e60d04c6df 100644 --- a/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj +++ b/src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj @@ -2,6 +2,8 @@ netcoreapp3.0 + + false diff --git a/src/SiteExtensions/LoggingBranch/LB.csproj b/src/SiteExtensions/LoggingBranch/LB.csproj index cae245955b..ffa4a60c81 100644 --- a/src/SiteExtensions/LoggingBranch/LB.csproj +++ b/src/SiteExtensions/LoggingBranch/LB.csproj @@ -31,6 +31,9 @@ + + + diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj index 891e11b609..e0d39cff01 100644 --- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj +++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj @@ -13,9 +13,6 @@ MSBuild;Swagger;OpenAPI;code generation;Web API;service reference;document generation true true - - true - false + false + + From f2f23589a6086627166d9f816cf58b277ed75531 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Fri, 13 Dec 2019 12:56:23 -0800 Subject: [PATCH 041/116] Use fields in a `readonly` `struct` --- .../ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs index acc3d82bb8..bfc077c521 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs @@ -266,7 +266,12 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { private readonly object _dummy; private readonly int _dummyPrimitive; - public LifecycleProperty(System.Reflection.PropertyInfo propertyInfo, string key) { throw null; } + public LifecycleProperty(System.Reflection.PropertyInfo propertyInfo, string key) + { + _dummy = null; + _dummyPrimitive = 0; + throw null; + } public string Key { get { throw null; } } public System.Reflection.PropertyInfo PropertyInfo { get { throw null; } } public object GetValue(object instance) { throw null; } From 7052bc48d42509ebe23f64c65c51cf0455feb9fd Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 13 Dec 2019 13:19:27 -0800 Subject: [PATCH 042/116] Try ugly fix for LifecycleProperty --- .../ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs index bfc077c521..e1c6ce7806 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs @@ -268,9 +268,11 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters private readonly int _dummyPrimitive; public LifecycleProperty(System.Reflection.PropertyInfo propertyInfo, string key) { - _dummy = null; - _dummyPrimitive = 0; - throw null; + PropertyInfo = _dummy ?? propertyInfo; + if (_dummyPrimitive != -2) + { + Key = key; + } } public string Key { get { throw null; } } public System.Reflection.PropertyInfo PropertyInfo { get { throw null; } } From a3358d71cd66bebe03e415de1342a1c5c28b3bac Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 13 Dec 2019 13:26:24 -0800 Subject: [PATCH 043/116] Try ugly fix for LifecycleProperty --- .../ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs index e1c6ce7806..12f742474e 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs @@ -268,11 +268,9 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters private readonly int _dummyPrimitive; public LifecycleProperty(System.Reflection.PropertyInfo propertyInfo, string key) { - PropertyInfo = _dummy ?? propertyInfo; - if (_dummyPrimitive != -2) - { - Key = key; - } + _dummy = _dummy ?? null; + _dummyPrimitive = _dummyPrimitive + 1; + throw null; } public string Key { get { throw null; } } public System.Reflection.PropertyInfo PropertyInfo { get { throw null; } } From 138e801e342af561c8f12c8bfd2591d47129db82 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 13 Dec 2019 13:35:43 -0800 Subject: [PATCH 044/116] Remove _dummy/_dummyPrimitive from LifeCycleProperty --- .../ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs index 12f742474e..2c0b96c9e1 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs @@ -264,14 +264,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters } internal readonly partial struct LifecycleProperty { - private readonly object _dummy; - private readonly int _dummyPrimitive; - public LifecycleProperty(System.Reflection.PropertyInfo propertyInfo, string key) - { - _dummy = _dummy ?? null; - _dummyPrimitive = _dummyPrimitive + 1; - throw null; - } + public LifecycleProperty(System.Reflection.PropertyInfo propertyInfo, string key) { throw null; } public string Key { get { throw null; } } public System.Reflection.PropertyInfo PropertyInfo { get { throw null; } } public object GetValue(object instance) { throw null; } From fcb22728eea165087e79fd6618af5433db199b86 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 13 Dec 2019 13:38:33 -0800 Subject: [PATCH 045/116] Add dummy target for GetTargetPath to Components.Web.JS.npmproj (#17796) --- .../Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj b/src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj index 311f5079cd..89ca145324 100644 --- a/src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj +++ b/src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj @@ -24,6 +24,7 @@ + From e142091d27d50d20afa5b0cb587b23fa67c5eb9c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 13 Dec 2019 14:46:00 -0800 Subject: [PATCH 046/116] Add StructLayout to LifeCycleProperty --- .../ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs index 2c0b96c9e1..95ab268f58 100644 --- a/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs +++ b/src/Mvc/Mvc.ViewFeatures/ref/Microsoft.AspNetCore.Mvc.ViewFeatures.Manual.cs @@ -262,8 +262,11 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters public void OnTempDataSaving(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary tempData) { } protected void SetPropertyValues(Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionary tempData) { } } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] internal readonly partial struct LifecycleProperty { + private readonly object _dummy; + private readonly int _dummyPrimitive; public LifecycleProperty(System.Reflection.PropertyInfo propertyInfo, string key) { throw null; } public string Key { get { throw null; } } public System.Reflection.PropertyInfo PropertyInfo { get { throw null; } } From 6ce4719886ab8c9db810ca75431ca016a4731b34 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 13 Dec 2019 16:19:53 -0800 Subject: [PATCH 047/116] Fixup nuspecs for TargetingPackPackage/SharedFrameworkPackage --- .../Windows/SharedFramework/SharedFrameworkPackage.nuspec | 2 +- .../Windows/TargetingPack/TargetingPackPackage.nuspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec index 0752232efd..49ea59a3a8 100644 --- a/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec +++ b/src/Installers/Windows/SharedFramework/SharedFrameworkPackage.nuspec @@ -8,7 +8,7 @@ Microsoft $PackageLicenseExpression$ https://github.com/aspnet/aspnetcore - packageIcon.png + $PackageIcon$ true $MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption © Microsoft Corporation. All rights reserved. diff --git a/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec b/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec index 449160757e..25c24f3b28 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec +++ b/src/Installers/Windows/TargetingPack/TargetingPackPackage.nuspec @@ -8,7 +8,7 @@ Microsoft $PackageLicenseExpression$ https://github.com/aspnet/aspnetcore - packageIcon.png + $PackageIcon$ true $MAJOR$.$MINOR$ ASP.NET Core TargetingPack ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption © Microsoft Corporation. All rights reserved. From f89c8d15a2e4a993eb1b5ec34e8e37c6cf5b801f Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 13 Dec 2019 16:21:45 -0800 Subject: [PATCH 048/116] Use correct, non-stabilized version to find runtime archive (#17863) (#17869) --- src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index 4c4298a92d..bdacb9a582 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -33,7 +33,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant runtimes/$(RuntimeIdentifier)/native/ dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension) - $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreAppRuntimeVersion)/$(DotNetRuntimeArchiveFileName) + $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreAppInternalPackageVersion)/$(DotNetRuntimeArchiveFileName) $(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName) From e6af4bfe7e022e2c3b32c583b280965041c3d15c Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Sat, 14 Dec 2019 11:46:37 -0800 Subject: [PATCH 049/116] [release/3.1] Remove `grpc-nuget-dev` feed - https://grpc.jfrog.io/ seems to be failing though https://status.jfrog.io/ says all is well - feed is not needed because Grpc.AspNetCore v2.23.2 is available from NuGet.org --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 6a9ec52915..e30f18ae63 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,6 @@ - From 132467416377e1482506f629fa5d4fb88a6a7ee7 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 15 Dec 2019 17:23:03 +0000 Subject: [PATCH 050/116] Merged PR 4703: [internal/release/3.1] Update dependencies from 1 repositories This pull request updates the following dependencies [marker]: <> (Begin:48752c90-f78c-49ee-575f-08d76e1d56cb) ## From https://github.com/aspnet/EntityFrameworkCore - **Build**: 20191210.7 - **Date Produced**: 12/10/2019 8:25 PM - **Commit**: 813358a5fb4e1f35e5d82463d2bad6616ca6f594 - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.EntityFrameworkCore.Tools** -> 3.1.1-servicing.19610.7 - **Microsoft.EntityFrameworkCore.SqlServer** -> 3.1.1-servicing.19610.7 - **dotnet-ef** -> 3.1.1-servicing.19610.7 - **Microsoft.EntityFrameworkCore** -> 3.1.1-servicing.19610.7 - **Microsoft.EntityFrameworkCore.InMemory** -> 3.1.1-servicing.19610.7 - **Microsoft.EntityFrameworkCore.Relational** -> 3.1.1-servicing.19610.7 - **Microsoft.EntityFrameworkCore.Sqlite** -> 3.1.1-servicing.19610.7 [marker]: <> (End:48752c90-f78c-49ee-575f-08d76e1d56cb) --- .azure/pipelines/ci.yml | 91 +++- .azure/pipelines/jobs/codesign-xplat.yml | 9 + .azure/pipelines/jobs/default-build.yml | 18 + NuGet.config | 3 + build.ps1 | 24 +- build.sh | 77 ++-- eng/Version.Details.xml | 420 +++++++++--------- eng/Versions.props | 141 +++--- eng/common/tools.sh | 10 +- eng/scripts/CodeCheck.ps1 | 15 +- eng/scripts/ci-source-build.sh | 23 +- eng/tools/RepoTasks/DownloadFile.cs | 149 +++++++ eng/tools/RepoTasks/RepoTasks.tasks | 1 + .../Microsoft.AspNetCore.App.Runtime.csproj | 8 +- .../WindowsHostingBundle/Product.targets | 11 +- 15 files changed, 674 insertions(+), 326 deletions(-) create mode 100644 eng/tools/RepoTasks/DownloadFile.cs diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 93df4e04f9..a9b8019ab7 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -38,6 +38,19 @@ variables: value: '' - name: _SignType value: '' + - name: _InternalRuntimeDownloadArgs + value: '' + - name: _InternalRuntimeDownloadCodeSignArgs + value: '' +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNet-MSRC-Storage + - name: _InternalRuntimeDownloadArgs + value: -DotNetRuntimeSourceFeed https://dotnetclimsrc.blob.core.windows.net/dotnet -DotNetRuntimeSourceFeedKey $(dotnetclimsrc-read-sas-token-base64) /p:DotNetAssetRootAccessTokenSuffix='$(dotnetclimsrc-read-sas-token-base64)' + # The code signing doesn't use the aspnet build scripts, so the msbuild parameers have + # to be passed directly. This is awkward, since we pass the same info above, but we have + # to have it in two different forms + - name: _InternalRuntimeDownloadCodeSignArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: # DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1 @@ -81,7 +94,15 @@ stages: jobDisplayName: Code check agentOs: Windows steps: - - powershell: ./eng/scripts/CodeCheck.ps1 -ci + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs) displayName: Run eng/scripts/CodeCheck.ps1 artifacts: - name: Code_Check_Logs @@ -108,6 +129,14 @@ stages: # This is intentional to workaround https://github.com/dotnet/arcade/issues/1957 which always re-submits for code-signing, even # if they have already been signed. This results in slower builds due to re-submitting the same .nupkg many times for signing. # The sign settings have been configured to + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: ./build.cmd -ci @@ -117,6 +146,7 @@ stages: -buildNative /bl:artifacts/log/build.x64.binlog $(_BuildArgs) + $(_InternalRuntimeDownloadArgs) displayName: Build x64 # Build the x86 shared framework @@ -132,6 +162,7 @@ stages: /p:OnlyPackPlatformSpecificPackages=true /bl:artifacts/log/build.x86.binlog $(_BuildArgs) + $(_InternalRuntimeDownloadArgs) displayName: Build x86 # This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53 @@ -140,6 +171,7 @@ stages: -pack -noBuildDeps $(_BuildArgs) + $(_InternalRuntimeDownloadArgs) displayName: Build SiteExtension # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If https://github.com/dotnet/arcade/issues/1957 is resolved, @@ -165,6 +197,7 @@ stages: /p:AssetManifestFileName=aspnetcore-win-x64-x86.xml $(_BuildArgs) $(_PublishArgs) + $(_InternalRuntimeDownloadArgs) /p:PublishInstallerBaseVersion=true displayName: Build Installers @@ -205,6 +238,7 @@ stages: /p:AssetManifestFileName=aspnetcore-win-arm.xml $(_BuildArgs) $(_PublishArgs) + $(_InternalRuntimeDownloadArgs) installNodeJs: false installJdk: false artifacts: @@ -231,6 +265,7 @@ stages: -p:AssetManifestFileName=aspnetcore-MacOS_x64.xml $(_BuildArgs) $(_PublishArgs) + $(_InternalRuntimeDownloadArgs) installNodeJs: false installJdk: false artifacts: @@ -251,6 +286,14 @@ stages: jobDisplayName: "Build: Linux x64" agentOs: Linux steps: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: ./build.sh --ci --arch x64 @@ -261,6 +304,7 @@ stages: -p:OnlyPackPlatformSpecificPackages=true -bl:artifacts/log/build.linux-x64.binlog $(_BuildArgs) + $(_InternalRuntimeDownloadArgs) displayName: Run build.sh - script: | git clean -xfd src/**/obj/ @@ -274,7 +318,8 @@ stages: -p:BuildRuntimeArchive=false \ -p:LinuxInstallerType=deb \ -bl:artifacts/log/build.deb.binlog \ - $(_BuildArgs) + $(_BuildArgs) \ + $(_InternalRuntimeDownloadArgs) displayName: Build Debian installers - script: | git clean -xfd src/**/obj/ @@ -290,7 +335,8 @@ stages: -bl:artifacts/log/build.rpm.binlog \ -p:AssetManifestFileName=aspnetcore-Linux_x64.xml \ $(_BuildArgs) \ - $(_PublishArgs) + $(_PublishArgs) \ + $(_InternalRuntimeDownloadArgs) displayName: Build RPM installers installNodeJs: false installJdk: false @@ -322,6 +368,7 @@ stages: -p:AssetManifestFileName=aspnetcore-Linux_arm.xml $(_BuildArgs) $(_PublishArgs) + $(_InternalRuntimeDownloadArgs) installNodeJs: false installJdk: false artifacts: @@ -352,6 +399,7 @@ stages: -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml $(_BuildArgs) $(_PublishArgs) + $(_InternalRuntimeDownloadArgs) installNodeJs: false installJdk: false artifacts: @@ -385,6 +433,7 @@ stages: -p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml $(_BuildArgs) $(_PublishArgs) + $(_InternalRuntimeDownloadArgs) installNodeJs: false installJdk: false artifacts: @@ -418,6 +467,7 @@ stages: -p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml $(_BuildArgs) $(_PublishArgs) + $(_InternalRuntimeDownloadArgs) installNodeJs: false installJdk: false artifacts: @@ -439,7 +489,7 @@ stages: jobDisplayName: "Test: Windows Server 2016 x64" agentOs: Windows isTestingJob: true - buildArgs: -all -pack -test -BuildNative "/p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false" + buildArgs: -all -pack -test -BuildNative "/p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs) beforeBuild: - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1" displayName: Setup IISExpress test certificates and schema @@ -475,7 +525,15 @@ stages: agentOs: Windows isTestingJob: true steps: - - script: ./build.cmd -ci -all -pack + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: ./build.cmd -ci -all -pack $(_InternalRuntimeDownloadArgs) displayName: Build Repo - script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.pack.binlog" displayName: Pack Templates @@ -502,7 +560,7 @@ stages: jobDisplayName: "Test: macOS 10.13" agentOs: macOS isTestingJob: true - buildArgs: --all --test "/p:RunTemplateTests=false" + buildArgs: --all --test "/p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs) beforeBuild: - bash: "./eng/scripts/install-nginx-mac.sh" displayName: Installing Nginx @@ -537,7 +595,7 @@ stages: jobDisplayName: "Test: Ubuntu 16.04 x64" agentOs: Linux isTestingJob: true - buildArgs: --all --test "/p:RunTemplateTests=false" + buildArgs: --all --test "/p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs) beforeBuild: - bash: "./eng/scripts/install-nginx-linux.sh" displayName: Installing Nginx @@ -584,6 +642,25 @@ stages: chmod +x $HOME/bin/jq echo "##vso[task.prependpath]$HOME/bin" displayName: Install jq + - task: UseDotNet@2 + displayName: 'Use .NET Core sdk' + inputs: + packageType: sdk + # The SDK version selected here is intentionally supposed to use the latest release + # For the purpose of building Linux distros, we can't depend on features of the SDK + # which may not exist in pre-built versions of the SDK + # Pinning to preview 8 since preview 9 has breaking changes + version: 3.1.100 + installationPath: $(DotNetCoreSdkDir) + includePreviewVersions: true + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: ./eng/scripts/ci-source-build.sh --ci --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false displayName: Run ci-source-build.sh - task: PublishBuildArtifacts@1 diff --git a/.azure/pipelines/jobs/codesign-xplat.yml b/.azure/pipelines/jobs/codesign-xplat.yml index abf1512540..07e2e99f0e 100644 --- a/.azure/pipelines/jobs/codesign-xplat.yml +++ b/.azure/pipelines/jobs/codesign-xplat.yml @@ -28,6 +28,14 @@ jobs: contents: '**/*.nupkg' targetFolder: $(Build.SourcesDirectory)/artifacts/packages/$(BuildConfiguration)/shipping/ flattenFolders: true + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - powershell: .\eng\common\build.ps1 -ci -restore @@ -39,6 +47,7 @@ jobs: /p:DotNetSignType=$(_SignType) $(_BuildArgs) $(_PublishArgs) + $(_InternalRuntimeDownloadCodeSignArgs) displayName: Sign and publish packages artifacts: - name: CodeSign_Xplat_${{ parameters.inputName }}_Logs diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index d218c44531..cba72a653c 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -161,6 +161,24 @@ jobs: - ${{ if ne(parameters.steps, '')}}: - ${{ parameters.steps }} - ${{ if eq(parameters.steps, '')}}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if eq(parameters.agentOs, 'Windows') }}: + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if ne(parameters.agentOs, 'Windows') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if eq(parameters.buildScript, '') }}: - ${{ if eq(parameters.agentOs, 'Windows') }}: - script: .\$(BuildDirectory)\build.cmd -ci /p:DotNetSignType=$(_SignType) -Configuration $(BuildConfiguration) $(BuildScriptArgs) diff --git a/NuGet.config b/NuGet.config index e30f18ae63..4d0a835eb6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + diff --git a/build.ps1 b/build.ps1 index c515a84af5..cf854f54b4 100644 --- a/build.ps1 +++ b/build.ps1 @@ -77,6 +77,12 @@ MSBuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] .PARAMETER MSBuildArguments Additional MSBuild arguments to be passed through. +.PARAMETER DotNetRuntimeSourceFeed +Additional feed that can be used when downloading .NET runtimes + +.PARAMETER DotNetRuntimeSourceFeedKey +Key for feed that can be used when downloading .NET runtimes + .EXAMPLE Building both native and managed projects. @@ -151,6 +157,11 @@ param( # Other lifecycle targets [switch]$Help, # Show help + + # Optional arguments that enable downloading an internal + # runtime or runtime from a non-default location + [string]$DotNetRuntimeSourceFeed, + [string]$DotNetRuntimeSourceFeedKey, # Capture the rest [Parameter(ValueFromRemainingArguments = $true)] @@ -251,6 +262,16 @@ if (-not $Configuration) { } $MSBuildArguments += "/p:Configuration=$Configuration" +[string[]]$ToolsetBuildArguments = @() +if ($DotNetRuntimeSourceFeed -or $DotNetRuntimeSourceFeedKey) { + $runtimeFeedArg = "/p:DotNetRuntimeSourceFeed=$DotNetRuntimeSourceFeed" + $runtimeFeedKeyArg = "/p:DotNetRuntimeSourceFeedKey=$DotNetRuntimeSourceFeedKey" + $MSBuildArguments += $runtimeFeedArg + $MSBuildArguments += $runtimeFeedKeyArg + $ToolsetBuildArguments += $runtimeFeedArg + $ToolsetBuildArguments += $runtimeFeedKeyArg +} + $foundJdk = $false $javac = Get-Command javac -ErrorAction Ignore -CommandType Application $localJdkPath = "$PSScriptRoot\.tools\jdk\win-x64\" @@ -375,7 +396,8 @@ try { /p:Configuration=Release ` /p:Restore=$RunRestore ` /p:Build=true ` - /clp:NoSummary + /clp:NoSummary ` + @ToolsetBuildArguments } MSBuild $toolsetBuildProj ` diff --git a/build.sh b/build.sh index 05e1628368..b97417c4fa 100755 --- a/build.sh +++ b/build.sh @@ -29,6 +29,8 @@ build_installers='' build_projects='' target_arch='x64' configuration='' +dotnet_runtime_source_feed='' +dotnet_runtime_source_feed_key='' if [ "$(uname)" = "Darwin" ]; then target_os_name='osx' @@ -45,33 +47,36 @@ __usage() { echo "Usage: $(basename "${BASH_SOURCE[0]}") [options] [[--] ...] Arguments: - ... Arguments passed to the command. Variable number of arguments allowed. + ... Arguments passed to the command. Variable number of arguments allowed. Options: - --configuration|-c The build configuration (Debug, Release). Default=Debug - --arch The CPU architecture to build for (x64, arm, arm64). Default=$target_arch - --os-name The base runtime identifier to build for (linux, osx, linux-musl). Default=$target_os_name + --configuration|-c The build configuration (Debug, Release). Default=Debug + --arch The CPU architecture to build for (x64, arm, arm64). Default=$target_arch + --os-name The base runtime identifier to build for (linux, osx, linux-musl). Default=$target_os_name - --[no-]restore Run restore. - --[no-]build Compile projects. (Implies --no-restore) - --[no-]pack Produce packages. - --[no-]test Run tests. + --[no-]restore Run restore. + --[no-]build Compile projects. (Implies --no-restore) + --[no-]pack Produce packages. + --[no-]test Run tests. - --projects A list of projects to build. (Must be an absolute path.) - Globbing patterns are supported, such as \"$(pwd)/**/*.csproj\". - --no-build-deps Do not build project-to-project references and only build the specified project. - --no-build-repo-tasks Suppress building RepoTasks. + --projects A list of projects to build. (Must be an absolute path.) + Globbing patterns are supported, such as \"$(pwd)/**/*.csproj\". + --no-build-deps Do not build project-to-project references and only build the specified project. + --no-build-repo-tasks Suppress building RepoTasks. - --all Build all project types. - --[no-]build-native Build native projects (C, C++). - --[no-]build-managed Build managed projects (C#, F#, VB). - --[no-]build-nodejs Build NodeJS projects (TypeScript, JS). - --[no-]build-java Build Java projects. - --[no-]build-installers Build Java projects. + --all Build all project types. + --[no-]build-native Build native projects (C, C++). + --[no-]build-managed Build managed projects (C#, F#, VB). + --[no-]build-nodejs Build NodeJS projects (TypeScript, JS). + --[no-]build-java Build Java projects. + --[no-]build-installers Build Java projects. - --ci Apply CI specific settings and environment variables. - --binarylog|-bl Use a binary logger - --verbosity|-v MSBuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] + --ci Apply CI specific settings and environment variables. + --binarylog|-bl Use a binary logger + --verbosity|-v MSBuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] + + --dotnet-runtime-source-feed Additional feed that can be used when downloading .NET runtimes + --dotnet-runtime-source-feed-key Key for feed that can be used when downloading .NET runtimes Description: This build script installs required tools and runs an MSBuild command on this repository @@ -188,16 +193,26 @@ while [[ $# -gt 0 ]]; do -no-build-repo-tasks|-nobuildrepotasks) build_repo_tasks=false ;; + -arch) + shift + target_arch="${1:-}" + [ -z "$target_arch" ] && __error "Missing value for parameter --arch" && __usage + ;; -ci) ci=true ;; -binarylog|-bl) use_default_binary_log=true ;; - -verbosity|-v) + -dotnet-runtime-source-feed|-dotnetruntimesourcefeed) shift - [ -z "${1:-}" ] && __error "Missing value for parameter --verbosity" && __usage - verbosity="${1:-}" + [ -z "${1:-}" ] && __error "Missing value for parameter --dotnet-runtime-source-feed" && __usage + dotnet_runtime_source_feed="${1:-}" + ;; + -dotnet-runtime-source-feed-key|-dotnetruntimesourcefeedkey) + shift + [ -z "${1:-}" ] && __error "Missing value for parameter --dotnet-runtime-source-feed-key" && __usage + dotnet_runtime_source_feed_key="${1:-}" ;; *) msbuild_args[${#msbuild_args[*]}]="$1" @@ -270,6 +285,17 @@ msbuild_args[${#msbuild_args[*]}]="-p:Configuration=$configuration" echo "Setting msbuild verbosity to $verbosity" msbuild_args[${#msbuild_args[*]}]="-verbosity:$verbosity" +# Set up additional runtime args +toolset_build_args=() +if [ ! -z "$dotnet_runtime_source_feed" ] || [ ! -z "$dotnet_runtime_source_feed_key" ]; then + runtimeFeedArg="/p:DotNetRuntimeSourceFeed=$dotnet_runtime_source_feed" + runtimeFeedKeyArg="/p:DotNetRuntimeSourceFeedKey=$dotnet_runtime_source_feed_key" + msbuild_args[${#msbuild_args[*]}]=$runtimeFeedArg + msbuild_args[${#msbuild_args[*]}]=$runtimeFeedKeyArg + toolset_build_args[${#toolset_build_args[*]}]=$runtimeFeedArg + toolset_build_args[${#toolset_build_args[*]}]=$runtimeFeedKeyArg +fi + # Initialize global variables need to be set before the import of Arcade is imported restore=$run_restore @@ -325,7 +351,8 @@ if [ "$build_repo_tasks" = true ]; then -p:Configuration=Release \ -p:Restore=$run_restore \ -p:Build=true \ - -clp:NoSummary + -clp:NoSummary \ + ${toolset_build_args[@]+"${toolset_build_args[@]}"} fi # This incantation avoids unbound variable issues if msbuild_args is empty diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fffa6bcd5..6e634ae8dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,265 +29,265 @@ https://github.com/aspnet/AspNetCore-Tooling 9cf15bed711983d35362d62972ab87ccc88ba8ca - - https://github.com/aspnet/EntityFrameworkCore - 7f59c0bb92fb33698232f0d7007ebcb0a428b543 + + https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore + fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 - - https://github.com/aspnet/EntityFrameworkCore - 7f59c0bb92fb33698232f0d7007ebcb0a428b543 + + https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore + fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 - - https://github.com/aspnet/EntityFrameworkCore - 7f59c0bb92fb33698232f0d7007ebcb0a428b543 + + https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore + fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 - - https://github.com/aspnet/EntityFrameworkCore - 7f59c0bb92fb33698232f0d7007ebcb0a428b543 + + https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore + fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 - - https://github.com/aspnet/EntityFrameworkCore - 7f59c0bb92fb33698232f0d7007ebcb0a428b543 + + https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore + fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 - - https://github.com/aspnet/EntityFrameworkCore - 7f59c0bb92fb33698232f0d7007ebcb0a428b543 + + https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore + fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 - - https://github.com/aspnet/EntityFrameworkCore - 7f59c0bb92fb33698232f0d7007ebcb0a428b543 + + https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore + fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 https://github.com/dotnet/corefx @@ -377,25 +377,25 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://github.com/dotnet/core-setup - f3f2dd583fffa254015fc21ff0e45784b333256d + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - f3f2dd583fffa254015fc21ff0e45784b333256d + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/core-setup - f3f2dd583fffa254015fc21ff0e45784b333256d + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e @@ -413,9 +413,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 https://github.com/dotnet/arcade @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 - - https://github.com/aspnet/Extensions - d40e21ccc14908a054b2181b1d6aeb22c49c630d + + https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions + d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index ac32a23cfd..fb7875c1eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,10 +66,10 @@ 3.4.0-beta4-19569-03 - 3.1.1-servicing.19576.9 - 3.1.1-servicing.19576.9 + 3.1.1 + 3.1.1-servicing.19608.4 3.1.0 - 3.1.1-servicing.19576.9 + 3.1.1 2.1.0 1.1.0 @@ -99,75 +99,75 @@ 3.1.0-preview4.19605.1 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 - 3.1.1-servicing.19604.6 + 3.1.1-servicing.19614.4 + 3.1.1-servicing.19614.4 + 3.1.1-servicing.19614.4 + 3.1.1-servicing.19614.4 + 3.1.1-servicing.19614.4 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1-servicing.19614.4 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1-servicing.19614.4 + 3.1.1 + 3.1.1 + 3.1.1-servicing.19614.4 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1-servicing.19614.4 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1-servicing.19614.4 + 3.1.1 + 3.1.1-servicing.19614.4 + 3.1.1-servicing.19614.4 + 3.1.1 3.1.0-rtm.19565.4 - 3.1.1-servicing.19604.6 - 3.1.1-preview4.19604.6 + 3.1.1 + 3.1.1-preview4.19614.4 - 3.1.1-servicing.19605.1 - 3.1.1-servicing.19605.1 - 3.1.1-servicing.19605.1 - 3.1.1-servicing.19605.1 - 3.1.1-servicing.19605.1 - 3.1.1-servicing.19605.1 - 3.1.1-servicing.19605.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 3.1.1-servicing.19605.6 3.1.1-servicing.19605.6 @@ -269,5 +269,6 @@ https://dotnetcli.blob.core.windows.net/dotnet/ + https://dotnetclimsrc.blob.core.windows.net/dotnet/ diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 94965a8fd2..6221830226 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -210,7 +210,15 @@ function InstallDotNet { local runtimeSourceFeedKey='' if [[ -n "${7:-}" ]]; then - decodedFeedKey=`echo $7 | base64 --decode` + # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' + # like the rest of the unix variants. At the same time, MacOS doesn't support + # '-d'. To work around this, do a simple detection and switch the parameter + # accordingly. + decodeArg="--decode" + if base64 --help 2>&1 | grep -q "BusyBox"; then + decodeArg="-d" + fi + decodedFeedKey=`echo $7 | base64 $decodeArg` runtimeSourceFeedKey="--feed-credential $decodedFeedKey" fi diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 0d9c9dfec8..a8cff1da96 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -4,7 +4,11 @@ This script runs a quick check for common errors, such as checking that Visual Studio solutions are up to date or that generated code has been committed to source. #> param( - [switch]$ci + [switch]$ci, + # Optional arguments that enable downloading an internal + # runtime or runtime from a non-default location + [string]$DotNetRuntimeSourceFeed, + [string]$DotNetRuntimeSourceFeedKey ) $ErrorActionPreference = 'Stop' @@ -43,7 +47,7 @@ function LogError { try { if ($ci) { # Install dotnet.exe - & $repoRoot/restore.cmd -ci -NoBuildNodeJS + & $repoRoot/restore.cmd -ci -NoBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey } . "$repoRoot/activate.ps1" @@ -171,12 +175,13 @@ try { # Redirect stderr to stdout because PowerShell does not consistently handle output to stderr $changedFiles = & cmd /c 'git --no-pager diff --ignore-space-at-eol --name-only 2>nul' - # Temporary: Disable check for blazor js file - $changedFilesExclusion = "src/Components/Web.JS/dist/Release/blazor.server.js" + # Temporary: Disable check for blazor js file and nuget.config (updated automatically for + # internal builds) + $changedFilesExclusions = @("src/Components/Web.JS/dist/Release/blazor.server.js", "NuGet.config") if ($changedFiles) { foreach ($file in $changedFiles) { - if ($file -eq $changedFilesExclusion) {continue} + if ($changedFilesExclusions -contains $file) {continue} $filePath = Resolve-Path "${repoRoot}/${file}" LogError "Generated code is not up to date in $file. You might need to regenerate the reference assemblies or project list (see docs/ReferenceAssemblies.md and docs/ReferenceResolution.md)" -filepath $filePath diff --git a/eng/scripts/ci-source-build.sh b/eng/scripts/ci-source-build.sh index 3387125d78..ebc50dad0a 100755 --- a/eng/scripts/ci-source-build.sh +++ b/eng/scripts/ci-source-build.sh @@ -9,10 +9,31 @@ set -euo pipefail scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" reporoot="$(dirname "$(dirname "$scriptroot")")" + # For local development, make a backup copy of this file first +if [ ! -f "$reporoot/global.bak.json" ]; then + mv "$reporoot/global.json" "$reporoot/global.bak.json" +fi + + # Detect the current version of .NET Core installed +export SDK_VERSION=$(dotnet --version) +echo "The ambient version of .NET Core SDK version = $SDK_VERSION" + + # Update the global.json file to match the current .NET environment +cat "$reporoot/global.bak.json" | \ + jq '.sdk.version=env.SDK_VERSION' | \ + jq '.tools.dotnet=env.SDK_VERSION' | \ + jq 'del(.tools.runtimes)' \ + > "$reporoot/global.json" + + # Restore the original global.json file +trap "{ + mv "$reporoot/global.bak.json" "$reporoot/global.json" +}" EXIT + # Build repo tasks "$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj export DotNetBuildFromSource='true' # Build projects -"$reporoot/eng/common/build.sh" --restore --build --pack "$@" +"$reporoot/eng/common/build.sh" --restore --build --pack "$@" \ No newline at end of file diff --git a/eng/tools/RepoTasks/DownloadFile.cs b/eng/tools/RepoTasks/DownloadFile.cs new file mode 100644 index 0000000000..2be0954cc2 --- /dev/null +++ b/eng/tools/RepoTasks/DownloadFile.cs @@ -0,0 +1,149 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using System.IO; +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using System.Collections.Generic; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; + +namespace RepoTasks +{ + public class DownloadFile : Microsoft.Build.Utilities.Task + { + [Required] + public string Uri { get; set; } + + /// + /// If this field is set and the task fail to download the file from `Uri`, with a NotFound + /// status, it will try to download the file from `PrivateUri`. + /// + public string PrivateUri { get; set; } + + /// + /// Suffix for the private URI in base64 form (for SAS compatibility) + /// + public string PrivateUriSuffix { get; set; } + + public int MaxRetries { get; set; } = 5; + + [Required] + public string DestinationPath { get; set; } + + public bool Overwrite { get; set; } + + public override bool Execute() + { + return ExecuteAsync().GetAwaiter().GetResult(); + } + + private async System.Threading.Tasks.Task ExecuteAsync() + { + string destinationDir = Path.GetDirectoryName(DestinationPath); + if (!Directory.Exists(destinationDir)) + { + Directory.CreateDirectory(destinationDir); + } + + if (File.Exists(DestinationPath) && !Overwrite) + { + return true; + } + + const string FileUriProtocol = "file://"; + + if (Uri.StartsWith(FileUriProtocol, StringComparison.Ordinal)) + { + var filePath = Uri.Substring(FileUriProtocol.Length); + Log.LogMessage($"Copying '{filePath}' to '{DestinationPath}'"); + File.Copy(filePath, DestinationPath); + return true; + } + + List errorMessages = new List(); + bool? downloadStatus = await DownloadWithRetriesAsync(Uri, DestinationPath, errorMessages); + + if (downloadStatus == false && !string.IsNullOrEmpty(PrivateUri)) + { + string uriSuffix = ""; + if (!string.IsNullOrEmpty(PrivateUriSuffix)) + { + var uriSuffixBytes = System.Convert.FromBase64String(PrivateUriSuffix); + uriSuffix = System.Text.Encoding.UTF8.GetString(uriSuffixBytes); + } + downloadStatus = await DownloadWithRetriesAsync($"{PrivateUri}{uriSuffix}", DestinationPath, errorMessages); + } + + if (downloadStatus != true) + { + foreach (var error in errorMessages) + { + Log.LogError(error); + } + } + + return downloadStatus == true; + } + + /// + /// Attempt to download file from `source` with retries when response error is different of FileNotFound and Success. + /// + /// URL to the file to be downloaded. + /// Local path where to put the downloaded file. + /// true: Download Succeeded. false: Download failed with 404. null: Download failed but is retriable. + private async Task DownloadWithRetriesAsync(string source, string target, List errorMessages) + { + Random rng = new Random(); + + Log.LogMessage(MessageImportance.High, $"Attempting download '{source}' to '{target}'"); + + using (var httpClient = new HttpClient()) + { + for (int retryNumber = 0; retryNumber < MaxRetries; retryNumber++) + { + try + { + var httpResponse = await httpClient.GetAsync(source); + + Log.LogMessage(MessageImportance.High, $"{source} -> {httpResponse.StatusCode}"); + + // The Azure Storage REST API returns '400 - Bad Request' in some cases + // where the resource is not found on the storage. + // https://docs.microsoft.com/en-us/rest/api/storageservices/common-rest-api-error-codes + if (httpResponse.StatusCode == HttpStatusCode.NotFound || + httpResponse.ReasonPhrase.IndexOf("The requested URI does not represent any resource on the server.", StringComparison.OrdinalIgnoreCase) == 0) + { + errorMessages.Add($"Problems downloading file from '{source}'. Does the resource exist on the storage? {httpResponse.StatusCode} : {httpResponse.ReasonPhrase}"); + return false; + } + + httpResponse.EnsureSuccessStatusCode(); + + using (var outStream = File.Create(target)) + { + await httpResponse.Content.CopyToAsync(outStream); + } + + Log.LogMessage(MessageImportance.High, $"returning true {source} -> {httpResponse.StatusCode}"); + return true; + } + catch (Exception e) + { + Log.LogMessage(MessageImportance.High, $"returning error in {source} "); + errorMessages.Add($"Problems downloading file from '{source}'. {e.Message} {e.StackTrace}"); + File.Delete(target); + } + + await System.Threading.Tasks.Task.Delay(rng.Next(1000, 10000)); + } + } + + Log.LogMessage(MessageImportance.High, $"giving up {source} "); + errorMessages.Add($"Giving up downloading the file from '{source}' after {MaxRetries} retries."); + return null; + } + } +} diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks index 5fcc97d156..4916a97ed3 100644 --- a/eng/tools/RepoTasks/RepoTasks.tasks +++ b/eng/tools/RepoTasks/RepoTasks.tasks @@ -10,4 +10,5 @@ + diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index 62d93eef5a..4a7b1c9c4f 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -38,6 +38,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension) $(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreAppInternalPackageVersion)/$(DotNetRuntimeArchiveFileName) + $(DotNetPrivateAssetRootUrl)Runtime/$(MicrosoftNETCoreAppInternalPackageVersion)/$(DotNetRuntimeArchiveFileName) $(BaseIntermediateOutputPath)$(DotNetRuntimeArchiveFileName) @@ -379,9 +380,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant --> + Uri="$(DotNetRuntimeDownloadUrl)" + PrivateUri="$(DotNetRuntimePrivateDownloadUrl)" + PrivateUriSuffix="$(DotNetAssetRootAccessTokenSuffix)" + DestinationPath="$(DotNetRuntimeArchive)" /> https://dotnetcli.azureedge.net/dotnet/ $(DotNetAssetRootUrl)/ + https://dotnetclimsrc.azureedge.net/dotnet/ + $(DotNetPrivateAssetRootUrl)/ - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x64.exe - + dotnet-runtime-$(MicrosoftNETCoreAppRuntimeVersion)-win-x86.exe @@ -37,7 +39,10 @@ + Uri="$(DotNetAssetRootUrl)%(RemoteAsset.Identity)" + PrivateUri="$(DotNetPrivateAssetRootUrl)%(RemoteAsset.Identity)" + PrivateUriSuffix="$(DotNetAssetRootAccessTokenSuffix)" + DestinationPath="$(DepsPath)%(RemoteAsset.TargetFileName)" /> From 35b9d76e41c69989b0cab8df140f7c563b1d7938 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 16 Dec 2019 00:02:50 +0000 Subject: [PATCH 051/116] Merged PR 4903: [internal/release/3.1] Update dependencies from 1 repositories This pull request updates the following dependencies [marker]: <> (Begin:facfaf30-1c25-4166-575d-08d76e1d56cb) ## From https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - **Build**: 20191214.11 - **Date Produced**: 12/15/2019 3:03 AM - **Commit**: 07f16c89db55ab6f9f773cc3db6eb5a52908065e - **Branch**: refs/heads/internal/release/3.1 - **Updates**: - **Microsoft.AspNetCore.Mvc.Razor.Extensions** -> 3.1.1 - **Microsoft.AspNetCore.Razor.Language** -> 3.1.1 - **Microsoft.CodeAnalysis.Razor** -> 3.1.1 - **Microsoft.NET.Sdk.Razor** -> 3.1.1 [marker]: <> (End:facfaf30-1c25-4166-575d-08d76e1d56cb) --- NuGet.config | 1 + eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4d0a835eb6..1cf10a7f63 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e634ae8dc..e8fabf2c39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/aspnet/Blazor 7868699de745fd30a654c798a99dc541b77b95c0 - - https://github.com/aspnet/AspNetCore-Tooling - 9cf15bed711983d35362d62972ab87ccc88ba8ca + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling + 07f16c89db55ab6f9f773cc3db6eb5a52908065e - - https://github.com/aspnet/AspNetCore-Tooling - 9cf15bed711983d35362d62972ab87ccc88ba8ca + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling + 07f16c89db55ab6f9f773cc3db6eb5a52908065e - - https://github.com/aspnet/AspNetCore-Tooling - 9cf15bed711983d35362d62972ab87ccc88ba8ca + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling + 07f16c89db55ab6f9f773cc3db6eb5a52908065e - - https://github.com/aspnet/AspNetCore-Tooling - 9cf15bed711983d35362d62972ab87ccc88ba8ca + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling + 07f16c89db55ab6f9f773cc3db6eb5a52908065e https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore diff --git a/eng/Versions.props b/eng/Versions.props index fb7875c1eb..cc2b222c37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -169,10 +169,10 @@ 3.1.1 3.1.1 - 3.1.1-servicing.19605.6 - 3.1.1-servicing.19605.6 - 3.1.1-servicing.19605.6 - 3.1.1-servicing.19605.6 + 3.1.1 + 3.1.1 + 3.1.1 + 3.1.1 - false + true release true false From 32de399cda3cd3de63a5173c2b11d0006c7770b9 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Jan 2020 01:27:55 -0800 Subject: [PATCH 053/116] Update branding to 3.1.2 --- Directory.Build.props | 6 +++--- NuGet.config | 4 ---- eng/Baseline.Designer.props | 2 +- eng/Baseline.xml | 2 +- eng/Versions.props | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index b123605a33..27c4622d2b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -84,11 +84,11 @@ aspnetcore-runtime aspnetcore-targeting-pack - - + + false true + Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(VersionPrefix)' == '3.1.2' ">true false true diff --git a/NuGet.config b/NuGet.config index 1cf10a7f63..e30f18ae63 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,6 @@ - - - - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index b5c8196535..01b0b87bb5 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 3.1.0 + 3.1.1 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index bdcbf3e91d..93c9ada7e0 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - + diff --git a/eng/Versions.props b/eng/Versions.props index e69e1a1ff1..adeb6806fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 3 1 - 1 + 2 0 @@ -453,23 +453,23 @@ - 1.0.4 + 1.0.15 - + - + @@ -1063,12 +1063,12 @@ - 1.0.4 + 1.0.15 + - diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 69761f4e19..af6f6eaf27 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. --> - + @@ -53,7 +53,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + @@ -109,7 +109,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 48bab5aea1..b4ea70ab0a 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -44,7 +44,7 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.CookiePolicy; - + Microsoft.AspNetCore.Http.Connections; Microsoft.AspNetCore.SignalR.Core; diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.15.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.15.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.15.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.15.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.15.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.15.txt @@ -0,0 +1 @@ + diff --git a/version.props b/version.props index 6f78c654d6..aede0b4113 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ 2 1 - 15 + 16 servicing Servicing t000 From 67122035d07d1d2d62396c12fb0db99485b03e4a Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Jan 2020 17:45:17 -0800 Subject: [PATCH 055/116] Update baselines --- eng/Baseline.Designer.props | 434 ++++++++++++++++++------------------ eng/Baseline.xml | 150 ++++++------- 2 files changed, 293 insertions(+), 291 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 01b0b87bb5..0550859109 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -6,102 +6,102 @@ - 3.0.0 + 3.0.2 - 3.0.0 + 3.0.2 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - - - + + + - + - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - - + + - 3.1.0 + 3.1.1 - - + + - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 @@ -109,39 +109,39 @@ - 3.1.0 + 3.1.1 - - - + + + - - - + + + - 3.1.0 + 3.1.1 - - + + - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - + @@ -186,273 +186,273 @@ - 3.1.0 + 3.1.1 - - - + + + - - - + + + - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - - + + - - + + - 3.1.0 + 3.1.1 - + - + - 3.1.0 + 3.1.1 - - - - + + + + - - - - + + + + - 3.1.0 + 3.1.1 - - + + - 3.1.0 + 3.1.1 - + - + - + - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - + - + - 3.1.0 + 3.1.1 - - - - - - + + + + + + - - - - - - + + + + + + - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - - + + - 3.1.0 + 3.1.1 - - + + - - + + - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - - + + - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - - - + + + - - - + + + - 3.1.0 + 3.1.1 - + - + - 3.1.0 + 3.1.1 - + - + - 3.1.0 + 3.1.1 - - + + - - + + - 3.1.0 + 3.1.1 - - - - + + + + - 3.1.0 + 3.1.1 - - + + - 3.1.0 + 3.1.1 @@ -460,236 +460,238 @@ - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - - - + + + - 3.1.0 + 3.1.1 - - - + + + - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - + - - + + - 3.1.0 + 3.1.1 - - + + - 3.1.0 + 3.1.1 - - + + - - + + - - - - + + + + - 3.1.0 + 3.1.1 - - + + - - + + - 3.1.0 + 3.1.1 - + - + - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - - - - + + + + - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - + - 3.1.0 + 3.1.1 - - + + - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - 3.1.0 + 3.1.1 - - - + + + - 3.1.0 + 3.1.1 - - - + + + - - - + + + - 3.1.0 + 3.1.1 - - + + + - - + + + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 93c9ada7e0..d479dfe6ce 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -5,85 +5,85 @@ Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From a47417090d7cc33eab4113c2ede3da2cfef9e35c Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 14 Jan 2020 18:33:01 -0800 Subject: [PATCH 056/116] Fix CodeCheck --- eng/scripts/CodeCheck.ps1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index a8cff1da96..072f55fe21 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -47,7 +47,12 @@ function LogError { try { if ($ci) { # Install dotnet.exe - & $repoRoot/restore.cmd -ci -NoBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey + if ($DotNetRuntimeSourceFeed -or $DotNetRuntimeSourceFeedKey) { + & $repoRoot/restore.cmd -ci -NoBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey + } + else{ + & $repoRoot/restore.cmd -ci -NoBuildNodeJS + } } . "$repoRoot/activate.ps1" From eb1150ba37e76e0a33db91edd7f26199f30fe1d3 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 14 Jan 2020 23:44:39 -0800 Subject: [PATCH 057/116] Fixup templates --- Directory.Build.props | 2 +- .../test/Infrastructure/GenerateTestProps.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 27c4622d2b..aa477ec9ed 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -88,7 +88,7 @@ false true + Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(VersionPrefix)' == '3.0.1' ">true false true diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index 7cc09195fe..948108395a 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -15,7 +15,7 @@ %(_TargetingPackVersionInfo.PackageVersion) - $(AspNetCoreBaselineVersion) + $(TargetingPackVersionPrefix) From ee57a0c309f4ec769e6d8ec5b83fd75f0e9e09ee Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 15 Jan 2020 11:01:16 -0800 Subject: [PATCH 058/116] Use checked-in platform manifest in 3.1.2 (#18250) * Use checked-in platform manifest in 3.1.2 * Only used checked-in manifest in servicing builds --- Directory.Build.props | 2 +- eng/PlatformManifest.txt | 131 ++++++++++++++++++ eng/Versions.props | 2 +- .../ref/Microsoft.AspNetCore.App.Ref.csproj | 17 +-- src/Framework/test/TargetingPackTests.cs | 2 +- 5 files changed, 137 insertions(+), 17 deletions(-) create mode 100644 eng/PlatformManifest.txt diff --git a/Directory.Build.props b/Directory.Build.props index aa477ec9ed..27c4622d2b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -88,7 +88,7 @@ false true + Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(VersionPrefix)' == '3.1.2' ">true false true diff --git a/eng/PlatformManifest.txt b/eng/PlatformManifest.txt new file mode 100644 index 0000000000..1d5a81f517 --- /dev/null +++ b/eng/PlatformManifest.txt @@ -0,0 +1,131 @@ +aspnetcorev2_inprocess.dll|Microsoft.AspNetCore.App.Ref||13.1.19320.0 +Microsoft.AspNetCore.Antiforgery.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Authentication.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Authentication.Cookies.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Authentication.Core.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Authentication.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Authentication.OAuth.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Authorization.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Authorization.Policy.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Components.Authorization.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Components.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Components.Forms.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Components.Server.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Components.Web.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Connections.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.CookiePolicy.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Cors.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Cryptography.Internal.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Cryptography.KeyDerivation.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.DataProtection.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.DataProtection.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.DataProtection.Extensions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Diagnostics.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Diagnostics.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Diagnostics.HealthChecks.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.HostFiltering.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Hosting.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Hosting.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Hosting.Server.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Html.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Http.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Http.Connections.Common.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Http.Connections.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Http.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Http.Extensions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Http.Features.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.HttpOverrides.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.HttpsPolicy.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Identity.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Localization.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Localization.Routing.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Metadata.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.ApiExplorer.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.Core.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.Cors.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.DataAnnotations.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.Formatters.Json.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.Formatters.Xml.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.Localization.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.Razor.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.RazorPages.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.TagHelpers.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Mvc.ViewFeatures.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Razor.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Razor.Runtime.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.ResponseCaching.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.ResponseCaching.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.ResponseCompression.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Rewrite.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Routing.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Routing.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Server.HttpSys.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Server.IIS.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Server.IISIntegration.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Server.Kestrel.Core.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Server.Kestrel.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.Session.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.SignalR.Common.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.SignalR.Core.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.SignalR.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.SignalR.Protocols.Json.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.StaticFiles.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.WebSockets.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.AspNetCore.WebUtilities.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.Extensions.Caching.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Caching.Memory.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Configuration.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Configuration.Binder.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Configuration.CommandLine.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Configuration.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Configuration.EnvironmentVariables.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Configuration.FileExtensions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Configuration.Ini.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Configuration.Json.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Configuration.KeyPerFile.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Configuration.UserSecrets.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Configuration.Xml.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.DependencyInjection.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.DependencyInjection.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Diagnostics.HealthChecks.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.FileProviders.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.FileProviders.Composite.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.FileProviders.Embedded.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.FileProviders.Physical.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.FileSystemGlobbing.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Hosting.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Hosting.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Http.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Identity.Core.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.Extensions.Identity.Stores.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.Extensions.Localization.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Localization.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Logging.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Logging.Configuration.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Logging.Console.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Logging.Debug.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Logging.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Logging.EventLog.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Logging.EventSource.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Logging.TraceSource.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.ObjectPool.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Options.ConfigurationExtensions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Options.DataAnnotations.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Options.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.Primitives.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Extensions.WebEncoders.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.JSInterop.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 +Microsoft.Net.Http.Headers.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 +Microsoft.Win32.SystemEvents.dll|Microsoft.AspNetCore.App.Ref|4.0.2.0|4.700.19.56404 +System.Diagnostics.EventLog.dll|Microsoft.AspNetCore.App.Ref|4.0.2.0|4.700.19.56404 +System.Drawing.Common.dll|Microsoft.AspNetCore.App.Ref|4.0.2.0|4.700.19.56404 +System.IO.Pipelines.dll|Microsoft.AspNetCore.App.Ref|4.0.2.0|4.700.19.56404 +System.Security.Cryptography.Pkcs.dll|Microsoft.AspNetCore.App.Ref|4.1.1.0|4.700.19.56404 +System.Security.Cryptography.Xml.dll|Microsoft.AspNetCore.App.Ref|4.0.3.0|4.700.19.56404 +System.Security.Permissions.dll|Microsoft.AspNetCore.App.Ref|4.0.3.0|4.700.19.56404 +System.Windows.Extensions.dll|Microsoft.AspNetCore.App.Ref|4.0.1.0|4.700.19.56404 \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index adeb6806fb..e1ba194136 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ $(VersionPrefix) - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0 + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).2 0.3.$(AspNetCorePatchVersion) $([MSBuild]::Add(10, $(AspNetCoreMajorVersion))) diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index f403463fde..bb74b33f6a 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -53,7 +53,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0 $(ReferencePackSharedFxVersion)-$(VersionSuffix) - $(ArtifactsObjDir)ref\PlatformManifest.txt + $(PlatformManifestOutputPath) + $(RepoRoot)eng\PlatformManifest.txt @@ -143,23 +144,11 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - - - + diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs index ec8a646f48..12672a210a 100644 --- a/src/Framework/test/TargetingPackTests.cs +++ b/src/Framework/test/TargetingPackTests.cs @@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore public void PlatformManifestListsAllFiles() { var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt"); - var expectedAssemblies = TestData.GetTargetingPackDependencies() + var expectedAssemblies = TestData.GetSharedFxDependencies() .Split(';', StringSplitOptions.RemoveEmptyEntries) .Select(i => { From 67424e78a42b753c7b7284a03e3ea335b9816a40 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 15 Jan 2020 11:01:52 -0800 Subject: [PATCH 059/116] Don't use baseline assembly versions for RID-agnostic packages (#17970) --- Directory.Build.targets | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 70f9528919..0e0db95ab3 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,8 +1,6 @@ - - false + + false + + $(PackageVersion) From 6ec28e871581b579d070b838b8cc00db03161dbe Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 15 Jan 2020 11:02:08 -0800 Subject: [PATCH 060/116] Fix setter for CandidateState.Values in reference assembly (#18278) --- src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs index 7d939eeb89..3ce07a7861 100644 --- a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs +++ b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs @@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Routing.Matching public partial struct CandidateState { - public Microsoft.AspNetCore.Routing.RouteValueDictionary Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Routing.RouteValueDictionary Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } } internal sealed partial class DataSourceDependentMatcher : Microsoft.AspNetCore.Routing.Matching.Matcher From 164ddfd48b51b8d4be5845f11763460680131f0d Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 15 Jan 2020 11:06:16 -0800 Subject: [PATCH 061/116] Fix flaky LongPolling tests (#14395) --- .../Tests.Utils/VerifyNoErrorsScope.cs | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/src/SignalR/common/testassets/Tests.Utils/VerifyNoErrorsScope.cs b/src/SignalR/common/testassets/Tests.Utils/VerifyNoErrorsScope.cs index c66862fedc..511ab8bd1c 100644 --- a/src/SignalR/common/testassets/Tests.Utils/VerifyNoErrorsScope.cs +++ b/src/SignalR/common/testassets/Tests.Utils/VerifyNoErrorsScope.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; @@ -34,6 +34,32 @@ namespace Microsoft.AspNetCore.SignalR.Tests var results = _sink.GetLogs().Where(w => w.Write.LogLevel >= LogLevel.Error).ToList(); +#if NETCOREAPP2_1 || NETCOREAPP2_2 || NET461 + // -- Remove this code after 2.2 -- + // This section of code is resolving test flakiness caused by a race in LongPolling + // The race has been resolved in version 3.0 + // The below code tries to find is a DELETE request has arrived from the client before removing error logs associated with the race + // We do this because we don't want to hide any actual issues, but we feel confident that looking for DELETE first wont hide any real problems + var foundDelete = false; + var allLogs = _sink.GetLogs(); + foreach (var log in allLogs) + { + if (foundDelete == false && log.Write.Message.Contains("Request starting") && log.Write.Message.Contains("DELETE")) + { + foundDelete = true; + } + + if (foundDelete) + { + if ((log.Write.EventId.Name == "LongPollingTerminated" || log.Write.EventId.Name == "ApplicationError" || log.Write.EventId.Name == "FailedDispose") + && log.Write.Exception?.Message.Contains("Reading is not allowed after reader was completed.") == true) + { + results.Remove(log); + } + } + } +#endif + if (_expectedErrorsFilter != null) { results = results.Where(w => !_expectedErrorsFilter(w.Write)).ToList(); @@ -64,4 +90,4 @@ namespace Microsoft.AspNetCore.SignalR.Tests } } } -} \ No newline at end of file +} From 8211a1c31331be75d6486ca4db3619fa93e4d165 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Wed, 15 Jan 2020 11:07:15 -0800 Subject: [PATCH 062/116] =?UTF-8?q?[2.1]=20CookieChunkingManager=20needs?= =?UTF-8?q?=20to=20flow=20the=20Secure=20attribute=E2=80=A6=20(#17953)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eng/PatchConfig.props | 6 +++ .../samples/OpenIdConnectSample/Startup.cs | 2 +- .../test/WsFederation/WsFederationTest.cs | 6 +-- .../CookiePolicy/test/CookieChunkingTests.cs | 41 +++++++++++++++---- .../ChunkingCookieManager.cs | 5 +++ 5 files changed, 47 insertions(+), 13 deletions(-) diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index b4ea70ab0a..a4aab7c0b5 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -50,4 +50,10 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.SignalR.Core; + + + Microsoft.AspNetCore.Authentication.Cookies; + Microsoft.AspNetCore.Mvc.Core; + + diff --git a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Startup.cs b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Startup.cs index 638a6050d7..2ecfc882ec 100644 --- a/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Startup.cs +++ b/src/Security/Authentication/OpenIdConnect/samples/OpenIdConnectSample/Startup.cs @@ -45,7 +45,7 @@ namespace OpenIdConnectSample private void CheckSameSite(HttpContext httpContext, CookieOptions options) { - if (options.SameSite > (SameSiteMode)(-1)) + if (options.SameSite == SameSiteMode.None) { var userAgent = httpContext.Request.Headers["User-Agent"].ToString(); // TODO: Use your User Agent library of choice here. diff --git a/src/Security/Authentication/test/WsFederation/WsFederationTest.cs b/src/Security/Authentication/test/WsFederation/WsFederationTest.cs index bc1ef757f1..1c4fc9e94d 100644 --- a/src/Security/Authentication/test/WsFederation/WsFederationTest.cs +++ b/src/Security/Authentication/test/WsFederation/WsFederationTest.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; @@ -190,7 +190,7 @@ namespace Microsoft.AspNetCore.Authentication.WsFederation response.EnsureSuccessStatusCode(); var cookie = response.Headers.GetValues(HeaderNames.SetCookie).Single(); - Assert.Equal(".AspNetCore.Cookies=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; samesite=lax", cookie); + Assert.Equal(".AspNetCore.Cookies=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; samesite=lax; httponly", cookie); Assert.Equal("OnRemoteSignOut", response.Headers.GetValues("EventHeader").Single()); Assert.Equal("", await response.Content.ReadAsStringAsync()); } @@ -440,4 +440,4 @@ namespace Microsoft.AspNetCore.Authentication.WsFederation } } } -} \ No newline at end of file +} diff --git a/src/Security/CookiePolicy/test/CookieChunkingTests.cs b/src/Security/CookiePolicy/test/CookieChunkingTests.cs index e645745b35..20e186783a 100644 --- a/src/Security/CookiePolicy/test/CookieChunkingTests.cs +++ b/src/Security/CookiePolicy/test/CookieChunkingTests.cs @@ -21,6 +21,29 @@ namespace Microsoft.AspNetCore.Internal Assert.Equal("TestCookie=" + testString + "; path=/; samesite=lax", values[0]); } + [Fact] + public void AppendLargeCookie_WithOptions_Appended() + { + HttpContext context = new DefaultHttpContext(); + var now = DateTimeOffset.UtcNow; + var options = new CookieOptions + { + Domain = "foo.com", + HttpOnly = true, + SameSite = SameSiteMode.Strict, + Path = "/bar", + Secure = true, + Expires = now.AddMinutes(5), + MaxAge = TimeSpan.FromMinutes(5) + }; + var testString = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + new ChunkingCookieManager() { ChunkSize = null }.AppendResponseCookie(context, "TestCookie", testString, options); + + var values = context.Response.Headers["Set-Cookie"]; + Assert.Single(values); + Assert.Equal($"TestCookie={testString}; expires={now.AddMinutes(5).ToString("R")}; max-age=300; domain=foo.com; path=/bar; secure; samesite=strict; httponly", values[0]); + } + [Fact] public void AppendLargeCookieWithLimit_Chunked() { @@ -112,19 +135,19 @@ namespace Microsoft.AspNetCore.Internal HttpContext context = new DefaultHttpContext(); context.Request.Headers.Append("Cookie", "TestCookie=chunks-7"); - new ChunkingCookieManager().DeleteCookie(context, "TestCookie", new CookieOptions() { Domain = "foo.com" }); + new ChunkingCookieManager().DeleteCookie(context, "TestCookie", new CookieOptions() { Domain = "foo.com", Secure = true }); var cookies = context.Response.Headers["Set-Cookie"]; Assert.Equal(8, cookies.Count); Assert.Equal(new[] { - "TestCookie=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax", - "TestCookieC1=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax", - "TestCookieC2=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax", - "TestCookieC3=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax", - "TestCookieC4=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax", - "TestCookieC5=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax", - "TestCookieC6=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax", - "TestCookieC7=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; samesite=lax", + "TestCookie=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; samesite=lax", + "TestCookieC1=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; samesite=lax", + "TestCookieC2=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; samesite=lax", + "TestCookieC3=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; samesite=lax", + "TestCookieC4=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; samesite=lax", + "TestCookieC5=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; samesite=lax", + "TestCookieC6=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; samesite=lax", + "TestCookieC7=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure; samesite=lax", }, cookies); } } diff --git a/src/Shared/ChunkingCookieManager/ChunkingCookieManager.cs b/src/Shared/ChunkingCookieManager/ChunkingCookieManager.cs index 42cc4e2f0f..4f1700bb77 100644 --- a/src/Shared/ChunkingCookieManager/ChunkingCookieManager.cs +++ b/src/Shared/ChunkingCookieManager/ChunkingCookieManager.cs @@ -169,6 +169,7 @@ namespace Microsoft.AspNetCore.Internal HttpOnly = options.HttpOnly, Path = options.Path, Secure = options.Secure, + MaxAge = options.MaxAge, }; var templateLength = template.ToString().Length; @@ -285,8 +286,10 @@ namespace Microsoft.AspNetCore.Internal Path = options.Path, Domain = options.Domain, SameSite = options.SameSite, + Secure = options.Secure, IsEssential = options.IsEssential, Expires = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc), + HttpOnly = options.HttpOnly, }); for (int i = 1; i <= chunks; i++) @@ -300,8 +303,10 @@ namespace Microsoft.AspNetCore.Internal Path = options.Path, Domain = options.Domain, SameSite = options.SameSite, + Secure = options.Secure, IsEssential = options.IsEssential, Expires = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc), + HttpOnly = options.HttpOnly, }); } } From ad8ecf96a1d9840167a87faf080cc2f48531a307 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Wed, 15 Jan 2020 11:07:50 -0800 Subject: [PATCH 063/116] React to runtime/594 Encoder.Convert change (#17747) --- .../src/Extensions/HttpResponseWritingExtensions.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Http/Http.Abstractions/src/Extensions/HttpResponseWritingExtensions.cs b/src/Http/Http.Abstractions/src/Extensions/HttpResponseWritingExtensions.cs index 7d4532c4c8..c94118a82e 100644 --- a/src/Http/Http.Abstractions/src/Extensions/HttpResponseWritingExtensions.cs +++ b/src/Http/Http.Abstractions/src/Extensions/HttpResponseWritingExtensions.cs @@ -133,7 +133,8 @@ namespace Microsoft.AspNetCore.Http // Therefore, we check encodedLength - totalBytesUsed too. while (!completed || encodedLength - totalBytesUsed != 0) { - encoder.Convert(source, destination, flush: source.Length == 0, out var charsUsed, out var bytesUsed, out completed); + // 'text' is a complete string, the converter should always flush its buffer. + encoder.Convert(source, destination, flush: true, out var charsUsed, out var bytesUsed, out completed); totalBytesUsed += bytesUsed; writer.Advance(bytesUsed); From 34294a3e7a4f0a3adb39c8e2c7643a87199e6fdd Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 16 Jan 2020 08:08:41 +1300 Subject: [PATCH 064/116] Fix TestServer hang with duplex streaming requests (#17158) --- .../TestHost/src/HttpContextBuilder.cs | 19 +++----- src/Hosting/TestHost/test/TestClientTests.cs | 47 +++++++++++++++++++ 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/src/Hosting/TestHost/src/HttpContextBuilder.cs b/src/Hosting/TestHost/src/HttpContextBuilder.cs index aab30590aa..c286f26488 100644 --- a/src/Hosting/TestHost/src/HttpContextBuilder.cs +++ b/src/Hosting/TestHost/src/HttpContextBuilder.cs @@ -110,8 +110,10 @@ namespace Microsoft.AspNetCore.TestHost try { await _application.ProcessRequestAsync(_testContext); - await CompleteRequestAsync(); + + // Matches Kestrel server: response is completed before request is drained await CompleteResponseAsync(); + await CompleteRequestAsync(); _application.DisposeContext(_testContext, exception: null); } catch (Exception ex) @@ -171,18 +173,9 @@ namespace Microsoft.AspNetCore.TestHost await _requestPipe.Reader.CompleteAsync(); } - if (_sendRequestStreamTask != null) - { - try - { - // Ensure duplex request is either completely read or has been aborted. - await _sendRequestStreamTask; - } - catch (OperationCanceledException) - { - // Request was canceled, likely because it wasn't read before the request ended. - } - } + // Don't wait for request to drain. It could block indefinitely. In a real server + // we would wait for a timeout and then kill the socket. + // Potential future improvement: add logging that the request timed out } internal async Task CompleteResponseAsync() diff --git a/src/Hosting/TestHost/test/TestClientTests.cs b/src/Hosting/TestHost/test/TestClientTests.cs index 9ae6caebfe..b4f5b06b4d 100644 --- a/src/Hosting/TestHost/test/TestClientTests.cs +++ b/src/Hosting/TestHost/test/TestClientTests.cs @@ -384,6 +384,53 @@ namespace Microsoft.AspNetCore.TestHost await writeTask; } + [Fact] + public async Task ClientStreaming_ResponseCompletesWithoutResponseBodyWrite() + { + // Arrange + var requestStreamTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + + RequestDelegate appDelegate = ctx => + { + ctx.Response.Headers["test-header"] = "true"; + return Task.CompletedTask; + }; + + Stream requestStream = null; + + var builder = new WebHostBuilder().Configure(app => app.Run(appDelegate)); + var server = new TestServer(builder); + var client = server.CreateClient(); + + var httpRequest = new HttpRequestMessage(HttpMethod.Post, "http://localhost:12345"); + httpRequest.Version = new Version(2, 0); + httpRequest.Content = new PushContent(async stream => + { + requestStream = stream; + await requestStreamTcs.Task; + }); + + // Act + var response = await client.SendAsync(httpRequest, HttpCompletionOption.ResponseHeadersRead).WithTimeout(); + + var responseContent = await response.Content.ReadAsStreamAsync().WithTimeout(); + + // Assert + response.EnsureSuccessStatusCode(); + Assert.Equal("true", response.Headers.GetValues("test-header").Single()); + + // Read response + byte[] buffer = new byte[1024]; + var length = await responseContent.ReadAsync(buffer).AsTask().WithTimeout(); + Assert.Equal(0, length); + + // Writing to request stream will fail because server is complete + await Assert.ThrowsAnyAsync(() => requestStream.WriteAsync(buffer).AsTask()); + + // Unblock request + requestStreamTcs.TrySetResult(null); + } + [Fact] public async Task ClientStreaming_ServerAbort() { From cba11d7e22f6e42d691f56d31f14906c6f2b508f Mon Sep 17 00:00:00 2001 From: Ajay Bhargav B Date: Wed, 15 Jan 2020 11:42:30 -0800 Subject: [PATCH 065/116] Workaround for #18058 (#18213) --- .../content/BlazorServerWeb-CSharp/App.razor | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor index 7b58ea096f..d3525b251f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/App.razor @@ -1,4 +1,5 @@ -@*#if (NoAuth) + +@*#if (NoAuth) From b4d2f9aa52eeacf7fa1632b5c9db9e957cf1d7ac Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Wed, 15 Jan 2020 11:45:21 -0800 Subject: [PATCH 066/116] [Static Web Assets] Allow assets with empty base paths (#17414) --- .../StaticWebAssetsFileProvider.cs | 10 +++++++ .../StaticWebAssetsFileProviderTests.cs | 29 +++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/src/Hosting/Hosting/src/StaticWebAssets/StaticWebAssetsFileProvider.cs b/src/Hosting/Hosting/src/StaticWebAssets/StaticWebAssetsFileProvider.cs index e63fa411fc..5a9b578e98 100644 --- a/src/Hosting/Hosting/src/StaticWebAssets/StaticWebAssetsFileProvider.cs +++ b/src/Hosting/Hosting/src/StaticWebAssets/StaticWebAssetsFileProvider.cs @@ -46,6 +46,11 @@ namespace Microsoft.AspNetCore.Hosting.StaticWebAssets { var modifiedSub = NormalizePath(subpath); + if (BasePath == "/") + { + return InnerProvider.GetDirectoryContents(modifiedSub); + } + if (StartsWithBasePath(modifiedSub, out var physicalPath)) { return InnerProvider.GetDirectoryContents(physicalPath.Value); @@ -67,6 +72,11 @@ namespace Microsoft.AspNetCore.Hosting.StaticWebAssets { var modifiedSub = NormalizePath(subpath); + if (BasePath == "/") + { + return InnerProvider.GetFileInfo(subpath); + } + if (!StartsWithBasePath(modifiedSub, out var physicalPath)) { return new NotFoundFileInfo(subpath); diff --git a/src/Hosting/Hosting/test/StaticWebAssets/StaticWebAssetsFileProviderTests.cs b/src/Hosting/Hosting/test/StaticWebAssets/StaticWebAssetsFileProviderTests.cs index 5fc2800e0f..a51a85fc0a 100644 --- a/src/Hosting/Hosting/test/StaticWebAssets/StaticWebAssetsFileProviderTests.cs +++ b/src/Hosting/Hosting/test/StaticWebAssets/StaticWebAssetsFileProviderTests.cs @@ -117,6 +117,35 @@ namespace Microsoft.AspNetCore.Hosting.StaticWebAssets Assert.True(provider.GetFileInfo("/_content/Static Web Assets.txt").Exists); } + [Fact] + public void GetDirectoryContents_HandlesEmptyBasePath() + { + // Arrange + var provider = new StaticWebAssetsFileProvider("/", + Path.Combine(AppContext.BaseDirectory, "testroot", "wwwroot")); + + // Act + var directory = provider.GetDirectoryContents("/Static Web/"); + + // Assert + Assert.Collection(directory, + file => + { + Assert.Equal("Static Web.txt", file.Name); + }); + } + + [Fact] + public void StaticWebAssetsFileProviderWithEmptyBasePath_FindsFile() + { + // Arrange & Act + var provider = new StaticWebAssetsFileProvider("/", + Path.Combine(AppContext.BaseDirectory, "testroot", "wwwroot")); + + // Assert + Assert.True(provider.GetFileInfo("/Static Web Assets.txt").Exists); + } + [Fact] public void GetFileInfo_DoesNotMatch_IncompletePrefixSegments() { From 9522e1dd2e0c0a5b5bb2e9c4e37a31130a7940ff Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 15 Jan 2020 12:08:17 -0800 Subject: [PATCH 067/116] Multi-target all shared framework projects with netcoreapp3.1 (#17998) - regen ref --- ...NetCore.DataProtection.Abstractions.csproj | 7 +++- ....DataProtection.Abstractions.netcoreapp.cs | 33 +++++++++++++++++++ ...NetCore.DataProtection.Abstractions.csproj | 2 +- ...ft.AspNetCore.Cryptography.Internal.csproj | 7 +++- ...etCore.Cryptography.Internal.netcoreapp.cs | 3 ++ ...ft.AspNetCore.Cryptography.Internal.csproj | 2 +- ...pNetCore.Cryptography.KeyDerivation.csproj | 9 ++++- ...pNetCore.Cryptography.KeyDerivation.csproj | 2 +- .../src/PBKDF2/NetCorePbkdf2Provider.cs | 2 +- .../src/PBKDF2/Pbkdf2Util.cs | 2 +- .../ref/Microsoft.AspNetCore.Metadata.csproj | 5 ++- ...icrosoft.AspNetCore.Metadata.netcoreapp.cs | 15 +++++++++ .../src/Microsoft.AspNetCore.Metadata.csproj | 2 +- 13 files changed, 81 insertions(+), 10 deletions(-) create mode 100644 src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.netcoreapp.cs create mode 100644 src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.netcoreapp.cs create mode 100644 src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.netcoreapp.cs diff --git a/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj index 6461cb0623..a42a893d8f 100644 --- a/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj +++ b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj @@ -1,11 +1,16 @@ - netstandard2.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + + + + + diff --git a/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.netcoreapp.cs b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.netcoreapp.cs new file mode 100644 index 0000000000..fcd0fcb0b7 --- /dev/null +++ b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.netcoreapp.cs @@ -0,0 +1,33 @@ +// 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. + +namespace Microsoft.AspNetCore.DataProtection +{ + public static partial class DataProtectionCommonExtensions + { + public static Microsoft.AspNetCore.DataProtection.IDataProtector CreateProtector(this Microsoft.AspNetCore.DataProtection.IDataProtectionProvider provider, System.Collections.Generic.IEnumerable purposes) { throw null; } + public static Microsoft.AspNetCore.DataProtection.IDataProtector CreateProtector(this Microsoft.AspNetCore.DataProtection.IDataProtectionProvider provider, string purpose, params string[] subPurposes) { throw null; } + public static Microsoft.AspNetCore.DataProtection.IDataProtectionProvider GetDataProtectionProvider(this System.IServiceProvider services) { throw null; } + public static Microsoft.AspNetCore.DataProtection.IDataProtector GetDataProtector(this System.IServiceProvider services, System.Collections.Generic.IEnumerable purposes) { throw null; } + public static Microsoft.AspNetCore.DataProtection.IDataProtector GetDataProtector(this System.IServiceProvider services, string purpose, params string[] subPurposes) { throw null; } + public static string Protect(this Microsoft.AspNetCore.DataProtection.IDataProtector protector, string plaintext) { throw null; } + public static string Unprotect(this Microsoft.AspNetCore.DataProtection.IDataProtector protector, string protectedData) { throw null; } + } + public partial interface IDataProtectionProvider + { + Microsoft.AspNetCore.DataProtection.IDataProtector CreateProtector(string purpose); + } + public partial interface IDataProtector : Microsoft.AspNetCore.DataProtection.IDataProtectionProvider + { + byte[] Protect(byte[] plaintext); + byte[] Unprotect(byte[] protectedData); + } +} +namespace Microsoft.AspNetCore.DataProtection.Infrastructure +{ + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public partial interface IApplicationDiscriminator + { + string Discriminator { get; } + } +} diff --git a/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj b/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj index 8b7fb04cd7..03cf5d11e5 100644 --- a/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj +++ b/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj @@ -5,7 +5,7 @@ Commonly used types: Microsoft.AspNetCore.DataProtection.IDataProtectionProvider Microsoft.AspNetCore.DataProtection.IDataProtector - netstandard2.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) true true true diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj index 823b288f69..462f2dddf5 100644 --- a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj @@ -1,11 +1,16 @@ - netstandard2.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + + + + + diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.netcoreapp.cs b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.netcoreapp.cs new file mode 100644 index 0000000000..618082bc4a --- /dev/null +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.netcoreapp.cs @@ -0,0 +1,3 @@ +// 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. + diff --git a/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj index 9fbec5f398..1f340cfe15 100644 --- a/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj +++ b/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj @@ -2,7 +2,7 @@ Infrastructure for ASP.NET Core cryptographic packages. Applications and libraries should not reference this package directly. - netstandard2.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) true true $(NoWarn);CS1591 diff --git a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj index c9850676ba..311b1a944c 100644 --- a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj +++ b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp2.0 + netstandard2.0;netcoreapp2.0;$(DefaultNetCoreTargetFramework) @@ -16,4 +16,11 @@ + + + + + + + diff --git a/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj b/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj index dea0ee73e2..9bd47ba7c3 100644 --- a/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj +++ b/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj @@ -2,7 +2,7 @@ ASP.NET Core utilities for key derivation. - netstandard2.0;netcoreapp2.0 + netstandard2.0;netcoreapp2.0;$(DefaultNetCoreTargetFramework) true true true diff --git a/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/NetCorePbkdf2Provider.cs b/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/NetCorePbkdf2Provider.cs index 11b8f481bb..d6bd494b1c 100644 --- a/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/NetCorePbkdf2Provider.cs +++ b/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/NetCorePbkdf2Provider.cs @@ -1,7 +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. -#if NETCOREAPP2_0 +#if NETCOREAPP using System; using System.Diagnostics; using System.Security.Cryptography; diff --git a/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Pbkdf2Util.cs b/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Pbkdf2Util.cs index 9b2ecf1008..a3340b13b2 100644 --- a/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Pbkdf2Util.cs +++ b/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Pbkdf2Util.cs @@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2 { #if NETSTANDARD2_0 return new ManagedPbkdf2Provider(); -#elif NETCOREAPP2_0 +#elif NETCOREAPP // fastest implementation on .NET Core for Linux/macOS. // Not supported on .NET Framework return new NetCorePbkdf2Provider(); diff --git a/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj b/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj index da5e9234e8..2661d12430 100644 --- a/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj +++ b/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj @@ -1,9 +1,12 @@ - netstandard2.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) + + + diff --git a/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.netcoreapp.cs b/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.netcoreapp.cs new file mode 100644 index 0000000000..effddb3203 --- /dev/null +++ b/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.netcoreapp.cs @@ -0,0 +1,15 @@ +// 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. + +namespace Microsoft.AspNetCore.Authorization +{ + public partial interface IAllowAnonymous + { + } + public partial interface IAuthorizeData + { + string AuthenticationSchemes { get; set; } + string Policy { get; set; } + string Roles { get; set; } + } +} diff --git a/src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj b/src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj index 10a3baad25..235a0c98c3 100644 --- a/src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj +++ b/src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj @@ -2,7 +2,7 @@ ASP.NET Core metadata. - netstandard2.0 + netstandard2.0;$(DefaultNetCoreTargetFramework) true true $(NoWarn);CS1591 From 89d26402ef57911d54ee663addb7520706ac5d94 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 15 Jan 2020 12:11:52 -0800 Subject: [PATCH 068/116] [release/3.1] Mark Blazor packages as nonshipping (#18357) * Mark Blazor packages as nonshipping * Explicitly set IsShippingPackage=false * Pin blazor dependency version --- eng/Version.Details.xml | 2 +- .../Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj | 2 +- .../Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj | 2 +- .../DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj | 2 +- src/Components/Blazor/Directory.Build.props | 2 -- .../Http/src/Microsoft.AspNetCore.Blazor.HttpClient.csproj | 2 +- .../Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj | 2 +- .../Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj | 2 +- ...icrosoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj | 2 +- 9 files changed, 8 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8fabf2c39..41cccfbdcf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,7 +9,7 @@ --> - + https://github.com/aspnet/Blazor 7868699de745fd30a654c798a99dc541b77b95c0 diff --git a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj index 0673c85b2d..e98ef09268 100644 --- a/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj +++ b/src/Components/Blazor/Blazor/src/Microsoft.AspNetCore.Blazor.csproj @@ -3,7 +3,7 @@ netstandard2.0 Build client-side single-page applications (SPAs) with Blazor running under WebAssembly. - true + false diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj index 35853a4b9e..2f5b3297f5 100644 --- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj +++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj @@ -4,7 +4,7 @@ $(DefaultNetCoreTargetFramework) Build mechanism for ASP.NET Core Blazor applications. Exe - true + false false diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj index d18ab7c9e4..4749a781ca 100644 --- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj +++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj @@ -5,7 +5,7 @@ Exe blazor-devserver Microsoft.AspNetCore.Blazor.DevServer - true + false false Microsoft.AspNetCore.Blazor.DevServer.Program Development server for use when building Blazor applications. diff --git a/src/Components/Blazor/Directory.Build.props b/src/Components/Blazor/Directory.Build.props index cdb6c81b16..a90d83b4cc 100644 --- a/src/Components/Blazor/Directory.Build.props +++ b/src/Components/Blazor/Directory.Build.props @@ -4,8 +4,6 @@ $(BlazorClientPreReleaseVersionLabel) - - false diff --git a/src/Components/Blazor/Http/src/Microsoft.AspNetCore.Blazor.HttpClient.csproj b/src/Components/Blazor/Http/src/Microsoft.AspNetCore.Blazor.HttpClient.csproj index 18bdc5e1fe..9c5974d9d6 100644 --- a/src/Components/Blazor/Http/src/Microsoft.AspNetCore.Blazor.HttpClient.csproj +++ b/src/Components/Blazor/Http/src/Microsoft.AspNetCore.Blazor.HttpClient.csproj @@ -3,7 +3,7 @@ netstandard2.0 Provides experimental support for using System.Text.Json with HttpClient. Intended for use with Blazor running under WebAssembly. - true + false diff --git a/src/Components/Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj b/src/Components/Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj index 2d7b2d8fb4..ab6c3b6ee6 100644 --- a/src/Components/Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj +++ b/src/Components/Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj @@ -3,7 +3,7 @@ $(DefaultNetCoreTargetFramework) Runtime server features for ASP.NET Core Blazor applications. - true + false diff --git a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj index c91a32128d..55364eee45 100644 --- a/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj +++ b/src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj @@ -2,7 +2,7 @@ netstandard2.0 Microsoft.AspNetCore.Blazor.Templates.nuspec - true + false False False False diff --git a/src/Components/Blazor/Validation/src/Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj b/src/Components/Blazor/Validation/src/Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj index a166d5f1f3..89023db6b9 100644 --- a/src/Components/Blazor/Validation/src/Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj +++ b/src/Components/Blazor/Validation/src/Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj @@ -3,7 +3,7 @@ netstandard2.0 Provides experimental support for validation using DataAnnotations. - true + false false From 109663e078da47ae119008f21837d68caf59e37e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 8 Jan 2020 13:30:01 -0800 Subject: [PATCH 069/116] Send confirmation mails for external accounts --- .../Pages/V3/Account/ExternalLogin.cshtml.cs | 15 ++++++++------- .../Pages/V4/Account/ExternalLogin.cshtml.cs | 19 ++++++++----------- .../RegistrationTests.cs | 5 ++++- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml.cs index df1df133f8..549e6029cb 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml.cs +++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml.cs @@ -197,13 +197,6 @@ namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal { _logger.LogInformation("User created an account using {Name} provider.", info.LoginProvider); - // If account confirmation is required, we need to show the link if we don't have a real email sender - if (_userManager.Options.SignIn.RequireConfirmedAccount) - { - return RedirectToPage("./RegisterConfirmation", new { Email = Input.Email }); - } - - await _signInManager.SignInAsync(user, isPersistent: false); var userId = await _userManager.GetUserIdAsync(user); var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code)); @@ -215,6 +208,14 @@ namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal await _emailSender.SendEmailAsync(Input.Email, "Confirm your email", $"Please confirm your account by clicking here."); + + // If account confirmation is required, we need to show the link if we don't have a real email sender + if (_userManager.Options.SignIn.RequireConfirmedAccount) + { + return RedirectToPage("./RegisterConfirmation", new { Email = Input.Email }); + } + + await _signInManager.SignInAsync(user, isPersistent: false); return LocalRedirect(returnUrl); } diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml.cs b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml.cs index c584cacd8e..62df7a64f4 100644 --- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml.cs +++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml.cs @@ -116,10 +116,7 @@ namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal _emailSender = emailSender; } - public override IActionResult OnGet() - { - return RedirectToPage("./Login"); - } + public override IActionResult OnGet() => RedirectToPage("./Login"); public override IActionResult OnPost(string provider, string returnUrl = null) { @@ -197,13 +194,6 @@ namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal { _logger.LogInformation("User created an account using {Name} provider.", info.LoginProvider); - // If account confirmation is required, we need to show the link if we don't have a real email sender - if (_userManager.Options.SignIn.RequireConfirmedAccount) - { - return RedirectToPage("./RegisterConfirmation", new { Email = Input.Email }); - } - - await _signInManager.SignInAsync(user, isPersistent: false); var userId = await _userManager.GetUserIdAsync(user); var code = await _userManager.GenerateEmailConfirmationTokenAsync(user); code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code)); @@ -216,6 +206,13 @@ namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal await _emailSender.SendEmailAsync(Input.Email, "Confirm your email", $"Please confirm your account by clicking here."); + // If account confirmation is required, we need to show the link if we don't have a real email sender + if (_userManager.Options.SignIn.RequireConfirmedAccount) + { + return RedirectToPage("./RegisterConfirmation", new { Email = Input.Email }); + } + + await _signInManager.SignInAsync(user, isPersistent: false); return LocalRedirect(returnUrl); } } diff --git a/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs b/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs index 760b36088f..a07404d666 100644 --- a/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs +++ b/src/Identity/test/Identity.FunctionalTests/RegistrationTests.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; +using Identity.DefaultUI.WebSite; using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; @@ -155,9 +156,10 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests public async Task CanRegisterWithASocialLoginProviderFromLoginWithConfirmationAndRealEmailSender() { // Arrange + var emailSender = new ContosoEmailSender(); void ConfigureTestServices(IServiceCollection services) { - services.AddSingleton(); + services.SetupTestEmailSender(emailSender); services .Configure(o => o.SignIn.RequireConfirmedAccount = true) .SetupTestThirdPartyLogin(); @@ -173,6 +175,7 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests // Act & Assert await UserStories.RegisterNewUserWithSocialLoginWithConfirmationAsync(client, userName, email, hasRealEmailSender: true); + Assert.Single(emailSender.SentEmails); } [Fact] From cf3bf405431b9573f92695a029f47b1be6f5d2bd Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 15 Jan 2020 14:34:58 -0800 Subject: [PATCH 070/116] Update PoliCheckExclusions.xml (#17705) Ignore test log output --- eng/PoliCheckExclusions.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/PoliCheckExclusions.xml b/eng/PoliCheckExclusions.xml index 73e3072f1c..49b67cd50f 100644 --- a/eng/PoliCheckExclusions.xml +++ b/eng/PoliCheckExclusions.xml @@ -1,3 +1,3 @@ - LINUX_TEST_RESULTS|MACOS_TEST_RESULTS|WINDOWS_TEST_RESULTS - \ No newline at end of file + LINUX_TEST_RESULTS|MACOS_TEST_RESULTS|WINDOWS_TEST_RESULTS|LINUX_TEST_LOGS|MACOS_TEST_LOGS|WINDOWS_TEST_LOGS|WINDOWS_TEST_TEMPLATES_LOGS + From ca56fee980cba5bcbcd26f83d194af2277258ae8 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 15 Jan 2020 16:26:32 -0800 Subject: [PATCH 071/116] Missed conflicts --- eng/Baseline.Designer.props | 4 - .../ArchiveBaseline.2.1.15.txt | 1 - .../ArchiveBaseline.2.1.15.txt | 1 - .../src/Internal/HttpConnectionContext.cs | 42 ------- .../src/Internal/HttpConnectionDispatcher.cs | 97 ---------------- .../src/Internal/HttpConnectionManager.cs | 33 ------ .../test/HttpConnectionDispatcherTests.cs | 104 ------------------ .../Tests.Utils/VerifyNoErrorsScope.cs | 26 ----- 8 files changed, 308 deletions(-) delete mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.15.txt delete mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.15.txt diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index b0493f1b1a..0550859109 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,11 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) -<<<<<<< HEAD 3.1.1 -======= - 2.1.15 ->>>>>>> release/2.1 diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.15.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.15.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.15.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.15.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.15.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.15.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs index 1d617a3f51..b496aa370e 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs @@ -33,10 +33,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal { private static long _tenSeconds = TimeSpan.FromSeconds(10).Ticks; -<<<<<<< HEAD private readonly object _stateLock = new object(); -======= ->>>>>>> release/2.1 private readonly object _itemsLock = new object(); private readonly object _heartbeatLock = new object(); private List<(Action handler, object state)> _heartbeatHandlers; @@ -49,10 +46,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal private bool _activeSend; private long _startedSendTime; private readonly object _sendingLock = new object(); -<<<<<<< HEAD -======= - ->>>>>>> release/2.1 internal CancellationToken SendingToken { get; private set; } // This tcs exists so that multiple calls to DisposeAsync all wait asynchronously @@ -299,7 +292,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal // Wait for either to finish var result = await Task.WhenAny(applicationTask, transportTask); -<<<<<<< HEAD // If the application is complete, complete the transport pipe (it's the pipe to the transport) if (result == applicationTask) { @@ -341,25 +333,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal Transport?.Output.Complete(); Transport?.Input.Complete(); -======= - // Normally it isn't safe to try and acquire this lock because the Send can hold onto it for a long time if there is backpressure - // It is safe to wait for this lock now because the Send will be in one of 4 states - // 1. In the middle of a write which is in the middle of being canceled by the CancelPendingFlush above, when it throws - // an OperationCanceledException it will complete the PipeWriter which will make any other Send waiting on the lock - // throw an InvalidOperationException if they call Write - // 2. About to write and see that there is a pending cancel from the CancelPendingFlush, go to 1 to see what happens - // 3. Enters the Send and sees the Dispose state from DisposeAndRemoveAsync and releases the lock - // 4. No Send in progress - await WriteLock.WaitAsync(); - try - { - // Complete the applications read loop - Application?.Output.Complete(transportTask.Exception?.InnerException); - } - finally - { - WriteLock.Release(); ->>>>>>> release/2.1 } Application?.Input.CancelPendingRead(); @@ -401,7 +374,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal } } -<<<<<<< HEAD internal bool TryActivatePersistentConnection( ConnectionDelegate connectionDelegate, IHttpTransport transport, @@ -582,8 +554,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal await connectionDelegate(this); } -======= ->>>>>>> release/2.1 internal void StartSendCancellation() { lock (_sendingLock) @@ -593,18 +563,10 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal _sendCts = new CancellationTokenSource(); SendingToken = _sendCts.Token; } -<<<<<<< HEAD -======= - ->>>>>>> release/2.1 _startedSendTime = DateTime.UtcNow.Ticks; _activeSend = true; } } -<<<<<<< HEAD -======= - ->>>>>>> release/2.1 internal void TryCancelSend(long currentTicks) { lock (_sendingLock) @@ -618,10 +580,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal } } } -<<<<<<< HEAD -======= - ->>>>>>> release/2.1 internal void StopSendCancellation() { lock (_sendingLock) diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs index df6ce3b676..c40a80b9ce 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs @@ -142,11 +142,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal connection.SupportedFormats = TransferFormat.Text; // We only need to provide the Input channel since writing to the application is handled through /send. -<<<<<<< HEAD var sse = new ServerSentEventsServerTransport(connection.Application.Input, connection.ConnectionId, connection, _loggerFactory); -======= - var sse = new ServerSentEventsTransport(connection.Application.Input, connection.ConnectionId, connection, _loggerFactory); ->>>>>>> release/2.1 await DoPersistentConnection(connectionDelegate, sse, context, connection); } @@ -195,83 +191,9 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal if (!await connection.CancelPreviousPoll(context)) { -<<<<<<< HEAD // Connection closed. It's already set the response status code. return; } -======= - if (connection.Status == HttpConnectionStatus.Disposed) - { - Log.ConnectionDisposed(_logger, connection.ConnectionId); - - // The connection was disposed - context.Response.StatusCode = StatusCodes.Status404NotFound; - context.Response.ContentType = "text/plain"; - return; - } - - if (connection.Status == HttpConnectionStatus.Active) - { - var existing = connection.GetHttpContext(); - Log.ConnectionAlreadyActive(_logger, connection.ConnectionId, existing.TraceIdentifier); - } - - using (connection.Cancellation) - { - // Cancel the previous request - connection.Cancellation?.Cancel(); - - try - { - // Wait for the previous request to drain - await connection.PreviousPollTask; - } - catch (OperationCanceledException) - { - // Previous poll canceled due to connection closing, close this poll too - context.Response.ContentType = "text/plain"; - context.Response.StatusCode = StatusCodes.Status204NoContent; - return; - } - - connection.PreviousPollTask = currentRequestTcs.Task; - } - - // Mark the connection as active - connection.Status = HttpConnectionStatus.Active; - - // Raise OnConnected for new connections only since polls happen all the time - if (connection.ApplicationTask == null) - { - Log.EstablishedConnection(_logger); - - connection.ApplicationTask = ExecuteApplication(connectionDelegate, connection); - - context.Response.ContentType = "application/octet-stream"; - - // This request has no content - context.Response.ContentLength = 0; - - // On the first poll, we flush the response immediately to mark the poll as "initialized" so future - // requests can be made safely - connection.TransportTask = context.Response.Body.FlushAsync(); - } - else - { - Log.ResumingConnection(_logger); - - // REVIEW: Performance of this isn't great as this does a bunch of per request allocations - connection.Cancellation = new CancellationTokenSource(); - - var timeoutSource = new CancellationTokenSource(); - var tokenSource = CancellationTokenSource.CreateLinkedTokenSource(connection.Cancellation.Token, context.RequestAborted, timeoutSource.Token); - - // Dispose these tokens when the request is over - context.Response.RegisterForDispose(timeoutSource); - context.Response.RegisterForDispose(tokenSource); - - var longPolling = new LongPollingTransport(timeoutSource.Token, connection.Application.Input, _loggerFactory, connection); ->>>>>>> release/2.1 // Create a new Tcs every poll to keep track of the poll finishing, so we can properly wait on previous polls var currentRequestTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -314,23 +236,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal connection.MarkInactive(); } } -<<<<<<< HEAD else if (resultTask.IsFaulted || resultTask.IsCanceled) -======= - else if (connection.TransportTask.IsFaulted || connection.TransportTask.IsCanceled) - { - // Cancel current request to release any waiting poll and let dispose aquire the lock - currentRequestTcs.TrySetCanceled(); - - // We should be able to safely dispose because there's no more data being written - // We don't need to wait for close here since we've already waited for both sides - await _manager.DisposeAndRemoveAsync(connection, closeGracefully: false); - - // Don't poll again if we've removed the connection completely - pollAgain = false; - } - else if (context.Response.StatusCode == StatusCodes.Status204NoContent) ->>>>>>> release/2.1 { // Cancel current request to release any waiting poll and let dispose acquire the lock currentRequestTcs.TrySetCanceled(); @@ -538,7 +444,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal // Other code isn't guaranteed to be able to acquire the lock before another write // even if CancelPendingFlush is called, and the other write could hang if there is backpressure connection.Application.Output.Complete(); -<<<<<<< HEAD return; } catch (IOException ex) @@ -548,8 +453,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal context.Response.StatusCode = StatusCodes.Status400BadRequest; context.Response.ContentType = "text/plain"; -======= ->>>>>>> release/2.1 return; } diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs index 85c9701242..b0f4b079fb 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionManager.cs @@ -32,10 +32,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal private readonly ILogger _logger; private readonly ILogger _connectionLogger; private readonly bool _useSendTimeout = true; -<<<<<<< HEAD private readonly TimeSpan _disconnectTimeout; -======= ->>>>>>> release/2.1 public HttpConnectionManager(ILoggerFactory loggerFactory, IHostApplicationLifetime appLifetime) : this(loggerFactory, appLifetime, Options.Create(new ConnectionOptions() { DisconnectTimeout = ConnectionOptionsSetup.DefaultDisconectTimeout })) @@ -56,15 +53,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal // Register these last as the callbacks could run immediately appLifetime.ApplicationStarted.Register(() => Start()); appLifetime.ApplicationStopping.Register(() => CloseConnections()); -<<<<<<< HEAD -======= - _nextHeartbeat = new TimerAwaitable(_heartbeatTickRate, _heartbeatTickRate); - - if (AppContext.TryGetSwitch("Microsoft.AspNetCore.Http.Connections.DoNotUseSendTimeout", out var timeoutDisabled)) - { - _useSendTimeout = !timeoutDisabled; - } ->>>>>>> release/2.1 } public void Start() @@ -173,31 +161,10 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal // Capture the connection state var lastSeenUtc = connection.LastSeenUtcIfInactive; -<<<<<<< HEAD var utcNow = DateTimeOffset.UtcNow; // Once the decision has been made to dispose we don't check the status again // But don't clean up connections while the debugger is attached. if (!Debugger.IsAttached && lastSeenUtc.HasValue && (utcNow - lastSeenUtc.Value).TotalSeconds > _disconnectTimeout.TotalSeconds) -======= - await connection.StateLock.WaitAsync(); - - try - { - // Capture the connection state - status = connection.Status; - - lastSeenUtc = connection.LastSeenUtc; - } - finally - { - connection.StateLock.Release(); - } - - var utcNow = DateTimeOffset.UtcNow; - // Once the decision has been made to dispose we don't check the status again - // But don't clean up connections while the debugger is attached. - if (!Debugger.IsAttached && status == HttpConnectionStatus.Inactive && (utcNow - lastSeenUtc).TotalSeconds > 5) ->>>>>>> release/2.1 { Log.ConnectionTimedOut(_logger, connection.ConnectionId); HttpConnectionsEventSource.Log.ConnectionTimedOut(connection.ConnectionId); diff --git a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs index 6fa5ed0a8a..33d72eddc2 100644 --- a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs +++ b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs @@ -1951,110 +1951,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Tests } } - [Fact] - public async Task DeleteEndpointTerminatesLongPollingWithHangingApplication() - { - using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) - { - var manager = CreateConnectionManager(loggerFactory); - var pipeOptions = new PipeOptions(pauseWriterThreshold: 2, resumeWriterThreshold: 1); - var connection = manager.CreateConnection(pipeOptions, pipeOptions); - connection.TransportType = HttpTransportType.LongPolling; - - var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); - - var context = MakeRequest("/foo", connection); - - var services = new ServiceCollection(); - services.AddSingleton(); - var builder = new ConnectionBuilder(services.BuildServiceProvider()); - builder.UseConnectionHandler(); - var app = builder.Build(); - var options = new HttpConnectionDispatcherOptions(); - - var pollTask = dispatcher.ExecuteAsync(context, options, app); - Assert.True(pollTask.IsCompleted); - - // Now send the second poll - pollTask = dispatcher.ExecuteAsync(context, options, app); - - // Issue the delete request and make sure the poll completes - var deleteContext = new DefaultHttpContext(); - deleteContext.Request.Path = "/foo"; - deleteContext.Request.QueryString = new QueryString($"?id={connection.ConnectionId}"); - deleteContext.Request.Method = "DELETE"; - - Assert.False(pollTask.IsCompleted); - - await dispatcher.ExecuteAsync(deleteContext, options, app).OrTimeout(); - - await pollTask.OrTimeout(); - - // Verify that transport shuts down - await connection.TransportTask.OrTimeout(); - - // Verify the response from the DELETE request - Assert.Equal(StatusCodes.Status202Accepted, deleteContext.Response.StatusCode); - Assert.Equal("text/plain", deleteContext.Response.ContentType); - Assert.Equal(HttpConnectionStatus.Disposed, connection.Status); - - // Verify the connection not removed because application is hanging - Assert.True(manager.TryGetConnection(connection.ConnectionId, out _)); - } - } - - [Fact] - public async Task PollCanReceiveFinalMessageAfterAppCompletes() - { - using (StartVerifiableLog(out var loggerFactory, LogLevel.Debug)) - { - var transportType = HttpTransportType.LongPolling; - var manager = CreateConnectionManager(loggerFactory); - var dispatcher = new HttpConnectionDispatcher(manager, loggerFactory); - var connection = manager.CreateConnection(); - connection.TransportType = transportType; - - var waitForMessageTcs1 = new TaskCompletionSource(); - var messageTcs1 = new TaskCompletionSource(); - var waitForMessageTcs2 = new TaskCompletionSource(); - var messageTcs2 = new TaskCompletionSource(); - ConnectionDelegate connectionDelegate = async c => - { - await waitForMessageTcs1.Task.OrTimeout(); - await c.Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Message1")).OrTimeout(); - messageTcs1.TrySetResult(null); - await waitForMessageTcs2.Task.OrTimeout(); - await c.Transport.Output.WriteAsync(Encoding.UTF8.GetBytes("Message2")).OrTimeout(); - messageTcs2.TrySetResult(null); - }; - { - var options = new HttpConnectionDispatcherOptions(); - var context = MakeRequest("/foo", connection); - await dispatcher.ExecuteAsync(context, options, connectionDelegate).OrTimeout(); - - // second poll should have data - waitForMessageTcs1.SetResult(null); - await messageTcs1.Task.OrTimeout(); - - var ms = new MemoryStream(); - context.Response.Body = ms; - // Now send the second poll - await dispatcher.ExecuteAsync(context, options, connectionDelegate).OrTimeout(); - Assert.Equal("Message1", Encoding.UTF8.GetString(ms.ToArray())); - - waitForMessageTcs2.SetResult(null); - await messageTcs2.Task.OrTimeout(); - - context = MakeRequest("/foo", connection); - ms.Seek(0, SeekOrigin.Begin); - context.Response.Body = ms; - // This is the third poll which gets the final message after the app is complete - await dispatcher.ExecuteAsync(context, options, connectionDelegate).OrTimeout(); - Assert.Equal("Message2", Encoding.UTF8.GetString(ms.ToArray())); - } - } - } - [Fact] public async Task NegotiateDoesNotReturnWebSocketsWhenNotAvailable() { diff --git a/src/SignalR/common/testassets/Tests.Utils/VerifyNoErrorsScope.cs b/src/SignalR/common/testassets/Tests.Utils/VerifyNoErrorsScope.cs index 0e3c8f47a4..7aa1c4544f 100644 --- a/src/SignalR/common/testassets/Tests.Utils/VerifyNoErrorsScope.cs +++ b/src/SignalR/common/testassets/Tests.Utils/VerifyNoErrorsScope.cs @@ -32,32 +32,6 @@ namespace Microsoft.AspNetCore.SignalR.Tests var results = _sink.GetLogs().Where(w => w.Write.LogLevel >= LogLevel.Error).ToList(); -#if NETCOREAPP2_1 || NETCOREAPP2_2 || NET461 - // -- Remove this code after 2.2 -- - // This section of code is resolving test flakiness caused by a race in LongPolling - // The race has been resolved in version 3.0 - // The below code tries to find is a DELETE request has arrived from the client before removing error logs associated with the race - // We do this because we don't want to hide any actual issues, but we feel confident that looking for DELETE first wont hide any real problems - var foundDelete = false; - var allLogs = _sink.GetLogs(); - foreach (var log in allLogs) - { - if (foundDelete == false && log.Write.Message.Contains("Request starting") && log.Write.Message.Contains("DELETE")) - { - foundDelete = true; - } - - if (foundDelete) - { - if ((log.Write.EventId.Name == "LongPollingTerminated" || log.Write.EventId.Name == "ApplicationError" || log.Write.EventId.Name == "FailedDispose") - && log.Write.Exception?.Message.Contains("Reading is not allowed after reader was completed.") == true) - { - results.Remove(log); - } - } - } -#endif - if (_expectedErrorsFilter != null) { results = results.Where(w => !_expectedErrorsFilter(w.Write)).ToList(); From 93a51f5f13373ba2499fc3a97f25592136940e65 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 15 Jan 2020 16:27:07 -0800 Subject: [PATCH 072/116] Remove version.props --- version.props | 56 --------------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 version.props diff --git a/version.props b/version.props deleted file mode 100644 index aede0b4113..0000000000 --- a/version.props +++ /dev/null @@ -1,56 +0,0 @@ - - - 2 - 1 - 16 - servicing - Servicing - t000 - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) - 0.1.$(AspNetCorePatchVersion) - - - 1$(AspNetCoreMajorVersion) - $(AspNetCoreMinorVersion) - $(AspNetCorePatchVersion) - - $(PreReleaseLabel)-$(BuildNumber) - $(PreReleaseBrandingLabel) Build $(BuildNumber) - - - true - - false - true - false - - - $(VersionPrefix) - $(PackageBrandingVersion) $(BrandingVersionSuffix) - - - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix) - - - $(ExperimentalVersionPrefix) - $(ExperimentalVersionPrefix)-$(VersionSuffix) - - pb-$(DotNetProductBuildId) - $(VersionSuffix)+$(VersionMetadata) - - release/$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) - - - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$([MSBuild]::Subtract($(AspNetCorePatchVersion), 1)) - - - - - - - - - - - From d9ccf235fd8844bacdae25e7c409f7d95cc73899 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 15 Jan 2020 16:39:50 -0800 Subject: [PATCH 073/116] Final bad conflicts --- .../CookiePolicy/test/CookieChunkingTests.cs | 23 ------------------- .../src/Internal/HttpConnectionContext.cs | 21 ----------------- .../server/Core/src/HubConnectionContext.cs | 20 ---------------- 3 files changed, 64 deletions(-) diff --git a/src/Security/CookiePolicy/test/CookieChunkingTests.cs b/src/Security/CookiePolicy/test/CookieChunkingTests.cs index a8b8c59305..4b65df4073 100644 --- a/src/Security/CookiePolicy/test/CookieChunkingTests.cs +++ b/src/Security/CookiePolicy/test/CookieChunkingTests.cs @@ -44,29 +44,6 @@ namespace Microsoft.AspNetCore.Internal Assert.Equal($"TestCookie={testString}; expires={now.AddMinutes(5).ToString("R")}; max-age=300; domain=foo.com; path=/bar; secure; samesite=strict; httponly", values[0]); } - [Fact] - public void AppendLargeCookie_WithOptions_Appended() - { - HttpContext context = new DefaultHttpContext(); - var now = DateTimeOffset.UtcNow; - var options = new CookieOptions - { - Domain = "foo.com", - HttpOnly = true, - SameSite = SameSiteMode.Strict, - Path = "/bar", - Secure = true, - Expires = now.AddMinutes(5), - MaxAge = TimeSpan.FromMinutes(5) - }; - var testString = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - new ChunkingCookieManager() { ChunkSize = null }.AppendResponseCookie(context, "TestCookie", testString, options); - - var values = context.Response.Headers["Set-Cookie"]; - Assert.Single(values); - Assert.Equal($"TestCookie={testString}; expires={now.AddMinutes(5).ToString("R")}; max-age=300; domain=foo.com; path=/bar; secure; samesite=strict; httponly", values[0]); - } - [Fact] public void AppendLargeCookieWithLimit_Chunked() { diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs index b496aa370e..abf6b69524 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionContext.cs @@ -334,27 +334,6 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal Transport?.Output.Complete(); Transport?.Input.Complete(); } - - Application?.Input.CancelPendingRead(); - - await transportTask.NoThrow(); - Application?.Input.Complete(); - - Log.WaitingForTransportAndApplication(_logger, TransportType); - - // A poorly written application *could* in theory get stuck forever and it'll show up as a memory leak - // Wait for application so we can complete the writer safely - await applicationTask.NoThrow(); - Log.TransportAndApplicationComplete(_logger, TransportType); - - // Shutdown application side now that it's finished - Transport?.Output.Complete(applicationTask.Exception?.InnerException); - - // Close the reading side after both sides run - Transport?.Input.Complete(); - - // Observe exceptions - await Task.WhenAll(transportTask, applicationTask); } // Notify all waiters that we're done disposing diff --git a/src/SignalR/server/Core/src/HubConnectionContext.cs b/src/SignalR/server/Core/src/HubConnectionContext.cs index b299b2c93b..1dc7ad89c4 100644 --- a/src/SignalR/server/Core/src/HubConnectionContext.cs +++ b/src/SignalR/server/Core/src/HubConnectionContext.cs @@ -702,26 +702,6 @@ namespace Microsoft.AspNetCore.SignalR _receivedMessageTimeoutEnabled = false; } } - finally - { - _ = InnerAbortConnection(connection); - } - } - - private static async Task InnerAbortConnection(HubConnectionContext connection) - { - // We lock to make sure all writes are done before triggering the completion of the pipe - await connection._writeLock.WaitAsync(); - try - { - // Communicate the fact that we're finished triggering abort callbacks - // HubOnDisconnectedAsync is waiting on this to complete the Pipe - connection._abortCompletedTcs.TrySetResult(null); - } - finally - { - connection._writeLock.Release(); - } } private static class Log From 5dc2d6eafa01bba47714515c77a1aa8d8032cdd0 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 15 Jan 2020 18:44:56 -0800 Subject: [PATCH 074/116] Extend timeout and report failure to WarmUp for template tests (#16759) * Extend timeout and report failure to WarmUp for template tests * Retry click events --- .../test/BlazorServerTemplateTest.cs | 6 ++-- .../SpaTemplateTest/SpaTemplateTestBase.cs | 31 ++++++++++++------- src/Shared/E2ETesting/WaitAssert.cs | 6 ++++ 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/ProjectTemplates/test/BlazorServerTemplateTest.cs b/src/ProjectTemplates/test/BlazorServerTemplateTest.cs index 463b710ac3..1c6239d10e 100644 --- a/src/ProjectTemplates/test/BlazorServerTemplateTest.cs +++ b/src/ProjectTemplates/test/BlazorServerTemplateTest.cs @@ -146,17 +146,17 @@ namespace Templates.Test Browser.Equal("Hello, world!", () => Browser.FindElement(By.TagName("h1")).Text); // Can navigate to the counter page - Browser.FindElement(By.PartialLinkText("Counter")).Click(); + Browser.Click(By.PartialLinkText("Counter")); Browser.Contains("counter", () => Browser.Url); Browser.Equal("Counter", () => Browser.FindElement(By.TagName("h1")).Text); // Clicking the counter button works Browser.Equal("Current count: 0", () => Browser.FindElement(By.CssSelector("h1 + p")).Text); - Browser.FindElement(By.CssSelector("p+button")).Click(); + Browser.Click(By.CssSelector("p+button")); Browser.Equal("Current count: 1", () => Browser.FindElement(By.CssSelector("h1 + p")).Text); // Can navigate to the 'fetch data' page - Browser.FindElement(By.PartialLinkText("Fetch data")).Click(); + Browser.Click(By.PartialLinkText("Fetch data")); Browser.Contains("fetchdata", () => Browser.Url); Browser.Equal("Weather forecast", () => Browser.FindElement(By.TagName("h1")).Text); diff --git a/src/ProjectTemplates/test/SpaTemplateTest/SpaTemplateTestBase.cs b/src/ProjectTemplates/test/SpaTemplateTest/SpaTemplateTestBase.cs index fa2c3fb9fa..130533bf15 100644 --- a/src/ProjectTemplates/test/SpaTemplateTest/SpaTemplateTestBase.cs +++ b/src/ProjectTemplates/test/SpaTemplateTest/SpaTemplateTestBase.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Diagnostics; using System.IO; using System.Linq; using System.Net; @@ -193,8 +194,11 @@ namespace Templates.Test.SpaTemplateTest private static async Task WarmUpServer(AspNetProcess aspNetProcess) { + var intervalInSeconds = 5; var attempt = 0; - var maxAttempts = 3; + var maxAttempts = 5; + var stopwatch = new Stopwatch(); + stopwatch.Start(); do { try @@ -203,7 +207,7 @@ namespace Templates.Test.SpaTemplateTest var response = await aspNetProcess.SendRequest("/"); if (response.StatusCode == HttpStatusCode.OK) { - break; + return; } } catch (OperationCanceledException) @@ -212,8 +216,11 @@ namespace Templates.Test.SpaTemplateTest catch (HttpRequestException ex) when (ex.Message.StartsWith("The SSL connection could not be established")) { } - await Task.Delay(TimeSpan.FromSeconds(5 * attempt)); + var currentDelay = intervalInSeconds * attempt; + await Task.Delay(TimeSpan.FromSeconds(currentDelay)); } while (attempt < maxAttempts); + stopwatch.Stop(); + throw new TimeoutException($"Could not contact the server within {stopwatch.Elapsed.TotalSeconds} seconds"); } private void UpdatePublishedSettings() @@ -246,25 +253,25 @@ namespace Templates.Test.SpaTemplateTest browser.Equal("Hello, world!", () => browser.FindElement(By.TagName("h1")).Text); // Can navigate to the counter page - browser.FindElement(By.PartialLinkText("Counter")).Click(); + browser.Click(By.PartialLinkText("Counter")); browser.Contains("counter", () => browser.Url); browser.Equal("Counter", () => browser.FindElement(By.TagName("h1")).Text); // Clicking the counter button works browser.Equal("0", () => browser.FindElement(By.CssSelector("p>strong")).Text); - browser.FindElement(By.CssSelector("p+button")).Click(); + browser.Click(By.CssSelector("p+button")) ; browser.Equal("1", () => browser.FindElement(By.CssSelector("p>strong")).Text); if (visitFetchData) { - browser.FindElement(By.PartialLinkText("Fetch data")).Click(); + browser.Click(By.PartialLinkText("Fetch data")); if (usesAuth) { // We will be redirected to the identity UI browser.Contains("/Identity/Account/Login", () => browser.Url); - browser.FindElement(By.PartialLinkText("Register as a new user")).Click(); + browser.Click(By.PartialLinkText("Register as a new user")); var userName = $"{Guid.NewGuid()}@example.com"; var password = $"!Test.Password1$"; @@ -272,24 +279,24 @@ namespace Templates.Test.SpaTemplateTest browser.FindElement(By.Name("Input.Email")).SendKeys(userName); browser.FindElement(By.Name("Input.Password")).SendKeys(password); browser.FindElement(By.Name("Input.ConfirmPassword")).SendKeys(password); - browser.FindElement(By.Id("registerSubmit")).Click(); + browser.Click(By.Id("registerSubmit")); // We will be redirected to the RegisterConfirmation browser.Contains("/Identity/Account/RegisterConfirmation", () => browser.Url); - browser.FindElement(By.PartialLinkText("Click here to confirm your account")).Click(); + browser.Click(By.PartialLinkText("Click here to confirm your account")); // We will be redirected to the ConfirmEmail browser.Contains("/Identity/Account/ConfirmEmail", () => browser.Url); // Now we can login - browser.FindElement(By.PartialLinkText("Login")).Click(); + browser.Click(By.PartialLinkText("Login")); browser.Exists(By.Name("Input.Email")); browser.FindElement(By.Name("Input.Email")).SendKeys(userName); browser.FindElement(By.Name("Input.Password")).SendKeys(password); - browser.FindElement(By.Id("login-submit")).Click(); + browser.Click(By.Id("login-submit")); // Need to navigate to fetch page - browser.FindElement(By.PartialLinkText("Fetch data")).Click(); + browser.Click(By.PartialLinkText("Fetch data")); } // Can navigate to the 'fetch data' page diff --git a/src/Shared/E2ETesting/WaitAssert.cs b/src/Shared/E2ETesting/WaitAssert.cs index 8792d2692f..f6fee3e618 100644 --- a/src/Shared/E2ETesting/WaitAssert.cs +++ b/src/Shared/E2ETesting/WaitAssert.cs @@ -63,6 +63,12 @@ namespace Microsoft.AspNetCore.E2ETesting return result; }, timeout); + public static void Click(this IWebDriver driver, By selector) + => WaitAssertCore(driver, () => + { + driver.FindElement(selector).Click(); + }); + private static void WaitAssertCore(IWebDriver driver, Action assertion, TimeSpan timeout = default) { WaitAssertCore(driver, () => { assertion(); return null; }, timeout); From 7f53f7e95b014e8813f6601c7413610517728362 Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Wed, 15 Jan 2020 22:54:11 -0800 Subject: [PATCH 075/116] [Platform] Detect and fix certificates with potentially inaccessible keys on Mac OS (2.1) (#17560) * [Https] Detects and fixes HTTPS certificates where the key is not guaranteed to be accessible across security partitions * Fix dotnet dev-certs https --check * Update logic for detecting missing certs * Fix security command * Update warning logic * Check that the key is accessible in Kestrel * Add correct link to docs * Update src/Tools/dotnet-dev-certs/src/Program.cs Co-Authored-By: Daniel Roth * Update src/Tools/dotnet-dev-certs/src/Program.cs Co-Authored-By: Daniel Roth * Add test for 2.1 * Update src/Tools/dotnet-dev-certs/src/Program.cs Co-Authored-By: Chris Ross * Address feedback * Fix non-interctive path * Fix tests * Remove a couple of test from an unshipped product * Check only for certificates considered valid * Switch the exception being caught, remove invalid test Co-authored-by: Daniel Roth Co-authored-by: Chris Ross --- src/Servers/Kestrel/Core/src/CoreStrings.resx | 3 + .../src/Internal/HttpsConnectionAdapter.cs | 22 ++- .../src/Properties/CoreStrings.Designer.cs | 14 ++ .../Kestrel/shared/test/TestResources.cs | 5 + .../test/FunctionalTests/HttpsTests.cs | 2 +- .../CertificateManager.cs | 169 +++++++++++++++++- .../EnsureCertificateResult.cs | 5 +- .../src/CertificateGenerator.cs | 2 +- .../test/CertificateManagerTests.cs | 112 +----------- src/Tools/dotnet-dev-certs/src/Program.cs | 19 +- 10 files changed, 234 insertions(+), 119 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/CoreStrings.resx b/src/Servers/Kestrel/Core/src/CoreStrings.resx index ee80a16312..2b0326e1d7 100644 --- a/src/Servers/Kestrel/Core/src/CoreStrings.resx +++ b/src/Servers/Kestrel/Core/src/CoreStrings.resx @@ -518,4 +518,7 @@ For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?l The connection was timed out by the server. + + The ASP.NET Core developer certificate is in an invalid state. To fix this issue, run the following commands 'dotnet dev-certs https --clean' and 'dotnet dev-certs https' to remove all existing ASP.NET Core development certificates and create a new untrusted developer certificate. On macOS or Windows, use 'dotnet dev-certs https --trust' to trust the new certificate. + \ No newline at end of file diff --git a/src/Servers/Kestrel/Core/src/Internal/HttpsConnectionAdapter.cs b/src/Servers/Kestrel/Core/src/Internal/HttpsConnectionAdapter.cs index 95ee435b43..53f55a9e4e 100644 --- a/src/Servers/Kestrel/Core/src/Internal/HttpsConnectionAdapter.cs +++ b/src/Servers/Kestrel/Core/src/Internal/HttpsConnectionAdapter.cs @@ -9,6 +9,7 @@ using System.Security.Authentication; using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Certificates.Generation; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Server.Kestrel.Core; @@ -177,8 +178,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Https.Internal EnsureCertificateIsAllowedForServerAuth(serverCert); } } + await sslStream.AuthenticateAsServerAsync(serverCert, certificateRequired, - _options.SslProtocols, _options.CheckCertificateRevocation); + _options.SslProtocols, _options.CheckCertificateRevocation); #endif } catch (OperationCanceledException) @@ -187,12 +189,28 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Https.Internal sslStream.Dispose(); return _closedAdaptedConnection; } - catch (Exception ex) when (ex is IOException || ex is AuthenticationException) + catch (IOException ex) { _logger?.LogDebug(1, ex, CoreStrings.AuthenticationFailed); sslStream.Dispose(); return _closedAdaptedConnection; } + catch (AuthenticationException ex) + { + if (_serverCertificate != null && + CertificateManager.IsHttpsDevelopmentCertificate(_serverCertificate) && + !CertificateManager.CheckDeveloperCertificateKey(_serverCertificate)) + { + _logger?.LogError(3, ex, CoreStrings.BadDeveloperCertificateState); + } + else + { + _logger?.LogDebug(1, ex, CoreStrings.AuthenticationFailed); + } + + sslStream.Dispose(); + return _closedAdaptedConnection; + } finally { timeoutFeature.CancelTimeout(); diff --git a/src/Servers/Kestrel/Core/src/Properties/CoreStrings.Designer.cs b/src/Servers/Kestrel/Core/src/Properties/CoreStrings.Designer.cs index c813873491..164573901f 100644 --- a/src/Servers/Kestrel/Core/src/Properties/CoreStrings.Designer.cs +++ b/src/Servers/Kestrel/Core/src/Properties/CoreStrings.Designer.cs @@ -1876,6 +1876,20 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core internal static string FormatConnectionTimedOutByServer() => GetString("ConnectionTimedOutByServer"); + /// + /// The ASP.NET Core developer certificate is in an invalid state. To fix this issue, run the following commands 'dotnet dev-certs https --clean' and 'dotnet dev-certs https' to remove all existing ASP.NET Core development certificates and create a new untrusted developer certificate. On macOS or Windows, use 'dotnet dev-certs https --trust' to trust the new certificate. + /// + internal static string BadDeveloperCertificateState + { + get => GetString("BadDeveloperCertificateState"); + } + + /// + /// The ASP.NET Core developer certificate is in an invalid state. To fix this issue, run the following commands 'dotnet dev-certs https --clean' and 'dotnet dev-certs https' to remove all existing ASP.NET Core development certificates and create a new untrusted developer certificate. On macOS or Windows, use 'dotnet dev-certs https --trust' to trust the new certificate. + /// + internal static string FormatBadDeveloperCertificateState() + => GetString("BadDeveloperCertificateState"); + private static string GetString(string name, params string[] formatterNames) { var value = _resourceManager.GetString(name); diff --git a/src/Servers/Kestrel/shared/test/TestResources.cs b/src/Servers/Kestrel/shared/test/TestResources.cs index 3218a1eaca..a5bb04b9de 100644 --- a/src/Servers/Kestrel/shared/test/TestResources.cs +++ b/src/Servers/Kestrel/shared/test/TestResources.cs @@ -22,5 +22,10 @@ namespace Microsoft.AspNetCore.Testing { return new X509Certificate2(GetCertPath(certName), "testPassword"); } + + public static X509Certificate2 GetTestCertificate(string certName, string password) + { + return new X509Certificate2(GetCertPath(certName), password); + } } } diff --git a/src/Servers/Kestrel/test/FunctionalTests/HttpsTests.cs b/src/Servers/Kestrel/test/FunctionalTests/HttpsTests.cs index 9de8a29b48..8a538b862f 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/HttpsTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/HttpsTests.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; diff --git a/src/Shared/CertificateGeneration/CertificateManager.cs b/src/Shared/CertificateGeneration/CertificateManager.cs index 4e2a0a9964..f8b9b112ce 100644 --- a/src/Shared/CertificateGeneration/CertificateManager.cs +++ b/src/Shared/CertificateGeneration/CertificateManager.cs @@ -7,6 +7,7 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Runtime.InteropServices; +using System.Runtime.InteropServices.ComTypes; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Text; @@ -50,6 +51,8 @@ namespace Microsoft.AspNetCore.Certificates.Generation private static readonly string MacOSTrustCertificateCommandLineArguments = "security add-trusted-cert -d -r trustRoot -k " + MacOSSystemKeyChain + " "; #endif private const int UserCancelledErrorCode = 1223; + private const string MacOSSetPartitionKeyPermissionsCommandLine = "sudo"; + private static readonly string MacOSSetPartitionKeyPermissionsCommandLineArguments = "security set-key-partition-list -D localhost -S unsigned:,teamid:UBF8T346G9 " + MacOSUserKeyChain; public IList ListCertificates( CertificatePurpose purpose, @@ -147,6 +150,39 @@ namespace Microsoft.AspNetCore.Certificates.Generation } } + internal static bool IsHttpsDevelopmentCertificate(X509Certificate2 certificate) => + certificate.Extensions.OfType() + .Any(e => string.Equals(AspNetHttpsOid, e.Oid.Value, StringComparison.Ordinal)); + + internal static bool CheckDeveloperCertificateKey(X509Certificate2 candidate) + { + // Tries to use the certificate key to validate it can't access it + try + { + var rsa = candidate.GetRSAPrivateKey(); + if (rsa == null) + { + return false; + } + + // Encrypting a random value is the ultimate test for a key validity. + // Windows and Mac OS both return HasPrivateKey = true if there is (or there has been) a private key associated + // with the certificate at some point. + var value = new byte[32]; + using (var rng = RandomNumberGenerator.Create()) + { + rsa.Decrypt(rsa.Encrypt(value, RSAEncryptionPadding.Pkcs1), RSAEncryptionPadding.Pkcs1); + } + + // Being able to encrypt and decrypt a payload is the strongest guarantee that the key is valid. + return true; + } + catch (Exception) + { + return false; + } + } + #if NETCOREAPP2_0 || NETCOREAPP2_1 public X509Certificate2 CreateAspNetCoreHttpsDevelopmentCertificate(DateTimeOffset notBefore, DateTimeOffset notAfter, string subjectOverride) @@ -192,6 +228,27 @@ namespace Microsoft.AspNetCore.Certificates.Generation return certificate; } + internal bool HasValidCertificateWithInnaccessibleKeyAcrossPartitions() + { + var certificates = GetHttpsCertificates(); + if (certificates.Count == 0) + { + return false; + } + + // We need to check all certificates as a new one might be created that hasn't been correctly setup. + var result = false; + foreach (var certificate in certificates) + { + result = result || !CanAccessCertificateKeyAcrossPartitions(certificate); + } + + return result; + } + + public IList GetHttpsCertificates() => + ListCertificates(CertificatePurpose.HTTPS, StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: true); + public X509Certificate2 CreateApplicationTokenSigningDevelopmentCertificate(DateTimeOffset notBefore, DateTimeOffset notAfter, string subjectOverride) { var subject = new X500DistinguishedName(subjectOverride ?? IdentityDistinguishedName); @@ -596,9 +653,10 @@ namespace Microsoft.AspNetCore.Certificates.Generation bool trust = false, bool includePrivateKey = false, string password = null, - string subject = LocalhostHttpsDistinguishedName) + string subject = LocalhostHttpsDistinguishedName, + bool isInteractive = true) { - return EnsureValidCertificateExists(notBefore, notAfter, CertificatePurpose.HTTPS, path, trust, includePrivateKey, password, subject); + return EnsureValidCertificateExists(notBefore, notAfter, CertificatePurpose.HTTPS, path, trust, includePrivateKey, password, subject, isInteractive); } public EnsureCertificateResult EnsureAspNetCoreApplicationTokensDevelopmentCertificate( @@ -610,7 +668,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation string password = null, string subject = IdentityDistinguishedName) { - return EnsureValidCertificateExists(notBefore, notAfter, CertificatePurpose.Signing, path, trust, includePrivateKey, password, subject); + return EnsureValidCertificateExists(notBefore, notAfter, CertificatePurpose.Signing, path, trust, includePrivateKey, password, subject, isInteractive: true); } public EnsureCertificateResult EnsureValidCertificateExists( @@ -621,7 +679,8 @@ namespace Microsoft.AspNetCore.Certificates.Generation bool trust = false, bool includePrivateKey = false, string password = null, - string subjectOverride = null) + string subjectOverride = null, + bool isInteractive = true) { if (purpose == CertificatePurpose.All) { @@ -633,6 +692,33 @@ namespace Microsoft.AspNetCore.Certificates.Generation certificates = subjectOverride == null ? certificates : certificates.Where(c => c.Subject == subjectOverride); + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + foreach (var cert in certificates) + { + if (!CanAccessCertificateKeyAcrossPartitions(cert)) + { + if (!isInteractive) + { + // If the process is not interactive (first run experience) bail out. We will simply create a certificate + // in case there is none or report success during the first run experience. + break; + } + try + { + // The command we run handles making keys for all localhost certificates accessible across partitions. If it can not run the + // command safely (because there are other localhost certificates that were not created by asp.net core, it will throw. + MakeCertificateKeyAccessibleAcrossPartitions(cert); + break; + } + catch (Exception) + { + return EnsureCertificateResult.FailedToMakeKeyAccessible; + } + } + } + } + var result = EnsureCertificateResult.Succeeded; X509Certificate2 certificate = null; @@ -672,6 +758,11 @@ namespace Microsoft.AspNetCore.Certificates.Generation { return EnsureCertificateResult.ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore; } + + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && isInteractive) + { + MakeCertificateKeyAccessibleAcrossPartitions(certificate); + } } if (path != null) { @@ -704,6 +795,74 @@ namespace Microsoft.AspNetCore.Certificates.Generation return result; } + private void MakeCertificateKeyAccessibleAcrossPartitions(X509Certificate2 certificate) + { + if (OtherNonAspNetCoreHttpsCertificatesPresent()) + { + throw new InvalidOperationException("Unable to make HTTPS ceritificate key trusted across security partitions."); + } + using (var process = Process.Start(MacOSSetPartitionKeyPermissionsCommandLine, MacOSSetPartitionKeyPermissionsCommandLineArguments)) + { + process.WaitForExit(); + if (process.ExitCode != 0) + { + throw new InvalidOperationException("Error making the key accessible across partitions."); + } + } + + var certificateSentinelPath = GetCertificateSentinelPath(certificate); + File.WriteAllText(certificateSentinelPath, "true"); + } + + private static string GetCertificateSentinelPath(X509Certificate2 certificate) => + Path.Combine(Environment.GetEnvironmentVariable("HOME"), ".dotnet", $"certificate.{certificate.GetCertHashString(HashAlgorithmName.SHA256)}.sentinel"); + + private bool OtherNonAspNetCoreHttpsCertificatesPresent() + { + var certificates = new List(); + try + { + using (var store = new X509Store(StoreName.My, StoreLocation.CurrentUser)) + { + store.Open(OpenFlags.ReadOnly); + certificates.AddRange(store.Certificates.OfType()); + IEnumerable matchingCertificates = certificates; + // Ensure the certificate hasn't expired, has a private key and its exportable + // (for container/unix scenarios). + var now = DateTimeOffset.Now; + matchingCertificates = matchingCertificates + .Where(c => c.NotBefore <= now && + now <= c.NotAfter && c.Subject == LocalhostHttpsDistinguishedName); + + // We need to enumerate the certificates early to prevent dispoisng issues. + matchingCertificates = matchingCertificates.ToList(); + + var certificatesToDispose = certificates.Except(matchingCertificates); + DisposeCertificates(certificatesToDispose); + + store.Close(); + + return matchingCertificates.All(c => !HasOid(c, AspNetHttpsOid)); + } + } + catch + { + DisposeCertificates(certificates); + certificates.Clear(); + return true; + } + + bool HasOid(X509Certificate2 certificate, string oid) => + certificate.Extensions.OfType() + .Any(e => string.Equals(oid, e.Oid.Value, StringComparison.Ordinal)); + } + + private bool CanAccessCertificateKeyAcrossPartitions(X509Certificate2 certificate) + { + var certificateSentinelPath = GetCertificateSentinelPath(certificate); + return File.Exists(certificateSentinelPath); + } + private class UserCancelledTrustException : Exception { } @@ -717,4 +876,4 @@ namespace Microsoft.AspNetCore.Certificates.Generation } #endif } -} \ No newline at end of file +} diff --git a/src/Shared/CertificateGeneration/EnsureCertificateResult.cs b/src/Shared/CertificateGeneration/EnsureCertificateResult.cs index d3c86ce05d..ee2c6976b2 100644 --- a/src/Shared/CertificateGeneration/EnsureCertificateResult.cs +++ b/src/Shared/CertificateGeneration/EnsureCertificateResult.cs @@ -13,8 +13,9 @@ namespace Microsoft.AspNetCore.Certificates.Generation ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore, ErrorExportingTheCertificate, FailedToTrustTheCertificate, - UserCancelledTrustStep + UserCancelledTrustStep, + FailedToMakeKeyAccessible, } } -#endif \ No newline at end of file +#endif diff --git a/src/Tools/FirstRunCertGenerator/src/CertificateGenerator.cs b/src/Tools/FirstRunCertGenerator/src/CertificateGenerator.cs index d3f58eae35..d3a94baf2e 100644 --- a/src/Tools/FirstRunCertGenerator/src/CertificateGenerator.cs +++ b/src/Tools/FirstRunCertGenerator/src/CertificateGenerator.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.DeveloperCertificates.XPlat { var manager = new CertificateManager(); var now = DateTimeOffset.Now; - manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1)); + manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), isInteractive: false); } } } diff --git a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs index f6503673e5..d786f78336 100644 --- a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs +++ b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs @@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests // Act DateTimeOffset now = DateTimeOffset.UtcNow; now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); - var result = manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), CertificateName, trust: false, subject: TestCertificateSubject); + var result = manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), CertificateName, trust: false, subject: TestCertificateSubject, isInteractive: false); // Assert Assert.Equal(EnsureCertificateResult.Succeeded, result); @@ -140,12 +140,12 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests DateTimeOffset now = DateTimeOffset.UtcNow; now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); - manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject); + manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject, isInteractive: false); var httpsCertificate = manager.ListCertificates(CertificatePurpose.HTTPS, StoreName.My, StoreLocation.CurrentUser, isValid: false).Single(c => c.Subject == TestCertificateSubject); // Act - var result = manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), CertificateName, trust: false, includePrivateKey: true, password: certificatePassword, subject: TestCertificateSubject); + var result = manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), CertificateName, trust: false, includePrivateKey: true, password: certificatePassword, subject: TestCertificateSubject, isInteractive: false); // Assert Assert.Equal(EnsureCertificateResult.ValidCertificatePresent, result); @@ -172,7 +172,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests DateTimeOffset now = DateTimeOffset.UtcNow; now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); - var trustFailed = manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: true, subject: TestCertificateSubject); + var trustFailed = manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: true, subject: TestCertificateSubject, isInteractive: false); Assert.Equal(EnsureCertificateResult.UserCancelledTrustStep, trustFailed); } @@ -184,7 +184,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests DateTimeOffset now = DateTimeOffset.UtcNow; now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); - manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: true, subject: TestCertificateSubject); + manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: true, subject: TestCertificateSubject, isInteractive: false); manager.CleanupHttpsCertificates(TestCertificateSubject); @@ -194,107 +194,5 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests Assert.Empty(manager.ListCertificates(CertificatePurpose.HTTPS, StoreName.Root, StoreLocation.CurrentUser, isValid: false).Where(c => c.Subject == TestCertificateSubject)); } } - - [Fact] - public void EnsureCreateIdentityTokenSigningCertificate_CreatesACertificate_WhenThereAreNoHttpsCertificates() - { - // Arrange - const string CertificateName = nameof(EnsureCreateIdentityTokenSigningCertificate_CreatesACertificate_WhenThereAreNoHttpsCertificates) + ".cer"; - var manager = new CertificateManager(); - - manager.RemoveAllCertificates(CertificatePurpose.Signing, StoreName.My, StoreLocation.CurrentUser, TestCertificateSubject); - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - manager.RemoveAllCertificates(CertificatePurpose.Signing, StoreName.Root, StoreLocation.CurrentUser, TestCertificateSubject); - } - - // Act - DateTimeOffset now = DateTimeOffset.UtcNow; - now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); - var result = manager.EnsureAspNetCoreApplicationTokensDevelopmentCertificate(now, now.AddYears(1), CertificateName, trust: false, subject: TestCertificateSubject); - - // Assert - Assert.Equal(EnsureCertificateResult.Succeeded, result); - Assert.True(File.Exists(CertificateName)); - - var exportedCertificate = new X509Certificate2(File.ReadAllBytes(CertificateName)); - Assert.NotNull(exportedCertificate); - Assert.False(exportedCertificate.HasPrivateKey); - - var identityCertificates = manager.ListCertificates(CertificatePurpose.Signing, StoreName.My, StoreLocation.CurrentUser, isValid: false); - var identityCertificate = Assert.Single(identityCertificates, i => i.Subject == TestCertificateSubject); - Assert.True(identityCertificate.HasPrivateKey); - Assert.Equal(TestCertificateSubject, identityCertificate.Subject); - Assert.Equal(TestCertificateSubject, identityCertificate.Issuer); - Assert.Equal("sha256RSA", identityCertificate.SignatureAlgorithm.FriendlyName); - Assert.Equal("1.2.840.113549.1.1.11", identityCertificate.SignatureAlgorithm.Value); - - Assert.Equal(now.LocalDateTime, identityCertificate.NotBefore); - Assert.Equal(now.AddYears(1).LocalDateTime, identityCertificate.NotAfter); - Assert.Contains( - identityCertificate.Extensions.OfType(), - e => e is X509BasicConstraintsExtension basicConstraints && - basicConstraints.Critical == true && - basicConstraints.CertificateAuthority == false && - basicConstraints.HasPathLengthConstraint == false && - basicConstraints.PathLengthConstraint == 0); - - Assert.Contains( - identityCertificate.Extensions.OfType(), - e => e is X509KeyUsageExtension keyUsage && - keyUsage.Critical == true && - keyUsage.KeyUsages == X509KeyUsageFlags.DigitalSignature); - - Assert.Contains( - identityCertificate.Extensions.OfType(), - e => e is X509EnhancedKeyUsageExtension enhancedKeyUsage && - enhancedKeyUsage.Critical == true && - enhancedKeyUsage.EnhancedKeyUsages.OfType().Single() is Oid keyUsage && - keyUsage.Value == "1.3.6.1.5.5.7.3.1"); - - // ASP.NET Core Identity Json Web Token signing development certificate - Assert.Contains( - identityCertificate.Extensions.OfType(), - e => e.Critical == false && - e.Oid.Value == "1.3.6.1.4.1.311.84.1.2" && - Encoding.ASCII.GetString(e.RawData) == "ASP.NET Core Identity Json Web Token signing development certificate"); - - Assert.Equal(identityCertificate.GetCertHashString(), exportedCertificate.GetCertHashString()); - } - - [Fact] - public void EnsureCreateIdentityTokenSigningCertificate_DoesNotCreateACertificate_WhenThereIsAnExistingHttpsCertificates() - { - // Arrange - const string CertificateName = nameof(EnsureCreateIdentityTokenSigningCertificate_DoesNotCreateACertificate_WhenThereIsAnExistingHttpsCertificates) + ".pfx"; - var certificatePassword = Guid.NewGuid().ToString(); - - var manager = new CertificateManager(); - - manager.RemoveAllCertificates(CertificatePurpose.Signing, StoreName.My, StoreLocation.CurrentUser, TestCertificateSubject); - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - manager.RemoveAllCertificates(CertificatePurpose.Signing, StoreName.Root, StoreLocation.CurrentUser, TestCertificateSubject); - } - - DateTimeOffset now = DateTimeOffset.UtcNow; - now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); - manager.EnsureAspNetCoreApplicationTokensDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject); - - var identityTokenSigningCertificates = manager.ListCertificates(CertificatePurpose.Signing, StoreName.My, StoreLocation.CurrentUser, isValid: false).Single(c => c.Subject == TestCertificateSubject); - - // Act - var result = manager.EnsureAspNetCoreApplicationTokensDevelopmentCertificate(now, now.AddYears(1), CertificateName, trust: false, includePrivateKey: true, password: certificatePassword, subject: TestCertificateSubject); - - // Assert - Assert.Equal(EnsureCertificateResult.ValidCertificatePresent, result); - Assert.True(File.Exists(CertificateName)); - - var exportedCertificate = new X509Certificate2(File.ReadAllBytes(CertificateName), certificatePassword); - Assert.NotNull(exportedCertificate); - Assert.True(exportedCertificate.HasPrivateKey); - - Assert.Equal(identityTokenSigningCertificates.GetCertHashString(), exportedCertificate.GetCertHashString()); - } } } diff --git a/src/Tools/dotnet-dev-certs/src/Program.cs b/src/Tools/dotnet-dev-certs/src/Program.cs index 170e11b09d..80f6280ee4 100644 --- a/src/Tools/dotnet-dev-certs/src/Program.cs +++ b/src/Tools/dotnet-dev-certs/src/Program.cs @@ -24,6 +24,7 @@ namespace Microsoft.AspNetCore.DeveloperCertificates.Tools private const int ErrorNoValidCertificateFound = 6; private const int ErrorCertificateNotTrusted = 7; private const int ErrorCleaningUpCertificates = 8; + private const int ErrorMacOsCertificateKeyCouldNotBeAccessible = 9; public static readonly TimeSpan HttpsCertificateValidity = TimeSpan.FromDays(365); @@ -157,7 +158,16 @@ namespace Microsoft.AspNetCore.DeveloperCertificates.Tools } else { - reporter.Verbose("A valid certificate was found."); + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && certificateManager.HasValidCertificateWithInnaccessibleKeyAcrossPartitions()) + { + reporter.Warn($"A valid HTTPS certificate was found but it may not be accessible across security partitions. Run dotnet dev-certs https to ensure it will be accessible during development."); + return ErrorMacOsCertificateKeyCouldNotBeAccessible; + } + else + { + reporter.Verbose("A valid certificate was found."); + } + } if (trust != null && trust.HasValue()) @@ -184,6 +194,13 @@ namespace Microsoft.AspNetCore.DeveloperCertificates.Tools var now = DateTimeOffset.Now; var manager = new CertificateManager(); + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && manager.HasValidCertificateWithInnaccessibleKeyAcrossPartitions() || manager.GetHttpsCertificates().Count == 0) + { + reporter.Warn($"A valid HTTPS certificate with a key accessible across security partitions was not found. The following command will run to fix it:" + Environment.NewLine + + "'sudo security set-key-partition-list -D localhost -S unsigned:,teamid:UBF8T346G9'" + Environment.NewLine + + "This command will make the certificate key accessible across security partitions and might prompt you for your password. For more information see: https://aka.ms/aspnetcore/2.1/troubleshootcertissues"); + } + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && trust?.HasValue() == true) { reporter.Warn("Trusting the HTTPS development certificate was requested. If the certificate is not " + From 4682c2a6dcb52bd64bf4a81a724a878402619934 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 15 Jan 2020 22:27:19 -0800 Subject: [PATCH 076/116] Test ref pack fix --- src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index bb74b33f6a..1f2a51901d 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -130,13 +130,13 @@ This package is an internal implementation of the .NET Core SDK and is not meant Date: Thu, 16 Jan 2020 10:29:37 -0800 Subject: [PATCH 077/116] [Platform] Detect and fix certificates with potentially inaccessible keys on Mac OS (3.1) (#17581) * [Platform] Add logic to dotnet-dev-certs to detect and fix certificates with inaccessible keys on Mac OS * Update the docs link --- .../CertificateManager.cs | 132 +++++++++++++++++- .../EnsureCertificateResult.cs | 3 +- .../src/CertificateGenerator.cs | 2 +- .../test/CertificateManagerTests.cs | 18 +-- src/Tools/dotnet-dev-certs/src/Program.cs | 18 ++- 5 files changed, 158 insertions(+), 15 deletions(-) diff --git a/src/Shared/CertificateGeneration/CertificateManager.cs b/src/Shared/CertificateGeneration/CertificateManager.cs index 09824fb127..0ddaca67aa 100644 --- a/src/Shared/CertificateGeneration/CertificateManager.cs +++ b/src/Shared/CertificateGeneration/CertificateManager.cs @@ -41,6 +41,8 @@ namespace Microsoft.AspNetCore.Certificates.Generation private const string MacOSTrustCertificateCommandLine = "sudo"; private static readonly string MacOSTrustCertificateCommandLineArguments = "security add-trusted-cert -d -r trustRoot -k " + MacOSSystemKeyChain + " "; private const int UserCancelledErrorCode = 1223; + private const string MacOSSetPartitionKeyPermissionsCommandLine = "sudo"; + private static readonly string MacOSSetPartitionKeyPermissionsCommandLineArguments = "security set-key-partition-list -D localhost -S unsigned:,teamid:UBF8T346G9 " + MacOSUserKeyChain; // Setting to 0 means we don't append the version byte, // which is what all machines currently have. @@ -177,6 +179,27 @@ namespace Microsoft.AspNetCore.Certificates.Generation } } + internal bool HasValidCertificateWithInnaccessibleKeyAcrossPartitions() + { + var certificates = GetHttpsCertificates(); + if (certificates.Count == 0) + { + return false; + } + + // We need to check all certificates as a new one might be created that hasn't been correctly setup. + var result = false; + foreach (var certificate in certificates) + { + result = result || !CanAccessCertificateKeyAcrossPartitions(certificate); + } + + return result; + } + + public IList GetHttpsCertificates() => + ListCertificates(CertificatePurpose.HTTPS, StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: true); + public X509Certificate2 CreateAspNetCoreHttpsDevelopmentCertificate(DateTimeOffset notBefore, DateTimeOffset notAfter, string subjectOverride, DiagnosticInformation diagnostics = null) { var subject = new X500DistinguishedName(subjectOverride ?? LocalhostHttpsDistinguishedName); @@ -707,9 +730,10 @@ namespace Microsoft.AspNetCore.Certificates.Generation bool trust = false, bool includePrivateKey = false, string password = null, - string subject = LocalhostHttpsDistinguishedName) + string subject = LocalhostHttpsDistinguishedName, + bool isInteractive = true) { - return EnsureValidCertificateExists(notBefore, notAfter, CertificatePurpose.HTTPS, path, trust, includePrivateKey, password, subject); + return EnsureValidCertificateExists(notBefore, notAfter, CertificatePurpose.HTTPS, path, trust, includePrivateKey, password, subject, isInteractive); } public DetailedEnsureCertificateResult EnsureValidCertificateExists( @@ -720,7 +744,8 @@ namespace Microsoft.AspNetCore.Certificates.Generation bool trust, bool includePrivateKey, string password, - string subject) + string subject, + bool isInteractive) { if (purpose == CertificatePurpose.All) { @@ -747,6 +772,35 @@ namespace Microsoft.AspNetCore.Certificates.Generation result.Diagnostics.Debug("Skipped filtering certificates by subject."); } + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) + { + foreach (var cert in filteredCertificates) + { + if (!CanAccessCertificateKeyAcrossPartitions(cert)) + { + if (!isInteractive) + { + // If the process is not interactive (first run experience) bail out. We will simply create a certificate + // in case there is none or report success during the first run experience. + break; + } + try + { + // The command we run handles making keys for all localhost certificates accessible across partitions. If it can not run the + // command safely (because there are other localhost certificates that were not created by asp.net core, it will throw. + MakeCertificateKeyAccessibleAcrossPartitions(cert); + break; + } + catch (Exception ex) + { + result.Diagnostics.Error("Failed to make certificate key accessible", ex); + result.ResultCode = EnsureCertificateResult.FailedToMakeKeyAccessible; + return result; + } + } + } + } + certificates = filteredCertificates; result.ResultCode = EnsureCertificateResult.Succeeded; @@ -794,6 +848,11 @@ namespace Microsoft.AspNetCore.Certificates.Generation result.ResultCode = EnsureCertificateResult.ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore; return result; } + + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && isInteractive) + { + MakeCertificateKeyAccessibleAcrossPartitions(certificate); + } } if (path != null) { @@ -835,6 +894,73 @@ namespace Microsoft.AspNetCore.Certificates.Generation return result; } + private void MakeCertificateKeyAccessibleAcrossPartitions(X509Certificate2 certificate) { + if (OtherNonAspNetCoreHttpsCertificatesPresent()) + { + throw new InvalidOperationException("Unable to make HTTPS ceritificate key trusted across security partitions."); + } + using (var process = Process.Start(MacOSSetPartitionKeyPermissionsCommandLine, MacOSSetPartitionKeyPermissionsCommandLineArguments)) + { + process.WaitForExit(); + if (process.ExitCode != 0) + { + throw new InvalidOperationException("Error making the key accessible across partitions."); + } + } + + var certificateSentinelPath = GetCertificateSentinelPath(certificate); + File.WriteAllText(certificateSentinelPath, "true"); + } + + private static string GetCertificateSentinelPath(X509Certificate2 certificate) => + Path.Combine(Environment.GetEnvironmentVariable("HOME"), ".dotnet", $"certificate.{certificate.GetCertHashString(HashAlgorithmName.SHA256)}.sentinel"); + + private bool OtherNonAspNetCoreHttpsCertificatesPresent() + { + var certificates = new List(); + try + { + using (var store = new X509Store(StoreName.My, StoreLocation.CurrentUser)) + { + store.Open(OpenFlags.ReadOnly); + certificates.AddRange(store.Certificates.OfType()); + IEnumerable matchingCertificates = certificates; + // Ensure the certificate hasn't expired, has a private key and its exportable + // (for container/unix scenarios). + var now = DateTimeOffset.Now; + matchingCertificates = matchingCertificates + .Where(c => c.NotBefore <= now && + now <= c.NotAfter && c.Subject == LocalhostHttpsDistinguishedName); + + // We need to enumerate the certificates early to prevent dispoisng issues. + matchingCertificates = matchingCertificates.ToList(); + + var certificatesToDispose = certificates.Except(matchingCertificates); + DisposeCertificates(certificatesToDispose); + + store.Close(); + + return matchingCertificates.All(c => !HasOid(c, AspNetHttpsOid)); + } + } + catch + { + DisposeCertificates(certificates); + certificates.Clear(); + return true; + } + + bool HasOid(X509Certificate2 certificate, string oid) => + certificate.Extensions.OfType() + .Any(e => string.Equals(oid, e.Oid.Value, StringComparison.Ordinal)); + } + + private bool CanAccessCertificateKeyAcrossPartitions(X509Certificate2 certificate) + { + var certificateSentinelPath = GetCertificateSentinelPath(certificate); + return File.Exists(certificateSentinelPath); + } + private class UserCancelledTrustException : Exception { } diff --git a/src/Shared/CertificateGeneration/EnsureCertificateResult.cs b/src/Shared/CertificateGeneration/EnsureCertificateResult.cs index 4676d7b3aa..504264a189 100644 --- a/src/Shared/CertificateGeneration/EnsureCertificateResult.cs +++ b/src/Shared/CertificateGeneration/EnsureCertificateResult.cs @@ -11,6 +11,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation ErrorSavingTheCertificateIntoTheCurrentUserPersonalStore, ErrorExportingTheCertificate, FailedToTrustTheCertificate, - UserCancelledTrustStep + UserCancelledTrustStep, + FailedToMakeKeyAccessible, } } diff --git a/src/Tools/FirstRunCertGenerator/src/CertificateGenerator.cs b/src/Tools/FirstRunCertGenerator/src/CertificateGenerator.cs index d3f58eae35..d3a94baf2e 100644 --- a/src/Tools/FirstRunCertGenerator/src/CertificateGenerator.cs +++ b/src/Tools/FirstRunCertGenerator/src/CertificateGenerator.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.DeveloperCertificates.XPlat { var manager = new CertificateManager(); var now = DateTimeOffset.Now; - manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1)); + manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), isInteractive: false); } } } diff --git a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs index a0f103342a..d3be27defb 100644 --- a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs +++ b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs @@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests // Act DateTimeOffset now = DateTimeOffset.UtcNow; now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); - var result = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), CertificateName, trust: false, subject: TestCertificateSubject); + var result = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), CertificateName, trust: false, subject: TestCertificateSubject, isInteractive: false); // Assert Assert.Equal(EnsureCertificateResult.Succeeded, result.ResultCode); @@ -135,12 +135,12 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests DateTimeOffset now = DateTimeOffset.UtcNow; now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); - _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject); + _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject, isInteractive: false); var httpsCertificate = CertificateManager.ListCertificates(CertificatePurpose.HTTPS, StoreName.My, StoreLocation.CurrentUser, isValid: false).Single(c => c.Subject == TestCertificateSubject); // Act - var result = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), CertificateName, trust: false, includePrivateKey: true, password: certificatePassword, subject: TestCertificateSubject); + var result = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), CertificateName, trust: false, includePrivateKey: true, password: certificatePassword, subject: TestCertificateSubject, isInteractive: false); // Assert Assert.Equal(EnsureCertificateResult.ValidCertificatePresent, result.ResultCode); @@ -162,7 +162,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests DateTimeOffset now = DateTimeOffset.UtcNow; now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); - _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject); + _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject, isInteractive: false); CertificateManager.AspNetHttpsCertificateVersion = 2; @@ -179,7 +179,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests DateTimeOffset now = DateTimeOffset.UtcNow; now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); CertificateManager.AspNetHttpsCertificateVersion = 0; - _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject); + _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject, isInteractive: false); CertificateManager.AspNetHttpsCertificateVersion = 1; @@ -196,7 +196,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests DateTimeOffset now = DateTimeOffset.UtcNow; now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); CertificateManager.AspNetHttpsCertificateVersion = 0; - _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject); + _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject, isInteractive: false); var httpsCertificateList = CertificateManager.ListCertificates(CertificatePurpose.HTTPS, StoreName.My, StoreLocation.CurrentUser, isValid: true); Assert.NotEmpty(httpsCertificateList); @@ -211,7 +211,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests DateTimeOffset now = DateTimeOffset.UtcNow; now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); CertificateManager.AspNetHttpsCertificateVersion = 2; - _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject); + _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: false, subject: TestCertificateSubject, isInteractive: false); CertificateManager.AspNetHttpsCertificateVersion = 1; var httpsCertificateList = CertificateManager.ListCertificates(CertificatePurpose.HTTPS, StoreName.My, StoreLocation.CurrentUser, isValid: true); @@ -225,7 +225,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests DateTimeOffset now = DateTimeOffset.UtcNow; now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); - var trustFailed = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: true, subject: TestCertificateSubject); + var trustFailed = _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: true, subject: TestCertificateSubject, isInteractive: false); Assert.Equal(EnsureCertificateResult.UserCancelledTrustStep, trustFailed.ResultCode); } @@ -237,7 +237,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests DateTimeOffset now = DateTimeOffset.UtcNow; now = new DateTimeOffset(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, 0, now.Offset); - _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: true, subject: TestCertificateSubject); + _manager.EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1), path: null, trust: true, subject: TestCertificateSubject, isInteractive: false); _manager.CleanupHttpsCertificates(TestCertificateSubject); diff --git a/src/Tools/dotnet-dev-certs/src/Program.cs b/src/Tools/dotnet-dev-certs/src/Program.cs index 2c58ff4947..762d0ba087 100644 --- a/src/Tools/dotnet-dev-certs/src/Program.cs +++ b/src/Tools/dotnet-dev-certs/src/Program.cs @@ -24,6 +24,7 @@ namespace Microsoft.AspNetCore.DeveloperCertificates.Tools private const int ErrorNoValidCertificateFound = 6; private const int ErrorCertificateNotTrusted = 7; private const int ErrorCleaningUpCertificates = 8; + private const int ErrorMacOsCertificateKeyCouldNotBeAccessible = 9; public static readonly TimeSpan HttpsCertificateValidity = TimeSpan.FromDays(365); @@ -158,7 +159,15 @@ namespace Microsoft.AspNetCore.DeveloperCertificates.Tools } else { - reporter.Output("A valid certificate was found."); + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && certificateManager.HasValidCertificateWithInnaccessibleKeyAcrossPartitions()) + { + reporter.Warn($"A valid HTTPS certificate was found but it may not be accessible across security partitions. Run dotnet dev-certs https to ensure it will be accessible during development."); + return ErrorMacOsCertificateKeyCouldNotBeAccessible; + } + else + { + reporter.Verbose("A valid certificate was found."); + } } if (trust != null && trust.HasValue()) @@ -185,6 +194,13 @@ namespace Microsoft.AspNetCore.DeveloperCertificates.Tools var now = DateTimeOffset.Now; var manager = new CertificateManager(); + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && manager.HasValidCertificateWithInnaccessibleKeyAcrossPartitions() || manager.GetHttpsCertificates().Count == 0) + { + reporter.Warn($"A valid HTTPS certificate with a key accessible across security partitions was not found. The following command will run to fix it:" + Environment.NewLine + + "'sudo security set-key-partition-list -D localhost -S unsigned:,teamid:UBF8T346G9'" + Environment.NewLine + + "This command will make the certificate key accessible across security partitions and might prompt you for your password. For more information see: https://aka.ms/aspnetcore/3.1/troubleshootcertissues"); + } + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && trust?.HasValue() == true) { reporter.Warn("Trusting the HTTPS development certificate was requested. If the certificate is not " + From 6a8ce3ad6711fe44e83125f87bb1810f098ce3e0 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 16 Jan 2020 10:32:29 -0800 Subject: [PATCH 078/116] Add support for IAsyncEnumerable where T is value type (#17154) (#17563) * Add support for IAsyncEnumerable where T is value type (#17154) * Add support for IAsyncEnumerable where T is value type Fixes https://github.com/aspnet/AspNetCore/issues/17139 * Fixup ref asm * undo changes to blazor.server.js --- .../Microsoft.AspNetCore.Mvc.Core.Manual.cs | 2 +- .../Infrastructure/AsyncEnumerableReader.cs | 51 +++--- .../Infrastructure/ObjectResultExecutor.cs | 15 +- .../SystemTextJsonResultExecutor.cs | 12 +- .../AsyncEnumerableReaderTest.cs | 172 ++++++++++++++++-- .../JsonResultExecutorTestBase.cs | 43 +++++ .../ObjectResultExecutorTest.cs | 22 +++ .../src/NewtonsoftJsonResultExecutor.cs | 13 +- 8 files changed, 269 insertions(+), 61 deletions(-) diff --git a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs index 2fede83232..df2524aa1b 100644 --- a/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs +++ b/src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.Manual.cs @@ -875,7 +875,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure internal sealed partial class AsyncEnumerableReader { public AsyncEnumerableReader(Microsoft.AspNetCore.Mvc.MvcOptions mvcOptions) { } - public System.Threading.Tasks.Task ReadAsync(System.Collections.Generic.IAsyncEnumerable value) { throw null; } + public bool TryGetReader(System.Type type, out System.Func> reader) { throw null; } } internal partial class ClientErrorResultFilter : Microsoft.AspNetCore.Mvc.Filters.IAlwaysRunResultFilter, Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata, Microsoft.AspNetCore.Mvc.Filters.IOrderedFilter, Microsoft.AspNetCore.Mvc.Filters.IResultFilter { diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/AsyncEnumerableReader.cs b/src/Mvc/Mvc.Core/src/Infrastructure/AsyncEnumerableReader.cs index 846e8f19d5..3d4679d89b 100644 --- a/src/Mvc/Mvc.Core/src/Infrastructure/AsyncEnumerableReader.cs +++ b/src/Mvc/Mvc.Core/src/Infrastructure/AsyncEnumerableReader.cs @@ -5,7 +5,6 @@ using System; using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Diagnostics; using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Core; @@ -17,8 +16,6 @@ namespace Microsoft.AspNetCore.Mvc.NewtonsoftJson namespace Microsoft.AspNetCore.Mvc.Infrastructure #endif { - using ReaderFunc = Func, Task>; - /// /// Type that reads an instance into a /// generic collection instance. @@ -34,8 +31,8 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure nameof(ReadInternal), BindingFlags.NonPublic | BindingFlags.Instance); - private readonly ConcurrentDictionary _asyncEnumerableConverters = - new ConcurrentDictionary(); + private readonly ConcurrentDictionary>> _asyncEnumerableConverters = + new ConcurrentDictionary>>(); private readonly MvcOptions _mvcOptions; /// @@ -48,37 +45,39 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } /// - /// Reads a into an . + /// Attempts to produces a delagate that reads a into an . /// - /// The to read. - /// The . - public Task ReadAsync(IAsyncEnumerable value) + /// The type to read. + /// A delegate that when awaited reads the . + /// when is an instance of , othwerise . + public bool TryGetReader(Type type, out Func> reader) { - if (value == null) - { - throw new ArgumentNullException(nameof(value)); - } - - var type = value.GetType(); - if (!_asyncEnumerableConverters.TryGetValue(type, out var result)) + if (!_asyncEnumerableConverters.TryGetValue(type, out reader)) { var enumerableType = ClosedGenericMatcher.ExtractGenericInterface(type, typeof(IAsyncEnumerable<>)); - Debug.Assert(enumerableType != null); + if (enumerableType is null) + { + // Not an IAsyncEnumerable. Cache this result so we avoid reflection the next time we see this type. + reader = null; + _asyncEnumerableConverters.TryAdd(type, reader); + } + else + { + var enumeratedObjectType = enumerableType.GetGenericArguments()[0]; - var enumeratedObjectType = enumerableType.GetGenericArguments()[0]; + var converter = (Func>)Converter + .MakeGenericMethod(enumeratedObjectType) + .CreateDelegate(typeof(Func>), this); - var converter = (ReaderFunc)Converter - .MakeGenericMethod(enumeratedObjectType) - .CreateDelegate(typeof(ReaderFunc), this); - - _asyncEnumerableConverters.TryAdd(type, converter); - result = converter; + reader = converter; + _asyncEnumerableConverters.TryAdd(type, reader); + } } - return result(value); + return reader != null; } - private async Task ReadInternal(IAsyncEnumerable value) + private async Task ReadInternal(object value) { var asyncEnumerable = (IAsyncEnumerable)value; var result = new List(); diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ObjectResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ObjectResultExecutor.cs index 689604162a..0fad09d57e 100644 --- a/src/Mvc/Mvc.Core/src/Infrastructure/ObjectResultExecutor.cs +++ b/src/Mvc/Mvc.Core/src/Infrastructure/ObjectResultExecutor.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.IO; @@ -19,7 +20,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure /// public class ObjectResultExecutor : IActionResultExecutor { - private readonly AsyncEnumerableReader _asyncEnumerableReader; + private readonly AsyncEnumerableReader _asyncEnumerableReaderFactory; /// /// Creates a new . @@ -68,7 +69,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure WriterFactory = writerFactory.CreateWriter; Logger = loggerFactory.CreateLogger(); var options = mvcOptions?.Value ?? throw new ArgumentNullException(nameof(mvcOptions)); - _asyncEnumerableReader = new AsyncEnumerableReader(options); + _asyncEnumerableReaderFactory = new AsyncEnumerableReader(options); } /// @@ -117,19 +118,19 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure var value = result.Value; - if (value is IAsyncEnumerable asyncEnumerable) + if (value != null && _asyncEnumerableReaderFactory.TryGetReader(value.GetType(), out var reader)) { - return ExecuteAsyncEnumerable(context, result, asyncEnumerable); + return ExecuteAsyncEnumerable(context, result, value, reader); } return ExecuteAsyncCore(context, result, objectType, value); } - private async Task ExecuteAsyncEnumerable(ActionContext context, ObjectResult result, IAsyncEnumerable asyncEnumerable) + private async Task ExecuteAsyncEnumerable(ActionContext context, ObjectResult result, object asyncEnumerable, Func> reader) { Log.BufferingAsyncEnumerable(Logger, asyncEnumerable); - var enumerated = await _asyncEnumerableReader.ReadAsync(asyncEnumerable); + var enumerated = await reader(asyncEnumerable); await ExecuteAsyncCore(context, result, enumerated.GetType(), enumerated); } @@ -194,7 +195,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure "Buffering IAsyncEnumerable instance of type '{Type}'."); } - public static void BufferingAsyncEnumerable(ILogger logger, IAsyncEnumerable asyncEnumerable) + public static void BufferingAsyncEnumerable(ILogger logger, object asyncEnumerable) => _bufferingAsyncEnumerable(logger, asyncEnumerable.GetType().FullName, null); } } diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/SystemTextJsonResultExecutor.cs b/src/Mvc/Mvc.Core/src/Infrastructure/SystemTextJsonResultExecutor.cs index 176279550c..1a4960ba5d 100644 --- a/src/Mvc/Mvc.Core/src/Infrastructure/SystemTextJsonResultExecutor.cs +++ b/src/Mvc/Mvc.Core/src/Infrastructure/SystemTextJsonResultExecutor.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure private readonly JsonOptions _options; private readonly ILogger _logger; - private readonly AsyncEnumerableReader _asyncEnumerableReader; + private readonly AsyncEnumerableReader _asyncEnumerableReaderFactory; public SystemTextJsonResultExecutor( IOptions options, @@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure { _options = options.Value; _logger = logger; - _asyncEnumerableReader = new AsyncEnumerableReader(mvcOptions.Value); + _asyncEnumerableReaderFactory = new AsyncEnumerableReader(mvcOptions.Value); } public async Task ExecuteAsync(ActionContext context, JsonResult result) @@ -76,10 +76,10 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure try { var value = result.Value; - if (value is IAsyncEnumerable asyncEnumerable) + if (value != null && _asyncEnumerableReaderFactory.TryGetReader(value.GetType(), out var reader)) { - Log.BufferingAsyncEnumerable(_logger, asyncEnumerable); - value = await _asyncEnumerableReader.ReadAsync(asyncEnumerable); + Log.BufferingAsyncEnumerable(_logger, value); + value = await reader(value); } var type = value?.GetType() ?? typeof(object); @@ -154,7 +154,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure _jsonResultExecuting(logger, type, null); } - public static void BufferingAsyncEnumerable(ILogger logger, IAsyncEnumerable asyncEnumerable) + public static void BufferingAsyncEnumerable(ILogger logger, object asyncEnumerable) => _bufferingAsyncEnumerable(logger, asyncEnumerable.GetType().FullName, null); } } diff --git a/src/Mvc/Mvc.Core/test/Infrastructure/AsyncEnumerableReaderTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/AsyncEnumerableReaderTest.cs index 27baf232c9..4a3a861ed4 100644 --- a/src/Mvc/Mvc.Core/test/Infrastructure/AsyncEnumerableReaderTest.cs +++ b/src/Mvc/Mvc.Core/test/Infrastructure/AsyncEnumerableReaderTest.cs @@ -5,46 +5,173 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Microsoft.Extensions.Options; using Xunit; namespace Microsoft.AspNetCore.Mvc.Infrastructure { public class AsyncEnumerableReaderTest { - [Fact] - public async Task ReadAsync_ReadsIAsyncEnumerable() + [Theory] + [InlineData(typeof(Range))] + [InlineData(typeof(IEnumerable))] + [InlineData(typeof(List))] + public void TryGetReader_ReturnsFalse_IfTypeIsNotIAsyncEnumerable(Type type) { // Arrange var options = new MvcOptions(); - var reader = new AsyncEnumerableReader(options); + var readerFactory = new AsyncEnumerableReader(options); + var asyncEnumerable = TestEnumerable(); // Act - var result = await reader.ReadAsync(TestEnumerable()); + var result = readerFactory.TryGetReader(type, out var reader); // Assert - var collection = Assert.IsAssignableFrom>(result); + Assert.False(result); + } + + [Fact] + public async Task TryGetReader_ReturnsReaderForIAsyncEnumerable() + { + // Arrange + var options = new MvcOptions(); + var readerFactory = new AsyncEnumerableReader(options); + var asyncEnumerable = TestEnumerable(); + + // Act + var result = readerFactory.TryGetReader(asyncEnumerable.GetType(), out var reader); + + // Assert + Assert.True(result); + var readCollection = await reader(asyncEnumerable); + var collection = Assert.IsAssignableFrom>(readCollection); Assert.Equal(new[] { "0", "1", "2", }, collection); } [Fact] - public async Task ReadAsync_ReadsIAsyncEnumerable_ImplementingMultipleAsyncEnumerableInterfaces() + public async Task TryGetReader_ReturnsReaderForIAsyncEnumerableOfValueType() + { + // Arrange + var options = new MvcOptions(); + var readerFactory = new AsyncEnumerableReader(options); + var asyncEnumerable = PrimitiveEnumerable(); + + // Act + var result = readerFactory.TryGetReader(asyncEnumerable.GetType(), out var reader); + + // Assert + Assert.True(result); + var readCollection = await reader(asyncEnumerable); + var collection = Assert.IsAssignableFrom>(readCollection); + Assert.Equal(new[] { 0, 1, 2, }, collection); + } + + [Fact] + public void TryGetReader_ReturnsCachedDelegate() + { + // Arrange + var options = new MvcOptions(); + var readerFactory = new AsyncEnumerableReader(options); + var asyncEnumerable1 = TestEnumerable(); + var asyncEnumerable2 = TestEnumerable(); + + // Act + Assert.True(readerFactory.TryGetReader(asyncEnumerable1.GetType(), out var reader1)); + Assert.True(readerFactory.TryGetReader(asyncEnumerable2.GetType(), out var reader2)); + + // Assert + Assert.Same(reader1, reader2); + } + + [Fact] + public void TryGetReader_ReturnsCachedDelegate_WhenTypeImplementsMultipleIAsyncEnumerableContracts() + { + // Arrange + var options = new MvcOptions(); + var readerFactory = new AsyncEnumerableReader(options); + var asyncEnumerable1 = new MultiAsyncEnumerable(); + var asyncEnumerable2 = new MultiAsyncEnumerable(); + + // Act + Assert.True(readerFactory.TryGetReader(asyncEnumerable1.GetType(), out var reader1)); + Assert.True(readerFactory.TryGetReader(asyncEnumerable2.GetType(), out var reader2)); + + // Assert + Assert.Same(reader1, reader2); + } + + [Fact] + public async Task CachedDelegate_CanReadEnumerableInstanceMultipleTimes() + { + // Arrange + var options = new MvcOptions(); + var readerFactory = new AsyncEnumerableReader(options); + var asyncEnumerable1 = TestEnumerable(); + var asyncEnumerable2 = TestEnumerable(); + var expected = new[] { "0", "1", "2" }; + + // Act + Assert.True(readerFactory.TryGetReader(asyncEnumerable1.GetType(), out var reader)); + + // Assert + Assert.Equal(expected, await reader(asyncEnumerable1)); + Assert.Equal(expected, await reader(asyncEnumerable2)); + } + + [Fact] + public async Task CachedDelegate_CanReadEnumerableInstanceMultipleTimes_ThatProduceDifferentResults() + { + // Arrange + var options = new MvcOptions(); + var readerFactory = new AsyncEnumerableReader(options); + var asyncEnumerable1 = TestEnumerable(); + var asyncEnumerable2 = TestEnumerable(4); + + // Act + Assert.True(readerFactory.TryGetReader(asyncEnumerable1.GetType(), out var reader)); + + // Assert + Assert.Equal(new[] { "0", "1", "2" }, await reader(asyncEnumerable1)); + Assert.Equal(new[] { "0", "1", "2", "3" }, await reader(asyncEnumerable2)); + } + + [Fact] + public void TryGetReader_ReturnsDifferentInstancesForDifferentEnumerables() + { + // Arrange + var options = new MvcOptions(); + var readerFactory = new AsyncEnumerableReader(options); + var enumerable1 = TestEnumerable(); + var enumerable2 = TestEnumerable2(); + + // Act + Assert.True(readerFactory.TryGetReader(enumerable1.GetType(), out var reader1)); + Assert.True(readerFactory.TryGetReader(enumerable2.GetType(), out var reader2)); + + // Assert + Assert.NotSame(reader1, reader2); + } + + [Fact] + public async Task Reader_ReadsIAsyncEnumerable_ImplementingMultipleAsyncEnumerableInterfaces() { // This test ensures the reader does not fail if you have a type that implements IAsyncEnumerable for multiple Ts // Arrange var options = new MvcOptions(); - var reader = new AsyncEnumerableReader(options); + var readerFactory = new AsyncEnumerableReader(options); + var asyncEnumerable = new MultiAsyncEnumerable(); // Act - var result = await reader.ReadAsync(new MultiAsyncEnumerable()); + var result = readerFactory.TryGetReader(asyncEnumerable.GetType(), out var reader); // Assert - var collection = Assert.IsAssignableFrom>(result); + Assert.True(result); + var readCollection = await reader(asyncEnumerable); + var collection = Assert.IsAssignableFrom>(readCollection); Assert.Equal(new[] { "0", "1", "2", }, collection); } - [Fact] - public async Task ReadAsync_ThrowsIfBufferimitIsReached() + [Fact] + public async Task Reader_ThrowsIfBufferLimitIsReached() { // Arrange var enumerable = TestEnumerable(11); @@ -52,10 +179,11 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure "This limit is in place to prevent infinite streams of 'IAsyncEnumerable<>' from continuing indefinitely. If this is not a programming mistake, " + $"consider ways to reduce the collection size, or consider manually converting '{enumerable.GetType()}' into a list rather than increasing the limit."; var options = new MvcOptions { MaxIAsyncEnumerableBufferLimit = 10 }; - var reader = new AsyncEnumerableReader(options); + var readerFactory = new AsyncEnumerableReader(options); // Act - var ex = await Assert.ThrowsAsync(() => reader.ReadAsync(enumerable)); + Assert.True(readerFactory.TryGetReader(enumerable.GetType(), out var reader)); + var ex = await Assert.ThrowsAsync(() => reader(enumerable)); // Assert Assert.Equal(expected, ex.Message); @@ -70,6 +198,22 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } } + public static async IAsyncEnumerable TestEnumerable2() + { + await Task.Yield(); + yield return "Hello"; + yield return "world"; + } + + public static async IAsyncEnumerable PrimitiveEnumerable(int count = 3) + { + await Task.Yield(); + for (var i = 0; i < count; i++) + { + yield return i; + } + } + public class MultiAsyncEnumerable : IAsyncEnumerable, IAsyncEnumerable { public IAsyncEnumerator GetAsyncEnumerator(CancellationToken cancellationToken = default) diff --git a/src/Mvc/Mvc.Core/test/Infrastructure/JsonResultExecutorTestBase.cs b/src/Mvc/Mvc.Core/test/Infrastructure/JsonResultExecutorTestBase.cs index 7b74959cdc..8d0fa3ef84 100644 --- a/src/Mvc/Mvc.Core/test/Infrastructure/JsonResultExecutorTestBase.cs +++ b/src/Mvc/Mvc.Core/test/Infrastructure/JsonResultExecutorTestBase.cs @@ -311,6 +311,24 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure Assert.StartsWith("Property 'JsonResult.SerializerSettings' must be an instance of type", ex.Message); } + [Fact] + public async Task ExecuteAsync_WithNullValue() + { + // Arrange + var expected = Encoding.UTF8.GetBytes("null"); + + var context = GetActionContext(); + var result = new JsonResult(value: null); + var executor = CreateExecutor(); + + // Act + await executor.ExecuteAsync(context, result); + + // Assert + var written = GetWrittenBytes(context.HttpContext); + Assert.Equal(expected, written); + } + [Fact] public async Task ExecuteAsync_SerializesAsyncEnumerables() { @@ -329,6 +347,24 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure Assert.Equal(expected, written); } + [Fact] + public async Task ExecuteAsync_SerializesAsyncEnumerablesOfPrimtives() + { + // Arrange + var expected = Encoding.UTF8.GetBytes(JsonSerializer.Serialize(new[] { 1, 2 })); + + var context = GetActionContext(); + var result = new JsonResult(TestAsyncPrimitiveEnumerable()); + var executor = CreateExecutor(); + + // Act + await executor.ExecuteAsync(context, result); + + // Assert + var written = GetWrittenBytes(context.HttpContext); + Assert.Equal(expected, written); + } + protected IActionResultExecutor CreateExecutor() => CreateExecutor(NullLoggerFactory.Instance); protected abstract IActionResultExecutor CreateExecutor(ILoggerFactory loggerFactory); @@ -380,5 +416,12 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure yield return "Hello"; yield return "world"; } + + private async IAsyncEnumerable TestAsyncPrimitiveEnumerable() + { + await Task.Yield(); + yield return 1; + yield return 2; + } } } diff --git a/src/Mvc/Mvc.Core/test/Infrastructure/ObjectResultExecutorTest.cs b/src/Mvc/Mvc.Core/test/Infrastructure/ObjectResultExecutorTest.cs index 8ab2d76678..395362f8bf 100644 --- a/src/Mvc/Mvc.Core/test/Infrastructure/ObjectResultExecutorTest.cs +++ b/src/Mvc/Mvc.Core/test/Infrastructure/ObjectResultExecutorTest.cs @@ -361,6 +361,28 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure MediaTypeAssert.Equal(expectedContentType, responseContentType); } + [Fact] + public async Task ObjectResult_NullValue() + { + // Arrange + var executor = CreateExecutor(); + var result = new ObjectResult(value: null); + var formatter = new TestJsonOutputFormatter(); + result.Formatters.Add(formatter); + + var actionContext = new ActionContext() + { + HttpContext = GetHttpContext(), + }; + + // Act + await executor.ExecuteAsync(actionContext, result); + + // Assert + var formatterContext = formatter.LastOutputFormatterContext; + Assert.Null(formatterContext.Object); + } + [Fact] public async Task ObjectResult_ReadsAsyncEnumerables() { diff --git a/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonResultExecutor.cs b/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonResultExecutor.cs index eac7d6400a..a01ef805ae 100644 --- a/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonResultExecutor.cs +++ b/src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonResultExecutor.cs @@ -3,7 +3,6 @@ using System; using System.Buffers; -using System.Collections.Generic; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Formatters; @@ -31,7 +30,7 @@ namespace Microsoft.AspNetCore.Mvc.NewtonsoftJson private readonly MvcOptions _mvcOptions; private readonly MvcNewtonsoftJsonOptions _jsonOptions; private readonly IArrayPool _charPool; - private readonly AsyncEnumerableReader _asyncEnumerableReader; + private readonly AsyncEnumerableReader _asyncEnumerableReaderFactory; /// /// Creates a new . @@ -73,7 +72,7 @@ namespace Microsoft.AspNetCore.Mvc.NewtonsoftJson _mvcOptions = mvcOptions?.Value ?? throw new ArgumentNullException(nameof(mvcOptions)); _jsonOptions = jsonOptions.Value; _charPool = new JsonArrayPool(charPool); - _asyncEnumerableReader = new AsyncEnumerableReader(_mvcOptions); + _asyncEnumerableReaderFactory = new AsyncEnumerableReader(_mvcOptions); } /// @@ -133,10 +132,10 @@ namespace Microsoft.AspNetCore.Mvc.NewtonsoftJson var jsonSerializer = JsonSerializer.Create(jsonSerializerSettings); var value = result.Value; - if (result.Value is IAsyncEnumerable asyncEnumerable) + if (value != null && _asyncEnumerableReaderFactory.TryGetReader(value.GetType(), out var reader)) { - Log.BufferingAsyncEnumerable(_logger, asyncEnumerable); - value = await _asyncEnumerableReader.ReadAsync(asyncEnumerable); + Log.BufferingAsyncEnumerable(_logger, value); + value = await reader(value); } jsonSerializer.Serialize(jsonWriter, value); @@ -201,7 +200,7 @@ namespace Microsoft.AspNetCore.Mvc.NewtonsoftJson _jsonResultExecuting(logger, type, null); } - public static void BufferingAsyncEnumerable(ILogger logger, IAsyncEnumerable asyncEnumerable) + public static void BufferingAsyncEnumerable(ILogger logger, object asyncEnumerable) => _bufferingAsyncEnumerable(logger, asyncEnumerable.GetType().FullName, null); } } From 405e8415458e663ee964b04780765b177eb3ce65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2020 10:58:57 -0800 Subject: [PATCH 079/116] [release/3.1] Update dependencies from dotnet/efcore dotnet/aspnetcore-tooling (#18363) * Update dependencies from https://github.com/dotnet/efcore build 20200114.5 - Microsoft.EntityFrameworkCore.Tools - 3.1.2 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.2 - dotnet-ef - 3.1.2 - Microsoft.EntityFrameworkCore - 3.1.2 - Microsoft.EntityFrameworkCore.InMemory - 3.1.2 - Microsoft.EntityFrameworkCore.Relational - 3.1.2 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.2 * Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200114.7 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 - Microsoft.AspNetCore.Razor.Language - 3.1.2 - Microsoft.CodeAnalysis.Razor - 3.1.2 - Microsoft.NET.Sdk.Razor - 3.1.2 * Fixup nuget.config * fixup nuget.config * Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200115.8 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 - Microsoft.AspNetCore.Razor.Language - 3.1.2 - Microsoft.CodeAnalysis.Razor - 3.1.2 - Microsoft.NET.Sdk.Razor - 3.1.2 * Remove internal sources Co-authored-by: William Godbe Co-authored-by: John Luo --- NuGet.config | 2 ++ eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index e30f18ae63..f9091b1158 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,9 +3,11 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41cccfbdcf..7e2a0107f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,49 +13,49 @@ https://github.com/aspnet/Blazor 7868699de745fd30a654c798a99dc541b77b95c0 - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - 07f16c89db55ab6f9f773cc3db6eb5a52908065e + + https://github.com/dotnet/aspnetcore-tooling + 18bfc128c07023e9384697fba876df575238dba9 - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - 07f16c89db55ab6f9f773cc3db6eb5a52908065e + + https://github.com/dotnet/aspnetcore-tooling + 18bfc128c07023e9384697fba876df575238dba9 - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - 07f16c89db55ab6f9f773cc3db6eb5a52908065e + + https://github.com/dotnet/aspnetcore-tooling + 18bfc128c07023e9384697fba876df575238dba9 - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore-Tooling - 07f16c89db55ab6f9f773cc3db6eb5a52908065e + + https://github.com/dotnet/aspnetcore-tooling + 18bfc128c07023e9384697fba876df575238dba9 - - https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore - fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 + + https://github.com/dotnet/efcore + 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a - - https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore - fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 + + https://github.com/dotnet/efcore + 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a - - https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore - fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 + + https://github.com/dotnet/efcore + 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a - - https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore - fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 + + https://github.com/dotnet/efcore + 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a - - https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore - fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 + + https://github.com/dotnet/efcore + 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a - - https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore - fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 + + https://github.com/dotnet/efcore + 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a - - https://dev.azure.com/dnceng/internal/_git/aspnet-EntityFrameworkCore - fde8a73d63ea11e1f2bdc690cf1b16ba0a449649 + + https://github.com/dotnet/efcore + 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions diff --git a/eng/Versions.props b/eng/Versions.props index e1ba194136..c9b699726a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,18 +161,18 @@ 3.1.1 3.1.1-preview4.19614.4 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + + + + + + diff --git a/src/Components/test/testassets/TestServer/Components.TestServer.csproj b/src/Components/test/testassets/TestServer/Components.TestServer.csproj index 6c29275b2c..d512e61f61 100644 --- a/src/Components/test/testassets/TestServer/Components.TestServer.csproj +++ b/src/Components/test/testassets/TestServer/Components.TestServer.csproj @@ -2,6 +2,7 @@ $(DefaultNetCoreTargetFramework) + false From d839d4c2bc64f1cf30a2eda901f60d5456c6455c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Jan 2020 21:22:11 -0800 Subject: [PATCH 084/116] Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200116.8 (#18399) - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 - Microsoft.AspNetCore.Razor.Language - 3.1.2 - Microsoft.CodeAnalysis.Razor - 3.1.2 - Microsoft.NET.Sdk.Razor - 3.1.2 --- NuGet.config | 4 +--- eng/Version.Details.xml | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index f9091b1158..df87cf7733 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,8 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e2a0107f7..761c7d573b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,19 +15,19 @@ https://github.com/dotnet/aspnetcore-tooling - 18bfc128c07023e9384697fba876df575238dba9 + 5fd301284eb58f9402374cf8f5a1b06440dc511e https://github.com/dotnet/aspnetcore-tooling - 18bfc128c07023e9384697fba876df575238dba9 + 5fd301284eb58f9402374cf8f5a1b06440dc511e https://github.com/dotnet/aspnetcore-tooling - 18bfc128c07023e9384697fba876df575238dba9 + 5fd301284eb58f9402374cf8f5a1b06440dc511e https://github.com/dotnet/aspnetcore-tooling - 18bfc128c07023e9384697fba876df575238dba9 + 5fd301284eb58f9402374cf8f5a1b06440dc511e https://github.com/dotnet/efcore From 2dc908d502888ffd9f6cfb306d58f0337caf004b Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 17 Jan 2020 08:30:12 -0800 Subject: [PATCH 085/116] [automated] Merge branch 'release/2.1' => 'release/3.1' (#18396) * [Platform] Detect and fix certificates with potentially inaccessible keys on Mac OS (2.1) (#17560) * [Https] Detects and fixes HTTPS certificates where the key is not guaranteed to be accessible across security partitions * Fix dotnet dev-certs https --check * Update logic for detecting missing certs * Fix security command * Update warning logic * Check that the key is accessible in Kestrel * Add correct link to docs * Update src/Tools/dotnet-dev-certs/src/Program.cs Co-Authored-By: Daniel Roth * Update src/Tools/dotnet-dev-certs/src/Program.cs Co-Authored-By: Daniel Roth * Add test for 2.1 * Update src/Tools/dotnet-dev-certs/src/Program.cs Co-Authored-By: Chris Ross * Address feedback * Fix non-interctive path * Fix tests * Remove a couple of test from an unshipped product * Check only for certificates considered valid * Switch the exception being caught, remove invalid test Co-authored-by: Daniel Roth Co-authored-by: Chris Ross * Fix patchconfig merge (#18389) * Fix flaky HubConnectionHandler test (#18391) Co-authored-by: Javier Calvarro Nelson Co-authored-by: Daniel Roth Co-authored-by: Chris Ross Co-authored-by: Brennan --- src/Servers/Kestrel/Core/src/CoreStrings.resx | 2 +- .../Kestrel/shared/test/TestResources.cs | 5 +++ .../CertificateManager.cs | 31 ++++++++++++------- .../EnsureCertificateResult.cs | 1 + src/Tools/dotnet-dev-certs/src/Program.cs | 7 +++++ 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/CoreStrings.resx b/src/Servers/Kestrel/Core/src/CoreStrings.resx index cb3245b4fe..59bd610f1e 100644 --- a/src/Servers/Kestrel/Core/src/CoreStrings.resx +++ b/src/Servers/Kestrel/Core/src/CoreStrings.resx @@ -620,4 +620,4 @@ For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?l The ASP.NET Core developer certificate is in an invalid state. To fix this issue, run the following commands 'dotnet dev-certs https --clean' and 'dotnet dev-certs https' to remove all existing ASP.NET Core development certificates and create a new untrusted developer certificate. On macOS or Windows, use 'dotnet dev-certs https --trust' to trust the new certificate. - + \ No newline at end of file diff --git a/src/Servers/Kestrel/shared/test/TestResources.cs b/src/Servers/Kestrel/shared/test/TestResources.cs index d335617c7d..760eb81051 100644 --- a/src/Servers/Kestrel/shared/test/TestResources.cs +++ b/src/Servers/Kestrel/shared/test/TestResources.cs @@ -40,5 +40,10 @@ namespace Microsoft.AspNetCore.Testing importPfxMutex?.ReleaseMutex(); } } + + public static X509Certificate2 GetTestCertificate(string certName, string password) + { + return new X509Certificate2(GetCertPath(certName), password); + } } } diff --git a/src/Shared/CertificateGeneration/CertificateManager.cs b/src/Shared/CertificateGeneration/CertificateManager.cs index 0ddaca67aa..ef2a45cdeb 100644 --- a/src/Shared/CertificateGeneration/CertificateManager.cs +++ b/src/Shared/CertificateGeneration/CertificateManager.cs @@ -7,6 +7,7 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Runtime.InteropServices; +using System.Runtime.InteropServices.ComTypes; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Text; @@ -740,12 +741,12 @@ namespace Microsoft.AspNetCore.Certificates.Generation DateTimeOffset notBefore, DateTimeOffset notAfter, CertificatePurpose purpose, - string path, - bool trust, - bool includePrivateKey, - string password, - string subject, - bool isInteractive) + string path = null, + bool trust = false, + bool includePrivateKey = false, + string password = null, + string subjectOverride = null, + bool isInteractive = true) { if (purpose == CertificatePurpose.All) { @@ -757,12 +758,12 @@ namespace Microsoft.AspNetCore.Certificates.Generation var certificates = ListCertificates(purpose, StoreName.My, StoreLocation.CurrentUser, isValid: true, requireExportable: true, result.Diagnostics).Concat( ListCertificates(purpose, StoreName.My, StoreLocation.LocalMachine, isValid: true, requireExportable: true, result.Diagnostics)); - var filteredCertificates = subject == null ? certificates : certificates.Where(c => c.Subject == subject); - if (subject != null) + var filteredCertificates = subjectOverride == null ? certificates : certificates.Where(c => c.Subject == subjectOverride); + if (subjectOverride != null) { var excludedCertificates = certificates.Except(filteredCertificates); - result.Diagnostics.Debug($"Filtering found certificates to those with a subject equal to '{subject}'"); + result.Diagnostics.Debug($"Filtering found certificates to those with a subject equal to '{subjectOverride}'"); result.Diagnostics.Debug(result.Diagnostics.DescribeCertificates(filteredCertificates)); result.Diagnostics.Debug($"Listing certificates excluded from consideration."); result.Diagnostics.Debug(result.Diagnostics.DescribeCertificates(excludedCertificates)); @@ -825,7 +826,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation case CertificatePurpose.All: throw new InvalidOperationException("The certificate must have a specific purpose."); case CertificatePurpose.HTTPS: - certificate = CreateAspNetCoreHttpsDevelopmentCertificate(notBefore, notAfter, subject, result.Diagnostics); + certificate = CreateAspNetCoreHttpsDevelopmentCertificate(notBefore, notAfter, subjectOverride, result.Diagnostics); break; default: throw new InvalidOperationException("The certificate must have a purpose."); @@ -853,6 +854,11 @@ namespace Microsoft.AspNetCore.Certificates.Generation { MakeCertificateKeyAccessibleAcrossPartitions(certificate); } + + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && isInteractive) + { + MakeCertificateKeyAccessibleAcrossPartitions(certificate); + } } if (path != null) { @@ -894,10 +900,11 @@ namespace Microsoft.AspNetCore.Certificates.Generation return result; } - private void MakeCertificateKeyAccessibleAcrossPartitions(X509Certificate2 certificate) { + private void MakeCertificateKeyAccessibleAcrossPartitions(X509Certificate2 certificate) + { if (OtherNonAspNetCoreHttpsCertificatesPresent()) { - throw new InvalidOperationException("Unable to make HTTPS ceritificate key trusted across security partitions."); + throw new InvalidOperationException("Unable to make HTTPS certificate key trusted across security partitions."); } using (var process = Process.Start(MacOSSetPartitionKeyPermissionsCommandLine, MacOSSetPartitionKeyPermissionsCommandLineArguments)) { diff --git a/src/Shared/CertificateGeneration/EnsureCertificateResult.cs b/src/Shared/CertificateGeneration/EnsureCertificateResult.cs index 504264a189..00eebbac3d 100644 --- a/src/Shared/CertificateGeneration/EnsureCertificateResult.cs +++ b/src/Shared/CertificateGeneration/EnsureCertificateResult.cs @@ -15,3 +15,4 @@ namespace Microsoft.AspNetCore.Certificates.Generation FailedToMakeKeyAccessible, } } + diff --git a/src/Tools/dotnet-dev-certs/src/Program.cs b/src/Tools/dotnet-dev-certs/src/Program.cs index 762d0ba087..0afc705735 100644 --- a/src/Tools/dotnet-dev-certs/src/Program.cs +++ b/src/Tools/dotnet-dev-certs/src/Program.cs @@ -194,6 +194,13 @@ namespace Microsoft.AspNetCore.DeveloperCertificates.Tools var now = DateTimeOffset.Now; var manager = new CertificateManager(); + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && manager.HasValidCertificateWithInnaccessibleKeyAcrossPartitions() || manager.GetHttpsCertificates().Count == 0) + { + reporter.Warn($"A valid HTTPS certificate with a key accessible across security partitions was not found. The following command will run to fix it:" + Environment.NewLine + + "'sudo security set-key-partition-list -D localhost -S unsigned:,teamid:UBF8T346G9'" + Environment.NewLine + + "This command will make the certificate key accessible across security partitions and might prompt you for your password. For more information see: https://aka.ms/aspnetcore/2.1/troubleshootcertissues"); + } + if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && manager.HasValidCertificateWithInnaccessibleKeyAcrossPartitions() || manager.GetHttpsCertificates().Count == 0) { reporter.Warn($"A valid HTTPS certificate with a key accessible across security partitions was not found. The following command will run to fix it:" + Environment.NewLine + From 6f88144513f45e5d56d0c385c7fe6e6cc4b2eba7 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 17 Jan 2020 10:08:25 -0800 Subject: [PATCH 086/116] Unpin System.Data.SqlClient and pin System.Security.Cryptography.Cng (#18418) --- build/dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 405c2e1ec2..aa8383b323 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,7 +4,7 @@ 2.1.12 2.1.12 - 4.5.0 + 4.5.1 @@ -184,7 +184,6 @@ 4.5.0 1.5.0 4.5.0 - 4.5.1 4.5.1 4.5.0 5.2.0 @@ -199,6 +198,7 @@ 1.6.0 4.5.2 4.3.0 + 4.5.2 4.5.0 4.5.0 4.5.1 From 328b52d0561656962691c96eb7c3917e97d50e14 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Fri, 17 Jan 2020 12:52:50 -0800 Subject: [PATCH 087/116] Remove redundant method --- src/Servers/Kestrel/shared/test/TestResources.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Servers/Kestrel/shared/test/TestResources.cs b/src/Servers/Kestrel/shared/test/TestResources.cs index 84206c4fc8..760eb81051 100644 --- a/src/Servers/Kestrel/shared/test/TestResources.cs +++ b/src/Servers/Kestrel/shared/test/TestResources.cs @@ -45,10 +45,5 @@ namespace Microsoft.AspNetCore.Testing { return new X509Certificate2(GetCertPath(certName), password); } - - public static X509Certificate2 GetTestCertificate(string certName, string password) - { - return new X509Certificate2(GetCertPath(certName), password); - } } } From c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2020 09:17:26 -0800 Subject: [PATCH 088/116] [release/3.1] Update dependencies from dotnet/efcore dotnet/aspnetcore-tooling (#18434) * Update dependencies from https://github.com/dotnet/efcore build 20200117.2 - Microsoft.EntityFrameworkCore.Tools - 3.1.2 - Microsoft.EntityFrameworkCore.InMemory - 3.1.2 - Microsoft.EntityFrameworkCore - 3.1.2 - Microsoft.EntityFrameworkCore.Relational - 3.1.2 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.2 - dotnet-ef - 3.1.2 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.2 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.1.2-servicing.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.2-servicing.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.1.2-servicing.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.1.2-servicing.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.2-servicing.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.1.2-servicing.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.1.2-servicing.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.1.2-servicing.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.1.2-servicing.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.1.2-servicing.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.1.2-preview4.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - System.Text.Json - 4.7.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Extensions.DependencyModel - 3.1.2 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20067.4 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers - 3.1.2-servicing.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.1.2-servicing.20067.4 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Net.Compilers.Toolset - 3.4.1-beta4-19614-01 (parent: Microsoft.Extensions.Logging) * Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200117.7 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 - Microsoft.AspNetCore.Razor.Language - 3.1.2 - Microsoft.CodeAnalysis.Razor - 3.1.2 - Microsoft.NET.Sdk.Razor - 3.1.2 * Update dependencies from https://github.com/dotnet/efcore build 20200117.3 - Microsoft.EntityFrameworkCore.Tools - 3.1.2 - Microsoft.EntityFrameworkCore.InMemory - 3.1.2 - Microsoft.EntityFrameworkCore - 3.1.2 - Microsoft.EntityFrameworkCore.Relational - 3.1.2 - Microsoft.EntityFrameworkCore.Sqlite - 3.1.2 - dotnet-ef - 3.1.2 - Microsoft.EntityFrameworkCore.SqlServer - 3.1.2 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.1.2-servicing.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.1.2-servicing.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.1.2-servicing.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.1.2-servicing.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.1.2-servicing.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.1.2-servicing.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.1.2-servicing.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.1.2-servicing.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.1.2-servicing.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.1.2-servicing.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.1.2-preview4.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.NETCore.App.Runtime.win-x64 - 3.1.2 (parent: Microsoft.Extensions.Logging) - Microsoft.Extensions.Logging - 3.1.2 (parent: Microsoft.EntityFrameworkCore) - System.Text.Json - 4.7.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.Extensions.DependencyModel - 3.1.2 (parent: Microsoft.Extensions.Logging) - Microsoft.NETCore.App.Internal - 3.1.2-servicing.20067.4 (parent: Microsoft.Extensions.Logging) - Internal.AspNetCore.Analyzers - 3.1.2-servicing.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.1.2-servicing.20067.6 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Net.Compilers.Toolset - 3.4.1-beta4-19614-01 (parent: Microsoft.Extensions.Logging) * update deps from tooling * Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200117.9 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.1.2 - Microsoft.AspNetCore.Razor.Language - 3.1.2 - Microsoft.CodeAnalysis.Razor - 3.1.2 - Microsoft.NET.Sdk.Razor - 3.1.2 Co-authored-by: William Godbe --- NuGet.config | 7 +- eng/Version.Details.xml | 408 ++++++++++++++++++++-------------------- eng/Versions.props | 130 ++++++------- 3 files changed, 274 insertions(+), 271 deletions(-) diff --git a/NuGet.config b/NuGet.config index df87cf7733..34b0a54409 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,9 +3,12 @@ - + + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 761c7d573b..57c5906f0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,279 +15,279 @@ https://github.com/dotnet/aspnetcore-tooling - 5fd301284eb58f9402374cf8f5a1b06440dc511e + 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 https://github.com/dotnet/aspnetcore-tooling - 5fd301284eb58f9402374cf8f5a1b06440dc511e + 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 https://github.com/dotnet/aspnetcore-tooling - 5fd301284eb58f9402374cf8f5a1b06440dc511e + 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 https://github.com/dotnet/aspnetcore-tooling - 5fd301284eb58f9402374cf8f5a1b06440dc511e + 2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0 https://github.com/dotnet/efcore - 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a + 7ae89d6adb7433b6ae9c37091e57a1226092ef46 https://github.com/dotnet/efcore - 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a + 7ae89d6adb7433b6ae9c37091e57a1226092ef46 https://github.com/dotnet/efcore - 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a + 7ae89d6adb7433b6ae9c37091e57a1226092ef46 https://github.com/dotnet/efcore - 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a + 7ae89d6adb7433b6ae9c37091e57a1226092ef46 https://github.com/dotnet/efcore - 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a + 7ae89d6adb7433b6ae9c37091e57a1226092ef46 https://github.com/dotnet/efcore - 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a + 7ae89d6adb7433b6ae9c37091e57a1226092ef46 https://github.com/dotnet/efcore - 6cf5ee68c68e0d8eaaa929e04bfbfaf97314791a + 7ae89d6adb7433b6ae9c37091e57a1226092ef46 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 https://github.com/dotnet/corefx @@ -365,9 +365,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/dotnet/corefx - 0f7f38c4fd323b26da10cce95f857f77f0f09b48 + e946cebe43a510e8c6476bbc8185d1445df33a1a https://github.com/dotnet/corefx @@ -377,25 +377,25 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 916b5cba268e1e1e803243004f4276cf40b2dda8 - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 916b5cba268e1e1e803243004f4276cf40b2dda8 https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 916b5cba268e1e1e803243004f4276cf40b2dda8 @@ -413,9 +413,9 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 https://github.com/dotnet/arcade @@ -429,13 +429,13 @@ https://github.com/dotnet/arcade 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 - - https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions - d00c382ec5d68a85d2eb4a49ab4559b8db7a2390 + + https://github.com/dotnet/extensions + 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - + https://github.com/dotnet/roslyn - 82f2e2541478e239dc4b04f231e90dc2b3dcb422 + 165046097562cfe65b09c2e9a9d8f7cd88526f2c diff --git a/eng/Versions.props b/eng/Versions.props index c9b699726a..f0b625fffd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,12 +64,12 @@ 1.0.0-beta.19607.3 - 3.4.0-beta4-19569-03 + 3.4.1-beta4-19614-01 - 3.1.1 - 3.1.1-servicing.19608.4 + 3.1.2 + 3.1.2-servicing.20067.4 3.1.0 - 3.1.1 + 3.1.2 2.1.0 1.1.0 @@ -91,7 +91,7 @@ 4.7.0 4.7.0 4.7.0 - 4.7.0 + 4.7.1 4.7.0 4.7.0 @@ -99,67 +99,67 @@ 3.1.0-preview4.19605.1 - 3.1.1-servicing.19614.4 - 3.1.1-servicing.19614.4 - 3.1.1-servicing.19614.4 - 3.1.1-servicing.19614.4 - 3.1.1-servicing.19614.4 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1-servicing.19614.4 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1-servicing.19614.4 - 3.1.1 - 3.1.1 - 3.1.1-servicing.19614.4 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1-servicing.19614.4 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1 - 3.1.1-servicing.19614.4 - 3.1.1 - 3.1.1-servicing.19614.4 - 3.1.1-servicing.19614.4 - 3.1.1 + 3.1.2-servicing.20067.6 + 3.1.2-servicing.20067.6 + 3.1.2-servicing.20067.6 + 3.1.2-servicing.20067.6 + 3.1.2-servicing.20067.6 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2-servicing.20067.6 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2-servicing.20067.6 + 3.1.2 + 3.1.2 + 3.1.2-servicing.20067.6 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2-servicing.20067.6 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2 + 3.1.2-servicing.20067.6 + 3.1.2 + 3.1.2-servicing.20067.6 + 3.1.2-servicing.20067.6 + 3.1.2 3.1.0-rtm.19565.4 - 3.1.1 - 3.1.1-preview4.19614.4 + 3.1.2 + 3.1.2-preview4.20067.6 3.1.2 3.1.2 From 49920aa9d00e77e12f88fb53f96db97cf3284a43 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 13 Feb 2020 15:45:36 -0800 Subject: [PATCH 089/116] Update branding to 3.1.3 (#19015) * Update branding to 3.1.3 * TargetingPackVersionPrefix -> 3.1.0 --- eng/Baseline.Designer.props | 2 +- eng/Baseline.xml | 2 +- eng/Versions.props | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 0550859109..beae2b6a59 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 3.1.1 + 3.1.2 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index d479dfe6ce..bfddf93a7c 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - + diff --git a/eng/Versions.props b/eng/Versions.props index f0b625fffd..799adc7be6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 3 1 - 2 + 3 0 $(VersionPrefix) - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).2 + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0 0.3.$(AspNetCorePatchVersion) $([MSBuild]::Add(10, $(AspNetCoreMajorVersion))) From 09aadd6efadb9c829cc861b2fab492a88c762393 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 13 Feb 2020 15:49:25 -0800 Subject: [PATCH 090/116] Pin dependency on 3 CoreFx packages (#18542) --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57c5906f0b..b54ad439b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -297,7 +297,7 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 @@ -337,7 +337,7 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 @@ -353,7 +353,7 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 From 131f427194559b6846cff1d1b61cab4bd79f8734 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 13 Feb 2020 15:50:08 -0800 Subject: [PATCH 091/116] Don't include ref assembly from Microsoft.AspNetCore.Testing (#18803) --- eng/targets/ResolveReferences.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index d4f52db039..42c87c83f6 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -293,7 +293,7 @@ $(MicrosoftInternalExtensionsRefsPath)%(FileName).dll + Condition=" '%(ReferencePath.ReferenceAssembly)' == '' AND Exists('$(MicrosoftInternalExtensionsRefsPath)%(FileName).dll') AND '%(FileName)' != 'Microsoft.AspNetCore.Testing' ">$(MicrosoftInternalExtensionsRefsPath)%(FileName).dll From a6c43b14a145e67233bd1393c44df25282c1c87d Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 13 Feb 2020 15:51:27 -0800 Subject: [PATCH 092/116] Mark AspNetCore projects that aren't packaged explicitly (#18767) * Mark AspNetCore projects that aren't packaged explicitly - avoid NU5104 warnings due to confusing versioning - `$(IsShippingPackage)` was semantically incorrect in any case * Remove redundant `$(IsShippingPackage)` settings in `$(IsAspNetCoreApp)` projects - default is `true` for all implementation projects * Use `$(IsPackable)` when deciding how `$(IsAspNetCoreApp)` projects are handled - remove all use of `$(IsShippingPackage)` for shared framework composition - update documentation to match these changes nits: - remove odd default for `$(IsPackable)` in Directory.Build.targets - no longer relevant since all `$(IsAspNetCoreApp)` projects are `$(IsShippingPackage)` too - include more information in docs/ProjectProperties.md * Add direct System.Text.Json references - avoid MSB3277 warnings --- Directory.Build.targets | 6 ------ docs/ProjectProperties.md | 8 +++++--- eng/CodeGen.proj | 8 ++++---- eng/SharedFramework.Local.props | 2 +- eng/targets/ResolveReferences.targets | 2 +- .../src/Microsoft.AspNetCore.Antiforgery.csproj | 2 +- .../Microsoft.AspNetCore.Components.Authorization.csproj | 1 - .../Blazor/test/Microsoft.AspNetCore.Blazor.Tests.csproj | 2 ++ .../HostedInAspNet.Server/HostedInAspNet.Server.csproj | 2 ++ .../Components/src/Microsoft.AspNetCore.Components.csproj | 1 - .../src/Microsoft.AspNetCore.Components.Forms.csproj | 1 - src/Components/Ignitor/test/Ignitor.Test.csproj | 2 ++ .../src/Microsoft.AspNetCore.Components.Server.csproj | 2 +- .../Web/src/Microsoft.AspNetCore.Components.Web.csproj | 1 - ...icrosoft.AspNetCore.DataProtection.Abstractions.csproj | 1 - .../src/Microsoft.AspNetCore.Cryptography.Internal.csproj | 1 - ...Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj | 1 - .../src/Microsoft.AspNetCore.DataProtection.csproj | 1 - .../Microsoft.AspNetCore.DataProtection.Extensions.csproj | 1 - src/DefaultBuilder/src/Microsoft.AspNetCore.csproj | 2 +- .../src/Microsoft.AspNetCore.Hosting.Abstractions.csproj | 2 +- .../Hosting/src/Microsoft.AspNetCore.Hosting.csproj | 2 +- ...icrosoft.AspNetCore.Hosting.Server.Abstractions.csproj | 2 +- .../src/Microsoft.AspNetCore.Html.Abstractions.csproj | 2 +- ...icrosoft.AspNetCore.Authentication.Abstractions.csproj | 2 +- .../src/Microsoft.AspNetCore.Authentication.Core.csproj | 2 +- src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj | 2 +- .../src/Microsoft.AspNetCore.Http.Abstractions.csproj | 2 +- .../src/Microsoft.AspNetCore.Http.Extensions.csproj | 2 +- .../src/Microsoft.AspNetCore.Http.Features.csproj | 1 - src/Http/Http/src/Microsoft.AspNetCore.Http.csproj | 2 +- .../Metadata/src/Microsoft.AspNetCore.Metadata.csproj | 1 - .../src/Microsoft.AspNetCore.Routing.Abstractions.csproj | 2 +- src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj | 2 +- .../src/Microsoft.AspNetCore.WebUtilities.csproj | 2 +- .../Core/src/Microsoft.AspNetCore.Identity.csproj | 2 +- .../src/Microsoft.Extensions.Identity.Core.csproj | 1 - .../src/Microsoft.Extensions.Identity.Stores.csproj | 1 - src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj | 2 +- .../Microsoft.AspNetCore.Diagnostics.Abstractions.csproj | 2 +- .../src/Microsoft.AspNetCore.Diagnostics.csproj | 2 +- .../Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj | 2 +- .../src/Microsoft.AspNetCore.HostFiltering.csproj | 2 +- .../src/Microsoft.AspNetCore.HttpOverrides.csproj | 2 +- .../src/Microsoft.AspNetCore.HttpsPolicy.csproj | 2 +- .../src/Microsoft.AspNetCore.Localization.Routing.csproj | 2 +- .../src/Microsoft.AspNetCore.Localization.csproj | 2 +- ...crosoft.AspNetCore.ResponseCaching.Abstractions.csproj | 2 +- .../src/Microsoft.AspNetCore.ResponseCaching.csproj | 2 +- .../src/Microsoft.AspNetCore.ResponseCompression.csproj | 2 +- .../Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj | 2 +- .../Session/src/Microsoft.AspNetCore.Session.csproj | 2 +- .../src/Microsoft.AspNetCore.StaticFiles.csproj | 2 +- .../WebSockets/src/Microsoft.AspNetCore.WebSockets.csproj | 2 +- .../src/Microsoft.AspNetCore.Mvc.Abstractions.csproj | 2 +- .../src/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj | 2 +- src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj | 2 +- src/Mvc/Mvc.Cors/src/Microsoft.AspNetCore.Mvc.Cors.csproj | 2 +- .../src/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj | 2 +- .../src/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj | 2 +- .../src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj | 2 +- .../src/Microsoft.AspNetCore.Mvc.Localization.csproj | 2 +- .../Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj | 2 +- .../src/Microsoft.AspNetCore.Mvc.RazorPages.csproj | 2 +- .../src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj | 2 +- .../src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj | 2 +- src/Mvc/Mvc/src/Microsoft.AspNetCore.Mvc.csproj | 2 +- .../src/Microsoft.AspNetCore.Razor.Runtime.csproj | 2 +- src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj | 2 +- .../Microsoft.AspNetCore.Authentication.Cookies.csproj | 2 +- .../Core/src/Microsoft.AspNetCore.Authentication.csproj | 2 +- .../src/Microsoft.AspNetCore.Authentication.OAuth.csproj | 2 +- .../Core/src/Microsoft.AspNetCore.Authorization.csproj | 1 - .../src/Microsoft.AspNetCore.Authorization.Policy.csproj | 2 +- .../src/Microsoft.AspNetCore.CookiePolicy.csproj | 2 +- .../Microsoft.AspNetCore.Connections.Abstractions.csproj | 1 - .../src/Microsoft.AspNetCore.Server.HttpSys.csproj | 2 +- .../IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj | 2 +- .../src/Microsoft.AspNetCore.Server.IISIntegration.csproj | 2 +- .../src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj | 2 +- .../src/Microsoft.AspNetCore.Server.Kestrel.csproj | 2 +- ...oft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj | 2 +- .../Microsoft.AspNetCore.Http.Connections.Common.csproj | 1 - .../src/Microsoft.AspNetCore.Http.Connections.csproj | 2 +- .../Microsoft.AspNetCore.SignalR.Protocols.Json.csproj | 1 - .../src/Microsoft.AspNetCore.SignalR.Common.csproj | 1 - .../Core/src/Microsoft.AspNetCore.SignalR.Core.csproj | 2 +- .../SignalR/src/Microsoft.AspNetCore.SignalR.csproj | 2 +- 88 files changed, 79 insertions(+), 95 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 0e0db95ab3..0fbb33c40b 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,12 +1,6 @@ - - - false - - <_SharedFrameworkAndPackageRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsShippingPackage', 'true')->Distinct())" /> - <_SharedFrameworkRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsShippingPackage', 'false')->Distinct())" /> + <_SharedFrameworkAndPackageRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsPackable', 'true')->Distinct())" /> + <_SharedFrameworkRef Include="@(_ProjectReferenceProvider->WithMetadataValue('IsAspNetCoreApp','true')->WithMetadataValue('IsPackable', 'false')->Distinct())" /> <_ProjectReferenceProviderWithRefAssembly Include="@(_ProjectReferenceProvider->HasMetadata('ReferenceAssemblyProjectFileRelativePath'))" /> <_ProjectReferenceProvider Remove="@(_ProjectReferenceProviderWithRefAssembly)" /> @@ -58,7 +58,7 @@ This file contains a complete list of the assemblies which are part of the shared framework. - This project is generated using the and properties from each .csproj in this repository. + This project is generated using the and properties from each .csproj in this repository. --> @@ -85,4 +85,4 @@ SkipNonexistentProjects="true" /> - \ No newline at end of file + diff --git a/eng/SharedFramework.Local.props b/eng/SharedFramework.Local.props index 5f09d593de..ddfe60ecfb 100644 --- a/eng/SharedFramework.Local.props +++ b/eng/SharedFramework.Local.props @@ -3,7 +3,7 @@ This file contains a complete list of the assemblies which are part of the shared framework. - This project is generated using the and properties from each .csproj in this repository. + This project is generated using the and properties from each .csproj in this repository. --> diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 42c87c83f6..e77922ebcb 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -333,7 +333,7 @@ $([MSBuild]::ValueOrDefault($(IsAspNetCoreApp),'false')) - $([MSBuild]::ValueOrDefault($(IsShippingPackage),'false')) + $([MSBuild]::ValueOrDefault($(IsPackable),'false')) $([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectFullPath))) $(ReferenceAssemblyProjectFileRelativePath) diff --git a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj b/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj index d00d01e066..566e221871 100644 --- a/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj +++ b/src/Antiforgery/src/Microsoft.AspNetCore.Antiforgery.csproj @@ -6,7 +6,7 @@ true true aspnetcore;antiforgery - false + false diff --git a/src/Components/Authorization/src/Microsoft.AspNetCore.Components.Authorization.csproj b/src/Components/Authorization/src/Microsoft.AspNetCore.Components.Authorization.csproj index 8f3142849a..fa9f682772 100644 --- a/src/Components/Authorization/src/Microsoft.AspNetCore.Components.Authorization.csproj +++ b/src/Components/Authorization/src/Microsoft.AspNetCore.Components.Authorization.csproj @@ -6,7 +6,6 @@ true Authentication and authorization support for Blazor applications. true - true 3.0 diff --git a/src/Components/Blazor/Blazor/test/Microsoft.AspNetCore.Blazor.Tests.csproj b/src/Components/Blazor/Blazor/test/Microsoft.AspNetCore.Blazor.Tests.csproj index 1e084b10ee..c93519dfbd 100644 --- a/src/Components/Blazor/Blazor/test/Microsoft.AspNetCore.Blazor.Tests.csproj +++ b/src/Components/Blazor/Blazor/test/Microsoft.AspNetCore.Blazor.Tests.csproj @@ -10,6 +10,8 @@ + + diff --git a/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj index 224ada3963..afc09e4f77 100644 --- a/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj +++ b/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj @@ -12,6 +12,8 @@ + + diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj index 4c0a31a3f6..6bc25e8d43 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj @@ -5,7 +5,6 @@ $(DefaultNetCoreTargetFramework) Components feature for ASP.NET Core. true - true true diff --git a/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj b/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj index d338f21000..1c39c34f1d 100644 --- a/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj +++ b/src/Components/Forms/src/Microsoft.AspNetCore.Components.Forms.csproj @@ -6,7 +6,6 @@ true Forms and validation support for Blazor applications. true - true diff --git a/src/Components/Ignitor/test/Ignitor.Test.csproj b/src/Components/Ignitor/test/Ignitor.Test.csproj index ac0c88e54c..32e40b083f 100644 --- a/src/Components/Ignitor/test/Ignitor.Test.csproj +++ b/src/Components/Ignitor/test/Ignitor.Test.csproj @@ -9,6 +9,8 @@ + + diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj index 2e66dffc7e..b47c1c2fe3 100644 --- a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj +++ b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj @@ -9,7 +9,7 @@ true CS0436;$(NoWarn) $(DefineConstants);MESSAGEPACK_INTERNAL;COMPONENTS_SERVER - false + false diff --git a/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj index 02ae3157d2..6b0c9812e7 100644 --- a/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj +++ b/src/Components/Web/src/Microsoft.AspNetCore.Components.Web.csproj @@ -6,7 +6,6 @@ true Support for rendering ASP.NET Core components for browsers. true - true Microsoft.AspNetCore.Components diff --git a/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj b/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj index 03cf5d11e5..dcbaf568ee 100644 --- a/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj +++ b/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj @@ -7,7 +7,6 @@ Microsoft.AspNetCore.DataProtection.IDataProtectionProvider Microsoft.AspNetCore.DataProtection.IDataProtector netstandard2.0;$(DefaultNetCoreTargetFramework) true - true true aspnetcore;dataprotection diff --git a/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj index 1f340cfe15..88ab0de27e 100644 --- a/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj +++ b/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj @@ -4,7 +4,6 @@ Infrastructure for ASP.NET Core cryptographic packages. Applications and libraries should not reference this package directly. netstandard2.0;$(DefaultNetCoreTargetFramework) true - true $(NoWarn);CS1591 true true diff --git a/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj b/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj index 9bd47ba7c3..b665cf0f77 100644 --- a/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj +++ b/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj @@ -4,7 +4,6 @@ ASP.NET Core utilities for key derivation. netstandard2.0;netcoreapp2.0;$(DefaultNetCoreTargetFramework) true - true true true aspnetcore;dataprotection diff --git a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj index 4ce14755df..a675b5aa74 100644 --- a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj +++ b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj @@ -5,7 +5,6 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) $(DefaultNetCoreTargetFramework) true - true $(NoWarn);CS1591 true true diff --git a/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj index 21c2eae6b7..fe1e5448da 100644 --- a/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj +++ b/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj @@ -5,7 +5,6 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) $(DefaultNetCoreTargetFramework) true - true true aspnetcore;dataprotection diff --git a/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj b/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj index 54fc28cbea..89f0b0ff8b 100644 --- a/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj +++ b/src/DefaultBuilder/src/Microsoft.AspNetCore.csproj @@ -6,7 +6,7 @@ aspnetcore Microsoft.AspNetCore true - false + false diff --git a/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj b/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj index 4ab4e68f4d..4def523880 100644 --- a/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj +++ b/src/Hosting/Abstractions/src/Microsoft.AspNetCore.Hosting.Abstractions.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;hosting - false + false diff --git a/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj b/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj index 0e71bb69c9..38ec417cb4 100644 --- a/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj +++ b/src/Hosting/Hosting/src/Microsoft.AspNetCore.Hosting.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;hosting - false + false diff --git a/src/Hosting/Server.Abstractions/src/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj b/src/Hosting/Server.Abstractions/src/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj index 8f2f1b2bf7..4e6c350a51 100644 --- a/src/Hosting/Server.Abstractions/src/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj +++ b/src/Hosting/Server.Abstractions/src/Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;hosting - false + false diff --git a/src/Html/Abstractions/src/Microsoft.AspNetCore.Html.Abstractions.csproj b/src/Html/Abstractions/src/Microsoft.AspNetCore.Html.Abstractions.csproj index 133cae35db..0fce64a89d 100644 --- a/src/Html/Abstractions/src/Microsoft.AspNetCore.Html.Abstractions.csproj +++ b/src/Html/Abstractions/src/Microsoft.AspNetCore.Html.Abstractions.csproj @@ -10,7 +10,7 @@ Microsoft.AspNetCore.Html.IHtmlContent true true aspnetcore - false + false diff --git a/src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj b/src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj index 854edd740f..999e6741e5 100644 --- a/src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj +++ b/src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security - false + false diff --git a/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj b/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj index fd597d7b73..f3bc6965ea 100644 --- a/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj +++ b/src/Http/Authentication.Core/src/Microsoft.AspNetCore.Authentication.Core.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security - false + false diff --git a/src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj b/src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj index 96cadd39d5..d0c27e7ed7 100644 --- a/src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj +++ b/src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj @@ -8,7 +8,7 @@ true true http - false + false diff --git a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj index c5ab085eef..adea0a3059 100644 --- a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj +++ b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj @@ -13,7 +13,7 @@ Microsoft.AspNetCore.Http.HttpResponse true aspnetcore $(NoWarn);CS1591 - false + false diff --git a/src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj b/src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj index a67f1e5fe2..73ba2b8a9c 100644 --- a/src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj +++ b/src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore - false + false diff --git a/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj b/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj index 74dc703d74..85f9fdc847 100644 --- a/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj +++ b/src/Http/Http.Features/src/Microsoft.AspNetCore.Http.Features.csproj @@ -8,7 +8,6 @@ $(NoWarn);CS1591 true aspnetcore - true diff --git a/src/Http/Http/src/Microsoft.AspNetCore.Http.csproj b/src/Http/Http/src/Microsoft.AspNetCore.Http.csproj index feebf09578..a7fb56774b 100644 --- a/src/Http/Http/src/Microsoft.AspNetCore.Http.csproj +++ b/src/Http/Http/src/Microsoft.AspNetCore.Http.csproj @@ -8,7 +8,7 @@ true true aspnetcore - false + false diff --git a/src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj b/src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj index 235a0c98c3..7869ec0eb5 100644 --- a/src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj +++ b/src/Http/Metadata/src/Microsoft.AspNetCore.Metadata.csproj @@ -4,7 +4,6 @@ ASP.NET Core metadata. netstandard2.0;$(DefaultNetCoreTargetFramework) true - true $(NoWarn);CS1591 true aspnetcore diff --git a/src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj b/src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj index 4240032c6f..c500cb5ba7 100644 --- a/src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj +++ b/src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj @@ -10,7 +10,7 @@ Microsoft.AspNetCore.Routing.RouteData $(NoWarn);CS1591 true aspnetcore;routing - false + false diff --git a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj index 7c399fe557..95a5f0327d 100644 --- a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj +++ b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj @@ -11,7 +11,7 @@ Microsoft.AspNetCore.Routing.RouteCollection true aspnetcore;routing true - false + false diff --git a/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj b/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj index ae6214a552..63d3582d52 100644 --- a/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj +++ b/src/Http/WebUtilities/src/Microsoft.AspNetCore.WebUtilities.csproj @@ -8,7 +8,7 @@ $(NoWarn);CS1591 true aspnetcore - false + false diff --git a/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj b/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj index 69320a6669..c4d2657b63 100644 --- a/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj +++ b/src/Identity/Core/src/Microsoft.AspNetCore.Identity.csproj @@ -6,7 +6,7 @@ true true aspnetcore;identity;membership - false + false diff --git a/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj index 7fab931436..7555dda1fe 100644 --- a/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj +++ b/src/Identity/Extensions.Core/src/Microsoft.Extensions.Identity.Core.csproj @@ -5,7 +5,6 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) $(DefaultNetCoreTargetFramework) true - true true aspnetcore;identity;membership diff --git a/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj index 9066076dd0..fd80d41fcd 100644 --- a/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj +++ b/src/Identity/Extensions.Stores/src/Microsoft.Extensions.Identity.Stores.csproj @@ -5,7 +5,6 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) $(DefaultNetCoreTargetFramework) true - true true aspnetcore;identity;membership diff --git a/src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj b/src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj index 9471fd7465..656043ab16 100644 --- a/src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj +++ b/src/Middleware/CORS/src/Microsoft.AspNetCore.Cors.csproj @@ -10,7 +10,7 @@ Microsoft.AspNetCore.Cors.EnableCorsAttribute $(NoWarn);CS1591 true aspnetcore;cors - false + false diff --git a/src/Middleware/Diagnostics.Abstractions/src/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj b/src/Middleware/Diagnostics.Abstractions/src/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj index 4852ab174d..6b4d54af4f 100644 --- a/src/Middleware/Diagnostics.Abstractions/src/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj +++ b/src/Middleware/Diagnostics.Abstractions/src/Microsoft.AspNetCore.Diagnostics.Abstractions.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;diagnostics - false + false diff --git a/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj b/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj index 6a82485ad6..a8ac2a0901 100644 --- a/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj +++ b/src/Middleware/Diagnostics/src/Microsoft.AspNetCore.Diagnostics.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;diagnostics - false + false diff --git a/src/Middleware/HealthChecks/src/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj b/src/Middleware/HealthChecks/src/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj index 21126ad994..99c01627f6 100644 --- a/src/Middleware/HealthChecks/src/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj +++ b/src/Middleware/HealthChecks/src/Microsoft.AspNetCore.Diagnostics.HealthChecks.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true diagnostics;healthchecks - false + false diff --git a/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj b/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj index 0a0eb0383b..b1098f3cea 100644 --- a/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj +++ b/src/Middleware/HostFiltering/src/Microsoft.AspNetCore.HostFiltering.csproj @@ -8,7 +8,7 @@ true true aspnetcore - false + false diff --git a/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj b/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj index 000ca9b6d3..aa225718c4 100644 --- a/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj +++ b/src/Middleware/HttpOverrides/src/Microsoft.AspNetCore.HttpOverrides.csproj @@ -9,7 +9,7 @@ $(NoWarn);CS1591 true aspnetcore;proxy;headers;xforwarded - false + false diff --git a/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj b/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj index dbde5e594b..c6c14dd30d 100644 --- a/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj +++ b/src/Middleware/HttpsPolicy/src/Microsoft.AspNetCore.HttpsPolicy.csproj @@ -9,7 +9,7 @@ $(NoWarn);CS1591 true aspnetcore;https;hsts - false + false diff --git a/src/Middleware/Localization.Routing/src/Microsoft.AspNetCore.Localization.Routing.csproj b/src/Middleware/Localization.Routing/src/Microsoft.AspNetCore.Localization.Routing.csproj index 393fa1f355..3fbf8734b6 100644 --- a/src/Middleware/Localization.Routing/src/Microsoft.AspNetCore.Localization.Routing.csproj +++ b/src/Middleware/Localization.Routing/src/Microsoft.AspNetCore.Localization.Routing.csproj @@ -8,7 +8,7 @@ $(NoWarn);CS1591 true aspnetcore;localization - false + false diff --git a/src/Middleware/Localization/src/Microsoft.AspNetCore.Localization.csproj b/src/Middleware/Localization/src/Microsoft.AspNetCore.Localization.csproj index 4ec4f728dd..20a32d0507 100644 --- a/src/Middleware/Localization/src/Microsoft.AspNetCore.Localization.csproj +++ b/src/Middleware/Localization/src/Microsoft.AspNetCore.Localization.csproj @@ -8,7 +8,7 @@ $(NoWarn);CS1591 true aspnetcore;localization - false + false diff --git a/src/Middleware/ResponseCaching.Abstractions/src/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj b/src/Middleware/ResponseCaching.Abstractions/src/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj index 56918dab12..226e595816 100644 --- a/src/Middleware/ResponseCaching.Abstractions/src/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj +++ b/src/Middleware/ResponseCaching.Abstractions/src/Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj @@ -6,7 +6,7 @@ true true aspnetcore;cache;caching - false + false diff --git a/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj b/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj index da2d96e741..2846ee5907 100644 --- a/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj +++ b/src/Middleware/ResponseCaching/src/Microsoft.AspNetCore.ResponseCaching.csproj @@ -8,7 +8,7 @@ true true aspnetcore;cache;caching - false + false diff --git a/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj b/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj index 705e78ec8a..d63d281422 100644 --- a/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj +++ b/src/Middleware/ResponseCompression/src/Microsoft.AspNetCore.ResponseCompression.csproj @@ -6,7 +6,7 @@ true true aspnetcore - false + false diff --git a/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj b/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj index d7a25a253d..1f23363732 100644 --- a/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj +++ b/src/Middleware/Rewrite/src/Microsoft.AspNetCore.Rewrite.csproj @@ -10,7 +10,7 @@ $(NoWarn);CS1591 true aspnetcore;urlrewrite;mod_rewrite - false + false diff --git a/src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj b/src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj index d06dd6f5ed..4763fe2b20 100644 --- a/src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj +++ b/src/Middleware/Session/src/Microsoft.AspNetCore.Session.csproj @@ -8,7 +8,7 @@ true true aspnetcore;session;sessionstate - false + false diff --git a/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj b/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj index e48c4597f4..52f563a36b 100644 --- a/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj +++ b/src/Middleware/StaticFiles/src/Microsoft.AspNetCore.StaticFiles.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;staticfiles - false + false diff --git a/src/Middleware/WebSockets/src/Microsoft.AspNetCore.WebSockets.csproj b/src/Middleware/WebSockets/src/Microsoft.AspNetCore.WebSockets.csproj index a6fe40e2b2..74b48aea51 100644 --- a/src/Middleware/WebSockets/src/Microsoft.AspNetCore.WebSockets.csproj +++ b/src/Middleware/WebSockets/src/Microsoft.AspNetCore.WebSockets.csproj @@ -8,7 +8,7 @@ true true aspnetcore - false + false diff --git a/src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj index 4be8e0b016..71d459fb80 100644 --- a/src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj +++ b/src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj @@ -8,7 +8,7 @@ Microsoft.AspNetCore.Mvc.IActionResult true true aspnetcore;aspnetcoremvc - false + false diff --git a/src/Mvc/Mvc.ApiExplorer/src/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj b/src/Mvc/Mvc.ApiExplorer/src/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj index 2736b825a8..11be402c60 100644 --- a/src/Mvc/Mvc.ApiExplorer/src/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj +++ b/src/Mvc/Mvc.ApiExplorer/src/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj @@ -6,7 +6,7 @@ true true aspnetcore;aspnetcoremvc - false + false diff --git a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj index 1d1eaa6448..4c3e760a90 100644 --- a/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj @@ -15,7 +15,7 @@ Microsoft.AspNetCore.Mvc.RouteAttribute $(NoWarn);CS1591 true aspnetcore;aspnetcoremvc - false + false diff --git a/src/Mvc/Mvc.Cors/src/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Mvc/Mvc.Cors/src/Microsoft.AspNetCore.Mvc.Cors.csproj index c498ea42e8..6409a547e4 100644 --- a/src/Mvc/Mvc.Cors/src/Microsoft.AspNetCore.Mvc.Cors.csproj +++ b/src/Mvc/Mvc.Cors/src/Microsoft.AspNetCore.Mvc.Cors.csproj @@ -6,7 +6,7 @@ true true aspnetcore;aspnetcoremvc;cors - false + false diff --git a/src/Mvc/Mvc.DataAnnotations/src/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Mvc/Mvc.DataAnnotations/src/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj index 714aee5090..dcd837d20b 100644 --- a/src/Mvc/Mvc.DataAnnotations/src/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/Mvc/Mvc.DataAnnotations/src/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj @@ -6,7 +6,7 @@ true true aspnetcore;aspnetcoremvc - false + false diff --git a/src/Mvc/Mvc.Formatters.Json/src/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj b/src/Mvc/Mvc.Formatters.Json/src/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj index 55dd4b35c0..47b10f6ba8 100644 --- a/src/Mvc/Mvc.Formatters.Json/src/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj +++ b/src/Mvc/Mvc.Formatters.Json/src/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj @@ -6,7 +6,7 @@ true true aspnetcore;aspnetcoremvc;json - false + false diff --git a/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj index 64682adc8e..b42ee39139 100644 --- a/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj +++ b/src/Mvc/Mvc.Formatters.Xml/src/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;aspnetcoremvc;xml - false + false diff --git a/src/Mvc/Mvc.Localization/src/Microsoft.AspNetCore.Mvc.Localization.csproj b/src/Mvc/Mvc.Localization/src/Microsoft.AspNetCore.Mvc.Localization.csproj index 00f740f18b..e3f4cfd3c8 100644 --- a/src/Mvc/Mvc.Localization/src/Microsoft.AspNetCore.Mvc.Localization.csproj +++ b/src/Mvc/Mvc.Localization/src/Microsoft.AspNetCore.Mvc.Localization.csproj @@ -9,7 +9,7 @@ Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer true true aspnetcore;aspnetcoremvc;localization - false + false diff --git a/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj index 77ae07bc3b..e9fc306a9e 100644 --- a/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj +++ b/src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;aspnetcoremvc;cshtml;razor - false + false diff --git a/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj index 341722c228..b38018a13b 100644 --- a/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj +++ b/src/Mvc/Mvc.RazorPages/src/Microsoft.AspNetCore.Mvc.RazorPages.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;aspnetcoremvc;cshtml;razor - false + false diff --git a/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj index ccf1d5e424..4d31ad0585 100644 --- a/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj +++ b/src/Mvc/Mvc.TagHelpers/src/Microsoft.AspNetCore.Mvc.TagHelpers.csproj @@ -6,7 +6,7 @@ true aspnetcore;aspnetcoremvc;taghelper;taghelpers true - false + false diff --git a/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj index edc612008d..56f7a39218 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Mvc/Mvc.ViewFeatures/src/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -14,7 +14,7 @@ true aspnetcore;aspnetcoremvc true - false + false diff --git a/src/Mvc/Mvc/src/Microsoft.AspNetCore.Mvc.csproj b/src/Mvc/Mvc/src/Microsoft.AspNetCore.Mvc.csproj index 687b24a6f9..fbc44beae3 100644 --- a/src/Mvc/Mvc/src/Microsoft.AspNetCore.Mvc.csproj +++ b/src/Mvc/Mvc/src/Microsoft.AspNetCore.Mvc.csproj @@ -6,7 +6,7 @@ true aspnetcore;aspnetcoremvc true - false + false diff --git a/src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj b/src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj index b76cada4ee..8b9cdb9c3a 100644 --- a/src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj +++ b/src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj @@ -6,7 +6,7 @@ true true $(PackageTags);taghelper;taghelpers - false + false diff --git a/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj b/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj index c13602372b..9f8d7443c4 100644 --- a/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj +++ b/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj @@ -13,7 +13,7 @@ Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper true $(PackageTags);taghelper;taghelpers $(NoWarn);CS1591 - false + false true diff --git a/src/Security/Authentication/Cookies/src/Microsoft.AspNetCore.Authentication.Cookies.csproj b/src/Security/Authentication/Cookies/src/Microsoft.AspNetCore.Authentication.Cookies.csproj index 609247b5d5..803c58f408 100644 --- a/src/Security/Authentication/Cookies/src/Microsoft.AspNetCore.Authentication.Cookies.csproj +++ b/src/Security/Authentication/Cookies/src/Microsoft.AspNetCore.Authentication.Cookies.csproj @@ -8,7 +8,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security - false + false diff --git a/src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj b/src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj index a316d97f33..e81a55f314 100644 --- a/src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj +++ b/src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security - false + false diff --git a/src/Security/Authentication/OAuth/src/Microsoft.AspNetCore.Authentication.OAuth.csproj b/src/Security/Authentication/OAuth/src/Microsoft.AspNetCore.Authentication.OAuth.csproj index 3afc116b34..d7855aec1a 100644 --- a/src/Security/Authentication/OAuth/src/Microsoft.AspNetCore.Authentication.OAuth.csproj +++ b/src/Security/Authentication/OAuth/src/Microsoft.AspNetCore.Authentication.OAuth.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security - false + false diff --git a/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj index b6f1f89e70..4b42191fd2 100644 --- a/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj +++ b/src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj @@ -8,7 +8,6 @@ Microsoft.AspNetCore.Authorization.AuthorizeAttribute netstandard2.0;$(DefaultNetCoreTargetFramework) $(DefaultNetCoreTargetFramework) true - true $(NoWarn);CS1591 true aspnetcore;authorization diff --git a/src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj b/src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj index 39aaa6463f..604d5bb851 100644 --- a/src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj +++ b/src/Security/Authorization/Policy/src/Microsoft.AspNetCore.Authorization.Policy.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore;authorization - false + false diff --git a/src/Security/CookiePolicy/src/Microsoft.AspNetCore.CookiePolicy.csproj b/src/Security/CookiePolicy/src/Microsoft.AspNetCore.CookiePolicy.csproj index aa2a00b586..d401e8d69f 100644 --- a/src/Security/CookiePolicy/src/Microsoft.AspNetCore.CookiePolicy.csproj +++ b/src/Security/CookiePolicy/src/Microsoft.AspNetCore.CookiePolicy.csproj @@ -7,7 +7,7 @@ $(NoWarn);CS1591 true aspnetcore - false + false diff --git a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj index 43f6d4b574..d7040f2445 100644 --- a/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj +++ b/src/Servers/Connections.Abstractions/src/Microsoft.AspNetCore.Connections.Abstractions.csproj @@ -8,7 +8,6 @@ true aspnetcore CS1591;$(NoWarn) - true diff --git a/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj b/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj index c41c4af7a1..06d5ad8b82 100644 --- a/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj +++ b/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj @@ -8,7 +8,7 @@ true true aspnetcore;weblistener;httpsys - false + false diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj index 06fe1aa203..c645b12741 100644 --- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj @@ -10,7 +10,7 @@ aspnetcore;iis true $(DefaultNetCoreTargetFramework) - false + false diff --git a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj index ccc1caa9bc..addaf56ff2 100644 --- a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -8,7 +8,7 @@ true aspnetcore;iis true - false + false diff --git a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index ea3a87bad7..6c18f1a078 100644 --- a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -8,7 +8,7 @@ aspnetcore;kestrel true CS1591;$(NoWarn) - false + false diff --git a/src/Servers/Kestrel/Kestrel/src/Microsoft.AspNetCore.Server.Kestrel.csproj b/src/Servers/Kestrel/Kestrel/src/Microsoft.AspNetCore.Server.Kestrel.csproj index c82835cdce..f4ef0ca07a 100644 --- a/src/Servers/Kestrel/Kestrel/src/Microsoft.AspNetCore.Server.Kestrel.csproj +++ b/src/Servers/Kestrel/Kestrel/src/Microsoft.AspNetCore.Server.Kestrel.csproj @@ -7,7 +7,7 @@ true aspnetcore;kestrel CS1591;$(NoWarn) - false + false diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj b/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj index 037dcfb6fc..ecdca4391b 100644 --- a/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj +++ b/src/Servers/Kestrel/Transport.Sockets/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj @@ -8,7 +8,7 @@ aspnetcore;kestrel true CS1591;$(NoWarn) - false + false diff --git a/src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj b/src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj index 521467f849..dbf0e04aaf 100644 --- a/src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj +++ b/src/SignalR/common/Http.Connections.Common/src/Microsoft.AspNetCore.Http.Connections.Common.csproj @@ -7,7 +7,6 @@ true Microsoft.AspNetCore.Http.Connections true - true diff --git a/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj b/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj index d19e84efe5..1e8738d9a9 100644 --- a/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj +++ b/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj @@ -4,7 +4,7 @@ Components for providing real-time bi-directional communication across the Web. $(DefaultNetCoreTargetFramework) true - false + false diff --git a/src/SignalR/common/Protocols.Json/src/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj b/src/SignalR/common/Protocols.Json/src/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj index 27ac41a9df..dc3a19e0c5 100644 --- a/src/SignalR/common/Protocols.Json/src/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj +++ b/src/SignalR/common/Protocols.Json/src/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj @@ -7,7 +7,6 @@ true Microsoft.AspNetCore.SignalR true - true diff --git a/src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj b/src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj index fa97b3e082..8d374d387d 100644 --- a/src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj +++ b/src/SignalR/common/SignalR.Common/src/Microsoft.AspNetCore.SignalR.Common.csproj @@ -7,7 +7,6 @@ true Microsoft.AspNetCore.SignalR true - true diff --git a/src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj b/src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj index 79dcd00130..9a18d8ac74 100644 --- a/src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj +++ b/src/SignalR/server/Core/src/Microsoft.AspNetCore.SignalR.Core.csproj @@ -5,7 +5,7 @@ $(DefaultNetCoreTargetFramework) true Microsoft.AspNetCore.SignalR - false + false diff --git a/src/SignalR/server/SignalR/src/Microsoft.AspNetCore.SignalR.csproj b/src/SignalR/server/SignalR/src/Microsoft.AspNetCore.SignalR.csproj index e4b8eb4226..1f69a61ddc 100644 --- a/src/SignalR/server/SignalR/src/Microsoft.AspNetCore.SignalR.csproj +++ b/src/SignalR/server/SignalR/src/Microsoft.AspNetCore.SignalR.csproj @@ -3,7 +3,7 @@ Components for providing real-time bi-directional communication across the Web. $(DefaultNetCoreTargetFramework) true - false + false From d10a352e8caec866c4107b2fd4fdc5ce49f7a740 Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 13 Feb 2020 16:29:28 -0800 Subject: [PATCH 093/116] Remove non-existing dependency in Identity.Specification.Tests (#18790) --- .../Microsoft.AspNetCore.Identity.Specification.Tests.csproj | 5 ++++- .../Specification.Tests/src/UserManagerSpecificationTests.cs | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj index 0440e8914a..ceac9bcd6a 100644 --- a/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj +++ b/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj @@ -12,7 +12,6 @@ - @@ -21,4 +20,8 @@ + + + + diff --git a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs index cdf5fd5072..27afc892ac 100644 --- a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs +++ b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Linq.Expressions; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Xunit; @@ -1636,7 +1635,6 @@ namespace Microsoft.AspNetCore.Identity.Test /// /// Task [Fact] - [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1766", FlakyOn.All)] public async Task EmailFactorFailsAfterSecurityStampChangeTest() { var manager = CreateManager(); From 1027e5372ff2f0d16b7fe177f1eae72bffc034e3 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 14 Feb 2020 08:34:23 -0800 Subject: [PATCH 094/116] Use the analyzer from the SDK when available (#18885) * Use the analyzer from the SDK when available This prevents a build warning when building a project that contains a reference to Microsoft.AspNetCore.Components and a netcoreapp3.0 or newer targeting Web project. The Web SDK implicitly adds the Components.Analyzer for netcoreapp3.0 or newer targeting projects. If the project additionally referenced this package (directly or transitively), the package would set up a property that prevented the implicit analyzer reference. This prevented the analyzer from being referenced twice. There were two issues with the current approach: a) The props file wasn't propogated via buildTransitive. Consequently transitive project references would reference two copies of the analyzer. When these were different versions, it resulted in a compiler warning. b) Forward looking, this prevents newer versions of the analyzer shipped from the SDK from ever being used. This is particularly problematic since apps are likely to reference component libraries that were previously compiled against 3.x. This change attempts to mitigate both of these issues: a) We add a buildTransitive so our build targets flow b) We knock out the analyzer added by the package if the SDK's already added it. Fixes https://github.com/dotnet/aspnetcore/issues/18563 * Update Microsoft.AspNetCore.Components.Analyzers.targets * Update Microsoft.AspNetCore.Components.Analyzers.targets * Add a description * Update Microsoft.AspNetCore.Components.Analyzers.targets --- ...oft.AspNetCore.Components.Analyzers.csproj | 1 + ...soft.AspNetCore.Components.Analyzers.props | 5 --- ...ft.AspNetCore.Components.Analyzers.targets | 34 +++++++++++++++++++ ...ft.AspNetCore.Components.Analyzers.targets | 3 ++ 4 files changed, 38 insertions(+), 5 deletions(-) delete mode 100644 src/Components/Analyzers/src/build/netstandard2.0/Microsoft.AspNetCore.Components.Analyzers.props create mode 100644 src/Components/Analyzers/src/build/netstandard2.0/Microsoft.AspNetCore.Components.Analyzers.targets create mode 100644 src/Components/Analyzers/src/buildTransitive/netstandard2.0/Microsoft.AspNetCore.Components.Analyzers.targets diff --git a/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj b/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj index a83904f245..903de47c78 100644 --- a/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj +++ b/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj @@ -18,6 +18,7 @@ + diff --git a/src/Components/Analyzers/src/build/netstandard2.0/Microsoft.AspNetCore.Components.Analyzers.props b/src/Components/Analyzers/src/build/netstandard2.0/Microsoft.AspNetCore.Components.Analyzers.props deleted file mode 100644 index 0ba7b4da05..0000000000 --- a/src/Components/Analyzers/src/build/netstandard2.0/Microsoft.AspNetCore.Components.Analyzers.props +++ /dev/null @@ -1,5 +0,0 @@ - - - true - - diff --git a/src/Components/Analyzers/src/build/netstandard2.0/Microsoft.AspNetCore.Components.Analyzers.targets b/src/Components/Analyzers/src/build/netstandard2.0/Microsoft.AspNetCore.Components.Analyzers.targets new file mode 100644 index 0000000000..d8c68fd5ee --- /dev/null +++ b/src/Components/Analyzers/src/build/netstandard2.0/Microsoft.AspNetCore.Components.Analyzers.targets @@ -0,0 +1,34 @@ + + + + + <_AspNetCoreComponentsAnalyzerName Include="$([System.IO.Path]::GetFileNameWithoutExtension('%(Analyzer.Identity)'))" /> + + + + <_AspNetCoreComponentsAnalyzerPath>$([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)../../analyzers/dotnet/cs/Microsoft.AspNetCore.Components.Analyzers.dll')) + + + + + + + diff --git a/src/Components/Analyzers/src/buildTransitive/netstandard2.0/Microsoft.AspNetCore.Components.Analyzers.targets b/src/Components/Analyzers/src/buildTransitive/netstandard2.0/Microsoft.AspNetCore.Components.Analyzers.targets new file mode 100644 index 0000000000..fd79fdac66 --- /dev/null +++ b/src/Components/Analyzers/src/buildTransitive/netstandard2.0/Microsoft.AspNetCore.Components.Analyzers.targets @@ -0,0 +1,3 @@ + + + From d7f98bd562041645c212be1992c9f27aaba60dbd Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 14 Feb 2020 08:34:44 -0800 Subject: [PATCH 095/116] Use reference equality to compare model instances in EditContext (#18172) (#18649) * Use reference equality to compare model instances in EditContext Fixes https://github.com/aspnet/AspNetCore/issues/18069 --- src/Components/Forms/src/FieldIdentifier.cs | 16 +++++-- src/Components/Forms/test/EditContextTest.cs | 30 +++++++++++++ .../Forms/test/FieldIdentifierTest.cs | 42 +++++++++++++++++++ 3 files changed, 85 insertions(+), 3 deletions(-) diff --git a/src/Components/Forms/src/FieldIdentifier.cs b/src/Components/Forms/src/FieldIdentifier.cs index 1c2c923d38..41fe513a43 100644 --- a/src/Components/Forms/src/FieldIdentifier.cs +++ b/src/Components/Forms/src/FieldIdentifier.cs @@ -3,6 +3,7 @@ using System; using System.Linq.Expressions; +using System.Runtime.CompilerServices; namespace Microsoft.AspNetCore.Components.Forms { @@ -35,7 +36,7 @@ namespace Microsoft.AspNetCore.Components.Forms /// The name of the editable field. public FieldIdentifier(object model, string fieldName) { - if (model == null) + if (model is null) { throw new ArgumentNullException(nameof(model)); } @@ -64,7 +65,16 @@ namespace Microsoft.AspNetCore.Components.Forms /// public override int GetHashCode() - => (Model, FieldName).GetHashCode(); + { + // We want to compare Model instances by reference. RuntimeHelpers.GetHashCode returns identical hashes for equal object references (ignoring any `Equals`/`GetHashCode` overrides) which is what we want. + var modelHash = RuntimeHelpers.GetHashCode(Model); + var fieldHash = StringComparer.Ordinal.GetHashCode(FieldName); + return ( + modelHash, + fieldHash + ) + .GetHashCode(); + } /// public override bool Equals(object obj) @@ -75,7 +85,7 @@ namespace Microsoft.AspNetCore.Components.Forms public bool Equals(FieldIdentifier otherIdentifier) { return - otherIdentifier.Model == Model && + ReferenceEquals(otherIdentifier.Model, Model) && string.Equals(otherIdentifier.FieldName, FieldName, StringComparison.Ordinal); } diff --git a/src/Components/Forms/test/EditContextTest.cs b/src/Components/Forms/test/EditContextTest.cs index 5c8e7af36e..e26bda2c7f 100644 --- a/src/Components/Forms/test/EditContextTest.cs +++ b/src/Components/Forms/test/EditContextTest.cs @@ -236,5 +236,35 @@ namespace Microsoft.AspNetCore.Components.Forms Assert.False(isValid); Assert.Equal(new[] { "Some message" }, editContext.GetValidationMessages()); } + + [Fact] + public void LookingUpModel_ThatOverridesGetHashCodeAndEquals_Works() + { + // Test for https://github.com/aspnet/AspNetCore/issues/18069 + // Arrange + var model = new EquatableModel(); + var editContext = new EditContext(model); + + editContext.NotifyFieldChanged(editContext.Field(nameof(EquatableModel.Property))); + + model.Property = "new value"; + + Assert.True(editContext.IsModified(editContext.Field(nameof(EquatableModel.Property)))); + } + + class EquatableModel : IEquatable + { + public string Property { get; set; } = ""; + + public bool Equals(EquatableModel other) + { + return string.Equals(Property, other?.Property, StringComparison.Ordinal); + } + + public override int GetHashCode() + { + return StringComparer.Ordinal.GetHashCode(Property); + } + } } } diff --git a/src/Components/Forms/test/FieldIdentifierTest.cs b/src/Components/Forms/test/FieldIdentifierTest.cs index f19751a45d..6192017b59 100644 --- a/src/Components/Forms/test/FieldIdentifierTest.cs +++ b/src/Components/Forms/test/FieldIdentifierTest.cs @@ -76,6 +76,19 @@ namespace Microsoft.AspNetCore.Components.Forms Assert.False(fieldIdentifier1.Equals(fieldIdentifier2)); } + [Fact] + public void FieldIdentifier_ForModelWithoutField_ProduceSameHashCodesAndEquality() + { + // Arrange + var model = new object(); + var fieldIdentifier1 = new FieldIdentifier(model, fieldName: string.Empty); + var fieldIdentifier2 = new FieldIdentifier(model, fieldName: string.Empty); + + // Act/Assert + Assert.Equal(fieldIdentifier1.GetHashCode(), fieldIdentifier2.GetHashCode()); + Assert.True(fieldIdentifier1.Equals(fieldIdentifier2)); + } + [Fact] public void SameContentsProduceSameHashCodesAndEquality() { @@ -89,6 +102,20 @@ namespace Microsoft.AspNetCore.Components.Forms Assert.True(fieldIdentifier1.Equals(fieldIdentifier2)); } + [Fact] + public void SameContents_WithOverridenEqualsAndGetHashCode_ProduceSameHashCodesAndEquality() + { + // Arrange + var model = new EquatableModel(); + var fieldIdentifier1 = new FieldIdentifier(model, nameof(EquatableModel.Property)); + model.Property = "changed value"; // To show it makes no difference if the overridden `GetHashCode` result changes + var fieldIdentifier2 = new FieldIdentifier(model, nameof(EquatableModel.Property)); + + // Act/Assert + Assert.Equal(fieldIdentifier1.GetHashCode(), fieldIdentifier2.GetHashCode()); + Assert.True(fieldIdentifier1.Equals(fieldIdentifier2)); + } + [Fact] public void FieldNamesAreCaseSensitive() { @@ -194,5 +221,20 @@ namespace Microsoft.AspNetCore.Components.Forms { public TestModel Child { get; set; } } + + class EquatableModel : IEquatable + { + public string Property { get; set; } = ""; + + public bool Equals(EquatableModel other) + { + return string.Equals(Property, other?.Property, StringComparison.Ordinal); + } + + public override int GetHashCode() + { + return StringComparer.Ordinal.GetHashCode(Property); + } + } } } From e8d31697ad8cf227034de8119c3f3f14e164dab9 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 14 Feb 2020 08:35:06 -0800 Subject: [PATCH 096/116] Add an option to enable runtime compilation (#18648) --- ...etCore.Mvc.Razor.RuntimeCompilation.csproj | 1 + .../src/Properties/AssemblyInfo.cs | 4 ++++ .../RazorRuntimeCompilationHostingStartup.cs | 17 ++++++++++++++ .../RazorPagesWeb-CSharp.csproj.in | 9 ++++---- .../StarterWeb-CSharp.csproj.in | 9 ++++---- .../.template.config/dotnetcli.host.json | 4 ++++ .../.template.config/template.json | 6 +++++ .../.template.config/vs-2017.3.host.json | 9 ++++++++ .../Properties/launchSettings.json | 22 +++++++++++++----- .../.template.config/dotnetcli.host.json | 4 ++++ .../.template.config/template.json | 6 +++++ .../.template.config/vs-2017.3.host.json | 9 ++++++++ .../Properties/launchSettings.json | 22 +++++++++++++----- src/ProjectTemplates/test/MvcTemplateTest.cs | 19 +++++++++++++++ .../test/RazorPagesTemplateTest.cs | 23 +++++++++++++++++++ 15 files changed, 144 insertions(+), 20 deletions(-) create mode 100644 src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorRuntimeCompilationHostingStartup.cs diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj index 1476267dfc..ee568fe903 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj @@ -12,6 +12,7 @@ + diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Properties/AssemblyInfo.cs index 472b09032a..bb42a1ab38 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Properties/AssemblyInfo.cs +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Properties/AssemblyInfo.cs @@ -2,6 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Runtime.CompilerServices; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation; [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] + +[assembly: HostingStartup(typeof(RazorRuntimeCompilationHostingStartup))] \ No newline at end of file diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorRuntimeCompilationHostingStartup.cs b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorRuntimeCompilationHostingStartup.cs new file mode 100644 index 0000000000..62eee8072a --- /dev/null +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/RazorRuntimeCompilationHostingStartup.cs @@ -0,0 +1,17 @@ +// 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 Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.DependencyInjection; + +namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation +{ + internal sealed class RazorRuntimeCompilationHostingStartup : IHostingStartup + { + public void Configure(IWebHostBuilder builder) + { + // Add Razor services + builder.ConfigureServices(services => RazorRuntimeCompilationMvcCoreBuilderExtensions.AddServices(services)); + } + } +} diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in index ab090ad09e..5157f8936f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in @@ -7,16 +7,16 @@ 1 True Company.WebApplication1 + false - - - + + + - @@ -26,6 +26,7 @@ + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in index 70d65ede37..9b38d19da0 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in +++ b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in @@ -7,16 +7,16 @@ 1 True Company.WebApplication1 + false - - - + + + - @@ -26,6 +26,7 @@ + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/dotnetcli.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/dotnetcli.host.json index c39487b527..324da5d6ae 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/dotnetcli.host.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/dotnetcli.host.json @@ -67,6 +67,10 @@ "NoHttps": { "longName": "no-https", "shortName": "" + }, + "RazorRuntimeCompilation": { + "longName": "razor-runtime-compilation", + "shortName": "rrc" } }, "usageExamples": [ diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json index 5a01244a34..679e237894 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json @@ -304,6 +304,12 @@ "defaultValue": "false", "description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified." }, + "RazorRuntimeCompilation": { + "type": "parameter", + "datatype": "bool", + "defaultValue": "false", + "description": "Determines if the project is configured to use Razor runtime compilation in Debug builds." + }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/vs-2017.3.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/vs-2017.3.host.json index 52ba934378..8ee1e7b877 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/vs-2017.3.host.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/vs-2017.3.host.json @@ -59,6 +59,15 @@ "useHttps": true } ], + "symbolInfo": [ + { + "id": "RazorRuntimeCompilation", + "name": { + "text": "Enable _Razor runtime compilation" + }, + "isVisible": "true" + } + ], "excludeLaunchSettings": false, "azureReplyUrlPortName": "HttpsPort", "minFullFrameworkVersion": "4.6.1", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Properties/launchSettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Properties/launchSettings.json index a65eda75e3..d40962c82d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Properties/launchSettings.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Properties/launchSettings.json @@ -1,11 +1,11 @@ { "iisSettings": { - //#if (WindowsAuth) - "windowsAuthentication": true, - "anonymousAuthentication": false, - //#else - "windowsAuthentication": false, - "anonymousAuthentication": true, + //#if (WindowsAuth) + "windowsAuthentication": true, + "anonymousAuthentication": false, + //#else + "windowsAuthentication": false, + "anonymousAuthentication": true, //#endif "iisExpress": { "applicationUrl": "http://localhost:8080", @@ -21,7 +21,12 @@ "commandName": "IISExpress", "launchBrowser": true, "environmentVariables": { + //#if(RazorRuntimeCompilation) + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" + //#else "ASPNETCORE_ENVIRONMENT": "Development" + //#endif } }, "Company.WebApplication1": { @@ -33,7 +38,12 @@ "applicationUrl": "http://localhost:5000", //#endif "environmentVariables": { + //#if(RazorRuntimeCompilation) + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" + //#else "ASPNETCORE_ENVIRONMENT": "Development" + //#endif } } } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/dotnetcli.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/dotnetcli.host.json index 2473827568..5f4c4c45e5 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/dotnetcli.host.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/dotnetcli.host.json @@ -67,6 +67,10 @@ "NoHttps": { "longName": "no-https", "shortName": "" + }, + "RazorRuntimeCompilation": { + "longName": "razor-runtime-compilation", + "shortName": "rrc" } }, "usageExamples": [ diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json index d01fcbf4f0..8679ada1c6 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json @@ -294,6 +294,12 @@ "defaultValue": "false", "description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified." }, + "RazorRuntimeCompilation": { + "type": "parameter", + "datatype": "bool", + "defaultValue": "false", + "description": "Determines if the project is configured to use Razor runtime compilation in Debug builds." + }, "Framework": { "type": "parameter", "description": "The target framework for the project.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/vs-2017.3.host.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/vs-2017.3.host.json index 35b22113a6..98149ec9ba 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/vs-2017.3.host.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/vs-2017.3.host.json @@ -59,6 +59,15 @@ "useHttps": true } ], + "symbolInfo": [ + { + "id": "RazorRuntimeCompilation", + "name": { + "text": "Enable _Razor runtime compilation" + }, + "isVisible": "true" + } + ], "excludeLaunchSettings": false, "azureReplyUrlPortName": "HttpsPort", "minFullFrameworkVersion": "4.6.1", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Properties/launchSettings.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Properties/launchSettings.json index a65eda75e3..d40962c82d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Properties/launchSettings.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Properties/launchSettings.json @@ -1,11 +1,11 @@ { "iisSettings": { - //#if (WindowsAuth) - "windowsAuthentication": true, - "anonymousAuthentication": false, - //#else - "windowsAuthentication": false, - "anonymousAuthentication": true, + //#if (WindowsAuth) + "windowsAuthentication": true, + "anonymousAuthentication": false, + //#else + "windowsAuthentication": false, + "anonymousAuthentication": true, //#endif "iisExpress": { "applicationUrl": "http://localhost:8080", @@ -21,7 +21,12 @@ "commandName": "IISExpress", "launchBrowser": true, "environmentVariables": { + //#if(RazorRuntimeCompilation) + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" + //#else "ASPNETCORE_ENVIRONMENT": "Development" + //#endif } }, "Company.WebApplication1": { @@ -33,7 +38,12 @@ "applicationUrl": "http://localhost:5000", //#endif "environmentVariables": { + //#if(RazorRuntimeCompilation) + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" + //#else "ASPNETCORE_ENVIRONMENT": "Development" + //#endif } } } diff --git a/src/ProjectTemplates/test/MvcTemplateTest.cs b/src/ProjectTemplates/test/MvcTemplateTest.cs index af43914ed2..543ff779c0 100644 --- a/src/ProjectTemplates/test/MvcTemplateTest.cs +++ b/src/ProjectTemplates/test/MvcTemplateTest.cs @@ -212,5 +212,24 @@ namespace Templates.Test await aspNetProcess.AssertPagesOk(pages); } } + + [Fact] + public async Task MvcTemplate_RazorRuntimeCompilation_BuildsAndPublishes() + { + Project = await ProjectFactory.GetOrCreateProject("mvc_rc", Output); + + var createResult = await Project.RunDotNetNewAsync("mvc", args: new[] { "--razor-runtime-compilation" }); + Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", Project, createResult)); + + // Verify building in debug works + var buildResult = await Project.RunDotNetBuildAsync(); + Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("build", Project, buildResult)); + + // Publish builds in "release" configuration. Running publish should ensure we can compile in release and that we can publish without issues. + buildResult = await Project.RunDotNetPublishAsync(); + Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("publish", Project, buildResult)); + + Assert.False(Directory.Exists(Path.Combine(Project.TemplatePublishDir, "refs")), "The refs directory should not be published."); + } } } diff --git a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs index 7cd41d56b2..3de64d6ea7 100644 --- a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs +++ b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs @@ -209,6 +209,29 @@ namespace Templates.Test } } + [Fact] + public async Task RazorPagesTemplate_RazorRuntimeCompilation_BuildsAndPublishes() + { + Project = await ProjectFactory.GetOrCreateProject("razorpages_rc", Output); + + var createResult = await Project.RunDotNetNewAsync("razor", args: new[] { "--razor-runtime-compilation" }); + Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", Project, createResult)); + + // Verify building in debug works + var buildResult = await Project.RunDotNetBuildAsync(); + Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("build", Project, buildResult)); + + // Publish builds in "release" configuration. Running publish should ensure we can compile in release and that we can publish without issues. + buildResult = await Project.RunDotNetPublishAsync(); + Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("publish", Project, buildResult)); + + Assert.False(Directory.Exists(Path.Combine(Project.TemplatePublishDir, "refs")), "The refs directory should not be published."); + + // Verify ref assemblies isn't published + var refsDirectory = Path.Combine(Project.TemplatePublishDir, "refs"); + Assert.False(Directory.Exists(refsDirectory), $"{refsDirectory} should not be in the publish output."); + } + private string ReadFile(string basePath, string path) { From a633c66dc652397ef6815f22b37d851970f2bad6 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 14 Feb 2020 09:31:17 -0800 Subject: [PATCH 097/116] Fix layout of installer help page for non-ENU locales, #18152 (#18246) --- src/Installers/Windows/SharedFrameworkBundle/thm.xml | 2 +- src/Installers/Windows/WindowsHostingBundle/thm.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Installers/Windows/SharedFrameworkBundle/thm.xml b/src/Installers/Windows/SharedFrameworkBundle/thm.xml index c6e709b039..4873d0af14 100644 --- a/src/Installers/Windows/SharedFrameworkBundle/thm.xml +++ b/src/Installers/Windows/SharedFrameworkBundle/thm.xml @@ -1,6 +1,6 @@ - #(loc.Caption) + #(loc.Caption) Segoe UI Segoe UI Segoe UI diff --git a/src/Installers/Windows/WindowsHostingBundle/thm.xml b/src/Installers/Windows/WindowsHostingBundle/thm.xml index 29404280a1..8ec784cd41 100644 --- a/src/Installers/Windows/WindowsHostingBundle/thm.xml +++ b/src/Installers/Windows/WindowsHostingBundle/thm.xml @@ -1,6 +1,6 @@ - #(loc.Caption) + #(loc.Caption) Segoe UI Segoe UI Segoe UI From 7fa6d1964444b990890c18f32c0345094ff5b76f Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Fri, 14 Feb 2020 09:32:36 -0800 Subject: [PATCH 098/116] Add option to interpret request headers as Latin1 (#18255) --- ...t.AspNetCore.Server.Kestrel.Core.Manual.cs | 7 +- .../Core/src/Internal/ConfigurationReader.cs | 17 +- .../Internal/Http/HttpHeaders.Generated.cs | 4 +- .../Core/src/Internal/Http/HttpProtocol.cs | 8 +- .../src/Internal/Http/HttpRequestHeaders.cs | 6 +- .../Internal/Infrastructure/HttpUtilities.cs | 33 +++- .../Infrastructure/StringUtilities.cs | 145 +++++++++++++++++- .../Core/src/KestrelConfigurationLoader.cs | 2 + .../Kestrel/Core/src/KestrelServerOptions.cs | 5 + .../Core/test/HttpRequestHeadersTests.cs | 90 ++++++++++- src/Servers/Kestrel/Core/test/UTF8Decoding.cs | 4 +- .../test/KestrelConfigurationBuilderTests.cs | 21 +++ .../BytesToStringBenchmark.cs | 4 +- src/Servers/Kestrel/shared/KnownHeaders.cs | 4 +- .../Http2/Http2StreamTests.cs | 60 ++++++++ .../Http2/Http2TestBase.cs | 2 +- .../InMemory.FunctionalTests/RequestTests.cs | 63 ++++++++ 17 files changed, 451 insertions(+), 24 deletions(-) diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs index a0d91f8606..4dec82338a 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs @@ -40,6 +40,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core { internal System.Security.Cryptography.X509Certificates.X509Certificate2 DefaultCertificate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } internal bool IsDevCertLoaded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + internal bool Latin1RequestHeaders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } internal System.Collections.Generic.List ListenOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } internal void ApplyDefaultCert(Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions httpsOptions) { } internal void ApplyEndpointDefaults(Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions listenOptions) { } @@ -433,6 +434,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal public System.Collections.Generic.IDictionary Certificates { get { throw null; } } public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.EndpointDefaults EndpointDefaults { get { throw null; } } public System.Collections.Generic.IEnumerable Endpoints { get { throw null; } } + public bool Latin1RequestHeaders { get { throw null; } } } internal partial class HttpConnectionContext { @@ -879,7 +881,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } internal sealed partial class HttpRequestHeaders : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpHeaders { - public HttpRequestHeaders(bool reuseHeaderValues = true) { } + public HttpRequestHeaders(bool reuseHeaderValues = true, bool useLatin1 = false) { } public bool HasConnection { get { throw null; } } public bool HasTransferEncoding { get { throw null; } } public Microsoft.Extensions.Primitives.StringValues HeaderAccept { get { throw null; } set { } } @@ -1614,7 +1616,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure public const string Http2Version = "HTTP/2"; public const string HttpsUriScheme = "https://"; public const string HttpUriScheme = "http://"; - public static string GetAsciiOrUTF8StringNonNullCharacters(this System.Span span) { throw null; } public static string GetAsciiStringEscaped(this System.Span span, int maxChars) { throw null; } public static string GetAsciiStringNonNullCharacters(this System.Span span) { throw null; } public static string GetHeaderName(this System.Span span) { throw null; } @@ -1624,6 +1625,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod GetKnownMethod(string value) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal unsafe static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion GetKnownVersion(byte* location, int length) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GetKnownVersion(this System.Span span, out Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion knownVersion, out byte length) { throw null; } + public static string GetRequestHeaderStringNonNullCharacters(this System.Span span, bool useLatin1) { throw null; } public static bool IsHostHeaderValid(string hostText) { throw null; } public static string MethodToString(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod method) { throw null; } public static string SchemeToString(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpScheme scheme) { throw null; } @@ -1683,6 +1685,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure public static bool BytesOrdinalEqualsStringAndAscii(string previousValue, System.Span newValue) { throw null; } public static string ConcatAsHexSuffix(string str, char separator, uint number) { throw null; } public unsafe static bool TryGetAsciiString(byte* input, char* output, int count) { throw null; } + public unsafe static bool TryGetLatin1String(byte* input, char* output, int count) { throw null; } } internal partial class TimeoutControl : Microsoft.AspNetCore.Server.Kestrel.Core.Features.IConnectionTimeoutFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl { diff --git a/src/Servers/Kestrel/Core/src/Internal/ConfigurationReader.cs b/src/Servers/Kestrel/Core/src/Internal/ConfigurationReader.cs index 259f2c61b6..79dc84d5c1 100644 --- a/src/Servers/Kestrel/Core/src/Internal/ConfigurationReader.cs +++ b/src/Servers/Kestrel/Core/src/Internal/ConfigurationReader.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; @@ -15,11 +15,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal private const string EndpointDefaultsKey = "EndpointDefaults"; private const string EndpointsKey = "Endpoints"; private const string UrlKey = "Url"; + private const string Latin1RequestHeadersKey = "Latin1RequestHeaders"; private IConfiguration _configuration; private IDictionary _certificates; private IList _endpoints; private EndpointDefaults _endpointDefaults; + private bool? _latin1RequestHeaders; public ConfigurationReader(IConfiguration configuration) { @@ -65,6 +67,19 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal } } + public bool Latin1RequestHeaders + { + get + { + if (_latin1RequestHeaders is null) + { + _latin1RequestHeaders = _configuration.GetValue(Latin1RequestHeadersKey); + } + + return _latin1RequestHeaders.Value; + } + } + private void ReadCertificates() { _certificates = new Dictionary(0); diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs index e626a19d9c..aa22d87a86 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs @@ -6105,7 +6105,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } // We didn't have a previous matching header value, or have already added a header, so get the string for this value. - var valueStr = value.GetAsciiOrUTF8StringNonNullCharacters(); + var valueStr = value.GetRequestHeaderStringNonNullCharacters(_useLatin1); if ((_bits & flag) == 0) { // We didn't already have a header set, so add a new one. @@ -6123,7 +6123,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http // The header was not one of the "known" headers. // Convert value to string first, because passing two spans causes 8 bytes stack zeroing in // this method with rep stosd, which is slower than necessary. - var valueStr = value.GetAsciiOrUTF8StringNonNullCharacters(); + var valueStr = value.GetRequestHeaderStringNonNullCharacters(_useLatin1); AppendUnknownHeaders(name, valueStr); } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs index 7f10c3af64..f2d1564334 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs @@ -77,7 +77,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http _context = context; ServerOptions = ServiceContext.ServerOptions; - HttpRequestHeaders = new HttpRequestHeaders(reuseHeaderValues: !ServerOptions.DisableStringReuse); + + HttpRequestHeaders = new HttpRequestHeaders( + reuseHeaderValues: !ServerOptions.DisableStringReuse, + useLatin1: ServerOptions.Latin1RequestHeaders); + HttpResponseControl = this; } @@ -513,7 +517,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } string key = name.GetHeaderName(); - var valueStr = value.GetAsciiOrUTF8StringNonNullCharacters(); + var valueStr = value.GetRequestHeaderStringNonNullCharacters(ServerOptions.Latin1RequestHeaders); RequestTrailers.Append(key, valueStr); } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs index 32e9e41d84..af631f6442 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs @@ -15,11 +15,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http internal sealed partial class HttpRequestHeaders : HttpHeaders { private readonly bool _reuseHeaderValues; + private readonly bool _useLatin1; private long _previousBits = 0; - public HttpRequestHeaders(bool reuseHeaderValues = true) + public HttpRequestHeaders(bool reuseHeaderValues = true, bool useLatin1 = false) { _reuseHeaderValues = reuseHeaderValues; + _useLatin1 = useLatin1; } public void OnHeadersComplete() @@ -80,7 +82,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http parsed < 0 || consumed != value.Length) { - BadHttpRequestException.Throw(RequestRejectionReason.InvalidContentLength, value.GetAsciiOrUTF8StringNonNullCharacters()); + BadHttpRequestException.Throw(RequestRejectionReason.InvalidContentLength, value.GetRequestHeaderStringNonNullCharacters(_useLatin1)); } _contentLength = parsed; diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs index f57c296e1e..04fd9711d7 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs @@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure fixed (char* output = asciiString) fixed (byte* buffer = span) { - // This version if AsciiUtilities returns null if there are any null (0 byte) characters + // StringUtilities.TryGetAsciiString returns null if there are any null (0 byte) characters // in the string if (!StringUtilities.TryGetAsciiString(buffer, output, span.Length)) { @@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure return asciiString; } - public static unsafe string GetAsciiOrUTF8StringNonNullCharacters(this Span span) + private static unsafe string GetAsciiOrUTF8StringNonNullCharacters(this Span span) { if (span.IsEmpty) { @@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure fixed (char* output = resultString) fixed (byte* buffer = span) { - // This version if AsciiUtilities returns null if there are any null (0 byte) characters + // StringUtilities.TryGetAsciiString returns null if there are any null (0 byte) characters // in the string if (!StringUtilities.TryGetAsciiString(buffer, output, span.Length)) { @@ -162,9 +162,36 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure } } } + return resultString; } + private static unsafe string GetLatin1StringNonNullCharacters(this Span span) + { + if (span.IsEmpty) + { + return string.Empty; + } + + var resultString = new string('\0', span.Length); + + fixed (char* output = resultString) + fixed (byte* buffer = span) + { + // This returns false if there are any null (0 byte) characters in the string. + if (!StringUtilities.TryGetLatin1String(buffer, output, span.Length)) + { + // null characters are considered invalid + throw new InvalidOperationException(); + } + } + + return resultString; + } + + public static string GetRequestHeaderStringNonNullCharacters(this Span span, bool useLatin1) => + useLatin1 ? GetLatin1StringNonNullCharacters(span) : GetAsciiOrUTF8StringNonNullCharacters(span); + public static string GetAsciiStringEscaped(this Span span, int maxChars) { var sb = new StringBuilder(); diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/StringUtilities.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/StringUtilities.cs index aea8290b66..268d77a0e4 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/StringUtilities.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/StringUtilities.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Buffers.Binary; using System.Diagnostics; using System.Numerics; using System.Runtime.CompilerServices; @@ -17,6 +16,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure [MethodImpl(MethodImplOptions.AggressiveOptimization)] public static unsafe bool TryGetAsciiString(byte* input, char* output, int count) { + Debug.Assert(input != null); + Debug.Assert(output != null); + // Calculate end position var end = input + count; // Start as valid @@ -115,6 +117,111 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure return isValid; } + [MethodImpl(MethodImplOptions.AggressiveOptimization)] + public static unsafe bool TryGetLatin1String(byte* input, char* output, int count) + { + Debug.Assert(input != null); + Debug.Assert(output != null); + + // Calculate end position + var end = input + count; + // Start as valid + var isValid = true; + + do + { + // If Vector not-accelerated or remaining less than vector size + if (!Vector.IsHardwareAccelerated || input > end - Vector.Count) + { + if (IntPtr.Size == 8) // Use Intrinsic switch for branch elimination + { + // 64-bit: Loop longs by default + while (input <= end - sizeof(long)) + { + isValid &= CheckBytesNotNull(((long*)input)[0]); + + output[0] = (char)input[0]; + output[1] = (char)input[1]; + output[2] = (char)input[2]; + output[3] = (char)input[3]; + output[4] = (char)input[4]; + output[5] = (char)input[5]; + output[6] = (char)input[6]; + output[7] = (char)input[7]; + + input += sizeof(long); + output += sizeof(long); + } + if (input <= end - sizeof(int)) + { + isValid &= CheckBytesNotNull(((int*)input)[0]); + + output[0] = (char)input[0]; + output[1] = (char)input[1]; + output[2] = (char)input[2]; + output[3] = (char)input[3]; + + input += sizeof(int); + output += sizeof(int); + } + } + else + { + // 32-bit: Loop ints by default + while (input <= end - sizeof(int)) + { + isValid &= CheckBytesNotNull(((int*)input)[0]); + + output[0] = (char)input[0]; + output[1] = (char)input[1]; + output[2] = (char)input[2]; + output[3] = (char)input[3]; + + input += sizeof(int); + output += sizeof(int); + } + } + if (input <= end - sizeof(short)) + { + isValid &= CheckBytesNotNull(((short*)input)[0]); + + output[0] = (char)input[0]; + output[1] = (char)input[1]; + + input += sizeof(short); + output += sizeof(short); + } + if (input < end) + { + isValid &= CheckBytesNotNull(((sbyte*)input)[0]); + output[0] = (char)input[0]; + } + + return isValid; + } + + // do/while as entry condition already checked + do + { + // Use byte/ushort instead of signed equivalents to ensure it doesn't fill based on the high bit. + var vector = Unsafe.AsRef>(input); + isValid &= CheckBytesNotNull(vector); + Vector.Widen( + vector, + out Unsafe.AsRef>(output), + out Unsafe.AsRef>(output + Vector.Count)); + + input += Vector.Count; + output += Vector.Count; + } while (input <= end - Vector.Count); + + // Vector path done, loop back to do non-Vector + // If is a exact multiple of vector size, bail now + } while (input < end); + + return isValid; + } + [MethodImpl(MethodImplOptions.AggressiveOptimization)] public unsafe static bool BytesOrdinalEqualsStringAndAscii(string previousValue, Span newValue) { @@ -421,7 +528,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure // Validate: bytes != 0 && bytes <= 127 // Subtract 1 from all bytes to move 0 to high bits // bitwise or with self to catch all > 127 bytes - // mask off high bits and check if 0 + // mask off non high bits and check if 0 [MethodImpl(MethodImplOptions.AggressiveInlining)] // Needs a push private static bool CheckBytesInAsciiRange(long check) @@ -444,5 +551,39 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure private static bool CheckBytesInAsciiRange(sbyte check) => check > 0; + + [MethodImpl(MethodImplOptions.AggressiveInlining)] // Needs a push + private static bool CheckBytesNotNull(Vector check) + { + // Vectorized byte range check, signed byte != null + return !Vector.EqualsAny(check, Vector.Zero); + } + + // Validate: bytes != 0 + // Subtract 1 from all bytes to move 0 to high bits + // bitwise and with ~check so high bits are only set for bytes that were originally 0 + // mask off non high bits and check if 0 + + [MethodImpl(MethodImplOptions.AggressiveInlining)] // Needs a push + private static bool CheckBytesNotNull(long check) + { + const long HighBits = unchecked((long)0x8080808080808080L); + return ((check - 0x0101010101010101L) & ~check & HighBits) == 0; + } + + private static bool CheckBytesNotNull(int check) + { + const int HighBits = unchecked((int)0x80808080); + return ((check - 0x01010101) & ~check & HighBits) == 0; + } + + private static bool CheckBytesNotNull(short check) + { + const short HighBits = unchecked((short)0x8080); + return ((check - 0x0101) & ~check & HighBits) == 0; + } + + private static bool CheckBytesNotNull(sbyte check) + => check != 0; } } diff --git a/src/Servers/Kestrel/Core/src/KestrelConfigurationLoader.cs b/src/Servers/Kestrel/Core/src/KestrelConfigurationLoader.cs index 4522fedd62..5e202f3efa 100644 --- a/src/Servers/Kestrel/Core/src/KestrelConfigurationLoader.cs +++ b/src/Servers/Kestrel/Core/src/KestrelConfigurationLoader.cs @@ -222,6 +222,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel } _loaded = true; + Options.Latin1RequestHeaders = ConfigurationReader.Latin1RequestHeaders; + LoadDefaultCert(ConfigurationReader); foreach (var endpoint in ConfigurationReader.Endpoints) diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs index c383945c98..35a5b0bd49 100644 --- a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs +++ b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs @@ -92,6 +92,11 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core /// internal bool IsDevCertLoaded { get; set; } + /// + /// Treat request headers as Latin-1 or ISO/IEC 8859-1 instead of UTF-8. + /// + internal bool Latin1RequestHeaders { get; set; } + /// /// Specifies a configuration Action to run for each newly created endpoint. Calling this again will replace /// the prior action. diff --git a/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs b/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs index a7603b9190..d87f1f814f 100644 --- a/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs +++ b/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs @@ -318,6 +318,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests public void ValueReuseOnlyWhenAllowed(bool reuseValue, KnownHeader header) { const string HeaderValue = "Hello"; + var headers = new HttpRequestHeaders(reuseHeaderValues: reuseValue); for (var i = 0; i < 6; i++) @@ -336,14 +337,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests Assert.Equal(values.PrevHeaderValue, values.NextHeaderValue); if (reuseValue) { - // When materalized string is reused previous and new should be the same object + // When materialized string is reused previous and new should be the same object Assert.Same(values.PrevHeaderValue, values.NextHeaderValue); } else { - // When materalized string is not reused previous and new should be the different objects + // When materialized string is not reused previous and new should be the different objects Assert.NotSame(values.PrevHeaderValue, values.NextHeaderValue); - } + } } } @@ -483,6 +484,89 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests } } + [Theory] + [MemberData(nameof(KnownRequestHeaders))] + public void Latin1ValuesAcceptedInLatin1ModeButNotReused(bool reuseValue, KnownHeader header) + { + var headers = new HttpRequestHeaders(reuseHeaderValues: reuseValue, useLatin1: true); + + var headerValue = new char[127]; // 64 + 32 + 16 + 8 + 4 + 2 + 1 + for (var i = 0; i < headerValue.Length; i++) + { + headerValue[i] = 'a'; + } + + for (var i = 0; i < headerValue.Length; i++) + { + // Set non-ascii Latin char that is valid Utf16 when widened; but not a valid utf8 -> utf16 conversion. + headerValue[i] = '\u00a3'; + + for (var mode = 0; mode <= 1; mode++) + { + string headerValueUtf16Latin1CrossOver; + if (mode == 0) + { + // Full length + headerValueUtf16Latin1CrossOver = new string(headerValue); + } + else + { + // Truncated length (to ensure different paths from changing lengths in matching) + headerValueUtf16Latin1CrossOver = new string(headerValue.AsSpan().Slice(0, i + 1)); + } + + headers.Reset(); + + var headerName = Encoding.ASCII.GetBytes(header.Name).AsSpan(); + var latinValueSpan = Encoding.GetEncoding("iso-8859-1").GetBytes(headerValueUtf16Latin1CrossOver).AsSpan(); + + Assert.False(latinValueSpan.SequenceEqual(Encoding.ASCII.GetBytes(headerValueUtf16Latin1CrossOver))); + + headers.Append(headerName, latinValueSpan); + headers.OnHeadersComplete(); + var parsedHeaderValue = ((IHeaderDictionary)headers)[header.Name].ToString(); + + Assert.Equal(headerValueUtf16Latin1CrossOver, parsedHeaderValue); + Assert.NotSame(headerValueUtf16Latin1CrossOver, parsedHeaderValue); + } + + // Reset back to Ascii + headerValue[i] = 'a'; + } + } + + [Theory] + [MemberData(nameof(KnownRequestHeaders))] + public void NullCharactersRejectedInUTF8AndLatin1Mode(bool useLatin1, KnownHeader header) + { + var headers = new HttpRequestHeaders(useLatin1: useLatin1); + + var valueArray = new char[127]; // 64 + 32 + 16 + 8 + 4 + 2 + 1 + for (var i = 0; i < valueArray.Length; i++) + { + valueArray[i] = 'a'; + } + + for (var i = 1; i < valueArray.Length; i++) + { + // Set non-ascii Latin char that is valid Utf16 when widened; but not a valid utf8 -> utf16 conversion. + valueArray[i] = '\0'; + string valueString = new string(valueArray); + + headers.Reset(); + + Assert.Throws(() => + { + var headerName = Encoding.ASCII.GetBytes(header.Name).AsSpan(); + var valueSpan = Encoding.ASCII.GetBytes(valueString).AsSpan(); + + headers.Append(headerName, valueSpan); + }); + + valueArray[i] = 'a'; + } + } + [Fact] public void ValueReuseNeverWhenUnknownHeader() { diff --git a/src/Servers/Kestrel/Core/test/UTF8Decoding.cs b/src/Servers/Kestrel/Core/test/UTF8Decoding.cs index 532e13781d..4c4e377400 100644 --- a/src/Servers/Kestrel/Core/test/UTF8Decoding.cs +++ b/src/Servers/Kestrel/Core/test/UTF8Decoding.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests [InlineData(new byte[] { 0xef, 0xbf, 0xbd })] // 3 bytes: Replacement character, highest UTF-8 character currently encoded in the UTF-8 code page private void FullUTF8RangeSupported(byte[] encodedBytes) { - var s = encodedBytes.AsSpan().GetAsciiOrUTF8StringNonNullCharacters(); + var s = encodedBytes.AsSpan().GetRequestHeaderStringNonNullCharacters(useLatin1: false); Assert.Equal(1, s.Length); } @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var byteRange = Enumerable.Range(1, length).Select(x => (byte)x).ToArray(); Array.Copy(bytes, 0, byteRange, position, bytes.Length); - Assert.Throws(() => byteRange.AsSpan().GetAsciiOrUTF8StringNonNullCharacters()); + Assert.Throws(() => byteRange.AsSpan().GetRequestHeaderStringNonNullCharacters(useLatin1: false)); } } } diff --git a/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs b/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs index 5a47957cdf..23fb611551 100644 --- a/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs +++ b/src/Servers/Kestrel/Kestrel/test/KestrelConfigurationBuilderTests.cs @@ -456,6 +456,27 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests Assert.True(ran3); } + [Fact] + public void Latin1RequestHeadersReadFromConfig() + { + var options = CreateServerOptions(); + var config = new ConfigurationBuilder().AddInMemoryCollection().Build(); + + Assert.False(options.Latin1RequestHeaders); + options.Configure(config).Load(); + Assert.False(options.Latin1RequestHeaders); + + options = CreateServerOptions(); + config = new ConfigurationBuilder().AddInMemoryCollection(new[] + { + new KeyValuePair("Latin1RequestHeaders", "true"), + }).Build(); + + Assert.False(options.Latin1RequestHeaders); + options.Configure(config).Load(); + Assert.True(options.Latin1RequestHeaders); + } + private static string GetCertificatePath() { var appData = Environment.GetEnvironmentVariable("APPDATA"); diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/BytesToStringBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/BytesToStringBenchmark.cs index 28f365d7da..cd6d19b75c 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/BytesToStringBenchmark.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/BytesToStringBenchmark.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 BenchmarkDotNet.Attributes; @@ -67,7 +67,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance { for (uint i = 0; i < Iterations; i++) { - HttpUtilities.GetAsciiOrUTF8StringNonNullCharacters(_utf8Bytes); + HttpUtilities.GetRequestHeaderStringNonNullCharacters(_utf8Bytes, useLatin1: false); } } diff --git a/src/Servers/Kestrel/shared/KnownHeaders.cs b/src/Servers/Kestrel/shared/KnownHeaders.cs index e38dfb19a9..b2f3292f34 100644 --- a/src/Servers/Kestrel/shared/KnownHeaders.cs +++ b/src/Servers/Kestrel/shared/KnownHeaders.cs @@ -985,7 +985,7 @@ $@" private void Clear(long bitsToClear) }} // We didn't have a previous matching header value, or have already added a header, so get the string for this value. - var valueStr = value.GetAsciiOrUTF8StringNonNullCharacters(); + var valueStr = value.GetRequestHeaderStringNonNullCharacters(_useLatin1); if ((_bits & flag) == 0) {{ // We didn't already have a header set, so add a new one. @@ -1003,7 +1003,7 @@ $@" private void Clear(long bitsToClear) // The header was not one of the ""known"" headers. // Convert value to string first, because passing two spans causes 8 bytes stack zeroing in // this method with rep stosd, which is slower than necessary. - var valueStr = value.GetAsciiOrUTF8StringNonNullCharacters(); + var valueStr = value.GetRequestHeaderStringNonNullCharacters(_useLatin1); AppendUnknownHeaders(name, valueStr); }} }}" : "")} diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs index 4937000db9..4b1bced230 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2StreamTests.cs @@ -4408,5 +4408,65 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests Assert.Single(_decodedHeaders); Assert.Equal("Custom Value", _decodedHeaders["CustomName"]); } + + [Fact] + public async Task HEADERS_Received_Latin1_AcceptedWhenLatin1OptionIsConfigured() + { + _serviceContext.ServerOptions.Latin1RequestHeaders = true; + + var headers = new[] + { + new KeyValuePair(HeaderNames.Method, "GET"), + new KeyValuePair(HeaderNames.Path, "/"), + new KeyValuePair(HeaderNames.Scheme, "http"), + // The HPackEncoder will encode £ as 0xA3 aka Latin1 encoding. + new KeyValuePair("X-Test", "£"), + }; + + await InitializeConnectionAsync(context => + { + Assert.Equal("£", context.Request.Headers["X-Test"]); + return Task.CompletedTask; + }); + + await StartStreamAsync(1, headers, endStream: true); + + var headersFrame = await ExpectAsync(Http2FrameType.HEADERS, + withLength: 55, + withFlags: (byte)(Http2HeadersFrameFlags.END_HEADERS | Http2HeadersFrameFlags.END_STREAM), + withStreamId: 1); + + await StopConnectionAsync(expectedLastStreamId: 1, ignoreNonGoAwayFrames: false); + + _hpackDecoder.Decode(headersFrame.PayloadSequence, endHeaders: false, handler: this); + + Assert.Equal(3, _decodedHeaders.Count); + Assert.Contains("date", _decodedHeaders.Keys, StringComparer.OrdinalIgnoreCase); + Assert.Equal("200", _decodedHeaders[HeaderNames.Status]); + Assert.Equal("0", _decodedHeaders["content-length"]); + } + + [Fact] + public async Task HEADERS_Received_Latin1_RejectedWhenLatin1OptionIsNotConfigured() + { + var headers = new[] + { + new KeyValuePair(HeaderNames.Method, "GET"), + new KeyValuePair(HeaderNames.Path, "/"), + new KeyValuePair(HeaderNames.Scheme, "http"), + // The HPackEncoder will encode £ as 0xA3 aka Latin1 encoding. + new KeyValuePair("X-Test", "£"), + }; + + await InitializeConnectionAsync(_noopApplication); + + await StartStreamAsync(1, headers, endStream: true); + + await WaitForConnectionErrorAsync( + ignoreNonGoAwayFrames: true, + expectedLastStreamId: 1, + expectedErrorCode: Http2ErrorCode.PROTOCOL_ERROR, + expectedErrorMessage: CoreStrings.BadRequest_MalformedRequestInvalidHeaders); + } } } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs index 5b875bffab..d3d7e0e7ae 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs @@ -402,7 +402,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests void IHttpHeadersHandler.OnHeader(Span name, Span value) { - _decodedHeaders[name.GetAsciiStringNonNullCharacters()] = value.GetAsciiOrUTF8StringNonNullCharacters(); + _decodedHeaders[name.GetAsciiStringNonNullCharacters()] = value.GetRequestHeaderStringNonNullCharacters(useLatin1: _serviceContext.ServerOptions.Latin1RequestHeaders); } void IHttpHeadersHandler.OnHeadersComplete() { } diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs index ed53a2fca8..c10d9d08a0 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs @@ -1653,6 +1653,69 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } } + [Fact] + public async Task Latin1HeaderValueAcceptedWhenLatin1OptionIsConfigured() + { + var testContext = new TestServiceContext(LoggerFactory); + + testContext.ServerOptions.Latin1RequestHeaders = true; + + await using (var server = new TestServer(context => + { + Assert.Equal("£", context.Request.Headers["X-Test"]); + return Task.CompletedTask; + }, testContext)) + { + using (var connection = server.CreateConnection()) + { + // The StreamBackedTestConnection will encode £ using the "iso-8859-1" aka Latin1 encoding. + // It will be encoded as 0xA3 which isn't valid UTF-8. + await connection.Send( + "GET / HTTP/1.1", + "Host:", + "X-Test: £", + "", + ""); + + await connection.Receive( + "HTTP/1.1 200 OK", + $"Date: {testContext.DateHeaderValue}", + "Content-Length: 0", + "", + ""); + } + } + } + + [Fact] + public async Task Latin1HeaderValueRejectedWhenLatin1OptionIsNotConfigured() + { + var testContext = new TestServiceContext(LoggerFactory); + + await using (var server = new TestServer(_ => Task.CompletedTask, testContext)) + { + using (var connection = server.CreateConnection()) + { + // The StreamBackedTestConnection will encode £ using the "iso-8859-1" aka Latin1 encoding. + // It will be encoded as 0xA3 which isn't valid UTF-8. + await connection.Send( + "GET / HTTP/1.1", + "Host:", + "X-Test: £", + "", + ""); + + await connection.ReceiveEnd( + "HTTP/1.1 400 Bad Request", + "Connection: close", + $"Date: {testContext.DateHeaderValue}", + "Content-Length: 0", + "", + ""); + } + } + } + public static TheoryData HostHeaderData => HttpParsingData.HostHeaderData; } } From d05c9f465c53185b99be1af20511ea19642ce9a4 Mon Sep 17 00:00:00 2001 From: Alessio Franceschelli Date: Fri, 14 Feb 2020 17:33:26 +0000 Subject: [PATCH 099/116] HeaderPropagation: reset AsyncLocal per request (#18300) As Kestrel can bleed the AsyncLocal across requests, see https://github.com/aspnet/AspNetCore/issues/13991. --- .../src/HeaderPropagationMiddleware.cs | 5 +- .../test/HeaderPropagationMiddlewareTest.cs | 80 +++++++++++++++---- 2 files changed, 66 insertions(+), 19 deletions(-) diff --git a/src/Middleware/HeaderPropagation/src/HeaderPropagationMiddleware.cs b/src/Middleware/HeaderPropagation/src/HeaderPropagationMiddleware.cs index f62c9e4a72..bd24fb63e2 100644 --- a/src/Middleware/HeaderPropagation/src/HeaderPropagationMiddleware.cs +++ b/src/Middleware/HeaderPropagation/src/HeaderPropagationMiddleware.cs @@ -33,7 +33,8 @@ namespace Microsoft.AspNetCore.HeaderPropagation _values = values ?? throw new ArgumentNullException(nameof(values)); } - public Task Invoke(HttpContext context) + // This needs to be async as otherwise the AsyncLocal could bleed across requests, see https://github.com/aspnet/AspNetCore/issues/13991. + public async Task Invoke(HttpContext context) { // We need to intialize the headers because the message handler will use this to detect misconfiguration. var headers = _values.Headers ??= new Dictionary(StringComparer.OrdinalIgnoreCase); @@ -56,7 +57,7 @@ namespace Microsoft.AspNetCore.HeaderPropagation } } - return _next.Invoke(context); + await _next.Invoke(context); } private static StringValues GetValue(HttpContext context, HeaderPropagationEntry entry) diff --git a/src/Middleware/HeaderPropagation/test/HeaderPropagationMiddlewareTest.cs b/src/Middleware/HeaderPropagation/test/HeaderPropagationMiddlewareTest.cs index f6576d2d68..99bb4997a5 100644 --- a/src/Middleware/HeaderPropagation/test/HeaderPropagationMiddlewareTest.cs +++ b/src/Middleware/HeaderPropagation/test/HeaderPropagationMiddlewareTest.cs @@ -1,6 +1,8 @@ // 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 System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Options; @@ -14,7 +16,11 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests public HeaderPropagationMiddlewareTest() { Context = new DefaultHttpContext(); - Next = ctx => Task.CompletedTask; + Next = ctx => + { + CapturedHeaders = State.Headers; + return Task.CompletedTask; + }; Configuration = new HeaderPropagationOptions(); State = new HeaderPropagationValues(); Middleware = new HeaderPropagationMiddleware(Next, @@ -24,8 +30,10 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests public DefaultHttpContext Context { get; set; } public RequestDelegate Next { get; set; } + public Action Assertion { get; set; } public HeaderPropagationOptions Configuration { get; set; } public HeaderPropagationValues State { get; set; } + public IDictionary CapturedHeaders { get; set; } public HeaderPropagationMiddleware Middleware { get; set; } [Fact] @@ -39,8 +47,8 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests await Middleware.Invoke(Context); // Assert - Assert.Contains("in", State.Headers.Keys); - Assert.Equal(new[] { "test" }, State.Headers["in"]); + Assert.Contains("in", CapturedHeaders.Keys); + Assert.Equal(new[] { "test" }, CapturedHeaders["in"]); } [Fact] @@ -53,7 +61,7 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests await Middleware.Invoke(Context); // Assert - Assert.Empty(State.Headers); + Assert.Empty(CapturedHeaders); } [Fact] @@ -66,7 +74,7 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests await Middleware.Invoke(Context); // Assert - Assert.Empty(State.Headers); + Assert.Empty(CapturedHeaders); } [Fact] @@ -82,10 +90,10 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests await Middleware.Invoke(Context); // Assert - Assert.Contains("in", State.Headers.Keys); - Assert.Equal(new[] { "test" }, State.Headers["in"]); - Assert.Contains("another", State.Headers.Keys); - Assert.Equal(new[] { "test2" }, State.Headers["another"]); + Assert.Contains("in", CapturedHeaders.Keys); + Assert.Equal(new[] { "test" }, CapturedHeaders["in"]); + Assert.Contains("another", CapturedHeaders.Keys); + Assert.Equal(new[] { "test2" }, CapturedHeaders["another"]); } [Theory] @@ -101,7 +109,7 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests await Middleware.Invoke(Context); // Assert - Assert.DoesNotContain("in", State.Headers.Keys); + Assert.DoesNotContain("in", CapturedHeaders.Keys); } [Theory] @@ -127,8 +135,8 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests await Middleware.Invoke(Context); // Assert - Assert.Contains("in", State.Headers.Keys); - Assert.Equal(expectedValues, State.Headers["in"]); + Assert.Contains("in", CapturedHeaders.Keys); + Assert.Equal(expectedValues, CapturedHeaders["in"]); Assert.Equal("in", receivedName); Assert.Equal(new StringValues("value"), receivedValue); Assert.Same(Context, receivedContext); @@ -145,8 +153,8 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests await Middleware.Invoke(Context); // Assert - Assert.Contains("in", State.Headers.Keys); - Assert.Equal("test", State.Headers["in"]); + Assert.Contains("in", CapturedHeaders.Keys); + Assert.Equal("test", CapturedHeaders["in"]); } [Fact] @@ -159,7 +167,7 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests await Middleware.Invoke(Context); // Assert - Assert.DoesNotContain("in", State.Headers.Keys); + Assert.DoesNotContain("in", CapturedHeaders.Keys); } [Fact] @@ -174,8 +182,46 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests await Middleware.Invoke(Context); // Assert - Assert.Contains("in", State.Headers.Keys); - Assert.Equal("Test", State.Headers["in"]); + Assert.Contains("in", CapturedHeaders.Keys); + Assert.Equal("Test", CapturedHeaders["in"]); + } + + [Fact] + public async Task HeaderInRequest_WithBleedAsyncLocal_HasCorrectValue() + { + // Arrange + Configuration.Headers.Add("in"); + + // Process first request + Context.Request.Headers.Add("in", "dirty"); + await Middleware.Invoke(Context); + + // Process second request + Context = new DefaultHttpContext(); + Context.Request.Headers.Add("in", "test"); + await Middleware.Invoke(Context); + + // Assert + Assert.Contains("in", CapturedHeaders.Keys); + Assert.Equal(new[] { "test" }, CapturedHeaders["in"]); + } + + [Fact] + public async Task NoHeaderInRequest_WithBleedAsyncLocal_DoesNotHaveIt() + { + // Arrange + Configuration.Headers.Add("in"); + + // Process first request + Context.Request.Headers.Add("in", "dirty"); + await Middleware.Invoke(Context); + + // Process second request + Context = new DefaultHttpContext(); + await Middleware.Invoke(Context); + + // Assert + Assert.Empty(CapturedHeaders); } } } From ba74c35f0ed7038c521560e32a08c54afcf5d0c7 Mon Sep 17 00:00:00 2001 From: Brennan Date: Fri, 14 Feb 2020 09:35:01 -0800 Subject: [PATCH 100/116] Build 3.1 site extension (#18568) --- Directory.Build.targets | 2 +- eng/Build.props | 1 + ...rosoft.AspNetCore.AzureAppServices.SiteExtension.csproj | 3 +++ .../TransformTest.cs | 4 ++-- src/SiteExtensions/Sdk/SiteExtension.targets | 7 ++++++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 0fbb33c40b..bc8bb5dfc8 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -21,7 +21,7 @@ $(VersionPrefix) $(PackageBrandingVersion) $(BrandingVersionSuffix.Trim()) - $(VersionPrefix) + $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix.Replace('.','-')) $(Version) diff --git a/eng/Build.props b/eng/Build.props index 588be47ca8..42a4992e7d 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -140,6 +140,7 @@ $(RepoRoot)src\Servers\**\*.csproj; $(RepoRoot)src\Security\**\*.*proj; $(RepoRoot)src\SiteExtensions\Microsoft.Web.Xdt.Extensions\**\*.csproj; + $(RepoRoot)src\SiteExtensions\LoggingAggregate\test\**\*.csproj; $(RepoRoot)src\Shared\**\*.*proj; $(RepoRoot)src\Tools\**\*.*proj; $(RepoRoot)src\Middleware\**\*.csproj; diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index e7d1f91f90..18a0870512 100644 --- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -26,6 +26,9 @@ + + + diff --git a/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/TransformTest.cs b/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/TransformTest.cs index 1480483804..6e933e4fe7 100644 --- a/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/TransformTest.cs +++ b/src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/TransformTest.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.AzureAppServices.SiteExtension var depsElement = envNode.FirstChild; Assert.Equal("add", depsElement.Name); Assert.Equal("DOTNET_ADDITIONAL_DEPS", depsElement.Attributes["name"].Value); - Assert.Equal($@"{XdtExtensionPath}\additionalDeps\Microsoft.AspNetCore.AzureAppServices.HostingStartup\;" + + Assert.Equal($@"{XdtExtensionPath}\additionalDeps\;{XdtExtensionPath}\additionalDeps\Microsoft.AspNetCore.AzureAppServices.HostingStartup\;" + @"%ProgramFiles%\dotnet\additionalDeps\Microsoft.AspNetCore.AzureAppServices.HostingStartup\", depsElement.Attributes["value"].Value); @@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.AzureAppServices.SiteExtension Assert.Equal("add", depsElement.Name); Assert.Equal("DOTNET_ADDITIONAL_DEPS", depsElement.Attributes["name"].Value); Assert.Equal(@"ExistingValue1;"+ - $@"{XdtExtensionPath}\additionalDeps\Microsoft.AspNetCore.AzureAppServices.HostingStartup\;" + + $@"{XdtExtensionPath}\additionalDeps\;{XdtExtensionPath}\additionalDeps\Microsoft.AspNetCore.AzureAppServices.HostingStartup\;" + @"%ProgramFiles%\dotnet\additionalDeps\Microsoft.AspNetCore.AzureAppServices.HostingStartup\", depsElement.Attributes["value"].Value); diff --git a/src/SiteExtensions/Sdk/SiteExtension.targets b/src/SiteExtensions/Sdk/SiteExtension.targets index 3c4e9c9b5d..c2bf7ea61a 100644 --- a/src/SiteExtensions/Sdk/SiteExtension.targets +++ b/src/SiteExtensions/Sdk/SiteExtension.targets @@ -42,6 +42,11 @@ <_TemplateFiles Include="$(MSBuildThisFileDirectory)\HostingStartup\*.cs*" /> + <_HostingStartupPackageReference Include="%(HostingStartupPackageReference.Identity)" Source="%(HostingStartupPackageReference.Source)" @@ -50,7 +55,7 @@ Project="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\HostingStartup.csproj" DepsFile="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\p\HostingStartup.deps.json" TrimmedDepsFile="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\%(HostingStartupPackageReference.Identity).deps.json" - PackagePath="$(_BasePackagePath)\shared\Microsoft.AspNetCore.App\$(MicrosoftAspNetCoreAppPackageVersion)\" + PackagePath="$(_BasePackagePath)\shared\Microsoft.AspNetCore.App\$(AspNetCoreMajorMinorVersion).0\" /> From 89ab8633a4773c9600ec4a185daf24c8548ac8e3 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sat, 15 Feb 2020 06:35:41 +1300 Subject: [PATCH 101/116] Update Grpc.AspNetCore template reference to 2.27.0 (#18995) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 799adc7be6..3b01c7b99e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,7 +237,7 @@ 4.2.1 4.2.1 3.8.0 - 2.24.0 + 2.27.0 3.0.0 3.0.0 3.0.0 From f3e2b4d4d14c93016e467c723faf584d9d38454e Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Fri, 14 Feb 2020 09:36:57 -0800 Subject: [PATCH 102/116] Keep Pipe readable after FormPipeReader error (#18939) --- src/Http/WebUtilities/src/FormPipeReader.cs | 10 ++++++- .../WebUtilities/test/FormPipeReaderTests.cs | 29 ++++++++++++++++--- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/Http/WebUtilities/src/FormPipeReader.cs b/src/Http/WebUtilities/src/FormPipeReader.cs index 60f337757b..9cd7e7e35d 100644 --- a/src/Http/WebUtilities/src/FormPipeReader.cs +++ b/src/Http/WebUtilities/src/FormPipeReader.cs @@ -92,7 +92,15 @@ namespace Microsoft.AspNetCore.WebUtilities if (!buffer.IsEmpty) { - ParseFormValues(ref buffer, ref accumulator, readResult.IsCompleted); + try + { + ParseFormValues(ref buffer, ref accumulator, readResult.IsCompleted); + } + catch + { + _pipeReader.AdvanceTo(buffer.Start); + throw; + } } if (readResult.IsCompleted) diff --git a/src/Http/WebUtilities/test/FormPipeReaderTests.cs b/src/Http/WebUtilities/test/FormPipeReaderTests.cs index f0e806aae0..9c973c680d 100644 --- a/src/Http/WebUtilities/test/FormPipeReaderTests.cs +++ b/src/Http/WebUtilities/test/FormPipeReaderTests.cs @@ -94,21 +94,32 @@ namespace Microsoft.AspNetCore.WebUtilities [Fact] public async Task ReadFormAsync_ValueCountLimitExceeded_Throw() { - var bodyPipe = await MakePipeReader("foo=1&baz=2&bar=3&baz=4&baf=5"); + var content = "foo=1&baz=2&bar=3&baz=4&baf=5"; + var bodyPipe = await MakePipeReader(content); var exception = await Assert.ThrowsAsync( () => ReadFormAsync(new FormPipeReader(bodyPipe) { ValueCountLimit = 3 })); Assert.Equal("Form value count limit 3 exceeded.", exception.Message); + + // The body pipe is still readable and has not advanced. + var readResult = await bodyPipe.ReadAsync(); + Assert.Equal(Encoding.UTF8.GetBytes(content), readResult.Buffer.ToArray()); } [Fact] public async Task ReadFormAsync_ValueCountLimitExceededSameKey_Throw() { - var bodyPipe = await MakePipeReader("baz=1&baz=2&baz=3&baz=4"); + var content = "baz=1&baz=2&baz=3&baz=4"; + var bodyPipe = await MakePipeReader(content); var exception = await Assert.ThrowsAsync( () => ReadFormAsync(new FormPipeReader(bodyPipe) { ValueCountLimit = 3 })); Assert.Equal("Form value count limit 3 exceeded.", exception.Message); + + + // The body pipe is still readable and has not advanced. + var readResult = await bodyPipe.ReadAsync(); + Assert.Equal(Encoding.UTF8.GetBytes(content), readResult.Buffer.ToArray()); } [Fact] @@ -127,11 +138,16 @@ namespace Microsoft.AspNetCore.WebUtilities [Fact] public async Task ReadFormAsync_KeyLengthLimitExceeded_Throw() { - var bodyPipe = await MakePipeReader("foo=1&baz12345678=2"); + var content = "foo=1&baz12345678=2"; + var bodyPipe = await MakePipeReader(content); var exception = await Assert.ThrowsAsync( () => ReadFormAsync(new FormPipeReader(bodyPipe) { KeyLengthLimit = 10 })); Assert.Equal("Form key length limit 10 exceeded.", exception.Message); + + // The body pipe is still readable and has not advanced. + var readResult = await bodyPipe.ReadAsync(); + Assert.Equal(Encoding.UTF8.GetBytes(content), readResult.Buffer.ToArray()); } [Fact] @@ -150,11 +166,16 @@ namespace Microsoft.AspNetCore.WebUtilities [Fact] public async Task ReadFormAsync_ValueLengthLimitExceeded_Throw() { - var bodyPipe = await MakePipeReader("foo=1&baz=12345678901"); + var content = "foo=1&baz=12345678901"; + var bodyPipe = await MakePipeReader(content); var exception = await Assert.ThrowsAsync( () => ReadFormAsync(new FormPipeReader(bodyPipe) { ValueLengthLimit = 10 })); Assert.Equal("Form value length limit 10 exceeded.", exception.Message); + + // The body pipe is still readable and has not advanced. + var readResult = await bodyPipe.ReadAsync(); + Assert.Equal(Encoding.UTF8.GetBytes(content), readResult.Buffer.ToArray()); } // https://en.wikipedia.org/wiki/Percent-encoding From 439f4af49c9eaf5ad4dffeb8aff2e720297fd854 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Fri, 14 Feb 2020 09:38:31 -0800 Subject: [PATCH 103/116] Cache _absoluteRequestTarget when reusing strings (#18547) --- .../Core/src/Internal/Http/Http1Connection.cs | 19 +++++++++-- .../Core/src/Internal/Http/HttpProtocol.cs | 5 --- .../InMemory.FunctionalTests/RequestTests.cs | 33 ++++++++++++++++++- 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs index 8cf1bd068b..d703bc71fe 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs @@ -34,6 +34,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http private HttpRequestTarget _requestTargetForm = HttpRequestTarget.Unknown; private Uri _absoluteRequestTarget; + // The _parsed fields cache the Path, QueryString, RawTarget, and/or _absoluteRequestTarget + // from the previous request when DisableStringReuse is false. + private string _parsedPath = null; + private string _parsedQueryString = null; + private string _parsedRawTarget = null; + private Uri _parsedAbsoluteRequestTarget; + private int _remainingRequestHeadersBytesAllowed; public Http1Connection(HttpConnectionContext context) @@ -337,6 +344,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http // Clear parsedData as we won't check it if we come via this path again, // an setting to null is fast as it doesn't need to use a GC write barrier. _parsedRawTarget = _parsedPath = _parsedQueryString = null; + _parsedAbsoluteRequestTarget = null; return; } @@ -389,6 +397,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http Path = _parsedPath; QueryString = _parsedQueryString; } + + // Clear parsedData for absolute target as we won't check it if we come via this path again, + // an setting to null is fast as it doesn't need to use a GC write barrier. + _parsedAbsoluteRequestTarget = null; } catch (InvalidOperationException) { @@ -441,9 +453,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http Path = string.Empty; QueryString = string.Empty; - // Clear parsedData for path and queryString as we won't check it if we come via this path again, + // Clear parsedData for path, queryString and absolute target as we won't check it if we come via this path again, // an setting to null is fast as it doesn't need to use a GC write barrier. _parsedPath = _parsedQueryString = null; + _parsedAbsoluteRequestTarget = null; } private void OnAsteriskFormTarget(HttpMethod method) @@ -463,6 +476,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http // Clear parsedData as we won't check it if we come via this path again, // an setting to null is fast as it doesn't need to use a GC write barrier. _parsedRawTarget = _parsedPath = _parsedQueryString = null; + _parsedAbsoluteRequestTarget = null; } private void OnAbsoluteFormTarget(Span target, Span query) @@ -497,7 +511,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http ThrowRequestTargetRejected(target); } - _absoluteRequestTarget = uri; + _absoluteRequestTarget = _parsedAbsoluteRequestTarget = uri; Path = _parsedPath = uri.LocalPath; // don't use uri.Query because we need the unescaped version previousValue = _parsedQueryString; @@ -520,6 +534,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http RawTarget = _parsedRawTarget; Path = _parsedPath; QueryString = _parsedQueryString; + _absoluteRequestTarget = _parsedAbsoluteRequestTarget; } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs index f2d1564334..0dc3170b08 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs @@ -134,13 +134,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http public HttpMethod Method { get; set; } public string PathBase { get; set; } - protected string _parsedPath = null; public string Path { get; set; } - - protected string _parsedQueryString = null; public string QueryString { get; set; } - - protected string _parsedRawTarget = null; public string RawTarget { get; set; } public string HttpVersion diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs index c10d9d08a0..fef0608c1c 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs @@ -253,6 +253,38 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } } + [Fact] + public async Task CanHandleTwoAbsoluteFormRequestsInARow() + { + // Regression test for https://github.com/dotnet/aspnetcore/issues/18438 + var testContext = new TestServiceContext(LoggerFactory); + + await using (var server = new TestServer(TestApp.EchoAppChunked, testContext)) + { + using (var connection = server.CreateConnection()) + { + await connection.Send( + "GET http://localhost/ HTTP/1.1", + "Host: localhost", + "", + "GET http://localhost/ HTTP/1.1", + "Host: localhost", + "", + ""); + await connection.Receive( + "HTTP/1.1 200 OK", + $"Date: {testContext.DateHeaderValue}", + "Content-Length: 0", + "", + "HTTP/1.1 200 OK", + $"Date: {testContext.DateHeaderValue}", + "Content-Length: 0", + "", + ""); + } + } + } + [Fact] public async Task AppCanSetTraceIdentifier() { @@ -358,7 +390,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } } - [Fact] public async Task Http10NotKeptAliveByDefault() { From a085554993e97ff2cb330a57a7856567b9363bcf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 09:44:12 -0800 Subject: [PATCH 104/116] Update dependencies from https://github.com/dotnet/arcade build 20200213.5 (#19036) - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.20113.5 - Microsoft.DotNet.GenAPI - 1.0.0-beta.20113.5 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.20113.5 --- eng/Version.Details.xml | 12 +++++----- eng/Versions.props | 2 +- eng/common/darc-init.ps1 | 2 +- .../templates/post-build/post-build.yml | 24 +++++++++++++++++++ eng/common/tools.sh | 10 +------- global.json | 4 ++-- 6 files changed, 35 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b54ad439b3..bfaab1801f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -417,17 +417,17 @@ https://github.com/dotnet/extensions 1286a6ff55e300352dabeb6d778c9fcdd258bd08 - + https://github.com/dotnet/arcade - 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 + 15f00efd583eab4372b2e9ca25bd80ace5b119ad - + https://github.com/dotnet/arcade - 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 + 15f00efd583eab4372b2e9ca25bd80ace5b119ad - + https://github.com/dotnet/arcade - 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 + 15f00efd583eab4372b2e9ca25bd80ace5b119ad https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 3b01c7b99e..2459205fcf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,7 +62,7 @@ --> - 1.0.0-beta.19607.3 + 1.0.0-beta.20113.5 3.4.1-beta4-19614-01 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 46d175fdfd..b94c2f4e41 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -27,7 +27,7 @@ function InstallDarcCli ($darcVersion) { Write-Host "Installing Darc CLI version $darcVersion..." Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g --framework netcoreapp2.1 } InstallDarcCli $darcVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index b121d77e07..3c69186f03 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -341,4 +341,28 @@ stages: channelId: 557 transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_313xx_Publishing' + channelName: '.NET Core SDK 3.1.3xx' + channelId: 759 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_313xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.3xx Internal' + channelId: 760 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6221830226..94965a8fd2 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -210,15 +210,7 @@ function InstallDotNet { local runtimeSourceFeedKey='' if [[ -n "${7:-}" ]]; then - # The 'base64' binary on alpine uses '-d' and doesn't support '--decode' - # like the rest of the unix variants. At the same time, MacOS doesn't support - # '-d'. To work around this, do a simple detection and switch the parameter - # accordingly. - decodeArg="--decode" - if base64 --help 2>&1 | grep -q "BusyBox"; then - decodeArg="-d" - fi - decodedFeedKey=`echo $7 | base64 $decodeArg` + decodedFeedKey=`echo $7 | base64 --decode` runtimeSourceFeedKey="--feed-credential $decodedFeedKey" fi diff --git a/global.json b/global.json index 3070303dd9..e1e9eebf33 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19607.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20113.5", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20113.5" } } From e29c49516646227d5c6c1dcfa7c04993759c3067 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 14 Feb 2020 10:53:47 -0800 Subject: [PATCH 105/116] Transfer endpoint metadata from PageActionDescriptor to CompiledPageActionDescriptor (#19061) Fixes https://github.com/dotnet/aspnetcore/issues/17300 --- .../src/Abstractions/ActionDescriptor.cs | 1 + .../src/Infrastructure/DefaultPageLoader.cs | 20 ++++- .../DynamicPageEndpointMatcherPolicy.cs | 14 +++- .../Infrastructure/PageLoaderMatcherPolicy.cs | 11 ++- .../AuthMiddlewareUsingRequireAuthTest.cs | 80 +++++++++++++++++++ .../SecurityWebSite/StartupWithRequireAuth.cs | 44 ++++++++++ 6 files changed, 165 insertions(+), 5 deletions(-) create mode 100644 src/Mvc/test/Mvc.FunctionalTests/AuthMiddlewareUsingRequireAuthTest.cs create mode 100644 src/Mvc/test/WebSites/SecurityWebSite/StartupWithRequireAuth.cs diff --git a/src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptor.cs b/src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptor.cs index 443e05259a..c6200ba6ee 100644 --- a/src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptor.cs +++ b/src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptor.cs @@ -47,6 +47,7 @@ namespace Microsoft.AspNetCore.Mvc.Abstractions /// /// Gets or sets the endpoint metadata for this action. + /// This API is meant for infrastructure and should not be used by application code. /// public IList EndpointMetadata { get; set; } diff --git a/src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageLoader.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageLoader.cs index 32472186e2..370df5baee 100644 --- a/src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageLoader.cs +++ b/src/Mvc/Mvc.RazorPages/src/Infrastructure/DefaultPageLoader.cs @@ -67,6 +67,9 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure } public override Task LoadAsync(PageActionDescriptor actionDescriptor) + => LoadAsync(actionDescriptor, EndpointMetadataCollection.Empty); + + internal Task LoadAsync(PageActionDescriptor actionDescriptor, EndpointMetadataCollection endpointMetadata) { if (actionDescriptor == null) { @@ -79,10 +82,10 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure return compiledDescriptorTask; } - return cache.GetOrAdd(actionDescriptor, LoadAsyncCore(actionDescriptor)); + return cache.GetOrAdd(actionDescriptor, LoadAsyncCore(actionDescriptor, endpointMetadata)); } - private async Task LoadAsyncCore(PageActionDescriptor actionDescriptor) + private async Task LoadAsyncCore(PageActionDescriptor actionDescriptor, EndpointMetadataCollection endpointMetadata) { var viewDescriptor = await Compiler.CompileAsync(actionDescriptor.RelativePath); var context = new PageApplicationModelProviderContext(actionDescriptor, viewDescriptor.Type.GetTypeInfo()); @@ -110,7 +113,18 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure routeNames: new HashSet(StringComparer.OrdinalIgnoreCase), action: compiled, routes: Array.Empty(), - conventions: Array.Empty>(), + conventions: new Action[] + { + b => + { + // Metadata from PageActionDescriptor is less significant than the one discovered from the compiled type. + // Consequently, we'll insert it at the beginning. + for (var i = endpointMetadata.Count - 1; i >=0; i--) + { + b.Metadata.Insert(0, endpointMetadata[i]); + } + }, + }, createInertEndpoints: false); // In some test scenarios there's no route so the endpoint isn't created. This is fine because diff --git a/src/Mvc/Mvc.RazorPages/src/Infrastructure/DynamicPageEndpointMatcherPolicy.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/DynamicPageEndpointMatcherPolicy.cs index ea68558d4b..9f1faa2baa 100644 --- a/src/Mvc/Mvc.RazorPages/src/Infrastructure/DynamicPageEndpointMatcherPolicy.cs +++ b/src/Mvc/Mvc.RazorPages/src/Infrastructure/DynamicPageEndpointMatcherPolicy.cs @@ -160,7 +160,19 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure var loadedEndpoints = new List(endpoints); for (var j = 0; j < loadedEndpoints.Count; j++) { - var compiled = await _loader.LoadAsync(loadedEndpoints[j].Metadata.GetMetadata()); + var metadata = loadedEndpoints[j].Metadata; + var pageActionDescriptor = metadata.GetMetadata(); + + CompiledPageActionDescriptor compiled; + if (_loader is DefaultPageLoader defaultPageLoader) + { + compiled = await defaultPageLoader.LoadAsync(pageActionDescriptor, endpoint.Metadata); + } + else + { + compiled = await _loader.LoadAsync(pageActionDescriptor); + } + loadedEndpoints[j] = compiled.Endpoint; } diff --git a/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageLoaderMatcherPolicy.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageLoaderMatcherPolicy.cs index 3d2acb23e8..18c14db7c6 100644 --- a/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageLoaderMatcherPolicy.cs +++ b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageLoaderMatcherPolicy.cs @@ -78,7 +78,16 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure { // We found an endpoint instance that has a PageActionDescriptor, but not a // CompiledPageActionDescriptor. Update the CandidateSet. - var compiled = _loader.LoadAsync(page); + Task compiled; + if (_loader is DefaultPageLoader defaultPageLoader) + { + compiled = defaultPageLoader.LoadAsync(page, endpoint.Metadata); + } + else + { + compiled = _loader.LoadAsync(page); + } + if (compiled.IsCompletedSuccessfully) { candidates.ReplaceEndpoint(i, compiled.Result.Endpoint, candidate.Values); diff --git a/src/Mvc/test/Mvc.FunctionalTests/AuthMiddlewareUsingRequireAuthTest.cs b/src/Mvc/test/Mvc.FunctionalTests/AuthMiddlewareUsingRequireAuthTest.cs new file mode 100644 index 0000000000..7c8e4fed40 --- /dev/null +++ b/src/Mvc/test/Mvc.FunctionalTests/AuthMiddlewareUsingRequireAuthTest.cs @@ -0,0 +1,80 @@ +// 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.Linq; +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Xunit; + +namespace Microsoft.AspNetCore.Mvc.FunctionalTests +{ + public class AuthMiddlewareUsingRequireAuthTest : IClassFixture> + { + public AuthMiddlewareUsingRequireAuthTest(MvcTestFixture fixture) + { + var factory = fixture.Factories.FirstOrDefault() ?? fixture.WithWebHostBuilder(ConfigureWebHostBuilder); + Client = factory.CreateDefaultClient(); + } + + private static void ConfigureWebHostBuilder(IWebHostBuilder builder) => + builder.UseStartup(); + + public HttpClient Client { get; } + + [Fact] + public async Task RequireAuthConfiguredGlobally_AppliesToControllers() + { + // Arrange + var action = "Home/Index"; + var response = await Client.GetAsync(action); + + await AssertAuthorizeResponse(response); + + // We should be able to login with ClaimA alone + var authCookie = await GetAuthCookieAsync("LoginClaimA"); + + var request = new HttpRequestMessage(HttpMethod.Get, action); + request.Headers.Add("Cookie", authCookie); + + response = await Client.SendAsync(request); + await response.AssertStatusCodeAsync(HttpStatusCode.OK); + } + + [Fact] + public async Task RequireAuthConfiguredGlobally_AppliesToRazorPages() + { + // Arrange + var action = "PagesHome"; + var response = await Client.GetAsync(action); + + await AssertAuthorizeResponse(response); + + // We should be able to login with ClaimA alone + var authCookie = await GetAuthCookieAsync("LoginClaimA"); + + var request = new HttpRequestMessage(HttpMethod.Get, action); + request.Headers.Add("Cookie", authCookie); + + response = await Client.SendAsync(request); + await response.AssertStatusCodeAsync(HttpStatusCode.OK); + } + + private async Task AssertAuthorizeResponse(HttpResponseMessage response) + { + await response.AssertStatusCodeAsync(HttpStatusCode.Redirect); + Assert.Equal("/Home/Login", response.Headers.Location.LocalPath); + } + + private async Task GetAuthCookieAsync(string action) + { + var response = await Client.PostAsync($"Login/{action}", null); + + await response.AssertStatusCodeAsync(HttpStatusCode.OK); + Assert.True(response.Headers.Contains("Set-Cookie")); + return response.Headers.GetValues("Set-Cookie").FirstOrDefault(); + } + } +} + diff --git a/src/Mvc/test/WebSites/SecurityWebSite/StartupWithRequireAuth.cs b/src/Mvc/test/WebSites/SecurityWebSite/StartupWithRequireAuth.cs new file mode 100644 index 0000000000..6f28bfdd3a --- /dev/null +++ b/src/Mvc/test/WebSites/SecurityWebSite/StartupWithRequireAuth.cs @@ -0,0 +1,44 @@ +// 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 Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Authorization.Policy; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; + +namespace SecurityWebSite +{ + public class StartupWithRequireAuth + { + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices(IServiceCollection services) + { + // Add framework services. + services.AddControllersWithViews().SetCompatibilityVersion(CompatibilityVersion.Latest); + services.AddRazorPages(); + services.AddAntiforgery(); + services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(options => + { + options.LoginPath = "/Home/Login"; + options.LogoutPath = "/Home/Logout"; + }) + .AddCookie("Cookie2"); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app) + { + app.UseRouting(); + + app.UseAuthentication(); + app.UseAuthorization(); + + app.UseEndpoints(endpoints => + { + endpoints.MapRazorPages().RequireAuthorization(); + endpoints.MapDefaultControllerRoute().RequireAuthorization(); + }); + } + } +} From 7fc314f73b075650f79d5225af8165e0a9369c22 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 14 Feb 2020 14:28:58 -0800 Subject: [PATCH 106/116] Use nonshipping package to determine publish location for installers (#19067) --- eng/Publishing.props | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index aa5294832a..ba728e1f71 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -30,8 +30,11 @@ - - + From b92f4231e8096a0170cdc0fc420f1d945f719516 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Tue, 18 Feb 2020 12:06:06 -0800 Subject: [PATCH 107/116] Todos --- Directory.Build.props | 5 +- eng/GenAPI.exclusions.txt | 22 +- eng/PlatformManifest.txt | 131 ---------- eng/ProjectReferences.props | 2 +- eng/targets/ResolveReferences.targets | 240 +++++------------- eng/tools/RepoTasks/DownloadFile.cs | 149 ----------- eng/tools/RepoTasks/RepoTasks.tasks | 1 - ...Authentication.AzureADB2C.UI.netcoreapp.cs | 68 ----- ...rosoft.AspNetCore.Components.netcoreapp.cs | 21 -- ...ft.AspNetCore.Components.netstandard2.0.cs | 2 - .../Web.JS/dist/Release/blazor.server.js | 2 +- ...pNetCore.Cryptography.KeyDerivation.csproj | 9 +- ...Microsoft.AspNetCore.Routing.netcoreapp.cs | 1 - .../src/UserManagerSpecificationTests.cs | 1 - .../Microsoft.AspNetCore.WebSockets.csproj | 2 + ...crosoft.AspNetCore.Mvc.Razor.netcoreapp.cs | 1 - ...ft.AspNetCore.Mvc.RazorPages.netcoreapp.cs | 1 - ...pNetCore.Server.Kestrel.Core.netcoreapp.cs | 1 - .../Core/src/Internal/Http/HttpProtocol.cs | 4 +- .../Internal/Infrastructure/HttpUtilities.cs | 4 +- ...tCore.Server.Kestrel.Transport.Quic.csproj | 13 - ...erver.Kestrel.Transport.Quic.netcoreapp.cs | 38 --- ...Core.Http.Connections.Client.netcoreapp.cs | 49 ---- .../Core/src/DefaultHubLifetimeManager.cs | 2 +- 24 files changed, 88 insertions(+), 681 deletions(-) delete mode 100644 eng/PlatformManifest.txt delete mode 100644 eng/tools/RepoTasks/DownloadFile.cs delete mode 100644 src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp.cs delete mode 100644 src/Servers/Kestrel/Transport.Quic/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj delete mode 100644 src/Servers/Kestrel/Transport.Quic/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.netcoreapp.cs delete mode 100644 src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp.cs diff --git a/Directory.Build.props b/Directory.Build.props index 629eaa13fd..9a51ce06e6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -91,11 +91,8 @@ aspnetcore-runtime aspnetcore-targeting-pack - - + false - true false true diff --git a/eng/GenAPI.exclusions.txt b/eng/GenAPI.exclusions.txt index 810c09e52c..ebabc0ac7d 100644 --- a/eng/GenAPI.exclusions.txt +++ b/eng/GenAPI.exclusions.txt @@ -2,24 +2,4 @@ T:Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame # Manually implemented - https://github.com/dotnet/arcade/issues/2066 T:Microsoft.AspNetCore.Mvc.ApplicationModels.PageParameterModel -T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel -# Manually implemented - Need to include internal setter -P:Microsoft.AspNetCore.Mvc.Razor.Infrastructure.TagHelperMemoryCacheProvider.Cache -P:Microsoft.AspNetCore.Mvc.RazorPages.RazorPagesOptions.Conventions -P:Microsoft.AspNetCore.Routing.Matching.CandidateState.Values -P:Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions.KestrelServerOptions -# public structs with public fields that GenAPI doesn't handle -T:Microsoft.AspNetCore.Components.EventCallback -T:Microsoft.AspNetCore.Components.EventCallback`1 -# Break GenAPI - https://github.com/dotnet/arcade/issues/4488 -T:Microsoft.AspNetCore.Components.Rendering.HtmlRenderer.d__17 -T:Microsoft.AspNetCore.Components.Rendering.HtmlRenderer.d__8 -T:Microsoft.AspNetCore.Mvc.ApplicationModels.ActionAttributeRouteModel.<>c -T:Microsoft.AspNetCore.Mvc.ApplicationModels.ActionAttributeRouteModel.d__3 -T:Microsoft.AspNetCore.Mvc.ControllerBase.d__181`1 -T:Microsoft.AspNetCore.Mvc.ControllerBase.d__183`1 -T:Microsoft.AspNetCore.Mvc.ControllerBase.d__184`1 -T:Microsoft.AspNetCore.Mvc.ControllerBase.d__187 -T:Microsoft.AspNetCore.Mvc.Controllers.ControllerBinderDelegateProvider.<>c__DisplayClass0_0 -T:Microsoft.AspNetCore.Mvc.ModelBinding.CompositeValueProvider.d__4 -T:Microsoft.AspNetCore.Mvc.Routing.ConsumesMatcherPolicy.<>c +T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel \ No newline at end of file diff --git a/eng/PlatformManifest.txt b/eng/PlatformManifest.txt deleted file mode 100644 index 1d5a81f517..0000000000 --- a/eng/PlatformManifest.txt +++ /dev/null @@ -1,131 +0,0 @@ -aspnetcorev2_inprocess.dll|Microsoft.AspNetCore.App.Ref||13.1.19320.0 -Microsoft.AspNetCore.Antiforgery.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Authentication.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Authentication.Cookies.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Authentication.Core.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Authentication.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Authentication.OAuth.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Authorization.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Authorization.Policy.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Components.Authorization.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Components.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Components.Forms.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Components.Server.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Components.Web.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Connections.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.CookiePolicy.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Cors.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Cryptography.Internal.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Cryptography.KeyDerivation.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.DataProtection.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.DataProtection.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.DataProtection.Extensions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Diagnostics.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Diagnostics.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Diagnostics.HealthChecks.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.HostFiltering.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Hosting.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Hosting.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Hosting.Server.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Html.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Http.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Http.Connections.Common.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Http.Connections.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Http.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Http.Extensions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Http.Features.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.HttpOverrides.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.HttpsPolicy.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Identity.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Localization.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Localization.Routing.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Metadata.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.ApiExplorer.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.Core.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.Cors.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.DataAnnotations.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.Formatters.Json.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.Formatters.Xml.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.Localization.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.Razor.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.RazorPages.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.TagHelpers.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Mvc.ViewFeatures.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Razor.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Razor.Runtime.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.ResponseCaching.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.ResponseCaching.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.ResponseCompression.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Rewrite.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Routing.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Routing.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Server.HttpSys.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Server.IIS.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Server.IISIntegration.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Server.Kestrel.Core.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Server.Kestrel.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.Session.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.SignalR.Common.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.SignalR.Core.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.SignalR.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.SignalR.Protocols.Json.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.StaticFiles.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.WebSockets.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.AspNetCore.WebUtilities.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.Extensions.Caching.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Caching.Memory.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Configuration.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Configuration.Binder.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Configuration.CommandLine.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Configuration.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Configuration.EnvironmentVariables.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Configuration.FileExtensions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Configuration.Ini.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Configuration.Json.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Configuration.KeyPerFile.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Configuration.UserSecrets.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Configuration.Xml.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.DependencyInjection.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.DependencyInjection.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Diagnostics.HealthChecks.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.FileProviders.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.FileProviders.Composite.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.FileProviders.Embedded.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.FileProviders.Physical.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.FileSystemGlobbing.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Hosting.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Hosting.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Http.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Identity.Core.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.Extensions.Identity.Stores.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.Extensions.Localization.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Localization.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Logging.Abstractions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Logging.Configuration.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Logging.Console.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Logging.Debug.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Logging.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Logging.EventLog.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Logging.EventSource.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Logging.TraceSource.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.ObjectPool.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Options.ConfigurationExtensions.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Options.DataAnnotations.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Options.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.Primitives.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Extensions.WebEncoders.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.JSInterop.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56504 -Microsoft.Net.Http.Headers.dll|Microsoft.AspNetCore.App.Ref|3.1.0.0|3.100.19.56601 -Microsoft.Win32.SystemEvents.dll|Microsoft.AspNetCore.App.Ref|4.0.2.0|4.700.19.56404 -System.Diagnostics.EventLog.dll|Microsoft.AspNetCore.App.Ref|4.0.2.0|4.700.19.56404 -System.Drawing.Common.dll|Microsoft.AspNetCore.App.Ref|4.0.2.0|4.700.19.56404 -System.IO.Pipelines.dll|Microsoft.AspNetCore.App.Ref|4.0.2.0|4.700.19.56404 -System.Security.Cryptography.Pkcs.dll|Microsoft.AspNetCore.App.Ref|4.1.1.0|4.700.19.56404 -System.Security.Cryptography.Xml.dll|Microsoft.AspNetCore.App.Ref|4.0.3.0|4.700.19.56404 -System.Security.Permissions.dll|Microsoft.AspNetCore.App.Ref|4.0.3.0|4.700.19.56404 -System.Windows.Extensions.dll|Microsoft.AspNetCore.App.Ref|4.0.1.0|4.700.19.56404 \ No newline at end of file diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 1f404f6943..feebe6e3ff 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -18,6 +18,7 @@ + @@ -93,7 +94,6 @@ - diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index e77922ebcb..81559a4f98 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -11,12 +11,11 @@ Items used by the resolution strategy: - * BaselinePackageReference = a list of packages that were referenced in the last release of the project currently building - - mainly used to ensure references do not change in servicing builds unless $(UseLatestPackageReferences) is not true. + * BaselinePackageReference = a list of packages that were reference in the last release of the project currently building * LatestPackageReference = a list of the latest versions of packages * Reference = a list of the references which are needed for compilation or runtime * ProjectReferenceProvider = a list which maps of assembly names to the project file that produces it ---> + --> @@ -30,49 +29,43 @@ + true + true true - true - true + Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsImplementationProject)' == 'true' AND '$(IsPackable)' == 'true' ">true false - true + true + true + false - true - false + true + false - true - false + true + false - + - true + true @@ -80,40 +73,35 @@ <_AllowedExplicitPackageReference Include="@(PackageReference->WithMetadataValue('AllowExplicitReference', 'true'))" /> <_AllowedExplicitPackageReference Include="FSharp.Core" Condition="'$(MSBuildProjectExtension)' == '.fsproj'" /> - <_ExplicitPackageReference Include="@(PackageReference)" - Exclude="@(_ImplicitPackageReference);@(_AllowedExplicitPackageReference)" /> + <_ExplicitPackageReference Include="@(PackageReference)" Exclude="@(_ImplicitPackageReference);@(_AllowedExplicitPackageReference)" /> <_UnusedProjectReferenceProvider Include="@(ProjectReferenceProvider)" Exclude="@(Reference)" /> - <_CompilationOnlyReference Include="@(Reference->WithMetadataValue('NuGetPackageId','NETStandard.Library'))" - Condition="'$(TargetFramework)' == 'netstandard2.0'" /> + <_CompilationOnlyReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="@(Reference->WithMetadataValue('NuGetPackageId','NETStandard.Library'))" /> <_InvalidReferenceToNonSharedFxAssembly Condition="'$(IsAspNetCoreApp)' == 'true'" - Include="@(Reference)" - Exclude=" - @(AspNetCoreAppReference); - @(AspNetCoreAppReferenceAndPackage); - @(ExternalAspNetCoreAppReference); - @(_CompilationOnlyReference); - @(Reference->WithMetadataValue('IsSharedSource', 'true'))" /> + Include="@(Reference)" + Exclude=" + @(AspNetCoreAppReference); + @(AspNetCoreAppReferenceAndPackage); + @(ExternalAspNetCoreAppReference); + @(_CompilationOnlyReference); + @(Reference->WithMetadataValue('IsSharedSource', 'true'))" /> <_OriginalReferences Include="@(Reference)" /> - <_ProjectReferenceByAssemblyName Condition="'$(UseProjectReferences)' == 'true'" - Include="@(ProjectReferenceProvider)" - Exclude="@(_UnusedProjectReferenceProvider)" /> + Include="@(ProjectReferenceProvider)" + Exclude="@(_UnusedProjectReferenceProvider)" /> - + false - + true @@ -121,31 +109,30 @@ + + Text="Cannot reference "%(_InvalidReferenceToSharedFxOnlyAssembly.Identity)" directly because it is part of the shared framework and this project is not. Use <FrameworkReference Include="Microsoft.AspNetCore.App" /> instead." /> + Text="Cannot reference "%(_InvalidReferenceToNonSharedFxAssembly.Identity)". This dependency is not in the shared framework. See docs/SharedFramework.md for instructions on how to modify what is in the shared framework." /> - + - + @@ -154,15 +141,9 @@ - - + - - + - - <_BaselinePackageReferenceWithVersion Include="@(Reference)" - Condition=" '$(IsServicingBuild)' == 'true' OR '$(UseLatestPackageReferences)' != 'true' "> + + <_BaselinePackageReferenceWithVersion Include="@(Reference)" Condition=" '$(IsServicingBuild)' == 'true' OR '$(UseLatestPackageReferences)' != 'true' "> %(BaselinePackageReference.Identity) %(BaselinePackageReference.Version) - <_BaselinePackageReferenceWithVersion Remove="@(_BaselinePackageReferenceWithVersion)" - Condition="'%(Id)' != '%(Identity)' " /> + + <_BaselinePackageReferenceWithVersion Remove="@(_BaselinePackageReferenceWithVersion)" Condition="'%(Id)' != '%(Identity)' " /> @@ -197,10 +176,10 @@ %(LatestPackageReference.Identity) %(LatestPackageReference.Version) - <_PrivatePackageReferenceWithVersion Remove="@(_PrivatePackageReferenceWithVersion)" - Condition="'%(Id)' != '%(Identity)' " /> - + <_PrivatePackageReferenceWithVersion Remove="@(_PrivatePackageReferenceWithVersion)" Condition="'%(Id)' != '%(Identity)' " /> + + @@ -211,91 +190,24 @@ <_ImplicitPackageReference Remove="@(_ImplicitPackageReference)" /> - + <_ExplicitPackageReference Remove="@(_ExplicitPackageReference)" /> - + - + - - - - - - <_CompileTfmUsingReferenceAssemblies>false - <_CompileTfmUsingReferenceAssemblies - Condition=" '$(CompileUsingReferenceAssemblies)' != false AND '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">true - - - <_ReferenceProjectFile>$(MSBuildProjectDirectory)/../ref/$(MSBuildProjectFile) - - - $(GetTargetPathWithTargetPlatformMonikerDependsOn);AddReferenceProjectMetadata - RemoveReferenceProjectMetadata;$(PrepareForRunDependsOn) - - - - - ReferenceProjectMetadata - false - - - - - true - @(ReferenceProjectMetadata) - - - - - - - - - - - - - - - - - $(MicrosoftInternalExtensionsRefsPath)%(FileName).dll - - + @@ -319,36 +231,24 @@ $([MSBuild]::MakeRelative($(RepoRoot), '$(ReferenceAssemblyDirectory)$(MSBuildProjectFile)')) - - - - + + $([MSBuild]::ValueOrDefault($(IsAspNetCoreApp),'false')) - $([MSBuild]::ValueOrDefault($(IsPackable),'false')) + $([MSBuild]::ValueOrDefault($(IsShippingPackage),'false')) $([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectFullPath))) - $(ReferenceAssemblyProjectFileRelativePath) + $(ReferenceAssemblyProjectFileRelativePath) - <_CustomCollectProjectReferenceDependsOn - Condition="'$(TargetFramework)' != ''">ResolveProjectReferences + <_CustomCollectProjectReferenceDependsOn Condition="'$(TargetFramework)' != ''">ResolveProjectReferences - + <_TargetFrameworks Include="$(TargetFrameworks)" /> @@ -369,4 +269,4 @@ - + \ No newline at end of file diff --git a/eng/tools/RepoTasks/DownloadFile.cs b/eng/tools/RepoTasks/DownloadFile.cs deleted file mode 100644 index 2be0954cc2..0000000000 --- a/eng/tools/RepoTasks/DownloadFile.cs +++ /dev/null @@ -1,149 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System; -using System.IO; -using System.Net; -using System.Net.Http; -using System.Threading.Tasks; -using System.Collections.Generic; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; - -namespace RepoTasks -{ - public class DownloadFile : Microsoft.Build.Utilities.Task - { - [Required] - public string Uri { get; set; } - - /// - /// If this field is set and the task fail to download the file from `Uri`, with a NotFound - /// status, it will try to download the file from `PrivateUri`. - /// - public string PrivateUri { get; set; } - - /// - /// Suffix for the private URI in base64 form (for SAS compatibility) - /// - public string PrivateUriSuffix { get; set; } - - public int MaxRetries { get; set; } = 5; - - [Required] - public string DestinationPath { get; set; } - - public bool Overwrite { get; set; } - - public override bool Execute() - { - return ExecuteAsync().GetAwaiter().GetResult(); - } - - private async System.Threading.Tasks.Task ExecuteAsync() - { - string destinationDir = Path.GetDirectoryName(DestinationPath); - if (!Directory.Exists(destinationDir)) - { - Directory.CreateDirectory(destinationDir); - } - - if (File.Exists(DestinationPath) && !Overwrite) - { - return true; - } - - const string FileUriProtocol = "file://"; - - if (Uri.StartsWith(FileUriProtocol, StringComparison.Ordinal)) - { - var filePath = Uri.Substring(FileUriProtocol.Length); - Log.LogMessage($"Copying '{filePath}' to '{DestinationPath}'"); - File.Copy(filePath, DestinationPath); - return true; - } - - List errorMessages = new List(); - bool? downloadStatus = await DownloadWithRetriesAsync(Uri, DestinationPath, errorMessages); - - if (downloadStatus == false && !string.IsNullOrEmpty(PrivateUri)) - { - string uriSuffix = ""; - if (!string.IsNullOrEmpty(PrivateUriSuffix)) - { - var uriSuffixBytes = System.Convert.FromBase64String(PrivateUriSuffix); - uriSuffix = System.Text.Encoding.UTF8.GetString(uriSuffixBytes); - } - downloadStatus = await DownloadWithRetriesAsync($"{PrivateUri}{uriSuffix}", DestinationPath, errorMessages); - } - - if (downloadStatus != true) - { - foreach (var error in errorMessages) - { - Log.LogError(error); - } - } - - return downloadStatus == true; - } - - /// - /// Attempt to download file from `source` with retries when response error is different of FileNotFound and Success. - /// - /// URL to the file to be downloaded. - /// Local path where to put the downloaded file. - /// true: Download Succeeded. false: Download failed with 404. null: Download failed but is retriable. - private async Task DownloadWithRetriesAsync(string source, string target, List errorMessages) - { - Random rng = new Random(); - - Log.LogMessage(MessageImportance.High, $"Attempting download '{source}' to '{target}'"); - - using (var httpClient = new HttpClient()) - { - for (int retryNumber = 0; retryNumber < MaxRetries; retryNumber++) - { - try - { - var httpResponse = await httpClient.GetAsync(source); - - Log.LogMessage(MessageImportance.High, $"{source} -> {httpResponse.StatusCode}"); - - // The Azure Storage REST API returns '400 - Bad Request' in some cases - // where the resource is not found on the storage. - // https://docs.microsoft.com/en-us/rest/api/storageservices/common-rest-api-error-codes - if (httpResponse.StatusCode == HttpStatusCode.NotFound || - httpResponse.ReasonPhrase.IndexOf("The requested URI does not represent any resource on the server.", StringComparison.OrdinalIgnoreCase) == 0) - { - errorMessages.Add($"Problems downloading file from '{source}'. Does the resource exist on the storage? {httpResponse.StatusCode} : {httpResponse.ReasonPhrase}"); - return false; - } - - httpResponse.EnsureSuccessStatusCode(); - - using (var outStream = File.Create(target)) - { - await httpResponse.Content.CopyToAsync(outStream); - } - - Log.LogMessage(MessageImportance.High, $"returning true {source} -> {httpResponse.StatusCode}"); - return true; - } - catch (Exception e) - { - Log.LogMessage(MessageImportance.High, $"returning error in {source} "); - errorMessages.Add($"Problems downloading file from '{source}'. {e.Message} {e.StackTrace}"); - File.Delete(target); - } - - await System.Threading.Tasks.Task.Delay(rng.Next(1000, 10000)); - } - } - - Log.LogMessage(MessageImportance.High, $"giving up {source} "); - errorMessages.Add($"Giving up downloading the file from '{source}' after {MaxRetries} retries."); - return null; - } - } -} diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks index 631944feea..0fa015d81f 100644 --- a/eng/tools/RepoTasks/RepoTasks.tasks +++ b/eng/tools/RepoTasks/RepoTasks.tasks @@ -10,5 +10,4 @@ - diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp.cs b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp.cs deleted file mode 100644 index 65981fe5fa..0000000000 --- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/ref/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.netcoreapp.cs +++ /dev/null @@ -1,68 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Authentication -{ - public static partial class AzureADB2CAuthenticationBuilderExtensions - { - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddAzureADB2C(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddAzureADB2C(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string scheme, string openIdConnectScheme, string cookieScheme, string displayName, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddAzureADB2CBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, System.Action configureOptions) { throw null; } - public static Microsoft.AspNetCore.Authentication.AuthenticationBuilder AddAzureADB2CBearer(this Microsoft.AspNetCore.Authentication.AuthenticationBuilder builder, string scheme, string jwtBearerScheme, System.Action configureOptions) { throw null; } - } -} -namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI -{ - public static partial class AzureADB2CDefaults - { - public const string AuthenticationScheme = "AzureADB2C"; - public const string BearerAuthenticationScheme = "AzureADB2CBearer"; - public const string CookieScheme = "AzureADB2CCookie"; - public static readonly string DisplayName; - public const string JwtBearerAuthenticationScheme = "AzureADB2CJwtBearer"; - public const string OpenIdScheme = "AzureADB2COpenID"; - public static readonly string PolicyKey; - } - public partial class AzureADB2COptions - { - public AzureADB2COptions() { } - public string[] AllSchemes { get { throw null; } } - public string CallbackPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string ClientId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string ClientSecret { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string CookieSchemeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string DefaultPolicy { get { throw null; } } - public string Domain { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string EditProfilePolicyId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string Instance { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string JwtBearerSchemeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public string OpenIdConnectSchemeName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string ResetPasswordPolicyId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string SignedOutCallbackPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string SignUpSignInPolicyId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - } -} -namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal -{ - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class AccessDeniedModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public AccessDeniedModel() { } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - [Microsoft.AspNetCore.Mvc.ResponseCacheAttribute(Duration=0, Location=Microsoft.AspNetCore.Mvc.ResponseCacheLocation.None, NoStore=true)] - public partial class ErrorModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public ErrorModel() { } - public string RequestId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public bool ShowRequestId { get { throw null; } } - public void OnGet() { } - } - [Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute] - public partial class SignedOutModel : Microsoft.AspNetCore.Mvc.RazorPages.PageModel - { - public SignedOutModel() { } - public Microsoft.AspNetCore.Mvc.IActionResult OnGet() { throw null; } - } -} diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs index 10a26b70af..8c989deda4 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs @@ -123,17 +123,6 @@ namespace Microsoft.AspNetCore.Components public ElementReference(string id) { throw null; } public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct EventCallback - { - private readonly object _dummy; - private readonly int _dummyPrimitive; - public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; - public static readonly Microsoft.AspNetCore.Components.EventCallbackFactory Factory; - public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } - public bool HasDelegate { get { throw null; } } - public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } - } public sealed partial class EventCallbackFactory { public EventCallbackFactory() { } @@ -197,16 +186,6 @@ namespace Microsoft.AspNetCore.Components public EventCallbackWorkItem(System.MulticastDelegate @delegate) { throw null; } public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct EventCallback - { - private readonly object _dummy; - private readonly int _dummyPrimitive; - public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; - public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } - public bool HasDelegate { get { throw null; } } - public System.Threading.Tasks.Task InvokeAsync(TValue arg) { throw null; } - } [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)] public sealed partial class EventHandlerAttribute : System.Attribute { diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs index ff3a7a10eb..8c989deda4 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs @@ -123,7 +123,6 @@ namespace Microsoft.AspNetCore.Components public ElementReference(string id) { throw null; } public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } } - private readonly int _dummyPrimitive; public sealed partial class EventCallbackFactory { public EventCallbackFactory() { } @@ -187,7 +186,6 @@ namespace Microsoft.AspNetCore.Components public EventCallbackWorkItem(System.MulticastDelegate @delegate) { throw null; } public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } } - private readonly int _dummyPrimitive; [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)] public sealed partial class EventHandlerAttribute : System.Attribute { diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js index b6d853ce32..e04bab52cc 100644 --- a/src/Components/Web.JS/dist/Release/blazor.server.js +++ b/src/Components/Web.JS/dist/Release/blazor.server.js @@ -12,4 +12,4 @@ var r=n(50),o=n(51),i=n(52);function a(){return c.TYPED_ARRAY_SUPPORT?2147483647 * @author Feross Aboukhadijeh * @license MIT */ -function r(e,t){if(e===t)return 0;for(var n=e.length,r=t.length,o=0,i=Math.min(n,r);o=0;u--)if(l[u]!==f[u])return!1;for(u=l.length-1;u>=0;u--)if(c=l[u],!b(e[c],t[c],n,r))return!1;return!0}(e,t,n,a))}return n?e===t:e==t}function m(e){return"[object Arguments]"==Object.prototype.toString.call(e)}function w(e,t){if(!e||!t)return!1;if("[object RegExp]"==Object.prototype.toString.call(t))return t.test(e);try{if(e instanceof t)return!0}catch(e){}return!Error.isPrototypeOf(t)&&!0===t.call({},e)}function E(e,t,n,r){var o;if("function"!=typeof t)throw new TypeError('"block" argument must be a function');"string"==typeof n&&(r=n,n=null),o=function(e){var t;try{e()}catch(e){t=e}return t}(t),r=(n&&n.name?" ("+n.name+").":".")+(r?" "+r:"."),e&&!o&&y(o,n,"Missing expected exception"+r);var a="string"==typeof r,s=!e&&o&&!n;if((!e&&i.isError(o)&&a&&w(o,n)||s)&&y(o,n,"Got unwanted exception"+r),e&&o&&n&&!w(o,n)||!e&&o)throw o}f.AssertionError=function(e){var t;this.name="AssertionError",this.actual=e.actual,this.expected=e.expected,this.operator=e.operator,e.message?(this.message=e.message,this.generatedMessage=!1):(this.message=d(g((t=this).actual),128)+" "+t.operator+" "+d(g(t.expected),128),this.generatedMessage=!0);var n=e.stackStartFunction||y;if(Error.captureStackTrace)Error.captureStackTrace(this,n);else{var r=new Error;if(r.stack){var o=r.stack,i=p(n),a=o.indexOf("\n"+i);if(a>=0){var s=o.indexOf("\n",a+1);o=o.substring(s+1)}this.stack=o}}},i.inherits(f.AssertionError,Error),f.fail=y,f.ok=v,f.equal=function(e,t,n){e!=t&&y(e,t,n,"==",f.equal)},f.notEqual=function(e,t,n){e==t&&y(e,t,n,"!=",f.notEqual)},f.deepEqual=function(e,t,n){b(e,t,!1)||y(e,t,n,"deepEqual",f.deepEqual)},f.deepStrictEqual=function(e,t,n){b(e,t,!0)||y(e,t,n,"deepStrictEqual",f.deepStrictEqual)},f.notDeepEqual=function(e,t,n){b(e,t,!1)&&y(e,t,n,"notDeepEqual",f.notDeepEqual)},f.notDeepStrictEqual=function e(t,n,r){b(t,n,!0)&&y(t,n,r,"notDeepStrictEqual",e)},f.strictEqual=function(e,t,n){e!==t&&y(e,t,n,"===",f.strictEqual)},f.notStrictEqual=function(e,t,n){e===t&&y(e,t,n,"!==",f.notStrictEqual)},f.throws=function(e,t,n){E(!0,e,t,n)},f.doesNotThrow=function(e,t,n){E(!1,e,t,n)},f.ifError=function(e){if(e)throw e};var S=Object.keys||function(e){var t=[];for(var n in e)a.call(e,n)&&t.push(n);return t}}).call(this,n(9))},function(e,t){e.exports=function(e){return e&&"object"==typeof e&&"function"==typeof e.copy&&"function"==typeof e.fill&&"function"==typeof e.readUInt8}},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t,n){e.exports=n(10)},function(e,t){var n={}.toString;e.exports=Array.isArray||function(e){return"[object Array]"==n.call(e)}},function(e,t){},function(e,t,n){"use strict";var r=n(15).Buffer,o=n(60);e.exports=function(){function e(){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.head=null,this.tail=null,this.length=0}return e.prototype.push=function(e){var t={data:e,next:null};this.length>0?this.tail.next=t:this.head=t,this.tail=t,++this.length},e.prototype.unshift=function(e){var t={data:e,next:this.head};0===this.length&&(this.tail=t),this.head=t,++this.length},e.prototype.shift=function(){if(0!==this.length){var e=this.head.data;return 1===this.length?this.head=this.tail=null:this.head=this.head.next,--this.length,e}},e.prototype.clear=function(){this.head=this.tail=null,this.length=0},e.prototype.join=function(e){if(0===this.length)return"";for(var t=this.head,n=""+t.data;t=t.next;)n+=e+t.data;return n},e.prototype.concat=function(e){if(0===this.length)return r.alloc(0);if(1===this.length)return this.head.data;for(var t,n,o,i=r.allocUnsafe(e>>>0),a=this.head,s=0;a;)t=a.data,n=i,o=s,t.copy(n,o),s+=a.data.length,a=a.next;return i},e}(),o&&o.inspect&&o.inspect.custom&&(e.exports.prototype[o.inspect.custom]=function(){var e=o.inspect({length:this.length});return this.constructor.name+" "+e})},function(e,t){},function(e,t,n){var r=n(6),o=r.Buffer;function i(e,t){for(var n in e)t[n]=e[n]}function a(e,t,n){return o(e,t,n)}o.from&&o.alloc&&o.allocUnsafe&&o.allocUnsafeSlow?e.exports=r:(i(r,t),t.Buffer=a),i(o,a),a.from=function(e,t,n){if("number"==typeof e)throw new TypeError("Argument must not be a number");return o(e,t,n)},a.alloc=function(e,t,n){if("number"!=typeof e)throw new TypeError("Argument must be a number");var r=o(e);return void 0!==t?"string"==typeof n?r.fill(t,n):r.fill(t):r.fill(0),r},a.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return o(e)},a.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return r.SlowBuffer(e)}},function(e,t,n){(function(e){var r=void 0!==e&&e||"undefined"!=typeof self&&self||window,o=Function.prototype.apply;function i(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new i(o.call(setTimeout,r,arguments),clearTimeout)},t.setInterval=function(){return new i(o.call(setInterval,r,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},i.prototype.unref=i.prototype.ref=function(){},i.prototype.close=function(){this._clearFn.call(r,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n(63),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(this,n(9))},function(e,t,n){(function(e,t){!function(e,n){"use strict";if(!e.setImmediate){var r,o,i,a,s,c=1,u={},l=!1,f=e.document,h=Object.getPrototypeOf&&Object.getPrototypeOf(e);h=h&&h.setTimeout?h:e,"[object process]"==={}.toString.call(e.process)?r=function(e){t.nextTick(function(){d(e)})}:!function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?e.MessageChannel?((i=new MessageChannel).port1.onmessage=function(e){d(e.data)},r=function(e){i.port2.postMessage(e)}):f&&"onreadystatechange"in f.createElement("script")?(o=f.documentElement,r=function(e){var t=f.createElement("script");t.onreadystatechange=function(){d(e),t.onreadystatechange=null,o.removeChild(t),t=null},o.appendChild(t)}):r=function(e){setTimeout(d,0,e)}:(a="setImmediate$"+Math.random()+"$",s=function(t){t.source===e&&"string"==typeof t.data&&0===t.data.indexOf(a)&&d(+t.data.slice(a.length))},e.addEventListener?e.addEventListener("message",s,!1):e.attachEvent("onmessage",s),r=function(t){e.postMessage(a+t,"*")}),h.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n0?this._transform(null,t,n):n()},e.exports.decoder=c,e.exports.encoder=s},function(e,t,n){(t=e.exports=n(36)).Stream=t,t.Readable=t,t.Writable=n(41),t.Duplex=n(10),t.Transform=n(42),t.PassThrough=n(67)},function(e,t,n){"use strict";e.exports=i;var r=n(42),o=n(21);function i(e){if(!(this instanceof i))return new i(e);r.call(this,e)}o.inherits=n(16),o.inherits(i,r),i.prototype._transform=function(e,t,n){n(null,e)}},function(e,t,n){var r=n(22);function o(e){Error.call(this),Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor),this.name=this.constructor.name,this.message=e||"unable to decode"}n(34).inherits(o,Error),e.exports=function(e){return function(e){e instanceof r||(e=r().append(e));var t=i(e);if(t)return e.consume(t.bytesConsumed),t.value;throw new o};function t(e,t,n){return t>=n+e}function n(e,t){return{value:e,bytesConsumed:t}}function i(e,r){r=void 0===r?0:r;var o=e.length-r;if(o<=0)return null;var i,l,f,h=e.readUInt8(r),p=0;if(!function(e,t){var n=function(e){switch(e){case 196:return 2;case 197:return 3;case 198:return 5;case 199:return 3;case 200:return 4;case 201:return 6;case 202:return 5;case 203:return 9;case 204:return 2;case 205:return 3;case 206:return 5;case 207:return 9;case 208:return 2;case 209:return 3;case 210:return 5;case 211:return 9;case 212:return 3;case 213:return 4;case 214:return 6;case 215:return 10;case 216:return 18;case 217:return 2;case 218:return 3;case 219:return 5;case 222:return 3;default:return-1}}(e);return!(-1!==n&&t=0;f--)p+=e.readUInt8(r+f+1)*Math.pow(2,8*(7-f));return n(p,9);case 208:return n(p=e.readInt8(r+1),2);case 209:return n(p=e.readInt16BE(r+1),3);case 210:return n(p=e.readInt32BE(r+1),5);case 211:return n(p=function(e,t){var n=128==(128&e[t]);if(n)for(var r=1,o=t+7;o>=t;o--){var i=(255^e[o])+r;e[o]=255&i,r=i>>8}var a=e.readUInt32BE(t+0),s=e.readUInt32BE(t+4);return(4294967296*a+s)*(n?-1:1)}(e.slice(r+1,r+9),0),9);case 202:return n(p=e.readFloatBE(r+1),5);case 203:return n(p=e.readDoubleBE(r+1),9);case 217:return t(i=e.readUInt8(r+1),o,2)?n(p=e.toString("utf8",r+2,r+2+i),2+i):null;case 218:return t(i=e.readUInt16BE(r+1),o,3)?n(p=e.toString("utf8",r+3,r+3+i),3+i):null;case 219:return t(i=e.readUInt32BE(r+1),o,5)?n(p=e.toString("utf8",r+5,r+5+i),5+i):null;case 196:return t(i=e.readUInt8(r+1),o,2)?n(p=e.slice(r+2,r+2+i),2+i):null;case 197:return t(i=e.readUInt16BE(r+1),o,3)?n(p=e.slice(r+3,r+3+i),3+i):null;case 198:return t(i=e.readUInt32BE(r+1),o,5)?n(p=e.slice(r+5,r+5+i),5+i):null;case 220:return o<3?null:(i=e.readUInt16BE(r+1),a(e,r,i,3));case 221:return o<5?null:(i=e.readUInt32BE(r+1),a(e,r,i,5));case 222:return i=e.readUInt16BE(r+1),s(e,r,i,3);case 223:throw new Error("map too big to decode in JS");case 212:return c(e,r,1);case 213:return c(e,r,2);case 214:return c(e,r,4);case 215:return c(e,r,8);case 216:return c(e,r,16);case 199:return i=e.readUInt8(r+1),l=e.readUInt8(r+2),t(i,o,3)?u(e,r,l,i,3):null;case 200:return i=e.readUInt16BE(r+1),l=e.readUInt8(r+3),t(i,o,4)?u(e,r,l,i,4):null;case 201:return i=e.readUInt32BE(r+1),l=e.readUInt8(r+5),t(i,o,6)?u(e,r,l,i,6):null}if(144==(240&h))return a(e,r,i=15&h,1);if(128==(240&h))return s(e,r,i=15&h,1);if(160==(224&h))return t(i=31&h,o,1)?n(p=e.toString("utf8",r+1,r+i+1),i+1):null;if(h>=224)return n(p=h-256,1);if(h<128)return n(h,1);throw new Error("not implemented yet")}function a(e,t,r,o){var a,s=[],c=0;for(t+=o,a=0;ai)&&((n=r.allocUnsafe(9))[0]=203,n.writeDoubleBE(e,1)),n}e.exports=function(e,t,n,i){function s(c,u){var l,f,h;if(void 0===c)throw new Error("undefined is not encodable in msgpack!");if(null===c)(l=r.allocUnsafe(1))[0]=192;else if(!0===c)(l=r.allocUnsafe(1))[0]=195;else if(!1===c)(l=r.allocUnsafe(1))[0]=194;else if("string"==typeof c)(f=r.byteLength(c))<32?((l=r.allocUnsafe(1+f))[0]=160|f,f>0&&l.write(c,1)):f<=255&&!n?((l=r.allocUnsafe(2+f))[0]=217,l[1]=f,l.write(c,2)):f<=65535?((l=r.allocUnsafe(3+f))[0]=218,l.writeUInt16BE(f,1),l.write(c,3)):((l=r.allocUnsafe(5+f))[0]=219,l.writeUInt32BE(f,1),l.write(c,5));else if(c&&(c.readUInt32LE||c instanceof Uint8Array))c instanceof Uint8Array&&(c=r.from(c)),c.length<=255?((l=r.allocUnsafe(2))[0]=196,l[1]=c.length):c.length<=65535?((l=r.allocUnsafe(3))[0]=197,l.writeUInt16BE(c.length,1)):((l=r.allocUnsafe(5))[0]=198,l.writeUInt32BE(c.length,1)),l=o([l,c]);else if(Array.isArray(c))c.length<16?(l=r.allocUnsafe(1))[0]=144|c.length:c.length<65536?((l=r.allocUnsafe(3))[0]=220,l.writeUInt16BE(c.length,1)):((l=r.allocUnsafe(5))[0]=221,l.writeUInt32BE(c.length,1)),l=c.reduce(function(e,t){return e.append(s(t,!0)),e},o().append(l));else{if(!i&&"function"==typeof c.getDate)return function(e){var t,n=1*e,i=Math.floor(n/1e3),a=1e6*(n-1e3*i);if(a||i>4294967295){(t=new r(10))[0]=215,t[1]=-1;var s=4*a,c=i/Math.pow(2,32),u=s+c&4294967295,l=4294967295&i;t.writeInt32BE(u,2),t.writeInt32BE(l,6)}else(t=new r(6))[0]=214,t[1]=-1,t.writeUInt32BE(Math.floor(n/1e3),2);return o().append(t)}(c);if("object"==typeof c)l=function(t){var n,i,a=-1,s=[];for(n=0;n>8),s.push(255&a)):(s.push(201),s.push(a>>24),s.push(a>>16&255),s.push(a>>8&255),s.push(255&a));return o().append(r.from(s)).append(i)}(c)||function(e){var t,n,i=[],a=0;for(t in e)e.hasOwnProperty(t)&&void 0!==e[t]&&"function"!=typeof e[t]&&(++a,i.push(s(t,!0)),i.push(s(e[t],!0)));a<16?(n=r.allocUnsafe(1))[0]=128|a:((n=r.allocUnsafe(3))[0]=222,n.writeUInt16BE(a,1));return i.unshift(n),i.reduce(function(e,t){return e.append(t)},o())}(c);else if("number"==typeof c){if((h=c)!==Math.floor(h))return a(c,t);if(c>=0)if(c<128)(l=r.allocUnsafe(1))[0]=c;else if(c<256)(l=r.allocUnsafe(2))[0]=204,l[1]=c;else if(c<65536)(l=r.allocUnsafe(3))[0]=205,l.writeUInt16BE(c,1);else if(c<=4294967295)(l=r.allocUnsafe(5))[0]=206,l.writeUInt32BE(c,1);else{if(!(c<=9007199254740991))return a(c,!0);(l=r.allocUnsafe(9))[0]=207,function(e,t){for(var n=7;n>=0;n--)e[n+1]=255&t,t/=256}(l,c)}else if(c>=-32)(l=r.allocUnsafe(1))[0]=256+c;else if(c>=-128)(l=r.allocUnsafe(2))[0]=208,l.writeInt8(c,1);else if(c>=-32768)(l=r.allocUnsafe(3))[0]=209,l.writeInt16BE(c,1);else if(c>-214748365)(l=r.allocUnsafe(5))[0]=210,l.writeInt32BE(c,1);else{if(!(c>=-9007199254740991))return a(c,!0);(l=r.allocUnsafe(9))[0]=211,function(e,t,n){var r=n<0;r&&(n=Math.abs(n));var o=n%4294967296,i=n/4294967296;if(e.writeUInt32BE(Math.floor(i),t+0),e.writeUInt32BE(o,t+4),r)for(var a=1,s=t+7;s>=t;s--){var c=(255^e[s])+a;e[s]=255&c,a=c>>8}}(l,1,c)}}}if(!l)throw new Error("not implemented yet");return u?l:l.slice()}return s}},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{c(r.next(e))}catch(e){i(e)}}function s(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]this.nextBatchId?this.fatalError?(this.logger.log(s.LogLevel.Debug,"Received a new batch "+e+" but errored out on a previous batch "+(this.nextBatchId-1)),[4,n.send("OnRenderCompleted",this.nextBatchId-1,this.fatalError.toString())]):[3,4]:[3,5];case 3:return o.sent(),[2];case 4:return this.logger.log(s.LogLevel.Debug,"Waiting for batch "+this.nextBatchId+". Batch "+e+" not processed."),[2];case 5:return o.trys.push([5,7,,8]),this.nextBatchId++,this.logger.log(s.LogLevel.Debug,"Applying batch "+e+"."),i.renderBatch(this.browserRendererId,new a.OutOfProcessRenderBatch(t)),[4,this.completeBatch(n,e)];case 6:return o.sent(),[3,8];case 7:throw r=o.sent(),this.fatalError=r.toString(),this.logger.log(s.LogLevel.Error,"There was an error applying batch "+e+"."),n.send("OnRenderCompleted",e,r.toString()),r;case 8:return[2]}})})},e.prototype.getLastBatchid=function(){return this.nextBatchId-1},e.prototype.completeBatch=function(e,t){return r(this,void 0,void 0,function(){return o(this,function(n){switch(n.label){case 0:return n.trys.push([0,2,,3]),[4,e.send("OnRenderCompleted",t,null)];case 1:return n.sent(),[3,3];case 2:return n.sent(),this.logger.log(s.LogLevel.Warning,"Failed to deliver completion notification for render '"+t+"'."),[3,3];case 3:return[2]}})})},e}();t.RenderQueue=c},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(72),o=Math.pow(2,32),i=Math.pow(2,21)-1,a=function(){function e(e){this.batchData=e;var t=new l(e);this.arrayRangeReader=new f(e),this.arrayBuilderSegmentReader=new h(e),this.diffReader=new s(e),this.editReader=new c(e,t),this.frameReader=new u(e,t)}return e.prototype.updatedComponents=function(){return p(this.batchData,this.batchData.length-20)},e.prototype.referenceFrames=function(){return p(this.batchData,this.batchData.length-16)},e.prototype.disposedComponentIds=function(){return p(this.batchData,this.batchData.length-12)},e.prototype.disposedEventHandlerIds=function(){return p(this.batchData,this.batchData.length-8)},e.prototype.updatedComponentsEntry=function(e,t){var n=e+4*t;return p(this.batchData,n)},e.prototype.referenceFramesEntry=function(e,t){return e+20*t},e.prototype.disposedComponentIdsEntry=function(e,t){var n=e+4*t;return p(this.batchData,n)},e.prototype.disposedEventHandlerIdsEntry=function(e,t){var n=e+8*t;return g(this.batchData,n)},e}();t.OutOfProcessRenderBatch=a;var s=function(){function e(e){this.batchDataUint8=e}return e.prototype.componentId=function(e){return p(this.batchDataUint8,e)},e.prototype.edits=function(e){return e+4},e.prototype.editsEntry=function(e,t){return e+16*t},e}(),c=function(){function e(e,t){this.batchDataUint8=e,this.stringReader=t}return e.prototype.editType=function(e){return p(this.batchDataUint8,e)},e.prototype.siblingIndex=function(e){return p(this.batchDataUint8,e+4)},e.prototype.newTreeIndex=function(e){return p(this.batchDataUint8,e+8)},e.prototype.moveToSiblingIndex=function(e){return p(this.batchDataUint8,e+8)},e.prototype.removedAttributeName=function(e){var t=p(this.batchDataUint8,e+12);return this.stringReader.readString(t)},e}(),u=function(){function e(e,t){this.batchDataUint8=e,this.stringReader=t}return e.prototype.frameType=function(e){return p(this.batchDataUint8,e)},e.prototype.subtreeLength=function(e){return p(this.batchDataUint8,e+4)},e.prototype.elementReferenceCaptureId=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.componentId=function(e){return p(this.batchDataUint8,e+8)},e.prototype.elementName=function(e){var t=p(this.batchDataUint8,e+8);return this.stringReader.readString(t)},e.prototype.textContent=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.markupContent=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.attributeName=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.attributeValue=function(e){var t=p(this.batchDataUint8,e+8);return this.stringReader.readString(t)},e.prototype.attributeEventHandlerId=function(e){return g(this.batchDataUint8,e+12)},e}(),l=function(){function e(e){this.batchDataUint8=e,this.stringTableStartIndex=p(e,e.length-4)}return e.prototype.readString=function(e){if(-1===e)return null;var t,n=p(this.batchDataUint8,this.stringTableStartIndex+4*e),o=function(e,t){for(var n=0,r=0,o=0;o<4;o++){var i=e[t+o];if(n|=(127&i)<>>0)}function g(e,t){var n=d(e,t+4);if(n>i)throw new Error("Cannot read uint64 with high order part "+n+", because the result would exceed Number.MAX_SAFE_INTEGER.");return n*o+d(e,t)}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r="function"==typeof TextDecoder?new TextDecoder("utf-8"):null;t.decodeUtf8=r?r.decode.bind(r):function(e){var t=0,n=e.length,r=[],o=[];for(;t65535&&(u-=65536,r.push(u>>>10&1023|55296),u=56320|1023&u),r.push(u)}r.length>1024&&(o.push(String.fromCharCode.apply(null,r)),r.length=0)}return o.push(String.fromCharCode.apply(null,r)),o.join("")}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(17),o=function(){function e(){}return e.prototype.log=function(e,t){},e.instance=new e,e}();t.NullLogger=o;var i=function(){function e(e){this.minimumLogLevel=e}return e.prototype.log=function(e,t){if(e>=this.minimumLogLevel)switch(e){case r.LogLevel.Critical:case r.LogLevel.Error:console.error("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;case r.LogLevel.Warning:console.warn("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;case r.LogLevel.Information:console.info("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;default:console.log("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t)}},e}();t.ConsoleLogger=i},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{c(r.next(e))}catch(e){i(e)}}function s(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]reloading the page if you're unable to reconnect.",this.message.querySelector("a").addEventListener("click",function(){return location.reload()})},e.prototype.rejected=function(){this.button.style.display="none",this.reloadParagraph.style.display="none",this.message.innerHTML="Could not reconnect to the server. Reload the page to restore functionality.",this.message.querySelector("a").addEventListener("click",function(){return location.reload()})},e}();t.DefaultReconnectDisplay=a},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=function(){function e(e){this.dialog=e}return e.prototype.show=function(){this.removeClasses(),this.dialog.classList.add(e.ShowClassName)},e.prototype.hide=function(){this.removeClasses(),this.dialog.classList.add(e.HideClassName)},e.prototype.failed=function(){this.removeClasses(),this.dialog.classList.add(e.FailedClassName)},e.prototype.rejected=function(){this.removeClasses(),this.dialog.classList.add(e.RejectedClassName)},e.prototype.removeClasses=function(){this.dialog.classList.remove(e.ShowClassName,e.HideClassName,e.FailedClassName,e.RejectedClassName)},e.ShowClassName="components-reconnect-show",e.HideClassName="components-reconnect-hide",e.FailedClassName="components-reconnect-failed",e.RejectedClassName="components-reconnect-rejected",e}();t.UserSpecifiedDisplay=r},function(e,t,n){"use strict";n.r(t);var r=n(6),o=n(11),i=n(2),a=function(){function e(){}return e.write=function(e){var t=e.byteLength||e.length,n=[];do{var r=127&t;(t>>=7)>0&&(r|=128),n.push(r)}while(t>0);t=e.byteLength||e.length;var o=new Uint8Array(n.length+t);return o.set(n,0),o.set(e,n.length),o.buffer},e.parse=function(e){for(var t=[],n=new Uint8Array(e),r=[0,7,14,21,28],o=0;o7)throw new Error("Messages bigger than 2GB are not supported.");if(!(n.byteLength>=o+i+a))throw new Error("Incomplete message.");t.push(n.slice?n.slice(o+i,o+i+a):n.subarray(o+i,o+i+a)),o=o+i+a}return t},e}();var s=new Uint8Array([145,i.MessageType.Ping]),c=function(){function e(){this.name="messagepack",this.version=1,this.transferFormat=i.TransferFormat.Binary,this.errorResult=1,this.voidResult=2,this.nonVoidResult=3}return e.prototype.parseMessages=function(e,t){if(!(e instanceof r.Buffer||(n=e,n&&"undefined"!=typeof ArrayBuffer&&(n instanceof ArrayBuffer||n.constructor&&"ArrayBuffer"===n.constructor.name))))throw new Error("Invalid input for MessagePack hub protocol. Expected an ArrayBuffer or Buffer.");var n;null===t&&(t=i.NullLogger.instance);for(var o=[],s=0,c=a.parse(e);s=3?e[2]:void 0,error:e[1],type:i.MessageType.Close}},e.prototype.createPingMessage=function(e){if(e.length<1)throw new Error("Invalid payload for Ping message.");return{type:i.MessageType.Ping}},e.prototype.createInvocationMessage=function(e,t){if(t.length<5)throw new Error("Invalid payload for Invocation message.");var n=t[2];return n?{arguments:t[4],headers:e,invocationId:n,streamIds:[],target:t[3],type:i.MessageType.Invocation}:{arguments:t[4],headers:e,streamIds:[],target:t[3],type:i.MessageType.Invocation}},e.prototype.createStreamItemMessage=function(e,t){if(t.length<4)throw new Error("Invalid payload for StreamItem message.");return{headers:e,invocationId:t[2],item:t[3],type:i.MessageType.StreamItem}},e.prototype.createCompletionMessage=function(e,t){if(t.length<4)throw new Error("Invalid payload for Completion message.");var n,r,o=t[3];if(o!==this.voidResult&&t.length<5)throw new Error("Invalid payload for Completion message.");switch(o){case this.errorResult:n=t[4];break;case this.nonVoidResult:r=t[4]}return{error:n,headers:e,invocationId:t[2],result:r,type:i.MessageType.Completion}},e.prototype.writeInvocation=function(e){var t=o().encode([i.MessageType.Invocation,e.headers||{},e.invocationId||null,e.target,e.arguments,e.streamIds]);return a.write(t.slice())},e.prototype.writeStreamInvocation=function(e){var t=o().encode([i.MessageType.StreamInvocation,e.headers||{},e.invocationId,e.target,e.arguments,e.streamIds]);return a.write(t.slice())},e.prototype.writeStreamItem=function(e){var t=o().encode([i.MessageType.StreamItem,e.headers||{},e.invocationId,e.item]);return a.write(t.slice())},e.prototype.writeCompletion=function(e){var t,n=o(),r=e.error?this.errorResult:e.result?this.nonVoidResult:this.voidResult;switch(r){case this.errorResult:t=n.encode([i.MessageType.Completion,e.headers||{},e.invocationId,r,e.error]);break;case this.voidResult:t=n.encode([i.MessageType.Completion,e.headers||{},e.invocationId,r]);break;case this.nonVoidResult:t=n.encode([i.MessageType.Completion,e.headers||{},e.invocationId,r,e.result])}return a.write(t.slice())},e.prototype.writeCancelInvocation=function(e){var t=o().encode([i.MessageType.CancelInvocation,e.headers||{},e.invocationId]);return a.write(t.slice())},e.prototype.readHeaders=function(e){var t=e[1];if("object"!=typeof t)throw new Error("Invalid headers.");return t},e}();n.d(t,"VERSION",function(){return u}),n.d(t,"MessagePackHubProtocol",function(){return c});var u="0.0.0-DEV_BUILD"}]); \ No newline at end of file +function r(e,t){if(e===t)return 0;for(var n=e.length,r=t.length,o=0,i=Math.min(n,r);o=0;u--)if(l[u]!==f[u])return!1;for(u=l.length-1;u>=0;u--)if(c=l[u],!b(e[c],t[c],n,r))return!1;return!0}(e,t,n,a))}return n?e===t:e==t}function m(e){return"[object Arguments]"==Object.prototype.toString.call(e)}function w(e,t){if(!e||!t)return!1;if("[object RegExp]"==Object.prototype.toString.call(t))return t.test(e);try{if(e instanceof t)return!0}catch(e){}return!Error.isPrototypeOf(t)&&!0===t.call({},e)}function E(e,t,n,r){var o;if("function"!=typeof t)throw new TypeError('"block" argument must be a function');"string"==typeof n&&(r=n,n=null),o=function(e){var t;try{e()}catch(e){t=e}return t}(t),r=(n&&n.name?" ("+n.name+").":".")+(r?" "+r:"."),e&&!o&&y(o,n,"Missing expected exception"+r);var a="string"==typeof r,s=!e&&o&&!n;if((!e&&i.isError(o)&&a&&w(o,n)||s)&&y(o,n,"Got unwanted exception"+r),e&&o&&n&&!w(o,n)||!e&&o)throw o}f.AssertionError=function(e){var t;this.name="AssertionError",this.actual=e.actual,this.expected=e.expected,this.operator=e.operator,e.message?(this.message=e.message,this.generatedMessage=!1):(this.message=d(g((t=this).actual),128)+" "+t.operator+" "+d(g(t.expected),128),this.generatedMessage=!0);var n=e.stackStartFunction||y;if(Error.captureStackTrace)Error.captureStackTrace(this,n);else{var r=new Error;if(r.stack){var o=r.stack,i=p(n),a=o.indexOf("\n"+i);if(a>=0){var s=o.indexOf("\n",a+1);o=o.substring(s+1)}this.stack=o}}},i.inherits(f.AssertionError,Error),f.fail=y,f.ok=v,f.equal=function(e,t,n){e!=t&&y(e,t,n,"==",f.equal)},f.notEqual=function(e,t,n){e==t&&y(e,t,n,"!=",f.notEqual)},f.deepEqual=function(e,t,n){b(e,t,!1)||y(e,t,n,"deepEqual",f.deepEqual)},f.deepStrictEqual=function(e,t,n){b(e,t,!0)||y(e,t,n,"deepStrictEqual",f.deepStrictEqual)},f.notDeepEqual=function(e,t,n){b(e,t,!1)&&y(e,t,n,"notDeepEqual",f.notDeepEqual)},f.notDeepStrictEqual=function e(t,n,r){b(t,n,!0)&&y(t,n,r,"notDeepStrictEqual",e)},f.strictEqual=function(e,t,n){e!==t&&y(e,t,n,"===",f.strictEqual)},f.notStrictEqual=function(e,t,n){e===t&&y(e,t,n,"!==",f.notStrictEqual)},f.throws=function(e,t,n){E(!0,e,t,n)},f.doesNotThrow=function(e,t,n){E(!1,e,t,n)},f.ifError=function(e){if(e)throw e};var S=Object.keys||function(e){var t=[];for(var n in e)a.call(e,n)&&t.push(n);return t}}).call(this,n(9))},function(e,t){e.exports=function(e){return e&&"object"==typeof e&&"function"==typeof e.copy&&"function"==typeof e.fill&&"function"==typeof e.readUInt8}},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})}:e.exports=function(e,t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}},function(e,t,n){e.exports=n(10)},function(e,t){var n={}.toString;e.exports=Array.isArray||function(e){return"[object Array]"==n.call(e)}},function(e,t){},function(e,t,n){"use strict";var r=n(15).Buffer,o=n(60);e.exports=function(){function e(){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this.head=null,this.tail=null,this.length=0}return e.prototype.push=function(e){var t={data:e,next:null};this.length>0?this.tail.next=t:this.head=t,this.tail=t,++this.length},e.prototype.unshift=function(e){var t={data:e,next:this.head};0===this.length&&(this.tail=t),this.head=t,++this.length},e.prototype.shift=function(){if(0!==this.length){var e=this.head.data;return 1===this.length?this.head=this.tail=null:this.head=this.head.next,--this.length,e}},e.prototype.clear=function(){this.head=this.tail=null,this.length=0},e.prototype.join=function(e){if(0===this.length)return"";for(var t=this.head,n=""+t.data;t=t.next;)n+=e+t.data;return n},e.prototype.concat=function(e){if(0===this.length)return r.alloc(0);if(1===this.length)return this.head.data;for(var t,n,o,i=r.allocUnsafe(e>>>0),a=this.head,s=0;a;)t=a.data,n=i,o=s,t.copy(n,o),s+=a.data.length,a=a.next;return i},e}(),o&&o.inspect&&o.inspect.custom&&(e.exports.prototype[o.inspect.custom]=function(){var e=o.inspect({length:this.length});return this.constructor.name+" "+e})},function(e,t){},function(e,t,n){var r=n(6),o=r.Buffer;function i(e,t){for(var n in e)t[n]=e[n]}function a(e,t,n){return o(e,t,n)}o.from&&o.alloc&&o.allocUnsafe&&o.allocUnsafeSlow?e.exports=r:(i(r,t),t.Buffer=a),i(o,a),a.from=function(e,t,n){if("number"==typeof e)throw new TypeError("Argument must not be a number");return o(e,t,n)},a.alloc=function(e,t,n){if("number"!=typeof e)throw new TypeError("Argument must be a number");var r=o(e);return void 0!==t?"string"==typeof n?r.fill(t,n):r.fill(t):r.fill(0),r},a.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return o(e)},a.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return r.SlowBuffer(e)}},function(e,t,n){(function(e){var r=void 0!==e&&e||"undefined"!=typeof self&&self||window,o=Function.prototype.apply;function i(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new i(o.call(setTimeout,r,arguments),clearTimeout)},t.setInterval=function(){return new i(o.call(setInterval,r,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},i.prototype.unref=i.prototype.ref=function(){},i.prototype.close=function(){this._clearFn.call(r,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},n(63),t.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==e&&e.setImmediate||this&&this.setImmediate,t.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==e&&e.clearImmediate||this&&this.clearImmediate}).call(this,n(9))},function(e,t,n){(function(e,t){!function(e,n){"use strict";if(!e.setImmediate){var r,o,i,a,s,c=1,u={},l=!1,f=e.document,h=Object.getPrototypeOf&&Object.getPrototypeOf(e);h=h&&h.setTimeout?h:e,"[object process]"==={}.toString.call(e.process)?r=function(e){t.nextTick(function(){d(e)})}:!function(){if(e.postMessage&&!e.importScripts){var t=!0,n=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=n,t}}()?e.MessageChannel?((i=new MessageChannel).port1.onmessage=function(e){d(e.data)},r=function(e){i.port2.postMessage(e)}):f&&"onreadystatechange"in f.createElement("script")?(o=f.documentElement,r=function(e){var t=f.createElement("script");t.onreadystatechange=function(){d(e),t.onreadystatechange=null,o.removeChild(t),t=null},o.appendChild(t)}):r=function(e){setTimeout(d,0,e)}:(a="setImmediate$"+Math.random()+"$",s=function(t){t.source===e&&"string"==typeof t.data&&0===t.data.indexOf(a)&&d(+t.data.slice(a.length))},e.addEventListener?e.addEventListener("message",s,!1):e.attachEvent("onmessage",s),r=function(t){e.postMessage(a+t,"*")}),h.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),n=0;n0?this._transform(null,t,n):n()},e.exports.decoder=c,e.exports.encoder=s},function(e,t,n){(t=e.exports=n(36)).Stream=t,t.Readable=t,t.Writable=n(41),t.Duplex=n(10),t.Transform=n(42),t.PassThrough=n(67)},function(e,t,n){"use strict";e.exports=i;var r=n(42),o=n(21);function i(e){if(!(this instanceof i))return new i(e);r.call(this,e)}o.inherits=n(16),o.inherits(i,r),i.prototype._transform=function(e,t,n){n(null,e)}},function(e,t,n){var r=n(22);function o(e){Error.call(this),Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor),this.name=this.constructor.name,this.message=e||"unable to decode"}n(34).inherits(o,Error),e.exports=function(e){return function(e){e instanceof r||(e=r().append(e));var t=i(e);if(t)return e.consume(t.bytesConsumed),t.value;throw new o};function t(e,t,n){return t>=n+e}function n(e,t){return{value:e,bytesConsumed:t}}function i(e,r){r=void 0===r?0:r;var o=e.length-r;if(o<=0)return null;var i,l,f,h=e.readUInt8(r),p=0;if(!function(e,t){var n=function(e){switch(e){case 196:return 2;case 197:return 3;case 198:return 5;case 199:return 3;case 200:return 4;case 201:return 6;case 202:return 5;case 203:return 9;case 204:return 2;case 205:return 3;case 206:return 5;case 207:return 9;case 208:return 2;case 209:return 3;case 210:return 5;case 211:return 9;case 212:return 3;case 213:return 4;case 214:return 6;case 215:return 10;case 216:return 18;case 217:return 2;case 218:return 3;case 219:return 5;case 222:return 3;default:return-1}}(e);return!(-1!==n&&t=0;f--)p+=e.readUInt8(r+f+1)*Math.pow(2,8*(7-f));return n(p,9);case 208:return n(p=e.readInt8(r+1),2);case 209:return n(p=e.readInt16BE(r+1),3);case 210:return n(p=e.readInt32BE(r+1),5);case 211:return n(p=function(e,t){var n=128==(128&e[t]);if(n)for(var r=1,o=t+7;o>=t;o--){var i=(255^e[o])+r;e[o]=255&i,r=i>>8}var a=e.readUInt32BE(t+0),s=e.readUInt32BE(t+4);return(4294967296*a+s)*(n?-1:1)}(e.slice(r+1,r+9),0),9);case 202:return n(p=e.readFloatBE(r+1),5);case 203:return n(p=e.readDoubleBE(r+1),9);case 217:return t(i=e.readUInt8(r+1),o,2)?n(p=e.toString("utf8",r+2,r+2+i),2+i):null;case 218:return t(i=e.readUInt16BE(r+1),o,3)?n(p=e.toString("utf8",r+3,r+3+i),3+i):null;case 219:return t(i=e.readUInt32BE(r+1),o,5)?n(p=e.toString("utf8",r+5,r+5+i),5+i):null;case 196:return t(i=e.readUInt8(r+1),o,2)?n(p=e.slice(r+2,r+2+i),2+i):null;case 197:return t(i=e.readUInt16BE(r+1),o,3)?n(p=e.slice(r+3,r+3+i),3+i):null;case 198:return t(i=e.readUInt32BE(r+1),o,5)?n(p=e.slice(r+5,r+5+i),5+i):null;case 220:return o<3?null:(i=e.readUInt16BE(r+1),a(e,r,i,3));case 221:return o<5?null:(i=e.readUInt32BE(r+1),a(e,r,i,5));case 222:return i=e.readUInt16BE(r+1),s(e,r,i,3);case 223:throw new Error("map too big to decode in JS");case 212:return c(e,r,1);case 213:return c(e,r,2);case 214:return c(e,r,4);case 215:return c(e,r,8);case 216:return c(e,r,16);case 199:return i=e.readUInt8(r+1),l=e.readUInt8(r+2),t(i,o,3)?u(e,r,l,i,3):null;case 200:return i=e.readUInt16BE(r+1),l=e.readUInt8(r+3),t(i,o,4)?u(e,r,l,i,4):null;case 201:return i=e.readUInt32BE(r+1),l=e.readUInt8(r+5),t(i,o,6)?u(e,r,l,i,6):null}if(144==(240&h))return a(e,r,i=15&h,1);if(128==(240&h))return s(e,r,i=15&h,1);if(160==(224&h))return t(i=31&h,o,1)?n(p=e.toString("utf8",r+1,r+i+1),i+1):null;if(h>=224)return n(p=h-256,1);if(h<128)return n(h,1);throw new Error("not implemented yet")}function a(e,t,r,o){var a,s=[],c=0;for(t+=o,a=0;ai)&&((n=r.allocUnsafe(9))[0]=203,n.writeDoubleBE(e,1)),n}e.exports=function(e,t,n,i){function s(c,u){var l,f,h;if(void 0===c)throw new Error("undefined is not encodable in msgpack!");if(null===c)(l=r.allocUnsafe(1))[0]=192;else if(!0===c)(l=r.allocUnsafe(1))[0]=195;else if(!1===c)(l=r.allocUnsafe(1))[0]=194;else if("string"==typeof c)(f=r.byteLength(c))<32?((l=r.allocUnsafe(1+f))[0]=160|f,f>0&&l.write(c,1)):f<=255&&!n?((l=r.allocUnsafe(2+f))[0]=217,l[1]=f,l.write(c,2)):f<=65535?((l=r.allocUnsafe(3+f))[0]=218,l.writeUInt16BE(f,1),l.write(c,3)):((l=r.allocUnsafe(5+f))[0]=219,l.writeUInt32BE(f,1),l.write(c,5));else if(c&&(c.readUInt32LE||c instanceof Uint8Array))c instanceof Uint8Array&&(c=r.from(c)),c.length<=255?((l=r.allocUnsafe(2))[0]=196,l[1]=c.length):c.length<=65535?((l=r.allocUnsafe(3))[0]=197,l.writeUInt16BE(c.length,1)):((l=r.allocUnsafe(5))[0]=198,l.writeUInt32BE(c.length,1)),l=o([l,c]);else if(Array.isArray(c))c.length<16?(l=r.allocUnsafe(1))[0]=144|c.length:c.length<65536?((l=r.allocUnsafe(3))[0]=220,l.writeUInt16BE(c.length,1)):((l=r.allocUnsafe(5))[0]=221,l.writeUInt32BE(c.length,1)),l=c.reduce(function(e,t){return e.append(s(t,!0)),e},o().append(l));else{if(!i&&"function"==typeof c.getDate)return function(e){var t,n=1*e,i=Math.floor(n/1e3),a=1e6*(n-1e3*i);if(a||i>4294967295){(t=new r(10))[0]=215,t[1]=-1;var s=4*a,c=i/Math.pow(2,32),u=s+c&4294967295,l=4294967295&i;t.writeInt32BE(u,2),t.writeInt32BE(l,6)}else(t=new r(6))[0]=214,t[1]=-1,t.writeUInt32BE(Math.floor(n/1e3),2);return o().append(t)}(c);if("object"==typeof c)l=function(t){var n,i,a=-1,s=[];for(n=0;n>8),s.push(255&a)):(s.push(201),s.push(a>>24),s.push(a>>16&255),s.push(a>>8&255),s.push(255&a));return o().append(r.from(s)).append(i)}(c)||function(e){var t,n,i=[],a=0;for(t in e)e.hasOwnProperty(t)&&void 0!==e[t]&&"function"!=typeof e[t]&&(++a,i.push(s(t,!0)),i.push(s(e[t],!0)));a<16?(n=r.allocUnsafe(1))[0]=128|a:((n=r.allocUnsafe(3))[0]=222,n.writeUInt16BE(a,1));return i.unshift(n),i.reduce(function(e,t){return e.append(t)},o())}(c);else if("number"==typeof c){if((h=c)!==Math.floor(h))return a(c,t);if(c>=0)if(c<128)(l=r.allocUnsafe(1))[0]=c;else if(c<256)(l=r.allocUnsafe(2))[0]=204,l[1]=c;else if(c<65536)(l=r.allocUnsafe(3))[0]=205,l.writeUInt16BE(c,1);else if(c<=4294967295)(l=r.allocUnsafe(5))[0]=206,l.writeUInt32BE(c,1);else{if(!(c<=9007199254740991))return a(c,!0);(l=r.allocUnsafe(9))[0]=207,function(e,t){for(var n=7;n>=0;n--)e[n+1]=255&t,t/=256}(l,c)}else if(c>=-32)(l=r.allocUnsafe(1))[0]=256+c;else if(c>=-128)(l=r.allocUnsafe(2))[0]=208,l.writeInt8(c,1);else if(c>=-32768)(l=r.allocUnsafe(3))[0]=209,l.writeInt16BE(c,1);else if(c>-214748365)(l=r.allocUnsafe(5))[0]=210,l.writeInt32BE(c,1);else{if(!(c>=-9007199254740991))return a(c,!0);(l=r.allocUnsafe(9))[0]=211,function(e,t,n){var r=n<0;r&&(n=Math.abs(n));var o=n%4294967296,i=n/4294967296;if(e.writeUInt32BE(Math.floor(i),t+0),e.writeUInt32BE(o,t+4),r)for(var a=1,s=t+7;s>=t;s--){var c=(255^e[s])+a;e[s]=255&c,a=c>>8}}(l,1,c)}}}if(!l)throw new Error("not implemented yet");return u?l:l.slice()}return s}},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{c(r.next(e))}catch(e){i(e)}}function s(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]this.nextBatchId?this.fatalError?(this.logger.log(s.LogLevel.Debug,"Received a new batch "+e+" but errored out on a previous batch "+(this.nextBatchId-1)),[4,n.send("OnRenderCompleted",this.nextBatchId-1,this.fatalError.toString())]):[3,4]:[3,5];case 3:return o.sent(),[2];case 4:return this.logger.log(s.LogLevel.Debug,"Waiting for batch "+this.nextBatchId+". Batch "+e+" not processed."),[2];case 5:return o.trys.push([5,7,,8]),this.nextBatchId++,this.logger.log(s.LogLevel.Debug,"Applying batch "+e+"."),i.renderBatch(this.browserRendererId,new a.OutOfProcessRenderBatch(t)),[4,this.completeBatch(n,e)];case 6:return o.sent(),[3,8];case 7:throw r=o.sent(),this.fatalError=r.toString(),this.logger.log(s.LogLevel.Error,"There was an error applying batch "+e+"."),n.send("OnRenderCompleted",e,r.toString()),r;case 8:return[2]}})})},e.prototype.getLastBatchid=function(){return this.nextBatchId-1},e.prototype.completeBatch=function(e,t){return r(this,void 0,void 0,function(){return o(this,function(n){switch(n.label){case 0:return n.trys.push([0,2,,3]),[4,e.send("OnRenderCompleted",t,null)];case 1:return n.sent(),[3,3];case 2:return n.sent(),this.logger.log(s.LogLevel.Warning,"Failed to deliver completion notification for render '"+t+"'."),[3,3];case 3:return[2]}})})},e}();t.RenderQueue=c},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(72),o=Math.pow(2,32),i=Math.pow(2,21)-1,a=function(){function e(e){this.batchData=e;var t=new l(e);this.arrayRangeReader=new f(e),this.arrayBuilderSegmentReader=new h(e),this.diffReader=new s(e),this.editReader=new c(e,t),this.frameReader=new u(e,t)}return e.prototype.updatedComponents=function(){return p(this.batchData,this.batchData.length-20)},e.prototype.referenceFrames=function(){return p(this.batchData,this.batchData.length-16)},e.prototype.disposedComponentIds=function(){return p(this.batchData,this.batchData.length-12)},e.prototype.disposedEventHandlerIds=function(){return p(this.batchData,this.batchData.length-8)},e.prototype.updatedComponentsEntry=function(e,t){var n=e+4*t;return p(this.batchData,n)},e.prototype.referenceFramesEntry=function(e,t){return e+20*t},e.prototype.disposedComponentIdsEntry=function(e,t){var n=e+4*t;return p(this.batchData,n)},e.prototype.disposedEventHandlerIdsEntry=function(e,t){var n=e+8*t;return g(this.batchData,n)},e}();t.OutOfProcessRenderBatch=a;var s=function(){function e(e){this.batchDataUint8=e}return e.prototype.componentId=function(e){return p(this.batchDataUint8,e)},e.prototype.edits=function(e){return e+4},e.prototype.editsEntry=function(e,t){return e+16*t},e}(),c=function(){function e(e,t){this.batchDataUint8=e,this.stringReader=t}return e.prototype.editType=function(e){return p(this.batchDataUint8,e)},e.prototype.siblingIndex=function(e){return p(this.batchDataUint8,e+4)},e.prototype.newTreeIndex=function(e){return p(this.batchDataUint8,e+8)},e.prototype.moveToSiblingIndex=function(e){return p(this.batchDataUint8,e+8)},e.prototype.removedAttributeName=function(e){var t=p(this.batchDataUint8,e+12);return this.stringReader.readString(t)},e}(),u=function(){function e(e,t){this.batchDataUint8=e,this.stringReader=t}return e.prototype.frameType=function(e){return p(this.batchDataUint8,e)},e.prototype.subtreeLength=function(e){return p(this.batchDataUint8,e+4)},e.prototype.elementReferenceCaptureId=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.componentId=function(e){return p(this.batchDataUint8,e+8)},e.prototype.elementName=function(e){var t=p(this.batchDataUint8,e+8);return this.stringReader.readString(t)},e.prototype.textContent=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.markupContent=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.attributeName=function(e){var t=p(this.batchDataUint8,e+4);return this.stringReader.readString(t)},e.prototype.attributeValue=function(e){var t=p(this.batchDataUint8,e+8);return this.stringReader.readString(t)},e.prototype.attributeEventHandlerId=function(e){return g(this.batchDataUint8,e+12)},e}(),l=function(){function e(e){this.batchDataUint8=e,this.stringTableStartIndex=p(e,e.length-4)}return e.prototype.readString=function(e){if(-1===e)return null;var t,n=p(this.batchDataUint8,this.stringTableStartIndex+4*e),o=function(e,t){for(var n=0,r=0,o=0;o<4;o++){var i=e[t+o];if(n|=(127&i)<>>0)}function g(e,t){var n=d(e,t+4);if(n>i)throw new Error("Cannot read uint64 with high order part "+n+", because the result would exceed Number.MAX_SAFE_INTEGER.");return n*o+d(e,t)}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r="function"==typeof TextDecoder?new TextDecoder("utf-8"):null;t.decodeUtf8=r?r.decode.bind(r):function(e){var t=0,n=e.length,r=[],o=[];for(;t65535&&(u-=65536,r.push(u>>>10&1023|55296),u=56320|1023&u),r.push(u)}r.length>1024&&(o.push(String.fromCharCode.apply(null,r)),r.length=0)}return o.push(String.fromCharCode.apply(null,r)),o.join("")}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(17),o=function(){function e(){}return e.prototype.log=function(e,t){},e.instance=new e,e}();t.NullLogger=o;var i=function(){function e(e){this.minimumLogLevel=e}return e.prototype.log=function(e,t){if(e>=this.minimumLogLevel)switch(e){case r.LogLevel.Critical:case r.LogLevel.Error:console.error("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;case r.LogLevel.Warning:console.warn("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;case r.LogLevel.Information:console.info("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t);break;default:console.log("["+(new Date).toISOString()+"] "+r.LogLevel[e]+": "+t)}},e}();t.ConsoleLogger=i},function(e,t,n){"use strict";var r=this&&this.__awaiter||function(e,t,n,r){return new(n||(n=Promise))(function(o,i){function a(e){try{c(r.next(e))}catch(e){i(e)}}function s(e){try{c(r.throw(e))}catch(e){i(e)}}function c(e){e.done?o(e.value):new n(function(t){t(e.value)}).then(a,s)}c((r=r.apply(e,t||[])).next())})},o=this&&this.__generator||function(e,t){var n,r,o,i,a={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return i={next:s(0),throw:s(1),return:s(2)},"function"==typeof Symbol&&(i[Symbol.iterator]=function(){return this}),i;function s(i){return function(s){return function(i){if(n)throw new TypeError("Generator is already executing.");for(;a;)try{if(n=1,r&&(o=2&i[0]?r.return:i[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,i[1])).done)return o;switch(r=0,o&&(i=[2&i[0],o.value]),i[0]){case 0:case 1:o=i;break;case 4:return a.label++,{value:i[1],done:!1};case 5:a.label++,r=i[1],i=[0];continue;case 7:i=a.ops.pop(),a.trys.pop();continue;default:if(!(o=(o=a.trys).length>0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]0&&o[o.length-1])&&(6===i[0]||2===i[0])){a=0;continue}if(3===i[0]&&(!o||i[1]>o[0]&&i[1]reloading the page if you're unable to reconnect.",this.message.querySelector("a").addEventListener("click",function(){return location.reload()})},e.prototype.rejected=function(){this.button.style.display="none",this.reloadParagraph.style.display="none",this.message.innerHTML="Could not reconnect to the server. Reload the page to restore functionality.",this.message.querySelector("a").addEventListener("click",function(){return location.reload()})},e}();t.DefaultReconnectDisplay=a},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=function(){function e(e){this.dialog=e}return e.prototype.show=function(){this.removeClasses(),this.dialog.classList.add(e.ShowClassName)},e.prototype.hide=function(){this.removeClasses(),this.dialog.classList.add(e.HideClassName)},e.prototype.failed=function(){this.removeClasses(),this.dialog.classList.add(e.FailedClassName)},e.prototype.rejected=function(){this.removeClasses(),this.dialog.classList.add(e.RejectedClassName)},e.prototype.removeClasses=function(){this.dialog.classList.remove(e.ShowClassName,e.HideClassName,e.FailedClassName,e.RejectedClassName)},e.ShowClassName="components-reconnect-show",e.HideClassName="components-reconnect-hide",e.FailedClassName="components-reconnect-failed",e.RejectedClassName="components-reconnect-rejected",e}();t.UserSpecifiedDisplay=r},function(e,t,n){"use strict";n.r(t);var r=n(6),o=n(11),i=n(2),a=function(){function e(){}return e.write=function(e){var t=e.byteLength||e.length,n=[];do{var r=127&t;(t>>=7)>0&&(r|=128),n.push(r)}while(t>0);t=e.byteLength||e.length;var o=new Uint8Array(n.length+t);return o.set(n,0),o.set(e,n.length),o.buffer},e.parse=function(e){for(var t=[],n=new Uint8Array(e),r=[0,7,14,21,28],o=0;o7)throw new Error("Messages bigger than 2GB are not supported.");if(!(n.byteLength>=o+i+a))throw new Error("Incomplete message.");t.push(n.slice?n.slice(o+i,o+i+a):n.subarray(o+i,o+i+a)),o=o+i+a}return t},e}();var s=new Uint8Array([145,i.MessageType.Ping]),c=function(){function e(){this.name="messagepack",this.version=1,this.transferFormat=i.TransferFormat.Binary,this.errorResult=1,this.voidResult=2,this.nonVoidResult=3}return e.prototype.parseMessages=function(e,t){if(!(e instanceof r.Buffer||(n=e,n&&"undefined"!=typeof ArrayBuffer&&(n instanceof ArrayBuffer||n.constructor&&"ArrayBuffer"===n.constructor.name))))throw new Error("Invalid input for MessagePack hub protocol. Expected an ArrayBuffer or Buffer.");var n;null===t&&(t=i.NullLogger.instance);for(var o=[],s=0,c=a.parse(e);s=3?e[2]:void 0,error:e[1],type:i.MessageType.Close}},e.prototype.createPingMessage=function(e){if(e.length<1)throw new Error("Invalid payload for Ping message.");return{type:i.MessageType.Ping}},e.prototype.createInvocationMessage=function(e,t){if(t.length<5)throw new Error("Invalid payload for Invocation message.");var n=t[2];return n?{arguments:t[4],headers:e,invocationId:n,streamIds:[],target:t[3],type:i.MessageType.Invocation}:{arguments:t[4],headers:e,streamIds:[],target:t[3],type:i.MessageType.Invocation}},e.prototype.createStreamItemMessage=function(e,t){if(t.length<4)throw new Error("Invalid payload for StreamItem message.");return{headers:e,invocationId:t[2],item:t[3],type:i.MessageType.StreamItem}},e.prototype.createCompletionMessage=function(e,t){if(t.length<4)throw new Error("Invalid payload for Completion message.");var n,r,o=t[3];if(o!==this.voidResult&&t.length<5)throw new Error("Invalid payload for Completion message.");switch(o){case this.errorResult:n=t[4];break;case this.nonVoidResult:r=t[4]}return{error:n,headers:e,invocationId:t[2],result:r,type:i.MessageType.Completion}},e.prototype.writeInvocation=function(e){var t=o().encode([i.MessageType.Invocation,e.headers||{},e.invocationId||null,e.target,e.arguments,e.streamIds]);return a.write(t.slice())},e.prototype.writeStreamInvocation=function(e){var t=o().encode([i.MessageType.StreamInvocation,e.headers||{},e.invocationId,e.target,e.arguments,e.streamIds]);return a.write(t.slice())},e.prototype.writeStreamItem=function(e){var t=o().encode([i.MessageType.StreamItem,e.headers||{},e.invocationId,e.item]);return a.write(t.slice())},e.prototype.writeCompletion=function(e){var t,n=o(),r=e.error?this.errorResult:e.result?this.nonVoidResult:this.voidResult;switch(r){case this.errorResult:t=n.encode([i.MessageType.Completion,e.headers||{},e.invocationId,r,e.error]);break;case this.voidResult:t=n.encode([i.MessageType.Completion,e.headers||{},e.invocationId,r]);break;case this.nonVoidResult:t=n.encode([i.MessageType.Completion,e.headers||{},e.invocationId,r,e.result])}return a.write(t.slice())},e.prototype.writeCancelInvocation=function(e){var t=o().encode([i.MessageType.CancelInvocation,e.headers||{},e.invocationId]);return a.write(t.slice())},e.prototype.readHeaders=function(e){var t=e[1];if("object"!=typeof t)throw new Error("Invalid headers.");return t},e}();n.d(t,"VERSION",function(){return u}),n.d(t,"MessagePackHubProtocol",function(){return c});var u="5.0.0-dev"}]); \ No newline at end of file diff --git a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj index aeb1c37401..dc038fa740 100644 --- a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj +++ b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj @@ -5,10 +5,15 @@ - + + + - + + + + diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp.cs b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp.cs index 25c554c639..73f23b8f46 100644 --- a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp.cs +++ b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp.cs @@ -517,7 +517,6 @@ namespace Microsoft.AspNetCore.Routing.Matching private int _dummyPrimitive; public Microsoft.AspNetCore.Http.Endpoint Endpoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } public int Score { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } - public Microsoft.AspNetCore.Routing.RouteValueDictionary Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } } public sealed partial class EndpointMetadataComparer : System.Collections.Generic.IComparer { diff --git a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs index b27d704186..27afc892ac 100644 --- a/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs +++ b/src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs @@ -1635,7 +1635,6 @@ namespace Microsoft.AspNetCore.Identity.Test /// /// Task [Fact] - [Flaky("https://github.com/dotnet/aspnetcore-internal/issues/1766", FlakyOn.All)] public async Task EmailFactorFailsAfterSecurityStampChangeTest() { var manager = CreateManager(); diff --git a/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj b/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj index be6b920ad5..8560f92744 100644 --- a/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj +++ b/src/Middleware/WebSockets/ref/Microsoft.AspNetCore.WebSockets.csproj @@ -8,5 +8,7 @@ + + diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp.cs b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp.cs index 28c29522ca..49c7324b19 100644 --- a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp.cs +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp.cs @@ -297,7 +297,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Infrastructure public sealed partial class TagHelperMemoryCacheProvider { public TagHelperMemoryCacheProvider() { } - public Microsoft.Extensions.Caching.Memory.IMemoryCache Cache { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } } } namespace Microsoft.AspNetCore.Mvc.Razor.Internal diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp.cs b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp.cs index b93e1462ed..606f4b2a6c 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp.cs +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp.cs @@ -637,7 +637,6 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages public partial class RazorPagesOptions : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable { public RazorPagesOptions() { } - public Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection Conventions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } public string RootDirectory { get { throw null; } set { } } System.Collections.Generic.IEnumerator System.Collections.Generic.IEnumerable.GetEnumerator() { throw null; } System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp.cs b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp.cs index 4bc6818046..d1455f1796 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp.cs +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp.cs @@ -155,7 +155,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core public System.IServiceProvider ApplicationServices { get { throw null; } } public ulong FileHandle { get { throw null; } } public System.Net.IPEndPoint IPEndPoint { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions KestrelServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } public Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols Protocols { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } public string SocketPath { get { throw null; } } public Microsoft.AspNetCore.Connections.ConnectionDelegate Build() { throw null; } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs index d86ab4107b..47d6e3fa32 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs @@ -309,7 +309,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http public bool HasResponseCompleted => _requestProcessingStatus == RequestProcessingStatus.ResponseCompleted; - protected HttpRequestHeaders HttpRequestHeaders { get; } = new HttpRequestHeaders(); + protected HttpRequestHeaders HttpRequestHeaders { get; set; } = new HttpRequestHeaders(); protected HttpResponseHeaders HttpResponseHeaders { get; } = new HttpResponseHeaders(); @@ -1192,7 +1192,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } // TODO allow customization of this. - if (ServerOptions.EnableAltSvc && _httpVersion < Http.HttpVersion.Http3) + if (ServerOptions.EnableAltSvc && _httpVersion < Http.HttpVersion.Http3) { foreach (var option in ServerOptions.ListenOptions) { diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs index 09c2d74265..70fa7f00b3 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.cs @@ -195,7 +195,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure } } - private static unsafe string GetLatin1StringNonNullCharacters(this Span span) + private static unsafe string GetLatin1StringNonNullCharacters(this ReadOnlySpan span) { if (span.IsEmpty) { @@ -218,7 +218,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure return resultString; } - public static string GetRequestHeaderStringNonNullCharacters(this Span span, bool useLatin1) => + public static string GetRequestHeaderStringNonNullCharacters(this ReadOnlySpan span, bool useLatin1) => useLatin1 ? GetLatin1StringNonNullCharacters(span) : GetAsciiOrUTF8StringNonNullCharacters(span); public static string GetAsciiStringEscaped(this Span span, int maxChars) diff --git a/src/Servers/Kestrel/Transport.Quic/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj b/src/Servers/Kestrel/Transport.Quic/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj deleted file mode 100644 index d242680513..0000000000 --- a/src/Servers/Kestrel/Transport.Quic/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - $(DefaultNetCoreTargetFramework) - - - - - - - - - diff --git a/src/Servers/Kestrel/Transport.Quic/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.netcoreapp.cs b/src/Servers/Kestrel/Transport.Quic/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.netcoreapp.cs deleted file mode 100644 index bb1157951d..0000000000 --- a/src/Servers/Kestrel/Transport.Quic/ref/Microsoft.AspNetCore.Server.Kestrel.Transport.Quic.netcoreapp.cs +++ /dev/null @@ -1,38 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Hosting -{ - public static partial class WebHostBuilderMsQuicExtensions - { - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseQuic(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder) { throw null; } - public static Microsoft.AspNetCore.Hosting.IWebHostBuilder UseQuic(this Microsoft.AspNetCore.Hosting.IWebHostBuilder hostBuilder, System.Action configureOptions) { throw null; } - } -} -namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic -{ - public partial class QuicConnectionFactory : Microsoft.AspNetCore.Connections.IConnectionFactory - { - public QuicConnectionFactory(Microsoft.Extensions.Options.IOptions options, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.ValueTask ConnectAsync(System.Net.EndPoint endPoint, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class QuicTransportFactory : Microsoft.AspNetCore.Connections.IConnectionListenerFactory, Microsoft.AspNetCore.Connections.IMultiplexedConnectionListenerFactory - { - public QuicTransportFactory(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.Options.IOptions options) { } - public System.Threading.Tasks.ValueTask BindAsync(System.Net.EndPoint endpoint, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class QuicTransportOptions - { - public QuicTransportOptions() { } - public long AbortErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string Alpn { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public System.Security.Cryptography.X509Certificates.X509Certificate2 Certificate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public System.TimeSpan IdleTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public ushort MaxBidirectionalStreamCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public long? MaxReadBufferSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public ushort MaxUnidirectionalStreamCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public long? MaxWriteBufferSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - public string RegistrationName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } - } -} diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp.cs b/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp.cs deleted file mode 100644 index 35b6c7cc35..0000000000 --- a/src/SignalR/clients/csharp/Http.Connections.Client/ref/Microsoft.AspNetCore.Http.Connections.Client.netcoreapp.cs +++ /dev/null @@ -1,49 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Http.Connections.Client -{ - public partial class HttpConnection : Microsoft.AspNetCore.Connections.ConnectionContext, Microsoft.AspNetCore.Connections.Features.IConnectionInherentKeepAliveFeature - { - public HttpConnection(Microsoft.AspNetCore.Http.Connections.Client.HttpConnectionOptions httpConnectionOptions, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public HttpConnection(System.Uri url) { } - public HttpConnection(System.Uri url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports) { } - public HttpConnection(System.Uri url, Microsoft.AspNetCore.Http.Connections.HttpTransportType transports, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public override string ConnectionId { get { throw null; } set { } } - public override Microsoft.AspNetCore.Http.Features.IFeatureCollection Features { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public override System.Collections.Generic.IDictionary Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - bool Microsoft.AspNetCore.Connections.Features.IConnectionInherentKeepAliveFeature.HasInherentKeepAlive { get { throw null; } } - public override System.IO.Pipelines.IDuplexPipe Transport { get { throw null; } set { } } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task StartAsync(Microsoft.AspNetCore.Connections.TransferFormat transferFormat, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.Threading.Tasks.Task StartAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - public partial class HttpConnectionOptions - { - public HttpConnectionOptions() { } - public System.Func> AccessTokenProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Security.Cryptography.X509Certificates.X509CertificateCollection ClientCertificates { get { throw null; } set { } } - public System.TimeSpan CloseTimeout { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.CookieContainer Cookies { get { throw null; } set { } } - public System.Net.ICredentials Credentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IDictionary Headers { get { throw null; } set { } } - public System.Func HttpMessageHandlerFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.IWebProxy Proxy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SkipNegotiation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.Connections.HttpTransportType Transports { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Uri Url { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool? UseDefaultCredentials { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Action WebSocketConfiguration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - public partial class NoTransportSupportedException : System.Exception - { - public NoTransportSupportedException(string message) { } - } - public partial class TransportFailedException : System.Exception - { - public TransportFailedException(string transportType, string message, System.Exception innerException = null) { } - public string TransportType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} diff --git a/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs b/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs index 172112b647..f3fd41291e 100644 --- a/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs +++ b/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs @@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.SignalR return SendToAllConnections(methodName, args, include: null, cancellationToken); } - private Task SendToAllConnections(string methodName, object[] args, Func include, object state = null, CancellationToken cancellationToken) + private Task SendToAllConnections(string methodName, object[] args, Func include, object state = null, CancellationToken cancellationToken = default) { List tasks = null; SerializedHubMessage message = null; From f2dd6d4598ea92299d2f7126dacacb0e1d8a2716 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Tue, 18 Feb 2020 15:36:44 -0800 Subject: [PATCH 108/116] Add back DownloadFile.cs Revert Razor.Runtime.Manual.cs and regenerate ref assemblies --- eng/tools/RepoTasks/DownloadFile.cs | 149 ++++++++++++++++++ eng/tools/RepoTasks/RepoTasks.tasks | 1 + ...rosoft.AspNetCore.Components.netcoreapp.cs | 21 +++ ...ft.AspNetCore.Components.netstandard2.0.cs | 21 +++ ...Microsoft.AspNetCore.Routing.netcoreapp.cs | 1 + ...crosoft.AspNetCore.Mvc.Razor.netcoreapp.cs | 1 + ...ft.AspNetCore.Mvc.RazorPages.netcoreapp.cs | 1 + ...crosoft.AspNetCore.Razor.Runtime.Manual.cs | 29 ++-- ...pNetCore.Server.Kestrel.Core.netcoreapp.cs | 1 + 9 files changed, 216 insertions(+), 9 deletions(-) create mode 100644 eng/tools/RepoTasks/DownloadFile.cs diff --git a/eng/tools/RepoTasks/DownloadFile.cs b/eng/tools/RepoTasks/DownloadFile.cs new file mode 100644 index 0000000000..7ba2602d0c --- /dev/null +++ b/eng/tools/RepoTasks/DownloadFile.cs @@ -0,0 +1,149 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using System.IO; +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using System.Collections.Generic; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; + +namespace RepoTasks +{ + public class DownloadFile : Microsoft.Build.Utilities.Task + { + [Required] + public string Uri { get; set; } + + /// + /// If this field is set and the task fail to download the file from `Uri`, with a NotFound + /// status, it will try to download the file from `PrivateUri`. + /// + public string PrivateUri { get; set; } + + /// + /// Suffix for the private URI in base64 form (for SAS compatibility) + /// + public string PrivateUriSuffix { get; set; } + + public int MaxRetries { get; set; } = 5; + + [Required] + public string DestinationPath { get; set; } + + public bool Overwrite { get; set; } + + public override bool Execute() + { + return ExecuteAsync().GetAwaiter().GetResult(); + } + + private async System.Threading.Tasks.Task ExecuteAsync() + { + string destinationDir = Path.GetDirectoryName(DestinationPath); + if (!Directory.Exists(destinationDir)) + { + Directory.CreateDirectory(destinationDir); + } + + if (File.Exists(DestinationPath) && !Overwrite) + { + return true; + } + + const string FileUriProtocol = "file://"; + + if (Uri.StartsWith(FileUriProtocol, StringComparison.Ordinal)) + { + var filePath = Uri.Substring(FileUriProtocol.Length); + Log.LogMessage($"Copying '{filePath}' to '{DestinationPath}'"); + File.Copy(filePath, DestinationPath); + return true; + } + + List errorMessages = new List(); + bool? downloadStatus = await DownloadWithRetriesAsync(Uri, DestinationPath, errorMessages); + + if (downloadStatus == false && !string.IsNullOrEmpty(PrivateUri)) + { + string uriSuffix = ""; + if (!string.IsNullOrEmpty(PrivateUriSuffix)) + { + var uriSuffixBytes = System.Convert.FromBase64String(PrivateUriSuffix); + uriSuffix = System.Text.Encoding.UTF8.GetString(uriSuffixBytes); + } + downloadStatus = await DownloadWithRetriesAsync($"{PrivateUri}{uriSuffix}", DestinationPath, errorMessages); + } + + if (downloadStatus != true) + { + foreach (var error in errorMessages) + { + Log.LogError(error); + } + } + + return downloadStatus == true; + } + + /// + /// Attempt to download file from `source` with retries when response error is different of FileNotFound and Success. + /// + /// URL to the file to be downloaded. + /// Local path where to put the downloaded file. + /// true: Download Succeeded. false: Download failed with 404. null: Download failed but is retriable. + private async Task DownloadWithRetriesAsync(string source, string target, List errorMessages) + { + Random rng = new Random(); + + Log.LogMessage(MessageImportance.High, $"Attempting download '{source}' to '{target}'"); + + using (var httpClient = new HttpClient()) + { + for (int retryNumber = 0; retryNumber < MaxRetries; retryNumber++) + { + try + { + var httpResponse = await httpClient.GetAsync(source); + + Log.LogMessage(MessageImportance.High, $"{source} -> {httpResponse.StatusCode}"); + + // The Azure Storage REST API returns '400 - Bad Request' in some cases + // where the resource is not found on the storage. + // https://docs.microsoft.com/en-us/rest/api/storageservices/common-rest-api-error-codes + if (httpResponse.StatusCode == HttpStatusCode.NotFound || + httpResponse.ReasonPhrase.IndexOf("The requested URI does not represent any resource on the server.", StringComparison.OrdinalIgnoreCase) == 0) + { + errorMessages.Add($"Problems downloading file from '{source}'. Does the resource exist on the storage? {httpResponse.StatusCode} : {httpResponse.ReasonPhrase}"); + return false; + } + + httpResponse.EnsureSuccessStatusCode(); + + using (var outStream = File.Create(target)) + { + await httpResponse.Content.CopyToAsync(outStream); + } + + Log.LogMessage(MessageImportance.High, $"returning true {source} -> {httpResponse.StatusCode}"); + return true; + } + catch (Exception e) + { + Log.LogMessage(MessageImportance.High, $"returning error in {source} "); + errorMessages.Add($"Problems downloading file from '{source}'. {e.Message} {e.StackTrace}"); + File.Delete(target); + } + + await System.Threading.Tasks.Task.Delay(rng.Next(1000, 10000)); + } + } + + Log.LogMessage(MessageImportance.High, $"giving up {source} "); + errorMessages.Add($"Giving up downloading the file from '{source}' after {MaxRetries} retries."); + return null; + } + } +} \ No newline at end of file diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks index 0fa015d81f..631944feea 100644 --- a/eng/tools/RepoTasks/RepoTasks.tasks +++ b/eng/tools/RepoTasks/RepoTasks.tasks @@ -10,4 +10,5 @@ + diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs index 8c989deda4..10a26b70af 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs @@ -123,6 +123,17 @@ namespace Microsoft.AspNetCore.Components public ElementReference(string id) { throw null; } public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public readonly partial struct EventCallback + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; + public static readonly Microsoft.AspNetCore.Components.EventCallbackFactory Factory; + public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } + public bool HasDelegate { get { throw null; } } + public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } + } public sealed partial class EventCallbackFactory { public EventCallbackFactory() { } @@ -186,6 +197,16 @@ namespace Microsoft.AspNetCore.Components public EventCallbackWorkItem(System.MulticastDelegate @delegate) { throw null; } public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public readonly partial struct EventCallback + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; + public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } + public bool HasDelegate { get { throw null; } } + public System.Threading.Tasks.Task InvokeAsync(TValue arg) { throw null; } + } [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)] public sealed partial class EventHandlerAttribute : System.Attribute { diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs index 8c989deda4..10a26b70af 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs @@ -123,6 +123,17 @@ namespace Microsoft.AspNetCore.Components public ElementReference(string id) { throw null; } public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public readonly partial struct EventCallback + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; + public static readonly Microsoft.AspNetCore.Components.EventCallbackFactory Factory; + public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } + public bool HasDelegate { get { throw null; } } + public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } + } public sealed partial class EventCallbackFactory { public EventCallbackFactory() { } @@ -186,6 +197,16 @@ namespace Microsoft.AspNetCore.Components public EventCallbackWorkItem(System.MulticastDelegate @delegate) { throw null; } public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public readonly partial struct EventCallback + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; + public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } + public bool HasDelegate { get { throw null; } } + public System.Threading.Tasks.Task InvokeAsync(TValue arg) { throw null; } + } [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=true, Inherited=true)] public sealed partial class EventHandlerAttribute : System.Attribute { diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp.cs b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp.cs index 73f23b8f46..25c554c639 100644 --- a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp.cs +++ b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp.cs @@ -517,6 +517,7 @@ namespace Microsoft.AspNetCore.Routing.Matching private int _dummyPrimitive; public Microsoft.AspNetCore.Http.Endpoint Endpoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } public int Score { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } + public Microsoft.AspNetCore.Routing.RouteValueDictionary Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } } public sealed partial class EndpointMetadataComparer : System.Collections.Generic.IComparer { diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp.cs b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp.cs index 49c7324b19..28c29522ca 100644 --- a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp.cs +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.netcoreapp.cs @@ -297,6 +297,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Infrastructure public sealed partial class TagHelperMemoryCacheProvider { public TagHelperMemoryCacheProvider() { } + public Microsoft.Extensions.Caching.Memory.IMemoryCache Cache { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } } } namespace Microsoft.AspNetCore.Mvc.Razor.Internal diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp.cs b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp.cs index 606f4b2a6c..b93e1462ed 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp.cs +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.netcoreapp.cs @@ -637,6 +637,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages public partial class RazorPagesOptions : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable { public RazorPagesOptions() { } + public Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection Conventions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } public string RootDirectory { get { throw null; } set { } } System.Collections.Generic.IEnumerator System.Collections.Generic.IEnumerable.GetEnumerator() { throw null; } System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } diff --git a/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.Manual.cs b/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.Manual.cs index 56b3976d61..8549a23cd4 100644 --- a/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.Manual.cs +++ b/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.Manual.cs @@ -1,12 +1,23 @@ // 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. -namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers -{ - public partial class TagHelperExecutionContext - { - internal TagHelperExecutionContext(string tagName, Microsoft.AspNetCore.Razor.TagHelpers.TagMode tagMode) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - internal System.Threading.Tasks.Task GetChildContentAsync(bool useCachedResult, System.Text.Encodings.Web.HtmlEncoder encoder) { throw null; } - } -} +using System.Runtime.CompilerServices; +using Microsoft.AspNetCore.Razor.TagHelpers; + +[assembly: TypeForwardedTo(typeof(DefaultTagHelperContent))] +[assembly: TypeForwardedTo(typeof(HtmlAttributeNameAttribute))] +[assembly: TypeForwardedTo(typeof(HtmlAttributeNotBoundAttribute))] +[assembly: TypeForwardedTo(typeof(HtmlTargetElementAttribute))] +[assembly: TypeForwardedTo(typeof(ITagHelper))] +[assembly: TypeForwardedTo(typeof(ITagHelperComponent))] +[assembly: TypeForwardedTo(typeof(NullHtmlEncoder))] +[assembly: TypeForwardedTo(typeof(OutputElementHintAttribute))] +[assembly: TypeForwardedTo(typeof(ReadOnlyTagHelperAttributeList))] +[assembly: TypeForwardedTo(typeof(RestrictChildrenAttribute))] +[assembly: TypeForwardedTo(typeof(TagHelper))] +[assembly: TypeForwardedTo(typeof(TagHelperAttribute))] +[assembly: TypeForwardedTo(typeof(TagHelperAttributeList))] +[assembly: TypeForwardedTo(typeof(TagHelperComponent))] +[assembly: TypeForwardedTo(typeof(TagHelperContent))] +[assembly: TypeForwardedTo(typeof(TagHelperContext))] +[assembly: TypeForwardedTo(typeof(TagHelperOutput))] \ No newline at end of file diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp.cs b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp.cs index d1455f1796..4bc6818046 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp.cs +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp.cs @@ -155,6 +155,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core public System.IServiceProvider ApplicationServices { get { throw null; } } public ulong FileHandle { get { throw null; } } public System.Net.IPEndPoint IPEndPoint { get { throw null; } } + public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions KestrelServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } } public Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols Protocols { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } } public string SocketPath { get { throw null; } } public Microsoft.AspNetCore.Connections.ConnectionDelegate Build() { throw null; } From 2d066dcd3e32df4f5fa6b5bdc71983afb62e3c05 Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Wed, 19 Feb 2020 10:39:39 -0800 Subject: [PATCH 109/116] Apply some fixes --- .azure/pipelines/ci.yml | 15 +- .azure/pipelines/jobs/default-build.yml | 2 +- .gitattributes | 5 + Directory.Build.props | 1 + Directory.Build.targets | 1 + eng/helix/content/InstallJdk.ps1 | 62 + eng/helix/content/installjdk.sh | 46 + eng/helix/content/installnode.sh | 12 +- eng/targets/CSharp.Common.props | 1 - eng/targets/CSharp.Common.targets | 2 +- eng/targets/Helix.props | 14 +- eng/targets/Helix.targets | 20 +- eng/targets/Npm.Common.targets | 2 +- eng/targets/ResolveReferences.targets | 2 +- ...spNetCore.Authentication.AzureAD.UI.csproj | 2 +- ...etCore.Authentication.AzureADB2C.UI.csproj | 2 +- ...ore.AzureAppServices.HostingStartup.csproj | 2 +- ...NetCore.AzureAppServicesIntegration.csproj | 2 +- ...oft.AspNetCore.Components.Analyzers.csproj | 2 +- .../Microsoft.AspNetCore.Components.Manual.cs | 26 - ...etCore.DataProtection.AzureKeyVault.csproj | 2 +- ...NetCore.DataProtection.AzureStorage.csproj | 2 +- ....DataProtection.EntityFrameworkCore.csproj | 2 +- ...e.DataProtection.StackExchangeRedis.csproj | 2 +- .../src/Microsoft.AspNetCore.JsonPatch.csproj | 2 +- .../ref/Microsoft.AspNetCore.App.Ref.csproj | 1 - .../Microsoft.AspNetCore.App.Runtime.csproj | 2 +- .../src/Microsoft.AspNetCore.TestHost.csproj | 2 +- ....AspNetCore.Hosting.WindowsServices.csproj | 2 +- .../Owin/src/Microsoft.AspNetCore.Owin.csproj | 2 +- .../Microsoft.AspNetCore.Routing.Manual.cs | 575 ----- .../ref/Microsoft.AspNetCore.Routing.csproj | 1 - ...ore.ApiAuthorization.IdentityServer.csproj | 2 +- ...etCore.Identity.EntityFrameworkCore.csproj | 2 +- ...etCore.Identity.Specification.Tests.csproj | 2 +- .../Microsoft.AspNetCore.Identity.UI.csproj | 2 +- src/Installers/Debian/Directory.Build.props | 2 +- src/Installers/Rpm/Directory.Build.props | 2 +- ...osoft.AspNetCore.ConcurrencyLimiter.csproj | 2 +- ...ore.Diagnostics.EntityFrameworkCore.csproj | 2 +- ...rosoft.AspNetCore.HeaderPropagation.csproj | 2 +- ...cs.HealthChecks.EntityFrameworkCore.csproj | 2 +- ...osoft.AspNetCore.MiddlewareAnalysis.csproj | 2 +- .../Microsoft.AspNetCore.NodeServices.csproj | 2 +- ...t.AspNetCore.SpaServices.Extensions.csproj | 2 +- .../Microsoft.AspNetCore.SpaServices.csproj | 2 +- ...osoft.AspNetCore.Mvc.NewtonsoftJson.csproj | 2 +- ...etCore.Mvc.Razor.RuntimeCompilation.csproj | 2 +- .../Microsoft.AspNetCore.Mvc.Razor.Manual.cs | 4 - .../Microsoft.AspNetCore.Mvc.Testing.csproj | 2 +- ...crosoft.AspNetCore.Blazor.Templates.csproj | 2 +- ...oft.DotNet.Web.Client.ItemTemplates.csproj | 2 +- .../Microsoft.DotNet.Web.ItemTemplates.csproj | 2 +- ...crosoft.DotNet.Web.ProjectTemplates.csproj | 2 +- ...oft.DotNet.Web.Spa.ProjectTemplates.csproj | 2 +- ...crosoft.AspNetCore.Razor.Runtime.Manual.cs | 23 - .../Microsoft.AspNetCore.Razor.Runtime.csproj | 1 - ...pNetCore.Authentication.Certificate.csproj | 2 +- ....AspNetCore.Authentication.Facebook.csproj | 2 +- ...ft.AspNetCore.Authentication.Google.csproj | 2 +- ...AspNetCore.Authentication.JwtBearer.csproj | 2 +- ...ore.Authentication.MicrosoftAccount.csproj | 2 +- ...AspNetCore.Authentication.Negotiate.csproj | 2 +- ...etCore.Authentication.OpenIdConnect.csproj | 2 +- ...t.AspNetCore.Authentication.Twitter.csproj | 2 +- ...NetCore.Authentication.WsFederation.csproj | 2 +- .../ref/Directory.Build.targets | 5 + .../CommonLibTests/CommonLibTests.vcxproj | 3 + ...t.AspNetCore.Server.Kestrel.Core.Manual.cs | 1957 ----------------- ...soft.AspNetCore.Server.Kestrel.Core.csproj | 1 - src/Servers/Kestrel/Core/test/UTF8Decoding.cs | 4 +- ...Core.Server.Kestrel.Transport.Libuv.csproj | 2 +- .../Http3/Http3TestBase.cs | 2 +- ...soft.AspNetCore.SignalR.Client.Core.csproj | 2 +- ...Microsoft.AspNetCore.SignalR.Client.csproj | 2 +- ....AspNetCore.Http.Connections.Client.csproj | 2 +- src/SignalR/clients/java/signalr/.gitignore | 1 + src/SignalR/clients/java/signalr/build.gradle | 6 +- ...roj => signalr.client.java.Tests.javaproj} | 33 +- .../SignalR.Npm.FunctionalTests.npmproj | 3 +- .../signalr-protocol-msgpack.npmproj | 2 +- .../clients/ts/signalr/signalr.npmproj | 2 +- ...tCore.SignalR.Protocols.MessagePack.csproj | 2 +- ...re.SignalR.Protocols.NewtonsoftJson.csproj | 2 +- ...NetCore.SignalR.Specification.Tests.csproj | 2 +- ...pNetCore.SignalR.StackExchangeRedis.csproj | 2 +- ...Core.AzureAppServices.SiteExtension.csproj | 2 +- ...t.AspNetCore.Runtime.SiteExtension.pkgproj | 2 +- ...ft.Extensions.ApiDescription.Client.csproj | 2 +- ...ft.Extensions.ApiDescription.Server.csproj | 2 +- .../src/Microsoft.dotnet-openapi.csproj | 2 +- .../src/dotnet-sql-cache.csproj | 2 +- 92 files changed, 261 insertions(+), 2692 deletions(-) create mode 100644 eng/helix/content/InstallJdk.ps1 create mode 100644 eng/helix/content/installjdk.sh delete mode 100644 src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs delete mode 100644 src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.Manual.cs create mode 100644 src/Servers/Connections.Abstractions/ref/Directory.Build.targets delete mode 100644 src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs rename src/SignalR/clients/java/signalr/{signalr.client.java.javaproj => signalr.client.java.Tests.javaproj} (63%) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index a46fd2e783..7c64003843 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -31,6 +31,8 @@ variables: value: .NETCORE - name: _DotNetValidationArtifactsCategory value: .NETCORE +- name: _UseHelixOpenQueues + value: 'true' - ${{ if ne(variables['System.TeamProject'], 'internal') }}: - name: _BuildArgs value: '' @@ -51,8 +53,6 @@ variables: # to have it in two different forms - name: _InternalRuntimeDownloadCodeSignArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) - - name: _UseHelixOpenQueues - value: 'true' - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNet-HelixApi-Access - name: _UseHelixOpenQueues @@ -714,17 +714,6 @@ stages: chmod +x $HOME/bin/jq echo "##vso[task.prependpath]$HOME/bin" displayName: Install jq - - task: UseDotNet@2 - displayName: 'Use .NET Core sdk' - inputs: - packageType: sdk - # The SDK version selected here is intentionally supposed to use the latest release - # For the purpose of building Linux distros, we can't depend on features of the SDK - # which may not exist in pre-built versions of the SDK - # Pinning to preview 8 since preview 9 has breaking changes - version: 3.1.100 - installationPath: $(DotNetCoreSdkDir) - includePreviewVersions: true - ${{ if ne(variables['System.TeamProject'], 'public') }}: - task: Bash@3 displayName: Setup Private Feeds Credentials diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index d869a5dbd8..ef4ec9e60c 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -251,7 +251,7 @@ jobs: condition: always() inputs: testRunner: junit - testResultsFiles: '**/TEST-com.microsoft.signalr*.xml' + testResultsFiles: '**/TEST-junit-jupiter.xml' buildConfiguration: $(BuildConfiguration) buildPlatform: $(AgentOsName) mergeTestResults: true diff --git a/.gitattributes b/.gitattributes index ff67a9158f..3225eae5e0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,6 +8,11 @@ ############################################################################### *.sh eol=lf +############################################################################### +# Make gradlew always have LF as line endings +############################################################################### +gradlew eol=lf + ############################################################################### # Set default behavior for command prompt diff. # diff --git a/Directory.Build.props b/Directory.Build.props index 9a51ce06e6..78ad5cd2af 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -189,5 +189,6 @@ + diff --git a/Directory.Build.targets b/Directory.Build.targets index a61b5e6505..6722516a33 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -165,5 +165,6 @@ + diff --git a/eng/helix/content/InstallJdk.ps1 b/eng/helix/content/InstallJdk.ps1 new file mode 100644 index 0000000000..a9346062fa --- /dev/null +++ b/eng/helix/content/InstallJdk.ps1 @@ -0,0 +1,62 @@ +<# +.SYNOPSIS + Installs JDK into a folder in this repo. +.DESCRIPTION + This script downloads an extracts the JDK. +.PARAMETER JdkVersion + The version of the JDK to install. If not set, the default value is read from global.json +.PARAMETER Force + Overwrite the existing installation +#> +param( + [string]$JdkVersion, + [Parameter(Mandatory = $false)] + $InstallDir +) +$ErrorActionPreference = 'Stop' +$ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 + +Set-StrictMode -Version 1 + +if ($InstallDir) { + $installDir = $InstallDir; +} +else { + $repoRoot = Resolve-Path "$PSScriptRoot\..\.." + $installDir = "$repoRoot\.tools\jdk\win-x64\" +} +$tempDir = "$installDir\obj" +if (-not $JdkVersion) { + $globalJson = Get-Content "$repoRoot\global.json" | ConvertFrom-Json + $JdkVersion = $globalJson.tools.jdk +} + +if (Test-Path $installDir) { + if ($Force) { + Remove-Item -Force -Recurse $installDir + } + else { + Write-Host "The JDK already installed to $installDir. Exiting without action. Call this script again with -Force to overwrite." + exit 0 + } +} + +Remove-Item -Force -Recurse $tempDir -ErrorAction Ignore | out-null +mkdir $tempDir -ea Ignore | out-null +mkdir $installDir -ea Ignore | out-null +Write-Host "Starting download of JDK ${JdkVersion}" +Invoke-WebRequest -UseBasicParsing -Uri "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/java/jdk-${JdkVersion}_windows-x64_bin.zip" -OutFile "$tempDir/jdk.zip" +Write-Host "Done downloading JDK ${JdkVersion}" + +Add-Type -assembly "System.IO.Compression.FileSystem" +[System.IO.Compression.ZipFile]::ExtractToDirectory("$tempDir/jdk.zip", "$tempDir/jdk/") + +Write-Host "Expanded JDK to $tempDir" +Write-Host "Installing JDK to $installDir" +Move-Item "$tempDir/jdk/jdk-${JdkVersion}/*" $installDir +Write-Host "Done installing JDK to $installDir" +Remove-Item -Force -Recurse $tempDir -ErrorAction Ignore | out-null + +if ($env:TF_BUILD) { + Write-Host "##vso[task.prependpath]$installDir\bin" +} diff --git a/eng/helix/content/installjdk.sh b/eng/helix/content/installjdk.sh new file mode 100644 index 0000000000..6c1c2ff5c6 --- /dev/null +++ b/eng/helix/content/installjdk.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +# Cause the script to fail if any subcommand fails +set -e + +pushd . + +if [ "$JAVA_HOME" != "" ]; then + echo "JAVA_HOME is set" + exit +fi + +java_version=$1 +arch=$2 +osname=`uname -s` +if [ "$osname" = "Darwin" ]; then + echo "macOS not supported, relying on the machine providing java itself" + exit 1 +else + platformarch="linux-$arch" +fi +echo "PlatformArch: $platformarch" +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +output_dir="$DIR/java" +url="https://netcorenativeassets.blob.core.windows.net/resource-packages/external/linux/java/jdk-${java_version}_${platformarch}_bin.tar.gz" +echo "Downloading from: $url" +tmp="$(mktemp -d -t install-jdk.XXXXXX)" + +cleanup() { + exitcode=$? + if [ $exitcode -ne 0 ]; then + echo "Failed to install java with exit code: $exitcode" + fi + rm -rf "$tmp" + exit $exitcode +} + +trap "cleanup" EXIT +cd "$tmp" +curl -Lsfo $(basename $url) "$url" +echo "Installing java from $(basename $url) $url" +mkdir $output_dir +echo "Unpacking to $output_dir" +tar --strip-components 1 -xzf "jdk-${java_version}_${platformarch}_bin.tar.gz" --no-same-owner --directory "$output_dir" + +popd \ No newline at end of file diff --git a/eng/helix/content/installnode.sh b/eng/helix/content/installnode.sh index 0442958ac2..db5d2fa5a5 100644 --- a/eng/helix/content/installnode.sh +++ b/eng/helix/content/installnode.sh @@ -22,7 +22,17 @@ output_dir="$DIR/node" url="http://nodejs.org/dist/v$node_version/node-v$node_version-$platformarch.tar.gz" echo "Downloading from: $url" tmp="$(mktemp -d -t install-node.XXXXXX)" -trap "rm -rf $tmp" EXIT + +cleanup() { + exitcode=$? + if [ $exitcode -ne 0 ]; then + echo "Failed to install node with exit code: $exitcode" + fi + rm -rf "$tmp" + exit $exitcode +} + +trap "cleanup" EXIT cd "$tmp" curl -Lsfo $(basename $url) "$url" echo "Installing node from $(basename $url) $url" diff --git a/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props index 6cc6bd2dd8..4600fad635 100644 --- a/eng/targets/CSharp.Common.props +++ b/eng/targets/CSharp.Common.props @@ -35,6 +35,5 @@ - diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets index 877665a63b..e327a7b886 100644 --- a/eng/targets/CSharp.Common.targets +++ b/eng/targets/CSharp.Common.targets @@ -30,5 +30,5 @@ - + diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props index 40e9420500..d36c4a1a7a 100644 --- a/eng/targets/Helix.props +++ b/eng/targets/Helix.props @@ -15,6 +15,8 @@ false false true + false + true $(MSBuildProjectName)--$(TargetFramework) false false @@ -33,16 +35,4 @@ - - - - - - - - - - - - diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index f3d1ad0f16..eecd36f02a 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -1,10 +1,26 @@ + + + + + + + + + + + + + + + + - + @@ -91,6 +108,7 @@ Usage: dotnet msbuild /t:Helix src/MyTestProject.csproj @(HelixPostCommand) call runtests.cmd $(TargetFileName) $(TargetFrameworkIdentifier) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) ./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) + $(HelixCommand) $(HelixTimeout) diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets index fd15a8e45e..3460edde2e 100644 --- a/eng/targets/Npm.Common.targets +++ b/eng/targets/Npm.Common.targets @@ -119,7 +119,7 @@ - + diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 81559a4f98..a3e4c70df5 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -237,7 +237,7 @@ $([MSBuild]::ValueOrDefault($(IsAspNetCoreApp),'false')) - $([MSBuild]::ValueOrDefault($(IsShippingPackage),'false')) + $([MSBuild]::ValueOrDefault($(IsPackable),'false')) $([MSBuild]::MakeRelative($(RepoRoot), $(MSBuildProjectFullPath))) $(ReferenceAssemblyProjectFileRelativePath) diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj index 6720f825e6..a17773b58d 100644 --- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj +++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj @@ -6,7 +6,7 @@ $(DefaultNetCoreTargetFramework) aspnetcore;authentication;AzureAD true - true + true Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core true diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj index 2711ae5303..77ec20937b 100644 --- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj +++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj @@ -6,7 +6,7 @@ $(DefaultNetCoreTargetFramework) aspnetcore;authentication;AzureADB2C true - true + true Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core true diff --git a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj index 8992d007b8..5d4b07647f 100644 --- a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj +++ b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj @@ -7,7 +7,7 @@ $(DefaultNetCoreTargetFramework) true aspnetcore;azure;appservices - true + true diff --git a/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj b/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj index 972ea62ff8..a9f4eae94d 100644 --- a/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj +++ b/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj @@ -7,7 +7,7 @@ true true aspnetcore;azure;appservices - true + true diff --git a/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj b/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj index 903de47c78..dab047ca11 100644 --- a/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj +++ b/src/Components/Analyzers/src/Microsoft.AspNetCore.Components.Analyzers.csproj @@ -6,7 +6,7 @@ true false Roslyn analyzers for ASP.NET Core Components. - true + true false diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.Manual.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.Manual.cs index fe78ce3bd4..26646bf79b 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.Manual.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.Manual.cs @@ -46,32 +46,6 @@ namespace Microsoft.AspNetCore.Components bool HasDelegate { get; } object UnpackForRenderTree(); } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct EventCallback : Microsoft.AspNetCore.Components.IEventCallback - { - public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; - public static readonly Microsoft.AspNetCore.Components.EventCallbackFactory Factory; - internal readonly MulticastDelegate Delegate; - internal readonly IHandleEvent Receiver; - public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } - public bool HasDelegate { get { throw null; } } - internal bool RequiresExplicitReceiver { get { throw null; } } - public System.Threading.Tasks.Task InvokeAsync(object arg) { throw null; } - object Microsoft.AspNetCore.Components.IEventCallback.UnpackForRenderTree() { throw null; } - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct EventCallback : Microsoft.AspNetCore.Components.IEventCallback - { - public static readonly Microsoft.AspNetCore.Components.EventCallback Empty; - internal readonly MulticastDelegate Delegate; - internal readonly IHandleEvent Receiver; - public EventCallback(Microsoft.AspNetCore.Components.IHandleEvent receiver, System.MulticastDelegate @delegate) { throw null; } - public bool HasDelegate { get { throw null; } } - internal bool RequiresExplicitReceiver { get { throw null; } } - internal Microsoft.AspNetCore.Components.EventCallback AsUntyped() { throw null; } - public System.Threading.Tasks.Task InvokeAsync(TValue arg) { throw null; } - object Microsoft.AspNetCore.Components.IEventCallback.UnpackForRenderTree() { throw null; } - } internal partial interface ICascadingValueComponent { object CurrentValue { get; } diff --git a/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj b/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj index 2f1aa7c4c0..f395c32300 100644 --- a/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj +++ b/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj @@ -5,7 +5,7 @@ netstandard2.0 true aspnetcore;dataprotection;azure;keyvault - true + true diff --git a/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj b/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj index 40698c9d33..abf1a2d5de 100644 --- a/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj +++ b/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj @@ -6,7 +6,7 @@ true true aspnetcore;dataprotection;azure;blob - true + true true diff --git a/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj b/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj index 58efeab480..f76d1568c3 100644 --- a/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj +++ b/src/DataProtection/EntityFrameworkCore/src/Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.csproj @@ -6,7 +6,7 @@ true true aspnetcore;dataprotection;entityframeworkcore - true + true diff --git a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj index ed592f5831..b32253856f 100644 --- a/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj +++ b/src/DataProtection/StackExchangeRedis/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj @@ -6,7 +6,7 @@ true true aspnetcore;dataprotection;redis - true + true diff --git a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj index 5865069fdd..73e2f0025b 100644 --- a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj +++ b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;json;jsonpatch - true + true diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index 6637411363..ffd0f18293 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -3,7 +3,6 @@ $(DefaultNetCoreTargetFramework) - true true false $(TargetingPackName) diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index 111c6d5da5..dfc22b718a 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -7,7 +7,7 @@ false $(MSBuildProjectName).$(RuntimeIdentifier) - true + true false false diff --git a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj index 0ef4679eb1..49695194c1 100644 --- a/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj +++ b/src/Hosting/TestHost/src/Microsoft.AspNetCore.TestHost.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;hosting;testing - true + true diff --git a/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj b/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj index 05e0c574f8..18171d7c57 100644 --- a/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj +++ b/src/Hosting/WindowsServices/src/Microsoft.AspNetCore.Hosting.WindowsServices.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;hosting - true + true diff --git a/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj b/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj index 0baf3ca385..590ab5661c 100644 --- a/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj +++ b/src/Http/Owin/src/Microsoft.AspNetCore.Owin.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;owin - true + true diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs deleted file mode 100644 index 3ce07a7861..0000000000 --- a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.Manual.cs +++ /dev/null @@ -1,575 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Routing.Matching -{ - - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal readonly partial struct Candidate - { - public readonly Microsoft.AspNetCore.Http.Endpoint Endpoint; - public readonly CandidateFlags Flags; - public readonly System.Collections.Generic.KeyValuePair[] Slots; - public readonly (string parameterName, int segmentIndex, int slotIndex)[] Captures; - public readonly (string parameterName, int segmentIndex, int slotIndex) CatchAll; - public readonly (Microsoft.AspNetCore.Routing.Patterns.RoutePatternPathSegment pathSegment, int segmentIndex)[] ComplexSegments; - public readonly System.Collections.Generic.KeyValuePair[] Constraints; - public readonly int Score; - public Candidate(Microsoft.AspNetCore.Http.Endpoint endpoint) { throw null; } - public Candidate(Microsoft.AspNetCore.Http.Endpoint endpoint, int score, System.Collections.Generic.KeyValuePair[] slots, System.ValueTuple[] captures, in (string parameterName, int segmentIndex, int slotIndex) catchAll, System.ValueTuple[] complexSegments, System.Collections.Generic.KeyValuePair[] constraints) { throw null; } - [System.FlagsAttribute] - public enum CandidateFlags - { - None = 0, - HasDefaults = 1, - HasCaptures = 2, - HasCatchAll = 4, - HasSlots = 7, - HasComplexSegments = 8, - HasConstraints = 16, - } - } - - internal partial class ILEmitTrieJumpTable : Microsoft.AspNetCore.Routing.Matching.JumpTable - { - internal System.Func _getDestination; - public ILEmitTrieJumpTable(int defaultDestination, int exitDestination, System.ValueTuple[] entries, bool? vectorize, Microsoft.AspNetCore.Routing.Matching.JumpTable fallback) { } - public override int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment) { throw null; } - internal void InitializeILDelegate() { } - internal System.Threading.Tasks.Task InitializeILDelegateAsync() { throw null; } - } - - internal partial class LinearSearchJumpTable : Microsoft.AspNetCore.Routing.Matching.JumpTable - { - public LinearSearchJumpTable(int defaultDestination, int exitDestination, System.ValueTuple[] entries) { } - public override string DebuggerToString() { throw null; } - public override int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment) { throw null; } - } - - internal partial class SingleEntryJumpTable : Microsoft.AspNetCore.Routing.Matching.JumpTable - { - public SingleEntryJumpTable(int defaultDestination, int exitDestination, string text, int destination) { } - public override string DebuggerToString() { throw null; } - public override int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment) { throw null; } - } - - internal partial class AmbiguousMatchException : System.Exception - { - protected AmbiguousMatchException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { } - public AmbiguousMatchException(string message) { } - } - - public sealed partial class EndpointMetadataComparer : System.Collections.Generic.IComparer - { - internal EndpointMetadataComparer(System.IServiceProvider services) { } - } - - internal static partial class ILEmitTrieFactory - { - public const int NotAscii = -2147483648; - public static System.Func Create(int defaultDestination, int exitDestination, System.ValueTuple[] entries, bool? vectorize) { throw null; } - public static void EmitReturnDestination(System.Reflection.Emit.ILGenerator il, System.ValueTuple[] entries) { } - internal static bool ShouldVectorize(System.ValueTuple[] entries) { throw null; } - } - - internal partial class SingleEntryAsciiJumpTable : Microsoft.AspNetCore.Routing.Matching.JumpTable - { - public SingleEntryAsciiJumpTable(int defaultDestination, int exitDestination, string text, int destination) { } - public override string DebuggerToString() { throw null; } - public override int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment) { throw null; } - } - - internal partial class ZeroEntryJumpTable : Microsoft.AspNetCore.Routing.Matching.JumpTable - { - public ZeroEntryJumpTable(int defaultDestination, int exitDestination) { } - public override string DebuggerToString() { throw null; } - public override int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment) { throw null; } - } - - public sealed partial class HttpMethodMatcherPolicy : Microsoft.AspNetCore.Routing.MatcherPolicy, Microsoft.AspNetCore.Routing.Matching.IEndpointComparerPolicy, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy, Microsoft.AspNetCore.Routing.Matching.INodeBuilderPolicy - { - internal static readonly string AccessControlRequestMethod; - internal const string AnyMethod = "*"; - internal const string Http405EndpointDisplayName = "405 HTTP Method Not Supported"; - internal static readonly string OriginHeader; - internal static readonly string PreflightHttpMethod; - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal readonly partial struct EdgeKey : System.IComparable, System.IComparable, System.IEquatable - { - public readonly bool IsCorsPreflightRequest; - public readonly string HttpMethod; - public EdgeKey(string httpMethod, bool isCorsPreflightRequest) { throw null; } - public int CompareTo(Microsoft.AspNetCore.Routing.Matching.HttpMethodMatcherPolicy.EdgeKey other) { throw null; } - public int CompareTo(object obj) { throw null; } - public bool Equals(Microsoft.AspNetCore.Routing.Matching.HttpMethodMatcherPolicy.EdgeKey other) { throw null; } - public override bool Equals(object obj) { throw null; } - public override int GetHashCode() { throw null; } - public override string ToString() { throw null; } - } - } - - internal static partial class Ascii - { - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool AsciiIgnoreCaseEquals(char charA, char charB) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool AsciiIgnoreCaseEquals(System.ReadOnlySpan a, System.ReadOnlySpan b, int length) { throw null; } - public static bool IsAscii(string text) { throw null; } - } - - public sealed partial class CandidateSet - { - internal Microsoft.AspNetCore.Routing.Matching.CandidateState[] Candidates; - internal CandidateSet(Microsoft.AspNetCore.Routing.Matching.CandidateState[] candidates) { } - internal CandidateSet(Microsoft.AspNetCore.Routing.Matching.Candidate[] candidates) { } - internal static bool IsValidCandidate(ref Microsoft.AspNetCore.Routing.Matching.CandidateState candidate) { throw null; } - internal static void SetValidity(ref Microsoft.AspNetCore.Routing.Matching.CandidateState candidate, bool value) { } - } - - public partial struct CandidateState - { - public Microsoft.AspNetCore.Routing.RouteValueDictionary Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } - } - - internal sealed partial class DataSourceDependentMatcher : Microsoft.AspNetCore.Routing.Matching.Matcher - { - public DataSourceDependentMatcher(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource, Microsoft.AspNetCore.Routing.Matching.DataSourceDependentMatcher.Lifetime lifetime, System.Func matcherBuilderFactory) { } - internal Microsoft.AspNetCore.Routing.Matching.Matcher CurrentMatcher { get { throw null; } } - public override System.Threading.Tasks.Task MatchAsync(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } - public sealed partial class Lifetime : System.IDisposable - { - public Lifetime() { } - public Microsoft.AspNetCore.Routing.DataSourceDependentCache Cache { get { throw null; } set { } } - public void Dispose() { } - } - } - - internal sealed partial class DefaultEndpointSelector : Microsoft.AspNetCore.Routing.Matching.EndpointSelector - { - public DefaultEndpointSelector() { } - internal static void Select(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateState[] candidateState) { } - public override System.Threading.Tasks.Task SelectAsync(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.Matching.CandidateSet candidateSet) { throw null; } - } - - internal sealed partial class DfaMatcher : Microsoft.AspNetCore.Routing.Matching.Matcher - { - public DfaMatcher(Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Routing.Matching.EndpointSelector selector, Microsoft.AspNetCore.Routing.Matching.DfaState[] states, int maxSegmentCount) { } - internal (Microsoft.AspNetCore.Routing.Matching.Candidate[] candidates, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy[] policies) FindCandidateSet(Microsoft.AspNetCore.Http.HttpContext httpContext, string path, System.ReadOnlySpan segments) { throw null; } - public sealed override System.Threading.Tasks.Task MatchAsync(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } - internal static partial class EventIds - { - public static readonly Microsoft.Extensions.Logging.EventId CandidateNotValid; - public static readonly Microsoft.Extensions.Logging.EventId CandidateRejectedByComplexSegment; - public static readonly Microsoft.Extensions.Logging.EventId CandidateRejectedByConstraint; - public static readonly Microsoft.Extensions.Logging.EventId CandidatesFound; - public static readonly Microsoft.Extensions.Logging.EventId CandidatesNotFound; - public static readonly Microsoft.Extensions.Logging.EventId CandidateValid; - } - } - - internal partial class DictionaryJumpTable : Microsoft.AspNetCore.Routing.Matching.JumpTable - { - public DictionaryJumpTable(int defaultDestination, int exitDestination, System.ValueTuple[] entries) { } - public override string DebuggerToString() { throw null; } - public override int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment) { throw null; } - } - - [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerToString(),nq}")] - internal partial class DfaNode - { - public DfaNode() { } - public Microsoft.AspNetCore.Routing.Matching.DfaNode CatchAll { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Label { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.Dictionary Literals { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Collections.Generic.List Matches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Routing.Matching.INodeBuilderPolicy NodeBuilder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Routing.Matching.DfaNode Parameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int PathDepth { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.Dictionary PolicyEdges { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public void AddLiteral(string literal, Microsoft.AspNetCore.Routing.Matching.DfaNode node) { } - public void AddMatch(Microsoft.AspNetCore.Http.Endpoint endpoint) { } - public void AddMatches(System.Collections.Generic.IEnumerable endpoints) { } - public void AddPolicyEdge(object state, Microsoft.AspNetCore.Routing.Matching.DfaNode node) { } - public void Visit(System.Action visitor) { } - } - - internal static partial class FastPathTokenizer - { - public static int Tokenize(string path, System.Span segments) { throw null; } - } - - internal partial class DfaMatcherBuilder : Microsoft.AspNetCore.Routing.Matching.MatcherBuilder - { - public DfaMatcherBuilder(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Routing.ParameterPolicyFactory parameterPolicyFactory, Microsoft.AspNetCore.Routing.Matching.EndpointSelector selector, System.Collections.Generic.IEnumerable policies) { } - public override void AddEndpoint(Microsoft.AspNetCore.Routing.RouteEndpoint endpoint) { } - public override Microsoft.AspNetCore.Routing.Matching.Matcher Build() { throw null; } - public Microsoft.AspNetCore.Routing.Matching.DfaNode BuildDfaTree(bool includeLabel = false) { throw null; } - internal Microsoft.AspNetCore.Routing.Matching.Candidate CreateCandidate(Microsoft.AspNetCore.Http.Endpoint endpoint, int score) { throw null; } - internal Microsoft.AspNetCore.Routing.Matching.Candidate[] CreateCandidates(System.Collections.Generic.IReadOnlyList endpoints) { throw null; } - } - - [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerToString(),nq}")] - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal readonly partial struct DfaState - { - public readonly Candidate[] Candidates; - public readonly IEndpointSelectorPolicy[] Policies; - public readonly JumpTable PathTransitions; - public readonly PolicyJumpTable PolicyTransitions; - public DfaState(Microsoft.AspNetCore.Routing.Matching.Candidate[] candidates, Microsoft.AspNetCore.Routing.Matching.IEndpointSelectorPolicy[] policies, Microsoft.AspNetCore.Routing.Matching.JumpTable pathTransitions, Microsoft.AspNetCore.Routing.Matching.PolicyJumpTable policyTransitions) { throw null; } - public string DebuggerToString() { throw null; } - } - - internal partial class EndpointComparer : System.Collections.Generic.IComparer, System.Collections.Generic.IEqualityComparer - { - public EndpointComparer(Microsoft.AspNetCore.Routing.Matching.IEndpointComparerPolicy[] policies) { } - public int Compare(Microsoft.AspNetCore.Http.Endpoint x, Microsoft.AspNetCore.Http.Endpoint y) { throw null; } - public bool Equals(Microsoft.AspNetCore.Http.Endpoint x, Microsoft.AspNetCore.Http.Endpoint y) { throw null; } - public int GetHashCode(Microsoft.AspNetCore.Http.Endpoint obj) { throw null; } - } - - [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerToString(),nq}")] - internal abstract partial class JumpTable - { - protected JumpTable() { } - public virtual string DebuggerToString() { throw null; } - public abstract int GetDestination(string path, Microsoft.AspNetCore.Routing.Matching.PathSegment segment); - } - - internal abstract partial class Matcher - { - protected Matcher() { } - public abstract System.Threading.Tasks.Task MatchAsync(Microsoft.AspNetCore.Http.HttpContext httpContext); - } - internal abstract partial class MatcherFactory - { - protected MatcherFactory() { } - public abstract Microsoft.AspNetCore.Routing.Matching.Matcher CreateMatcher(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource); - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal readonly partial struct PathSegment : System.IEquatable - { - public readonly int Start; - public readonly int Length; - public PathSegment(int start, int length) { throw null; } - public bool Equals(Microsoft.AspNetCore.Routing.Matching.PathSegment other) { throw null; } - public override bool Equals(object obj) { throw null; } - public override int GetHashCode() { throw null; } - public override string ToString() { throw null; } - } - - internal abstract partial class MatcherBuilder - { - protected MatcherBuilder() { } - public abstract void AddEndpoint(Microsoft.AspNetCore.Routing.RouteEndpoint endpoint); - public abstract Microsoft.AspNetCore.Routing.Matching.Matcher Build(); - } -} - -namespace Microsoft.AspNetCore.Routing -{ - - internal partial class RoutingMarkerService - { - public RoutingMarkerService() { } - } - - internal partial class UriBuilderContextPooledObjectPolicy : Microsoft.Extensions.ObjectPool.IPooledObjectPolicy - { - public UriBuilderContextPooledObjectPolicy() { } - public Microsoft.AspNetCore.Routing.UriBuildingContext Create() { throw null; } - public bool Return(Microsoft.AspNetCore.Routing.UriBuildingContext obj) { throw null; } - } - - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal partial struct PathTokenizer : System.Collections.Generic.IEnumerable, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.IEnumerable - { - private readonly string _path; - private int _count; - public PathTokenizer(Microsoft.AspNetCore.Http.PathString path) { throw null; } - public int Count { get { throw null; } } - public Microsoft.Extensions.Primitives.StringSegment this[int index] { get { throw null; } } - public Microsoft.AspNetCore.Routing.PathTokenizer.Enumerator GetEnumerator() { throw null; } - System.Collections.Generic.IEnumerator System.Collections.Generic.IEnumerable.GetEnumerator() { throw null; } - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct Enumerator : System.Collections.Generic.IEnumerator, System.Collections.IEnumerator, System.IDisposable - { - private readonly string _path; - private int _index; - private int _length; - public Enumerator(Microsoft.AspNetCore.Routing.PathTokenizer tokenizer) { throw null; } - public Microsoft.Extensions.Primitives.StringSegment Current { get { throw null; } } - object System.Collections.IEnumerator.Current { get { throw null; } } - public void Dispose() { } - public bool MoveNext() { throw null; } - public void Reset() { } - } - } - - public partial class RouteOptions - { - internal System.Collections.Generic.ICollection EndpointDataSources { get { throw null; } set { } } - } - - internal sealed partial class EndpointMiddleware - { - internal const string AuthorizationMiddlewareInvokedKey = "__AuthorizationMiddlewareWithEndpointInvoked"; - internal const string CorsMiddlewareInvokedKey = "__CorsMiddlewareWithEndpointInvoked"; - public EndpointMiddleware(Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Http.RequestDelegate next, Microsoft.Extensions.Options.IOptions routeOptions) { } - public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } - } - - internal sealed partial class DataSourceDependentCache : System.IDisposable where T : class - { - public DataSourceDependentCache(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource, System.Func, T> initialize) { } - public T Value { get { throw null; } } - public void Dispose() { } - public T EnsureInitialized() { throw null; } - } - - internal partial class DefaultEndpointConventionBuilder : Microsoft.AspNetCore.Builder.IEndpointConventionBuilder - { - public DefaultEndpointConventionBuilder(Microsoft.AspNetCore.Builder.EndpointBuilder endpointBuilder) { } - internal Microsoft.AspNetCore.Builder.EndpointBuilder EndpointBuilder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public void Add(System.Action convention) { } - public Microsoft.AspNetCore.Http.Endpoint Build() { throw null; } - } - - internal partial class DefaultEndpointRouteBuilder : Microsoft.AspNetCore.Routing.IEndpointRouteBuilder - { - public DefaultEndpointRouteBuilder(Microsoft.AspNetCore.Builder.IApplicationBuilder applicationBuilder) { } - public Microsoft.AspNetCore.Builder.IApplicationBuilder ApplicationBuilder { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Collections.Generic.ICollection DataSources { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.IServiceProvider ServiceProvider { get { throw null; } } - public Microsoft.AspNetCore.Builder.IApplicationBuilder CreateApplicationBuilder() { throw null; } - } - - internal sealed partial class DefaultLinkGenerator : Microsoft.AspNetCore.Routing.LinkGenerator, System.IDisposable - { - public DefaultLinkGenerator(Microsoft.AspNetCore.Routing.ParameterPolicyFactory parameterPolicyFactory, Microsoft.AspNetCore.Routing.Template.TemplateBinderFactory binderFactory, Microsoft.AspNetCore.Routing.EndpointDataSource dataSource, Microsoft.Extensions.Options.IOptions routeOptions, Microsoft.Extensions.Logging.ILogger logger, System.IServiceProvider serviceProvider) { } - public void Dispose() { } - public static Microsoft.AspNetCore.Routing.RouteValueDictionary GetAmbientValues(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } - public override string GetPathByAddress(Microsoft.AspNetCore.Http.HttpContext httpContext, TAddress address, Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues = null, Microsoft.AspNetCore.Http.PathString? pathBase = default(Microsoft.AspNetCore.Http.PathString?), Microsoft.AspNetCore.Http.FragmentString fragment = default(Microsoft.AspNetCore.Http.FragmentString), Microsoft.AspNetCore.Routing.LinkOptions options = null) { throw null; } - public override string GetPathByAddress(TAddress address, Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Http.PathString pathBase = default(Microsoft.AspNetCore.Http.PathString), Microsoft.AspNetCore.Http.FragmentString fragment = default(Microsoft.AspNetCore.Http.FragmentString), Microsoft.AspNetCore.Routing.LinkOptions options = null) { throw null; } - internal Microsoft.AspNetCore.Routing.Template.TemplateBinder GetTemplateBinder(Microsoft.AspNetCore.Routing.RouteEndpoint endpoint) { throw null; } - public override string GetUriByAddress(Microsoft.AspNetCore.Http.HttpContext httpContext, TAddress address, Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues = null, string scheme = null, Microsoft.AspNetCore.Http.HostString? host = default(Microsoft.AspNetCore.Http.HostString?), Microsoft.AspNetCore.Http.PathString? pathBase = default(Microsoft.AspNetCore.Http.PathString?), Microsoft.AspNetCore.Http.FragmentString fragment = default(Microsoft.AspNetCore.Http.FragmentString), Microsoft.AspNetCore.Routing.LinkOptions options = null) { throw null; } - public override string GetUriByAddress(TAddress address, Microsoft.AspNetCore.Routing.RouteValueDictionary values, string scheme, Microsoft.AspNetCore.Http.HostString host, Microsoft.AspNetCore.Http.PathString pathBase = default(Microsoft.AspNetCore.Http.PathString), Microsoft.AspNetCore.Http.FragmentString fragment = default(Microsoft.AspNetCore.Http.FragmentString), Microsoft.AspNetCore.Routing.LinkOptions options = null) { throw null; } - public string GetUriByEndpoints(System.Collections.Generic.List endpoints, Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues, string scheme, Microsoft.AspNetCore.Http.HostString host, Microsoft.AspNetCore.Http.PathString pathBase, Microsoft.AspNetCore.Http.FragmentString fragment, Microsoft.AspNetCore.Routing.LinkOptions options) { throw null; } - internal bool TryProcessTemplate(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.RouteEndpoint endpoint, Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues, Microsoft.AspNetCore.Routing.LinkOptions options, out (Microsoft.AspNetCore.Http.PathString path, Microsoft.AspNetCore.Http.QueryString query) result) { throw null; } - } - - internal partial class DefaultLinkParser : Microsoft.AspNetCore.Routing.LinkParser, System.IDisposable - { - public DefaultLinkParser(Microsoft.AspNetCore.Routing.ParameterPolicyFactory parameterPolicyFactory, Microsoft.AspNetCore.Routing.EndpointDataSource dataSource, Microsoft.Extensions.Logging.ILogger logger, System.IServiceProvider serviceProvider) { } - public void Dispose() { } - internal Microsoft.AspNetCore.Routing.DefaultLinkParser.MatcherState GetMatcherState(Microsoft.AspNetCore.Routing.RouteEndpoint endpoint) { throw null; } - public override Microsoft.AspNetCore.Routing.RouteValueDictionary ParsePathByAddress(TAddress address, Microsoft.AspNetCore.Http.PathString path) { throw null; } - internal bool TryParse(Microsoft.AspNetCore.Routing.RouteEndpoint endpoint, Microsoft.AspNetCore.Http.PathString path, out Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal readonly partial struct MatcherState - { - private readonly object _dummy; - public readonly Microsoft.AspNetCore.Routing.RoutePatternMatcher Matcher; - public readonly System.Collections.Generic.Dictionary> Constraints; - public MatcherState(Microsoft.AspNetCore.Routing.RoutePatternMatcher matcher, System.Collections.Generic.Dictionary> constraints) { throw null; } - public void Deconstruct(out Microsoft.AspNetCore.Routing.RoutePatternMatcher matcher, out System.Collections.Generic.Dictionary> constraints) { throw null; } - } - } - - internal partial class DefaultParameterPolicyFactory : Microsoft.AspNetCore.Routing.ParameterPolicyFactory - { - public DefaultParameterPolicyFactory(Microsoft.Extensions.Options.IOptions options, System.IServiceProvider serviceProvider) { } - public override Microsoft.AspNetCore.Routing.IParameterPolicy Create(Microsoft.AspNetCore.Routing.Patterns.RoutePatternParameterPart parameter, Microsoft.AspNetCore.Routing.IParameterPolicy parameterPolicy) { throw null; } - public override Microsoft.AspNetCore.Routing.IParameterPolicy Create(Microsoft.AspNetCore.Routing.Patterns.RoutePatternParameterPart parameter, string inlineText) { throw null; } - } - - internal sealed partial class EndpointNameAddressScheme : Microsoft.AspNetCore.Routing.IEndpointAddressScheme, System.IDisposable - { - public EndpointNameAddressScheme(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource) { } - internal System.Collections.Generic.Dictionary Entries { get { throw null; } } - public void Dispose() { } - public System.Collections.Generic.IEnumerable FindEndpoints(string address) { throw null; } - } - - internal sealed partial class EndpointRoutingMiddleware - { - public EndpointRoutingMiddleware(Microsoft.AspNetCore.Routing.Matching.MatcherFactory matcherFactory, Microsoft.Extensions.Logging.ILogger logger, Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpointRouteBuilder, System.Diagnostics.DiagnosticListener diagnosticListener, Microsoft.AspNetCore.Http.RequestDelegate next) { } - public System.Threading.Tasks.Task Invoke(Microsoft.AspNetCore.Http.HttpContext httpContext) { throw null; } - } - - internal partial class ModelEndpointDataSource : Microsoft.AspNetCore.Routing.EndpointDataSource - { - public ModelEndpointDataSource() { } - internal System.Collections.Generic.IEnumerable EndpointBuilders { get { throw null; } } - public override System.Collections.Generic.IReadOnlyList Endpoints { get { throw null; } } - public Microsoft.AspNetCore.Builder.IEndpointConventionBuilder AddEndpointBuilder(Microsoft.AspNetCore.Builder.EndpointBuilder endpointBuilder) { throw null; } - public override Microsoft.Extensions.Primitives.IChangeToken GetChangeToken() { throw null; } - } - - internal partial class NullRouter : Microsoft.AspNetCore.Routing.IRouter - { - public static readonly Microsoft.AspNetCore.Routing.NullRouter Instance; - public Microsoft.AspNetCore.Routing.VirtualPathData GetVirtualPath(Microsoft.AspNetCore.Routing.VirtualPathContext context) { throw null; } - public System.Threading.Tasks.Task RouteAsync(Microsoft.AspNetCore.Routing.RouteContext context) { throw null; } - } - - internal partial class RoutePatternMatcher - { - public RoutePatternMatcher(Microsoft.AspNetCore.Routing.Patterns.RoutePattern pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults) { } - public Microsoft.AspNetCore.Routing.RouteValueDictionary Defaults { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Routing.Patterns.RoutePattern RoutePattern { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - internal static bool MatchComplexSegment(Microsoft.AspNetCore.Routing.Patterns.RoutePatternPathSegment routeSegment, System.ReadOnlySpan requestSegment, Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } - public bool TryMatch(Microsoft.AspNetCore.Http.PathString path, Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } - } - - internal sealed partial class RouteValuesAddressScheme : Microsoft.AspNetCore.Routing.IEndpointAddressScheme, System.IDisposable - { - public RouteValuesAddressScheme(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource) { } - internal Microsoft.AspNetCore.Routing.RouteValuesAddressScheme.StateEntry State { get { throw null; } } - public void Dispose() { } - public System.Collections.Generic.IEnumerable FindEndpoints(Microsoft.AspNetCore.Routing.RouteValuesAddress address) { throw null; } - internal partial class StateEntry - { - public readonly System.Collections.Generic.List AllMatches; - public readonly Microsoft.AspNetCore.Routing.Tree.LinkGenerationDecisionTree AllMatchesLinkGenerationTree; - public readonly System.Collections.Generic.Dictionary> NamedMatches; - public StateEntry(System.Collections.Generic.List allMatches, Microsoft.AspNetCore.Routing.Tree.LinkGenerationDecisionTree allMatchesLinkGenerationTree, System.Collections.Generic.Dictionary> namedMatches) { } - } - } - - [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerToString(),nq}")] - internal partial class UriBuildingContext - { - public UriBuildingContext(System.Text.Encodings.Web.UrlEncoder urlEncoder) { } - public bool AppendTrailingSlash { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool LowercaseQueryStrings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool LowercaseUrls { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.IO.TextWriter PathWriter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.IO.TextWriter QueryWriter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool Accept(string value) { throw null; } - public bool Accept(string value, bool encodeSlashes) { throw null; } - public bool Buffer(string value) { throw null; } - public void Clear() { } - internal void EncodeValue(string value, int start, int characterCount, bool encodeSlashes) { } - public void EndSegment() { } - public void Remove(string literal) { } - public Microsoft.AspNetCore.Http.PathString ToPathString() { throw null; } - public Microsoft.AspNetCore.Http.QueryString ToQueryString() { throw null; } - public override string ToString() { throw null; } - } -} - -namespace Microsoft.AspNetCore.Routing.DecisionTree -{ - - internal partial class DecisionCriterion - { - public DecisionCriterion() { } - public System.Collections.Generic.Dictionary> Branches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - - internal static partial class DecisionTreeBuilder - { - public static Microsoft.AspNetCore.Routing.DecisionTree.DecisionTreeNode GenerateTree(System.Collections.Generic.IReadOnlyList items, Microsoft.AspNetCore.Routing.DecisionTree.IClassifier classifier) { throw null; } - } - - internal partial class DecisionTreeNode - { - public DecisionTreeNode() { } - public System.Collections.Generic.IList> Criteria { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.IList Matches { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal readonly partial struct DecisionCriterionValue - { - private readonly object _value; - public DecisionCriterionValue(object value) { throw null; } - public object Value { get { throw null; } } - } - - internal partial interface IClassifier - { - System.Collections.Generic.IEqualityComparer ValueComparer { get; } - System.Collections.Generic.IDictionary GetCriteria(TItem item); - } -} - -namespace Microsoft.AspNetCore.Routing.Tree -{ - - public partial class TreeRouter : Microsoft.AspNetCore.Routing.IRouter - { - internal TreeRouter(Microsoft.AspNetCore.Routing.Tree.UrlMatchingTree[] trees, System.Collections.Generic.IEnumerable linkGenerationEntries, System.Text.Encodings.Web.UrlEncoder urlEncoder, Microsoft.Extensions.ObjectPool.ObjectPool objectPool, Microsoft.Extensions.Logging.ILogger routeLogger, Microsoft.Extensions.Logging.ILogger constraintLogger, int version) { } - internal System.Collections.Generic.IEnumerable MatchingTrees { get { throw null; } } - } - - [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerDisplayString,nq}")] - internal partial class LinkGenerationDecisionTree - { - public LinkGenerationDecisionTree(System.Collections.Generic.IReadOnlyList entries) { } - internal string DebuggerDisplayString { get { throw null; } } - public System.Collections.Generic.IList GetMatches(Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues) { throw null; } - } - - public partial class TreeRouteBuilder - { - internal TreeRouteBuilder(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.ObjectPool.ObjectPool objectPool, Microsoft.AspNetCore.Routing.IInlineConstraintResolver constraintResolver) { } - } - - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal readonly partial struct OutboundMatchResult - { - private readonly object _dummy; - private readonly int _dummyPrimitive; - public OutboundMatchResult(Microsoft.AspNetCore.Routing.Tree.OutboundMatch match, bool isFallbackMatch) { throw null; } - public bool IsFallbackMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Routing.Tree.OutboundMatch Match { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} - -namespace Microsoft.AspNetCore.Routing.Patterns -{ - - [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerToString()}")] - public sealed partial class RoutePatternPathSegment - { - internal RoutePatternPathSegment(System.Collections.Generic.IReadOnlyList parts) { } - internal string DebuggerToString() { throw null; } - internal static string DebuggerToString(System.Collections.Generic.IReadOnlyList parts) { throw null; } - } - - internal static partial class RouteParameterParser - { - public static Microsoft.AspNetCore.Routing.Patterns.RoutePatternParameterPart ParseRouteParameter(string parameter) { throw null; } - } - - internal partial class DefaultRoutePatternTransformer : Microsoft.AspNetCore.Routing.Patterns.RoutePatternTransformer - { - public DefaultRoutePatternTransformer(Microsoft.AspNetCore.Routing.ParameterPolicyFactory policyFactory) { } - public override Microsoft.AspNetCore.Routing.Patterns.RoutePattern SubstituteRequiredValues(Microsoft.AspNetCore.Routing.Patterns.RoutePattern original, object requiredValues) { throw null; } - } - - internal static partial class RoutePatternParser - { - internal static readonly char[] InvalidParameterNameChars; - public static Microsoft.AspNetCore.Routing.Patterns.RoutePattern Parse(string pattern) { throw null; } - } -} - -namespace Microsoft.AspNetCore.Routing.Template -{ - public partial class TemplateBinder - { - internal TemplateBinder(System.Text.Encodings.Web.UrlEncoder urlEncoder, Microsoft.Extensions.ObjectPool.ObjectPool pool, Microsoft.AspNetCore.Routing.Patterns.RoutePattern pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults, System.Collections.Generic.IEnumerable requiredKeys, System.Collections.Generic.IEnumerable> parameterPolicies) { } - internal TemplateBinder(System.Text.Encodings.Web.UrlEncoder urlEncoder, Microsoft.Extensions.ObjectPool.ObjectPool pool, Microsoft.AspNetCore.Routing.Patterns.RoutePattern pattern, System.Collections.Generic.IEnumerable> parameterPolicies) { } - internal TemplateBinder(System.Text.Encodings.Web.UrlEncoder urlEncoder, Microsoft.Extensions.ObjectPool.ObjectPool pool, Microsoft.AspNetCore.Routing.Template.RouteTemplate template, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults) { } - internal bool TryBindValues(Microsoft.AspNetCore.Routing.RouteValueDictionary acceptedValues, Microsoft.AspNetCore.Routing.LinkOptions options, Microsoft.AspNetCore.Routing.LinkOptions globalOptions, out (Microsoft.AspNetCore.Http.PathString path, Microsoft.AspNetCore.Http.QueryString query) result) { throw null; } - } - - public static partial class RoutePrecedence - { - internal static decimal ComputeInbound(Microsoft.AspNetCore.Routing.Patterns.RoutePattern routePattern) { throw null; } - internal static decimal ComputeOutbound(Microsoft.AspNetCore.Routing.Patterns.RoutePattern routePattern) { throw null; } - } -} diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj index b0245a73c3..c80ec4d8da 100644 --- a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj +++ b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.csproj @@ -5,7 +5,6 @@ - diff --git a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj index 5efefb23bf..95cde240e2 100644 --- a/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj +++ b/src/Identity/ApiAuthorization.IdentityServer/src/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj @@ -6,7 +6,7 @@ true aspnetcore;apiauth;identity false - true + true false diff --git a/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj b/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj index 87df2f8e9e..3e4b125317 100644 --- a/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj +++ b/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj @@ -5,7 +5,7 @@ netstandard2.1;$(DefaultNetCoreTargetFramework) true aspnetcore;entityframeworkcore;identity;membership - true + true diff --git a/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj index ceac9bcd6a..704379724e 100644 --- a/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj +++ b/src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj @@ -6,7 +6,7 @@ true aspnetcore;identity;membership false - true + true false diff --git a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj index f5a122a355..6da54c6869 100644 --- a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj +++ b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj @@ -6,7 +6,7 @@ $(DefaultNetCoreTargetFramework) true aspnetcore;identity;membership;razorpages - true + true Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core false false diff --git a/src/Installers/Debian/Directory.Build.props b/src/Installers/Debian/Directory.Build.props index f3d7df1c9e..7eb60ce3ee 100644 --- a/src/Installers/Debian/Directory.Build.props +++ b/src/Installers/Debian/Directory.Build.props @@ -15,6 +15,6 @@ true - true + true diff --git a/src/Installers/Rpm/Directory.Build.props b/src/Installers/Rpm/Directory.Build.props index 09110a30fb..17abde691b 100644 --- a/src/Installers/Rpm/Directory.Build.props +++ b/src/Installers/Rpm/Directory.Build.props @@ -11,7 +11,7 @@ true - true + true diff --git a/src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj b/src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj index fd2eb47d66..bdae67a48c 100644 --- a/src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj +++ b/src/Middleware/ConcurrencyLimiter/src/Microsoft.AspNetCore.ConcurrencyLimiter.csproj @@ -5,7 +5,7 @@ $(DefaultNetCoreTargetFramework) true aspnetcore;queue;queuing - true + true diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj index ae641e7693..7bb7c4b2f7 100644 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;diagnostics;entityframeworkcore - true + true diff --git a/src/Middleware/HeaderPropagation/src/Microsoft.AspNetCore.HeaderPropagation.csproj b/src/Middleware/HeaderPropagation/src/Microsoft.AspNetCore.HeaderPropagation.csproj index dcebbcf2f6..c82ea7e2d3 100644 --- a/src/Middleware/HeaderPropagation/src/Microsoft.AspNetCore.HeaderPropagation.csproj +++ b/src/Middleware/HeaderPropagation/src/Microsoft.AspNetCore.HeaderPropagation.csproj @@ -3,7 +3,7 @@ ASP.NET Core middleware to propagate HTTP headers from the incoming request to the outgoing HTTP Client requests $(DefaultNetCoreTargetFramework) - true + true $(NoWarn);CS1591 true aspnetcore;httpclient diff --git a/src/Middleware/HealthChecks.EntityFrameworkCore/src/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj b/src/Middleware/HealthChecks.EntityFrameworkCore/src/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj index ad84dcf84e..f258cb0410 100644 --- a/src/Middleware/HealthChecks.EntityFrameworkCore/src/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj +++ b/src/Middleware/HealthChecks.EntityFrameworkCore/src/Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore.csproj @@ -8,7 +8,7 @@ $(NoWarn);CS1591 true diagnostics;healthchecks;entityframeworkcore - true + true Microsoft.Extensions.Diagnostics.HealthChecks diff --git a/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj b/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj index 4989ea776d..4dafc14b70 100644 --- a/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj +++ b/src/Middleware/MiddlewareAnalysis/src/Microsoft.AspNetCore.MiddlewareAnalysis.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;diagnostics - true + true diff --git a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj index e67862ea45..ccc02ac19c 100644 --- a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj @@ -2,7 +2,7 @@ Invoke Node.js modules at runtime in ASP.NET Core applications. $(DefaultNetCoreTargetFramework) - true + true diff --git a/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj b/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj index 9aa1e94247..486708b208 100644 --- a/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj +++ b/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj @@ -3,7 +3,7 @@ Helpers for building single-page applications on ASP.NET MVC Core. $(DefaultNetCoreTargetFramework) - true + true diff --git a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj index 3db479b01e..3d7be418f7 100644 --- a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj @@ -3,7 +3,7 @@ Helpers for building single-page applications on ASP.NET MVC Core. $(DefaultNetCoreTargetFramework) - true + true diff --git a/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj b/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj index c8739145a9..b6374dbe75 100644 --- a/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj +++ b/src/Mvc/Mvc.NewtonsoftJson/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj @@ -5,7 +5,7 @@ $(DefaultNetCoreTargetFramework) true aspnetcore;aspnetcoremvc;json - true + true $(DefineConstants);JSONNET diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj index ee568fe903..5e95e71c89 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;aspnetcoremvc;razor - true + true diff --git a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs index d04a45a77f..af64509fad 100644 --- a/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs +++ b/src/Mvc/Mvc.Razor/ref/Microsoft.AspNetCore.Mvc.Razor.Manual.cs @@ -159,10 +159,6 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Infrastructure public DefaultTagHelperActivator(Microsoft.AspNetCore.Mvc.Infrastructure.ITypeActivatorCache typeActivatorCache) { } public TTagHelper Create(Microsoft.AspNetCore.Mvc.Rendering.ViewContext context) where TTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper { throw null; } } - public sealed partial class TagHelperMemoryCacheProvider - { - public Microsoft.Extensions.Caching.Memory.IMemoryCache Cache { get { throw null; } internal set { } } - } } namespace Microsoft.AspNetCore.Mvc.Razor.TagHelpers diff --git a/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj index 0df3b51ffa..33ecce17c4 100644 --- a/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj +++ b/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;aspnetcoremvc;aspnetcoremvctesting - true + true diff --git a/src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj b/src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj index 65457a000d..3856d047c3 100644 --- a/src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj +++ b/src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj @@ -7,7 +7,7 @@ $(DefaultNetCoreTargetFramework) - true + true Templates for ASP.NET Core Blazor projects. $(PackageTags);blazor;spa diff --git a/src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj b/src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj index 27842cb73b..7ea486e4b2 100644 --- a/src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj +++ b/src/ProjectTemplates/Web.Client.ItemTemplates/Microsoft.DotNet.Web.Client.ItemTemplates.csproj @@ -3,7 +3,7 @@ $(DefaultNetCoreTargetFramework) Web Client-Side File Templates for Microsoft Template Engine - true + true diff --git a/src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj b/src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj index a1f51b94f5..d639fb1e0a 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj +++ b/src/ProjectTemplates/Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj @@ -3,7 +3,7 @@ $(DefaultNetCoreTargetFramework) Web File Templates for Microsoft Template Engine. - true + true diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj index ef85eb3657..5e3b743ff6 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj +++ b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj @@ -4,7 +4,7 @@ $(DefaultNetCoreTargetFramework) Microsoft.DotNet.Web.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) ASP.NET Core Web Template Pack for Microsoft Template Engine - true + true diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj index dba182f32b..e8e0653f3c 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj @@ -5,7 +5,7 @@ Microsoft.DotNet.Web.Spa.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) Single Page Application templates for ASP.NET Core $(PackageTags);spa - true + true true diff --git a/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.Manual.cs b/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.Manual.cs deleted file mode 100644 index 8549a23cd4..0000000000 --- a/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.Manual.cs +++ /dev/null @@ -1,23 +0,0 @@ -// 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.Runtime.CompilerServices; -using Microsoft.AspNetCore.Razor.TagHelpers; - -[assembly: TypeForwardedTo(typeof(DefaultTagHelperContent))] -[assembly: TypeForwardedTo(typeof(HtmlAttributeNameAttribute))] -[assembly: TypeForwardedTo(typeof(HtmlAttributeNotBoundAttribute))] -[assembly: TypeForwardedTo(typeof(HtmlTargetElementAttribute))] -[assembly: TypeForwardedTo(typeof(ITagHelper))] -[assembly: TypeForwardedTo(typeof(ITagHelperComponent))] -[assembly: TypeForwardedTo(typeof(NullHtmlEncoder))] -[assembly: TypeForwardedTo(typeof(OutputElementHintAttribute))] -[assembly: TypeForwardedTo(typeof(ReadOnlyTagHelperAttributeList))] -[assembly: TypeForwardedTo(typeof(RestrictChildrenAttribute))] -[assembly: TypeForwardedTo(typeof(TagHelper))] -[assembly: TypeForwardedTo(typeof(TagHelperAttribute))] -[assembly: TypeForwardedTo(typeof(TagHelperAttributeList))] -[assembly: TypeForwardedTo(typeof(TagHelperComponent))] -[assembly: TypeForwardedTo(typeof(TagHelperContent))] -[assembly: TypeForwardedTo(typeof(TagHelperContext))] -[assembly: TypeForwardedTo(typeof(TagHelperOutput))] \ No newline at end of file diff --git a/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj b/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj index 06658a3da0..a178a077b8 100644 --- a/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj +++ b/src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj @@ -5,7 +5,6 @@ - diff --git a/src/Security/Authentication/Certificate/src/Microsoft.AspNetCore.Authentication.Certificate.csproj b/src/Security/Authentication/Certificate/src/Microsoft.AspNetCore.Authentication.Certificate.csproj index cffabda435..86af316bad 100644 --- a/src/Security/Authentication/Certificate/src/Microsoft.AspNetCore.Authentication.Certificate.csproj +++ b/src/Security/Authentication/Certificate/src/Microsoft.AspNetCore.Authentication.Certificate.csproj @@ -6,7 +6,7 @@ $(DefineConstants);SECURITY true aspnetcore;authentication;security;x509;certificate - true + true diff --git a/src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj b/src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj index 19fbb851d7..4977e1892b 100644 --- a/src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj +++ b/src/Security/Authentication/Facebook/src/Microsoft.AspNetCore.Authentication.Facebook.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security - true + true diff --git a/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj b/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj index 96bc1b8b33..774fa9cac0 100644 --- a/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj +++ b/src/Security/Authentication/Google/src/Microsoft.AspNetCore.Authentication.Google.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security - true + true diff --git a/src/Security/Authentication/JwtBearer/src/Microsoft.AspNetCore.Authentication.JwtBearer.csproj b/src/Security/Authentication/JwtBearer/src/Microsoft.AspNetCore.Authentication.JwtBearer.csproj index 45391ac2db..efee848b37 100644 --- a/src/Security/Authentication/JwtBearer/src/Microsoft.AspNetCore.Authentication.JwtBearer.csproj +++ b/src/Security/Authentication/JwtBearer/src/Microsoft.AspNetCore.Authentication.JwtBearer.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security - true + true diff --git a/src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj b/src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj index 8f7ee4dc44..0f2dc832cc 100644 --- a/src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj +++ b/src/Security/Authentication/MicrosoftAccount/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security - true + true diff --git a/src/Security/Authentication/Negotiate/src/Microsoft.AspNetCore.Authentication.Negotiate.csproj b/src/Security/Authentication/Negotiate/src/Microsoft.AspNetCore.Authentication.Negotiate.csproj index cd7ef7ef55..390c449d9f 100644 --- a/src/Security/Authentication/Negotiate/src/Microsoft.AspNetCore.Authentication.Negotiate.csproj +++ b/src/Security/Authentication/Negotiate/src/Microsoft.AspNetCore.Authentication.Negotiate.csproj @@ -5,7 +5,7 @@ $(DefaultNetCoreTargetFramework) true aspnetcore;authentication;security - true + true diff --git a/src/Security/Authentication/OpenIdConnect/src/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj b/src/Security/Authentication/OpenIdConnect/src/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj index 79b6de0fbf..8a6c82928d 100644 --- a/src/Security/Authentication/OpenIdConnect/src/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj +++ b/src/Security/Authentication/OpenIdConnect/src/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security - true + true diff --git a/src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj b/src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj index 51f01cbd3f..c59a0fb276 100644 --- a/src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj +++ b/src/Security/Authentication/Twitter/src/Microsoft.AspNetCore.Authentication.Twitter.csproj @@ -6,7 +6,7 @@ $(NoWarn);CS1591 true aspnetcore;authentication;security - true + true diff --git a/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj b/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj index 79ea913ae1..7d1a23fabd 100644 --- a/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj +++ b/src/Security/Authentication/WsFederation/src/Microsoft.AspNetCore.Authentication.WsFederation.csproj @@ -5,7 +5,7 @@ $(DefaultNetCoreTargetFramework) true aspnetcore;authentication;security - true + true diff --git a/src/Servers/Connections.Abstractions/ref/Directory.Build.targets b/src/Servers/Connections.Abstractions/ref/Directory.Build.targets new file mode 100644 index 0000000000..1bdedd0c01 --- /dev/null +++ b/src/Servers/Connections.Abstractions/ref/Directory.Build.targets @@ -0,0 +1,5 @@ + + + $(DefaultNetCoreTargetFramework) + + \ No newline at end of file diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index d8d0ef653b..a49803ecce 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -1,4 +1,7 @@  + + false + Debug diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs deleted file mode 100644 index 4dec82338a..0000000000 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.Manual.cs +++ /dev/null @@ -1,1957 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Server.Kestrel.Core -{ - public partial class KestrelServer : Microsoft.AspNetCore.Hosting.Server.IServer, System.IDisposable - { - internal KestrelServer(Microsoft.AspNetCore.Connections.IConnectionListenerFactory transportFactory, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.ServiceContext serviceContext) { } - } - public sealed partial class BadHttpRequestException : System.IO.IOException - { - internal Microsoft.Extensions.Primitives.StringValues AllowedHeader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - internal Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason Reason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]internal static Microsoft.AspNetCore.Server.Kestrel.Core.BadHttpRequestException GetException(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason reason) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]internal static Microsoft.AspNetCore.Server.Kestrel.Core.BadHttpRequestException GetException(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason reason, string detail) { throw null; } - [System.Diagnostics.StackTraceHiddenAttribute] - internal static void Throw(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason reason) { } - [System.Diagnostics.StackTraceHiddenAttribute] - internal static void Throw(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason reason, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod method) { } - [System.Diagnostics.StackTraceHiddenAttribute] - internal static void Throw(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason reason, Microsoft.Extensions.Primitives.StringValues detail) { } - [System.Diagnostics.StackTraceHiddenAttribute] - internal static void Throw(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestRejectionReason reason, string detail) { } - } - internal sealed partial class LocalhostListenOptions : Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions - { - internal LocalhostListenOptions(int port) : base (default(System.Net.IPEndPoint)) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - internal override System.Threading.Tasks.Task BindAsync(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.AddressBindContext context) { throw null; } - internal Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions Clone(System.Net.IPAddress address) { throw null; } - internal override string GetDisplayName() { throw null; } - } - internal sealed partial class AnyIPListenOptions : Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions - { - internal AnyIPListenOptions(int port) : base (default(System.Net.IPEndPoint)) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - internal override System.Threading.Tasks.Task BindAsync(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.AddressBindContext context) { throw null; } - } - public partial class KestrelServerOptions - { - internal System.Security.Cryptography.X509Certificates.X509Certificate2 DefaultCertificate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - internal bool IsDevCertLoaded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - internal bool Latin1RequestHeaders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - internal System.Collections.Generic.List ListenOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - internal void ApplyDefaultCert(Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions httpsOptions) { } - internal void ApplyEndpointDefaults(Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions listenOptions) { } - internal void ApplyHttpsDefaults(Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions httpsOptions) { } - } - internal static partial class CoreStrings - { - internal static string AddressBindingFailed { get { throw null; } } - internal static string ArgumentOutOfRange { get { throw null; } } - internal static string AuthenticationFailed { get { throw null; } } - internal static string AuthenticationTimedOut { get { throw null; } } - internal static string BadRequest { get { throw null; } } - internal static string BadRequest_BadChunkSizeData { get { throw null; } } - internal static string BadRequest_BadChunkSuffix { get { throw null; } } - internal static string BadRequest_ChunkedRequestIncomplete { get { throw null; } } - internal static string BadRequest_FinalTransferCodingNotChunked { get { throw null; } } - internal static string BadRequest_HeadersExceedMaxTotalSize { get { throw null; } } - internal static string BadRequest_InvalidCharactersInHeaderName { get { throw null; } } - internal static string BadRequest_InvalidContentLength_Detail { get { throw null; } } - internal static string BadRequest_InvalidHostHeader { get { throw null; } } - internal static string BadRequest_InvalidHostHeader_Detail { get { throw null; } } - internal static string BadRequest_InvalidRequestHeadersNoCRLF { get { throw null; } } - internal static string BadRequest_InvalidRequestHeader_Detail { get { throw null; } } - internal static string BadRequest_InvalidRequestLine { get { throw null; } } - internal static string BadRequest_InvalidRequestLine_Detail { get { throw null; } } - internal static string BadRequest_InvalidRequestTarget_Detail { get { throw null; } } - internal static string BadRequest_LengthRequired { get { throw null; } } - internal static string BadRequest_LengthRequiredHttp10 { get { throw null; } } - internal static string BadRequest_MalformedRequestInvalidHeaders { get { throw null; } } - internal static string BadRequest_MethodNotAllowed { get { throw null; } } - internal static string BadRequest_MissingHostHeader { get { throw null; } } - internal static string BadRequest_MultipleContentLengths { get { throw null; } } - internal static string BadRequest_MultipleHostHeaders { get { throw null; } } - internal static string BadRequest_RequestBodyTimeout { get { throw null; } } - internal static string BadRequest_RequestBodyTooLarge { get { throw null; } } - internal static string BadRequest_RequestHeadersTimeout { get { throw null; } } - internal static string BadRequest_RequestLineTooLong { get { throw null; } } - internal static string BadRequest_TooManyHeaders { get { throw null; } } - internal static string BadRequest_UnexpectedEndOfRequestContent { get { throw null; } } - internal static string BadRequest_UnrecognizedHTTPVersion { get { throw null; } } - internal static string BadRequest_UpgradeRequestCannotHavePayload { get { throw null; } } - internal static string BigEndianNotSupported { get { throw null; } } - internal static string BindingToDefaultAddress { get { throw null; } } - internal static string BindingToDefaultAddresses { get { throw null; } } - internal static string CannotUpgradeNonUpgradableRequest { get { throw null; } } - internal static string CertNotFoundInStore { get { throw null; } } - internal static string ConcurrentTimeoutsNotSupported { get { throw null; } } - internal static string ConfigureHttpsFromMethodCall { get { throw null; } } - internal static string ConfigurePathBaseFromMethodCall { get { throw null; } } - internal static string ConnectionAbortedByApplication { get { throw null; } } - internal static string ConnectionAbortedByClient { get { throw null; } } - internal static string ConnectionAbortedDuringServerShutdown { get { throw null; } } - internal static string ConnectionOrStreamAbortedByCancellationToken { get { throw null; } } - internal static string ConnectionShutdownError { get { throw null; } } - internal static string ConnectionTimedBecauseResponseMininumDataRateNotSatisfied { get { throw null; } } - internal static string ConnectionTimedOutByServer { get { throw null; } } - internal static System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - internal static string DynamicPortOnLocalhostNotSupported { get { throw null; } } - internal static string EndpointAlreadyInUse { get { throw null; } } - internal static string EndPointHttp2NotNegotiated { get { throw null; } } - internal static string EndpointMissingUrl { get { throw null; } } - internal static string EndPointRequiresAtLeastOneProtocol { get { throw null; } } - internal static string FallbackToIPv4Any { get { throw null; } } - internal static string GreaterThanZeroRequired { get { throw null; } } - internal static string HeaderNotAllowedOnResponse { get { throw null; } } - internal static string HeadersAreReadOnly { get { throw null; } } - internal static string HPackErrorDynamicTableSizeUpdateNotAtBeginningOfHeaderBlock { get { throw null; } } - internal static string HPackErrorDynamicTableSizeUpdateTooLarge { get { throw null; } } - internal static string HPackErrorIncompleteHeaderBlock { get { throw null; } } - internal static string HPackErrorIndexOutOfRange { get { throw null; } } - internal static string HPackErrorIntegerTooBig { get { throw null; } } - internal static string HPackErrorNotEnoughBuffer { get { throw null; } } - internal static string HPackHuffmanError { get { throw null; } } - internal static string HPackHuffmanErrorDestinationTooSmall { get { throw null; } } - internal static string HPackHuffmanErrorEOS { get { throw null; } } - internal static string HPackHuffmanErrorIncomplete { get { throw null; } } - internal static string HPackStringLengthTooLarge { get { throw null; } } - internal static string Http2ConnectionFaulted { get { throw null; } } - internal static string Http2ErrorConnectionSpecificHeaderField { get { throw null; } } - internal static string Http2ErrorConnectMustNotSendSchemeOrPath { get { throw null; } } - internal static string Http2ErrorContinuationWithNoHeaders { get { throw null; } } - internal static string Http2ErrorDuplicatePseudoHeaderField { get { throw null; } } - internal static string Http2ErrorFlowControlWindowExceeded { get { throw null; } } - internal static string Http2ErrorFrameOverLimit { get { throw null; } } - internal static string Http2ErrorHeaderNameUppercase { get { throw null; } } - internal static string Http2ErrorHeadersInterleaved { get { throw null; } } - internal static string Http2ErrorHeadersWithTrailersNoEndStream { get { throw null; } } - internal static string Http2ErrorInitialWindowSizeInvalid { get { throw null; } } - internal static string Http2ErrorInvalidPreface { get { throw null; } } - internal static string Http2ErrorMaxStreams { get { throw null; } } - internal static string Http2ErrorMethodInvalid { get { throw null; } } - internal static string Http2ErrorMinTlsVersion { get { throw null; } } - internal static string Http2ErrorMissingMandatoryPseudoHeaderFields { get { throw null; } } - internal static string Http2ErrorPaddingTooLong { get { throw null; } } - internal static string Http2ErrorPseudoHeaderFieldAfterRegularHeaders { get { throw null; } } - internal static string Http2ErrorPushPromiseReceived { get { throw null; } } - internal static string Http2ErrorResponsePseudoHeaderField { get { throw null; } } - internal static string Http2ErrorSettingsAckLengthNotZero { get { throw null; } } - internal static string Http2ErrorSettingsLengthNotMultipleOfSix { get { throw null; } } - internal static string Http2ErrorSettingsParameterOutOfRange { get { throw null; } } - internal static string Http2ErrorStreamAborted { get { throw null; } } - internal static string Http2ErrorStreamClosed { get { throw null; } } - internal static string Http2ErrorStreamHalfClosedRemote { get { throw null; } } - internal static string Http2ErrorStreamIdEven { get { throw null; } } - internal static string Http2ErrorStreamIdle { get { throw null; } } - internal static string Http2ErrorStreamIdNotZero { get { throw null; } } - internal static string Http2ErrorStreamIdZero { get { throw null; } } - internal static string Http2ErrorStreamSelfDependency { get { throw null; } } - internal static string Http2ErrorTrailerNameUppercase { get { throw null; } } - internal static string Http2ErrorTrailersContainPseudoHeaderField { get { throw null; } } - internal static string Http2ErrorUnexpectedFrameLength { get { throw null; } } - internal static string Http2ErrorUnknownPseudoHeaderField { get { throw null; } } - internal static string Http2ErrorWindowUpdateIncrementZero { get { throw null; } } - internal static string Http2ErrorWindowUpdateSizeInvalid { get { throw null; } } - internal static string Http2MinDataRateNotSupported { get { throw null; } } - internal static string HTTP2NoTlsOsx { get { throw null; } } - internal static string HTTP2NoTlsWin7 { get { throw null; } } - internal static string Http2StreamAborted { get { throw null; } } - internal static string Http2StreamErrorAfterHeaders { get { throw null; } } - internal static string Http2StreamErrorLessDataThanLength { get { throw null; } } - internal static string Http2StreamErrorMoreDataThanLength { get { throw null; } } - internal static string Http2StreamErrorPathInvalid { get { throw null; } } - internal static string Http2StreamErrorSchemeMismatch { get { throw null; } } - internal static string Http2StreamResetByApplication { get { throw null; } } - internal static string Http2StreamResetByClient { get { throw null; } } - internal static string Http2TellClientToCalmDown { get { throw null; } } - internal static string InvalidAsciiOrControlChar { get { throw null; } } - internal static string InvalidContentLength_InvalidNumber { get { throw null; } } - internal static string InvalidEmptyHeaderName { get { throw null; } } - internal static string InvalidServerCertificateEku { get { throw null; } } - internal static string InvalidUrl { get { throw null; } } - internal static string KeyAlreadyExists { get { throw null; } } - internal static string MaxRequestBodySizeCannotBeModifiedAfterRead { get { throw null; } } - internal static string MaxRequestBodySizeCannotBeModifiedForUpgradedRequests { get { throw null; } } - internal static string MaxRequestBufferSmallerThanRequestHeaderBuffer { get { throw null; } } - internal static string MaxRequestBufferSmallerThanRequestLineBuffer { get { throw null; } } - internal static string MinimumGracePeriodRequired { get { throw null; } } - internal static string MultipleCertificateSources { get { throw null; } } - internal static string NetworkInterfaceBindingFailed { get { throw null; } } - internal static string NoCertSpecifiedNoDevelopmentCertificateFound { get { throw null; } } - internal static string NonNegativeNumberOrNullRequired { get { throw null; } } - internal static string NonNegativeNumberRequired { get { throw null; } } - internal static string NonNegativeTimeSpanRequired { get { throw null; } } - internal static string OverridingWithKestrelOptions { get { throw null; } } - internal static string OverridingWithPreferHostingUrls { get { throw null; } } - internal static string ParameterReadOnlyAfterResponseStarted { get { throw null; } } - internal static string PositiveFiniteTimeSpanRequired { get { throw null; } } - internal static string PositiveNumberOrNullMinDataRateRequired { get { throw null; } } - internal static string PositiveNumberOrNullRequired { get { throw null; } } - internal static string PositiveNumberRequired { get { throw null; } } - internal static string PositiveTimeSpanRequired { get { throw null; } } - internal static string PositiveTimeSpanRequired1 { get { throw null; } } - internal static string ProtocolSelectionFailed { get { throw null; } } - internal static string RequestProcessingAborted { get { throw null; } } - internal static string RequestProcessingEndError { get { throw null; } } - internal static string RequestTrailersNotAvailable { get { throw null; } } - internal static System.Resources.ResourceManager ResourceManager { get { throw null; } } - internal static string ResponseStreamWasUpgraded { get { throw null; } } - internal static string ServerAlreadyStarted { get { throw null; } } - internal static string ServerCertificateRequired { get { throw null; } } - internal static string ServerShutdownDuringConnectionInitialization { get { throw null; } } - internal static string StartAsyncBeforeGetMemory { get { throw null; } } - internal static string SynchronousReadsDisallowed { get { throw null; } } - internal static string SynchronousWritesDisallowed { get { throw null; } } - internal static string TooFewBytesWritten { get { throw null; } } - internal static string TooManyBytesWritten { get { throw null; } } - internal static string UnableToConfigureHttpsBindings { get { throw null; } } - internal static string UnhandledApplicationException { get { throw null; } } - internal static string UnixSocketPathMustBeAbsolute { get { throw null; } } - internal static string UnknownTransportMode { get { throw null; } } - internal static string UnsupportedAddressScheme { get { throw null; } } - internal static string UpgradeCannotBeCalledMultipleTimes { get { throw null; } } - internal static string UpgradedConnectionLimitReached { get { throw null; } } - internal static string WritingToResponseBodyAfterResponseCompleted { get { throw null; } } - internal static string WritingToResponseBodyNotSupported { get { throw null; } } - internal static string FormatAddressBindingFailed(object address) { throw null; } - internal static string FormatArgumentOutOfRange(object min, object max) { throw null; } - internal static string FormatBadRequest_FinalTransferCodingNotChunked(object detail) { throw null; } - internal static string FormatBadRequest_InvalidContentLength_Detail(object detail) { throw null; } - internal static string FormatBadRequest_InvalidHostHeader_Detail(object detail) { throw null; } - internal static string FormatBadRequest_InvalidRequestHeader_Detail(object detail) { throw null; } - internal static string FormatBadRequest_InvalidRequestLine_Detail(object detail) { throw null; } - internal static string FormatBadRequest_InvalidRequestTarget_Detail(object detail) { throw null; } - internal static string FormatBadRequest_LengthRequired(object detail) { throw null; } - internal static string FormatBadRequest_LengthRequiredHttp10(object detail) { throw null; } - internal static string FormatBadRequest_UnrecognizedHTTPVersion(object detail) { throw null; } - internal static string FormatBindingToDefaultAddress(object address) { throw null; } - internal static string FormatBindingToDefaultAddresses(object address0, object address1) { throw null; } - internal static string FormatCertNotFoundInStore(object subject, object storeLocation, object storeName, object allowInvalid) { throw null; } - internal static string FormatConfigureHttpsFromMethodCall(object methodName) { throw null; } - internal static string FormatConfigurePathBaseFromMethodCall(object methodName) { throw null; } - internal static string FormatEndpointAlreadyInUse(object endpoint) { throw null; } - internal static string FormatEndpointMissingUrl(object endpointName) { throw null; } - internal static string FormatFallbackToIPv4Any(object port) { throw null; } - internal static string FormatHeaderNotAllowedOnResponse(object name, object statusCode) { throw null; } - internal static string FormatHPackErrorDynamicTableSizeUpdateTooLarge(object size, object maxSize) { throw null; } - internal static string FormatHPackErrorIndexOutOfRange(object index) { throw null; } - internal static string FormatHPackStringLengthTooLarge(object length, object maxStringLength) { throw null; } - internal static string FormatHttp2ErrorFrameOverLimit(object size, object limit) { throw null; } - internal static string FormatHttp2ErrorHeadersInterleaved(object frameType, object streamId, object headersStreamId) { throw null; } - internal static string FormatHttp2ErrorMethodInvalid(object method) { throw null; } - internal static string FormatHttp2ErrorMinTlsVersion(object protocol) { throw null; } - internal static string FormatHttp2ErrorPaddingTooLong(object frameType) { throw null; } - internal static string FormatHttp2ErrorSettingsParameterOutOfRange(object parameter) { throw null; } - internal static string FormatHttp2ErrorStreamAborted(object frameType, object streamId) { throw null; } - internal static string FormatHttp2ErrorStreamClosed(object frameType, object streamId) { throw null; } - internal static string FormatHttp2ErrorStreamHalfClosedRemote(object frameType, object streamId) { throw null; } - internal static string FormatHttp2ErrorStreamIdEven(object frameType, object streamId) { throw null; } - internal static string FormatHttp2ErrorStreamIdle(object frameType, object streamId) { throw null; } - internal static string FormatHttp2ErrorStreamIdNotZero(object frameType) { throw null; } - internal static string FormatHttp2ErrorStreamIdZero(object frameType) { throw null; } - internal static string FormatHttp2ErrorStreamSelfDependency(object frameType, object streamId) { throw null; } - internal static string FormatHttp2ErrorUnexpectedFrameLength(object frameType, object expectedLength) { throw null; } - internal static string FormatHttp2StreamErrorPathInvalid(object path) { throw null; } - internal static string FormatHttp2StreamErrorSchemeMismatch(object requestScheme, object transportScheme) { throw null; } - internal static string FormatHttp2StreamResetByApplication(object errorCode) { throw null; } - internal static string FormatInvalidAsciiOrControlChar(object character) { throw null; } - internal static string FormatInvalidContentLength_InvalidNumber(object value) { throw null; } - internal static string FormatInvalidServerCertificateEku(object thumbprint) { throw null; } - internal static string FormatInvalidUrl(object url) { throw null; } - internal static string FormatMaxRequestBufferSmallerThanRequestHeaderBuffer(object requestBufferSize, object requestHeaderSize) { throw null; } - internal static string FormatMaxRequestBufferSmallerThanRequestLineBuffer(object requestBufferSize, object requestLineSize) { throw null; } - internal static string FormatMinimumGracePeriodRequired(object heartbeatInterval) { throw null; } - internal static string FormatMultipleCertificateSources(object endpointName) { throw null; } - internal static string FormatNetworkInterfaceBindingFailed(object address, object interfaceName, object error) { throw null; } - internal static string FormatOverridingWithKestrelOptions(object addresses, object methodName) { throw null; } - internal static string FormatOverridingWithPreferHostingUrls(object settingName, object addresses) { throw null; } - internal static string FormatParameterReadOnlyAfterResponseStarted(object name) { throw null; } - internal static string FormatTooFewBytesWritten(object written, object expected) { throw null; } - internal static string FormatTooManyBytesWritten(object written, object expected) { throw null; } - internal static string FormatUnknownTransportMode(object mode) { throw null; } - internal static string FormatUnsupportedAddressScheme(object address) { throw null; } - internal static string FormatWritingToResponseBodyNotSupported(object statusCode) { throw null; } - } - - public partial class ListenOptions : Microsoft.AspNetCore.Connections.IConnectionBuilder - { - internal readonly System.Collections.Generic.List> _middleware; - internal ListenOptions(System.Net.IPEndPoint endPoint) { } - internal ListenOptions(string socketPath) { } - internal ListenOptions(ulong fileHandle) { } - internal ListenOptions(ulong fileHandle, Microsoft.AspNetCore.Connections.FileHandleType handleType) { } - public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions KestrelServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } - internal System.Net.EndPoint EndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - internal bool IsHttp { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - internal bool IsTls { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - internal string Scheme { get { throw null; } } - internal virtual string GetDisplayName() { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - internal virtual System.Threading.Tasks.Task BindAsync(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.AddressBindContext context) { throw null; } - } -} - -namespace Microsoft.AspNetCore.Server.Kestrel.Https.Internal -{ - internal partial class HttpsConnectionMiddleware - { - public HttpsConnectionMiddleware(Microsoft.AspNetCore.Connections.ConnectionDelegate next, Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions options) { } - public HttpsConnectionMiddleware(Microsoft.AspNetCore.Connections.ConnectionDelegate next, Microsoft.AspNetCore.Server.Kestrel.Https.HttpsConnectionAdapterOptions options, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { } - public System.Threading.Tasks.Task OnConnectionAsync(Microsoft.AspNetCore.Connections.ConnectionContext context) { throw null; } - } -} -namespace Microsoft.AspNetCore.Server.Kestrel.Https -{ - public static partial class CertificateLoader - { - internal static bool DoesCertificateHaveAnAccessiblePrivateKey(System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { throw null; } - internal static bool IsCertificateAllowedForServerAuth(System.Security.Cryptography.X509Certificates.X509Certificate2 certificate) { throw null; } - } -} -namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal -{ - internal static partial class MemoryPoolExtensions - { - public static int GetMinimumAllocSize(this System.Buffers.MemoryPool pool) { throw null; } - public static int GetMinimumSegmentSize(this System.Buffers.MemoryPool pool) { throw null; } - } - internal partial class DuplexPipeStreamAdapter : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.DuplexPipeStream, System.IO.Pipelines.IDuplexPipe where TStream : System.IO.Stream - { - public DuplexPipeStreamAdapter(System.IO.Pipelines.IDuplexPipe duplexPipe, System.Func createStream) : base (default(System.IO.Pipelines.PipeReader), default(System.IO.Pipelines.PipeWriter), default(bool)) { } - public DuplexPipeStreamAdapter(System.IO.Pipelines.IDuplexPipe duplexPipe, System.IO.Pipelines.StreamPipeReaderOptions readerOptions, System.IO.Pipelines.StreamPipeWriterOptions writerOptions, System.Func createStream) : base (default(System.IO.Pipelines.PipeReader), default(System.IO.Pipelines.PipeWriter), default(bool)) { } - public System.IO.Pipelines.PipeReader Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.IO.Pipelines.PipeWriter Output { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public TStream Stream { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - protected override void Dispose(bool disposing) { } - public override System.Threading.Tasks.ValueTask DisposeAsync() { throw null; } - } - internal partial class DuplexPipeStream : System.IO.Stream - { - public DuplexPipeStream(System.IO.Pipelines.PipeReader input, System.IO.Pipelines.PipeWriter output, bool throwOnCancelled = false) { } - public override bool CanRead { get { throw null; } } - public override bool CanSeek { get { throw null; } } - public override bool CanWrite { get { throw null; } } - public override long Length { get { throw null; } } - public override long Position { get { throw null; } set { } } - public override System.IAsyncResult BeginRead(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } - public override System.IAsyncResult BeginWrite(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } - public void CancelPendingRead() { } - public override int EndRead(System.IAsyncResult asyncResult) { throw null; } - public override void EndWrite(System.IAsyncResult asyncResult) { } - public override void Flush() { } - public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } - public override int Read(byte[] buffer, int offset, int count) { throw null; } - public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Threading.Tasks.ValueTask ReadAsync(System.Memory destination, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } - public override void SetLength(long value) { } - public override void Write(byte[] buffer, int offset, int count) { } - public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } - public override System.Threading.Tasks.ValueTask WriteAsync(System.ReadOnlyMemory source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - internal partial class ConnectionLimitMiddleware - { - internal ConnectionLimitMiddleware(Microsoft.AspNetCore.Connections.ConnectionDelegate next, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ResourceCounter concurrentConnectionCounter, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace trace) { } - public ConnectionLimitMiddleware(Microsoft.AspNetCore.Connections.ConnectionDelegate next, long connectionLimit, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace trace) { } - public System.Threading.Tasks.Task OnConnectionAsync(Microsoft.AspNetCore.Connections.ConnectionContext connection) { throw null; } - } - internal static partial class HttpConnectionBuilderExtensions - { - public static Microsoft.AspNetCore.Connections.IConnectionBuilder UseHttpServer(this Microsoft.AspNetCore.Connections.IConnectionBuilder builder, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.ServiceContext serviceContext, Microsoft.AspNetCore.Hosting.Server.IHttpApplication application, Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols protocols) { throw null; } - } - internal partial class HttpConnection : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutHandler - { - public HttpConnection(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext context) { } - internal void Initialize(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.IRequestProcessor requestProcessor) { } - public void OnTimeout(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason reason) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task ProcessRequestsAsync(Microsoft.AspNetCore.Hosting.Server.IHttpApplication httpApplication) { throw null; } - } - internal partial class ConnectionDispatcher - { - public ConnectionDispatcher(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.ServiceContext serviceContext, Microsoft.AspNetCore.Connections.ConnectionDelegate connectionDelegate) { } - public System.Threading.Tasks.Task StartAcceptingConnections(Microsoft.AspNetCore.Connections.IConnectionListener listener) { throw null; } - } - internal partial class ServerAddressesFeature : Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature - { - public ServerAddressesFeature() { } - public System.Collections.Generic.ICollection Addresses { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool PreferHostingUrls { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - internal partial class AddressBindContext - { - public AddressBindContext() { } - public System.Collections.Generic.ICollection Addresses { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Func CreateBinding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Collections.Generic.List ListenOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.Extensions.Logging.ILogger Logger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions ServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - internal partial class AddressBinder - { - public AddressBinder() { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public static System.Threading.Tasks.Task BindAsync(Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature addresses, Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions serverOptions, Microsoft.Extensions.Logging.ILogger logger, System.Func createBinding) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - internal static System.Threading.Tasks.Task BindEndpointAsync(Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions endpoint, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.AddressBindContext context) { throw null; } - internal static Microsoft.AspNetCore.Server.Kestrel.Core.ListenOptions ParseAddress(string address, out bool https) { throw null; } - protected internal static bool TryCreateIPEndPoint(Microsoft.AspNetCore.Http.BindingAddress address, out System.Net.IPEndPoint endpoint) { throw null; } - } - internal partial class EndpointConfig - { - public EndpointConfig() { } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.CertificateConfig Certificate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.Extensions.Configuration.IConfigurationSection ConfigSection { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols? Protocols { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Url { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - internal partial class EndpointDefaults - { - public EndpointDefaults() { } - public Microsoft.Extensions.Configuration.IConfigurationSection ConfigSection { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols? Protocols { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - internal partial class CertificateConfig - { - public CertificateConfig(Microsoft.Extensions.Configuration.IConfigurationSection configSection) { } - public bool? AllowInvalid { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.Extensions.Configuration.IConfigurationSection ConfigSection { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool IsFileCert { get { throw null; } } - public bool IsStoreCert { get { throw null; } } - public string Location { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Password { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Store { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Subject { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - internal partial class ConfigurationReader - { - public ConfigurationReader(Microsoft.Extensions.Configuration.IConfiguration configuration) { } - public System.Collections.Generic.IDictionary Certificates { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.EndpointDefaults EndpointDefaults { get { throw null; } } - public System.Collections.Generic.IEnumerable Endpoints { get { throw null; } } - public bool Latin1RequestHeaders { get { throw null; } } - } - internal partial class HttpConnectionContext - { - public HttpConnectionContext() { } - public Microsoft.AspNetCore.Connections.ConnectionContext ConnectionContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.Features.IFeatureCollection ConnectionFeatures { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ConnectionId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.IPEndPoint LocalEndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Buffers.MemoryPool MemoryPool { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols Protocols { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.IPEndPoint RemoteEndPoint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.ServiceContext ServiceContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl TimeoutControl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.IO.Pipelines.IDuplexPipe Transport { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - internal partial interface IRequestProcessor - { - void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException ex); - void HandleReadDataRateTimeout(); - void HandleRequestHeadersTimeout(); - void OnInputOrOutputCompleted(); - System.Threading.Tasks.Task ProcessRequestsAsync(Microsoft.AspNetCore.Hosting.Server.IHttpApplication application); - void StopProcessingNextRequest(); - void Tick(System.DateTimeOffset now); - } - internal partial class KestrelServerOptionsSetup : Microsoft.Extensions.Options.IConfigureOptions - { - public KestrelServerOptionsSetup(System.IServiceProvider services) { } - public void Configure(Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions options) { } - } - internal partial class ServiceContext - { - public ServiceContext() { } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ConnectionManager ConnectionManager { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.DateHeaderValueManager DateHeaderValueManager { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.Heartbeat Heartbeat { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpParser HttpParser { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace Log { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.IO.Pipelines.PipeScheduler Scheduler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions ServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ISystemClock SystemClock { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } -} - -namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http -{ - internal sealed partial class Http1ContentLengthMessageBody : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1MessageBody - { - public Http1ContentLengthMessageBody(bool keepAlive, long contentLength, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection context) : base (default(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection)) { } - public override void AdvanceTo(System.SequencePosition consumed) { } - public override void AdvanceTo(System.SequencePosition consumed, System.SequencePosition examined) { } - public override void CancelPendingRead() { } - public override void Complete(System.Exception exception) { } - public override System.Threading.Tasks.Task ConsumeAsync() { throw null; } - protected override void OnReadStarting() { } - protected override System.Threading.Tasks.Task OnStopAsync() { throw null; } - public override System.Threading.Tasks.ValueTask ReadAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public override System.Threading.Tasks.ValueTask ReadAsyncInternal(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override bool TryRead(out System.IO.Pipelines.ReadResult readResult) { throw null; } - public override bool TryReadInternal(out System.IO.Pipelines.ReadResult readResult) { throw null; } - } - internal static partial class ReasonPhrases - { - public static byte[] ToStatusBytes(int statusCode, string reasonPhrase = null) { throw null; } - } - internal static partial class PathNormalizer - { - public unsafe static bool ContainsDotSegments(byte* start, byte* end) { throw null; } - public static string DecodePath(System.Span path, bool pathEncoded, string rawTarget, int queryLength) { throw null; } - public unsafe static int RemoveDotSegments(byte* start, byte* end) { throw null; } - public static int RemoveDotSegments(System.Span input) { throw null; } - } - internal enum RequestRejectionReason - { - UnrecognizedHTTPVersion = 0, - InvalidRequestLine = 1, - InvalidRequestHeader = 2, - InvalidRequestHeadersNoCRLF = 3, - MalformedRequestInvalidHeaders = 4, - InvalidContentLength = 5, - MultipleContentLengths = 6, - UnexpectedEndOfRequestContent = 7, - BadChunkSuffix = 8, - BadChunkSizeData = 9, - ChunkedRequestIncomplete = 10, - InvalidRequestTarget = 11, - InvalidCharactersInHeaderName = 12, - RequestLineTooLong = 13, - HeadersExceedMaxTotalSize = 14, - TooManyHeaders = 15, - RequestBodyTooLarge = 16, - RequestHeadersTimeout = 17, - RequestBodyTimeout = 18, - FinalTransferCodingNotChunked = 19, - LengthRequired = 20, - LengthRequiredHttp10 = 21, - OptionsMethodRequired = 22, - ConnectMethodRequired = 23, - MissingHostHeader = 24, - MultipleHostHeaders = 25, - InvalidHostHeader = 26, - UpgradeRequestCannotHavePayload = 27, - RequestBodyExceedsContentLength = 28, - } - internal static partial class ChunkWriter - { - public static int BeginChunkBytes(int dataCount, System.Span span) { throw null; } - internal static int GetPrefixBytesForChunk(int length, out bool sliceOneByte) { throw null; } - internal static int WriteBeginChunkBytes(this ref System.Buffers.BufferWriter start, int dataCount) { throw null; } - internal static void WriteEndChunkBytes(this ref System.Buffers.BufferWriter start) { } - } - internal sealed partial class HttpRequestPipeReader : System.IO.Pipelines.PipeReader - { - public HttpRequestPipeReader() { } - public void Abort(System.Exception error = null) { } - public override void AdvanceTo(System.SequencePosition consumed) { } - public override void AdvanceTo(System.SequencePosition consumed, System.SequencePosition examined) { } - public override void CancelPendingRead() { } - public override void Complete(System.Exception exception = null) { } - public override System.Threading.Tasks.ValueTask ReadAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public void StartAcceptingReads(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody body) { } - public void StopAcceptingReads() { } - public override bool TryRead(out System.IO.Pipelines.ReadResult result) { throw null; } - } - internal sealed partial class HttpRequestStream : System.IO.Stream - { - public HttpRequestStream(Microsoft.AspNetCore.Http.Features.IHttpBodyControlFeature bodyControl, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpRequestPipeReader pipeReader) { } - public override bool CanRead { get { throw null; } } - public override bool CanSeek { get { throw null; } } - public override bool CanWrite { get { throw null; } } - public override long Length { get { throw null; } } - public override long Position { get { throw null; } set { } } - public override int WriteTimeout { get { throw null; } set { } } - public override System.IAsyncResult BeginRead(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } - public override System.Threading.Tasks.Task CopyToAsync(System.IO.Stream destination, int bufferSize, System.Threading.CancellationToken cancellationToken) { throw null; } - public override int EndRead(System.IAsyncResult asyncResult) { throw null; } - public override void Flush() { } - public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } - public override int Read(byte[] buffer, int offset, int count) { throw null; } - public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } - public override System.Threading.Tasks.ValueTask ReadAsync(System.Memory destination, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } - public override void SetLength(long value) { } - public override void Write(byte[] buffer, int offset, int count) { } - public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } - } - internal abstract partial class Http1MessageBody : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody - { - protected bool _completed; - protected readonly Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection _context; - protected Http1MessageBody(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection context) : base (default(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpProtocol)) { } - protected void CheckCompletedReadResult(System.IO.Pipelines.ReadResult result) { } - public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody For(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion httpVersion, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpRequestHeaders headers, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection context) { throw null; } - protected override System.Threading.Tasks.Task OnConsumeAsync() { throw null; } - public abstract System.Threading.Tasks.ValueTask ReadAsyncInternal(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); - protected void ThrowIfCompleted() { } - public abstract bool TryReadInternal(out System.IO.Pipelines.ReadResult readResult); - } - internal partial interface IHttpOutputAborter - { - void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason); - } - internal partial class Http1OutputProducer : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpOutputAborter, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpOutputProducer, System.IDisposable - { - public Http1OutputProducer(System.IO.Pipelines.PipeWriter pipeWriter, string connectionId, Microsoft.AspNetCore.Connections.ConnectionContext connectionContext, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace log, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl timeoutControl, Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinResponseDataRateFeature minResponseDataRateFeature, System.Buffers.MemoryPool memoryPool) { } - public void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException error) { } - public void Advance(int bytes) { } - public void CancelPendingFlush() { } - public void Dispose() { } - public System.Threading.Tasks.ValueTask FirstWriteAsync(int statusCode, string reasonPhrase, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders responseHeaders, bool autoChunk, System.ReadOnlySpan buffer, System.Threading.CancellationToken cancellationToken) { throw null; } - public System.Threading.Tasks.ValueTask FirstWriteChunkedAsync(int statusCode, string reasonPhrase, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders responseHeaders, bool autoChunk, System.ReadOnlySpan buffer, System.Threading.CancellationToken cancellationToken) { throw null; } - public System.Threading.Tasks.ValueTask FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.Memory GetMemory(int sizeHint = 0) { throw null; } - public System.Span GetSpan(int sizeHint = 0) { throw null; } - public void Reset() { } - public void Stop() { } - public System.Threading.Tasks.ValueTask Write100ContinueAsync() { throw null; } - public System.Threading.Tasks.ValueTask WriteChunkAsync(System.ReadOnlySpan buffer, System.Threading.CancellationToken cancellationToken) { throw null; } - public System.Threading.Tasks.Task WriteDataAsync(System.ReadOnlySpan buffer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.Threading.Tasks.ValueTask WriteDataToPipeAsync(System.ReadOnlySpan buffer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public void WriteResponseHeaders(int statusCode, string reasonPhrase, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders responseHeaders, bool autoChunk, bool appComplete) { } - public System.Threading.Tasks.ValueTask WriteStreamSuffixAsync() { throw null; } - } - internal sealed partial class HttpResponseStream : System.IO.Stream - { - public HttpResponseStream(Microsoft.AspNetCore.Http.Features.IHttpBodyControlFeature bodyControl, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponsePipeWriter pipeWriter) { } - public override bool CanRead { get { throw null; } } - public override bool CanSeek { get { throw null; } } - public override bool CanWrite { get { throw null; } } - public override long Length { get { throw null; } } - public override long Position { get { throw null; } set { } } - public override int ReadTimeout { get { throw null; } set { } } - public override System.IAsyncResult BeginWrite(byte[] buffer, int offset, int count, System.AsyncCallback callback, object state) { throw null; } - public override void EndWrite(System.IAsyncResult asyncResult) { } - public override void Flush() { } - public override System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken) { throw null; } - public override int Read(byte[] buffer, int offset, int count) { throw null; } - public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } - public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } - public override void SetLength(long value) { } - public override void Write(byte[] buffer, int offset, int count) { } - public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } - public override System.Threading.Tasks.ValueTask WriteAsync(System.ReadOnlyMemory source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - internal sealed partial class HttpResponsePipeWriter : System.IO.Pipelines.PipeWriter - { - public HttpResponsePipeWriter(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpResponseControl pipeControl) { } - public void Abort() { } - public override void Advance(int bytes) { } - public override void CancelPendingFlush() { } - public override void Complete(System.Exception exception = null) { } - public override System.Threading.Tasks.ValueTask FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Memory GetMemory(int sizeHint = 0) { throw null; } - public override System.Span GetSpan(int sizeHint = 0) { throw null; } - public void StartAcceptingWrites() { } - public System.Threading.Tasks.Task StopAcceptingWritesAsync() { throw null; } - public override System.Threading.Tasks.ValueTask WriteAsync(System.ReadOnlyMemory source, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - } - internal partial class DateHeaderValueManager : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IHeartbeatHandler - { - public DateHeaderValueManager() { } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.DateHeaderValueManager.DateHeaderValues GetDateHeaderValues() { throw null; } - public void OnHeartbeat(System.DateTimeOffset now) { } - public partial class DateHeaderValues - { - public byte[] Bytes; - public string String; - public DateHeaderValues() { } - } - } - [System.FlagsAttribute] - internal enum ConnectionOptions - { - None = 0, - Close = 1, - KeepAlive = 2, - Upgrade = 4, - } - internal abstract partial class HttpHeaders : Microsoft.AspNetCore.Http.IHeaderDictionary, System.Collections.Generic.ICollection>, System.Collections.Generic.IDictionary, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable - { - protected System.Collections.Generic.Dictionary MaybeUnknown; - protected long _bits; - protected long? _contentLength; - protected bool _isReadOnly; - protected HttpHeaders() { } - public long? ContentLength { get { throw null; } set { } } - public int Count { get { throw null; } } - Microsoft.Extensions.Primitives.StringValues Microsoft.AspNetCore.Http.IHeaderDictionary.this[string key] { get { throw null; } set { } } - bool System.Collections.Generic.ICollection>.IsReadOnly { get { throw null; } } - Microsoft.Extensions.Primitives.StringValues System.Collections.Generic.IDictionary.this[string key] { get { throw null; } set { } } - System.Collections.Generic.ICollection System.Collections.Generic.IDictionary.Keys { get { throw null; } } - System.Collections.Generic.ICollection System.Collections.Generic.IDictionary.Values { get { throw null; } } - protected System.Collections.Generic.Dictionary Unknown { get { throw null; } } - protected virtual bool AddValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]protected static Microsoft.Extensions.Primitives.StringValues AppendValue(Microsoft.Extensions.Primitives.StringValues existing, string append) { throw null; } - protected virtual void ClearFast() { } - protected virtual bool CopyToFast(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { throw null; } - protected virtual int GetCountFast() { throw null; } - protected virtual System.Collections.Generic.IEnumerator> GetEnumeratorFast() { throw null; } - public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.TransferCoding GetFinalTransferCoding(Microsoft.Extensions.Primitives.StringValues transferEncoding) { throw null; } - public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.ConnectionOptions ParseConnection(Microsoft.Extensions.Primitives.StringValues connection) { throw null; } - protected virtual bool RemoveFast(string key) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]protected bool RemoveUnknown(string key) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Reset() { } - public void SetReadOnly() { } - protected virtual void SetValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { } - void System.Collections.Generic.ICollection>.Add(System.Collections.Generic.KeyValuePair item) { } - void System.Collections.Generic.ICollection>.Clear() { } - bool System.Collections.Generic.ICollection>.Contains(System.Collections.Generic.KeyValuePair item) { throw null; } - void System.Collections.Generic.ICollection>.CopyTo(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { } - bool System.Collections.Generic.ICollection>.Remove(System.Collections.Generic.KeyValuePair item) { throw null; } - void System.Collections.Generic.IDictionary.Add(string key, Microsoft.Extensions.Primitives.StringValues value) { } - bool System.Collections.Generic.IDictionary.ContainsKey(string key) { throw null; } - bool System.Collections.Generic.IDictionary.Remove(string key) { throw null; } - bool System.Collections.Generic.IDictionary.TryGetValue(string key, out Microsoft.Extensions.Primitives.StringValues value) { throw null; } - System.Collections.Generic.IEnumerator> System.Collections.Generic.IEnumerable>.GetEnumerator() { throw null; } - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } - protected static void ThrowArgumentException() { } - protected static void ThrowDuplicateKeyException() { } - protected static void ThrowHeadersReadOnlyException() { } - protected static void ThrowKeyNotFoundException() { } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]protected bool TryGetUnknown(string key, ref Microsoft.Extensions.Primitives.StringValues value) { throw null; } - protected virtual bool TryGetValueFast(string key, out Microsoft.Extensions.Primitives.StringValues value) { throw null; } - public static void ValidateHeaderNameCharacters(string headerCharacters) { } - public static void ValidateHeaderValueCharacters(Microsoft.Extensions.Primitives.StringValues headerValues) { } - public static void ValidateHeaderValueCharacters(string headerCharacters) { } - } - internal abstract partial class HttpProtocol : Microsoft.AspNetCore.Http.Features.IEndpointFeature, Microsoft.AspNetCore.Http.Features.IFeatureCollection, Microsoft.AspNetCore.Http.Features.IHttpBodyControlFeature, Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature, Microsoft.AspNetCore.Http.Features.IHttpMaxRequestBodySizeFeature, Microsoft.AspNetCore.Http.Features.IHttpRequestFeature, Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature, Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature, Microsoft.AspNetCore.Http.Features.IHttpRequestTrailersFeature, Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature, Microsoft.AspNetCore.Http.Features.IHttpResponseFeature, Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature, Microsoft.AspNetCore.Http.Features.IRequestBodyPipeFeature, Microsoft.AspNetCore.Http.Features.IRouteValuesFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpResponseControl, System.Collections.Generic.IEnumerable>, System.Collections.IEnumerable - { - protected System.Exception _applicationException; - protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.BodyControl _bodyControl; - protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion _httpVersion; - protected volatile bool _keepAlive; - protected string _methodText; - protected string _parsedPath; - protected string _parsedQueryString; - protected string _parsedRawTarget; - protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.RequestProcessingStatus _requestProcessingStatus; - public HttpProtocol(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext context) { } - public bool AllowSynchronousIO { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.Features.IFeatureCollection ConnectionFeatures { get { throw null; } } - protected string ConnectionId { get { throw null; } } - public string ConnectionIdFeature { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool HasFlushedHeaders { get { throw null; } } - public bool HasResponseCompleted { get { throw null; } } - public bool HasResponseStarted { get { throw null; } } - public bool HasStartedConsumingRequestBody { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpRequestHeaders HttpRequestHeaders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpResponseControl HttpResponseControl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders HttpResponseHeaders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string HttpVersion { get { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]set { } } - public bool IsUpgradableRequest { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool IsUpgraded { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Net.IPAddress LocalIpAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int LocalPort { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace Log { get { throw null; } } - public long? MaxRequestBodySize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod Method { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - Microsoft.AspNetCore.Http.Endpoint Microsoft.AspNetCore.Http.Features.IEndpointFeature.Endpoint { get { throw null; } set { } } - bool Microsoft.AspNetCore.Http.Features.IFeatureCollection.IsReadOnly { get { throw null; } } - object Microsoft.AspNetCore.Http.Features.IFeatureCollection.this[System.Type key] { get { throw null; } set { } } - int Microsoft.AspNetCore.Http.Features.IFeatureCollection.Revision { get { throw null; } } - bool Microsoft.AspNetCore.Http.Features.IHttpBodyControlFeature.AllowSynchronousIO { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.ConnectionId { get { throw null; } set { } } - System.Net.IPAddress Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.LocalIpAddress { get { throw null; } set { } } - int Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.LocalPort { get { throw null; } set { } } - System.Net.IPAddress Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.RemoteIpAddress { get { throw null; } set { } } - int Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature.RemotePort { get { throw null; } set { } } - bool Microsoft.AspNetCore.Http.Features.IHttpMaxRequestBodySizeFeature.IsReadOnly { get { throw null; } } - long? Microsoft.AspNetCore.Http.Features.IHttpMaxRequestBodySizeFeature.MaxRequestBodySize { get { throw null; } set { } } - System.IO.Stream Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Body { get { throw null; } set { } } - Microsoft.AspNetCore.Http.IHeaderDictionary Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Headers { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Method { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Path { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.PathBase { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Protocol { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.QueryString { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.RawTarget { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestFeature.Scheme { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature.TraceIdentifier { get { throw null; } set { } } - System.Threading.CancellationToken Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature.RequestAborted { get { throw null; } set { } } - bool Microsoft.AspNetCore.Http.Features.IHttpRequestTrailersFeature.Available { get { throw null; } } - Microsoft.AspNetCore.Http.IHeaderDictionary Microsoft.AspNetCore.Http.Features.IHttpRequestTrailersFeature.Trailers { get { throw null; } } - System.IO.Stream Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.Stream { get { throw null; } } - System.IO.Pipelines.PipeWriter Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.Writer { get { throw null; } } - System.IO.Stream Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.Body { get { throw null; } set { } } - bool Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.HasStarted { get { throw null; } } - Microsoft.AspNetCore.Http.IHeaderDictionary Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.Headers { get { throw null; } set { } } - string Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.ReasonPhrase { get { throw null; } set { } } - int Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.StatusCode { get { throw null; } set { } } - bool Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature.IsUpgradableRequest { get { throw null; } } - System.IO.Pipelines.PipeReader Microsoft.AspNetCore.Http.Features.IRequestBodyPipeFeature.Reader { get { throw null; } } - Microsoft.AspNetCore.Routing.RouteValueDictionary Microsoft.AspNetCore.Http.Features.IRouteValuesFeature.RouteValues { get { throw null; } set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate MinRequestBodyDataRate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpOutputProducer Output { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } - public string Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string PathBase { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string QueryString { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string RawTarget { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string ReasonPhrase { get { throw null; } set { } } - public System.Net.IPAddress RemoteIpAddress { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int RemotePort { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Threading.CancellationToken RequestAborted { get { throw null; } set { } } - public System.IO.Stream RequestBody { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.IO.Pipelines.PipeReader RequestBodyPipeReader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.IHeaderDictionary RequestHeaders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.IHeaderDictionary RequestTrailers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool RequestTrailersAvailable { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.IO.Stream ResponseBody { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.IO.Pipelines.PipeWriter ResponseBodyPipeWriter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Http.IHeaderDictionary ResponseHeaders { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseTrailers ResponseTrailers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public string Scheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - protected Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions ServerOptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.ServiceContext ServiceContext { get { throw null; } } - public int StatusCode { get { throw null; } set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl TimeoutControl { get { throw null; } } - public string TraceIdentifier { get { throw null; } set { } } - protected void AbortRequest() { } - public void Advance(int bytes) { } - protected abstract void ApplicationAbort(); - protected virtual bool BeginRead(out System.Threading.Tasks.ValueTask awaitable) { throw null; } - protected virtual void BeginRequestProcessing() { } - public void CancelPendingFlush() { } - public System.Threading.Tasks.Task CompleteAsync(System.Exception exception = null) { throw null; } - protected abstract Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody CreateMessageBody(); - protected abstract string CreateRequestId(); - protected System.Threading.Tasks.Task FireOnCompleted() { throw null; } - protected System.Threading.Tasks.Task FireOnStarting() { throw null; } - public System.Threading.Tasks.Task FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public System.Threading.Tasks.ValueTask FlushPipeAsync(System.Threading.CancellationToken cancellationToken) { throw null; } - public System.Memory GetMemory(int sizeHint = 0) { throw null; } - public System.Span GetSpan(int sizeHint = 0) { throw null; } - public void HandleNonBodyResponseWrite() { } - public void InitializeBodyControl(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody messageBody) { } - public System.Threading.Tasks.Task InitializeResponseAsync(int firstWriteByteCount) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)][System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task InitializeResponseAwaited(System.Threading.Tasks.Task startingTask, int firstWriteByteCount) { throw null; } - TFeature Microsoft.AspNetCore.Http.Features.IFeatureCollection.Get() { throw null; } - void Microsoft.AspNetCore.Http.Features.IFeatureCollection.Set(TFeature feature) { } - void Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature.Abort() { } - System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.CompleteAsync() { throw null; } - void Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.DisableBuffering() { } - System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.SendFileAsync(string path, long offset, long? count, System.Threading.CancellationToken cancellation) { throw null; } - System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.IHttpResponseBodyFeature.StartAsync(System.Threading.CancellationToken cancellationToken) { throw null; } - void Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.OnCompleted(System.Func callback, object state) { } - void Microsoft.AspNetCore.Http.Features.IHttpResponseFeature.OnStarting(System.Func callback, object state) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - System.Threading.Tasks.Task Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature.UpgradeAsync() { throw null; } - public void OnCompleted(System.Func callback, object state) { } - protected virtual void OnErrorAfterResponseStarted() { } - public void OnHeader(System.Span name, System.Span value) { } - public void OnHeadersComplete() { } - protected virtual void OnRequestProcessingEnded() { } - protected virtual void OnRequestProcessingEnding() { } - protected abstract void OnReset(); - public void OnStarting(System.Func callback, object state) { } - public void OnTrailer(System.Span name, System.Span value) { } - public void OnTrailersComplete() { } - protected void PoisonRequestBodyStream(System.Exception abortReason) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task ProcessRequestsAsync(Microsoft.AspNetCore.Hosting.Server.IHttpApplication application) { throw null; } - public void ProduceContinue() { } - protected System.Threading.Tasks.Task ProduceEnd() { throw null; } - public void ReportApplicationError(System.Exception ex) { } - public void Reset() { } - internal void ResetFeatureCollection() { } - protected void ResetHttp1Features() { } - protected void ResetHttp2Features() { } - internal void ResetState() { } - public void SetBadRequestState(Microsoft.AspNetCore.Server.Kestrel.Core.BadHttpRequestException ex) { } - System.Collections.Generic.IEnumerator> System.Collections.Generic.IEnumerable>.GetEnumerator() { throw null; } - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } - [System.Diagnostics.StackTraceHiddenAttribute] - public void ThrowRequestTargetRejected(System.Span target) { } - protected abstract bool TryParseRequest(System.IO.Pipelines.ReadResult result, out bool endConnection); - protected System.Threading.Tasks.Task TryProduceInvalidRequestResponse() { throw null; } - protected bool VerifyResponseContentLength(out System.Exception ex) { throw null; } - public System.Threading.Tasks.Task WriteAsync(System.ReadOnlyMemory data, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.ValueTask WriteAsyncAwaited(System.Threading.Tasks.Task initializeTask, System.ReadOnlyMemory data, System.Threading.CancellationToken cancellationToken) { throw null; } - public System.Threading.Tasks.ValueTask WritePipeAsync(System.ReadOnlyMemory data, System.Threading.CancellationToken cancellationToken) { throw null; } - } - internal sealed partial class HttpRequestHeaders : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpHeaders - { - public HttpRequestHeaders(bool reuseHeaderValues = true, bool useLatin1 = false) { } - public bool HasConnection { get { throw null; } } - public bool HasTransferEncoding { get { throw null; } } - public Microsoft.Extensions.Primitives.StringValues HeaderAccept { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAcceptCharset { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAcceptEncoding { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAcceptLanguage { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlRequestHeaders { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlRequestMethod { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAllow { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAuthorization { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderCacheControl { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderConnection { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentEncoding { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentLanguage { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentLength { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentLocation { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentMD5 { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentRange { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentType { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderCookie { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderCorrelationContext { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderDate { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderDNT { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderExpect { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderExpires { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderFrom { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderHost { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderIfMatch { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderIfModifiedSince { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderIfNoneMatch { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderIfRange { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderIfUnmodifiedSince { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderKeepAlive { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderLastModified { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderMaxForwards { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderOrigin { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderPragma { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderProxyAuthorization { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderRange { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderReferer { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderRequestId { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderTE { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderTraceParent { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderTraceState { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderTrailer { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderTransferEncoding { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderTranslate { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderUpgrade { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderUpgradeInsecureRequests { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderUserAgent { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderVia { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderWarning { get { throw null; } set { } } - public int HostCount { get { throw null; } } - protected override bool AddValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { throw null; } - public void Append(System.Span name, System.Span value) { } - protected override void ClearFast() { } - protected override bool CopyToFast(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { throw null; } - protected override int GetCountFast() { throw null; } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpRequestHeaders.Enumerator GetEnumerator() { throw null; } - protected override System.Collections.Generic.IEnumerator> GetEnumeratorFast() { throw null; } - public void OnHeadersComplete() { } - protected override bool RemoveFast(string key) { throw null; } - protected override void SetValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { } - protected override bool TryGetValueFast(string key, out Microsoft.Extensions.Primitives.StringValues value) { throw null; } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct Enumerator : System.Collections.Generic.IEnumerator>, System.Collections.IEnumerator, System.IDisposable - { - private readonly Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpRequestHeaders _collection; - private readonly long _bits; - private int _next; - private System.Collections.Generic.KeyValuePair _current; - private readonly bool _hasUnknown; - private System.Collections.Generic.Dictionary.Enumerator _unknownEnumerator; - internal Enumerator(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpRequestHeaders collection) { throw null; } - public System.Collections.Generic.KeyValuePair Current { get { throw null; } } - object System.Collections.IEnumerator.Current { get { throw null; } } - public void Dispose() { } - public bool MoveNext() { throw null; } - public void Reset() { } - } - } - internal sealed partial class HttpResponseHeaders : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpHeaders - { - public HttpResponseHeaders() { } - public bool HasConnection { get { throw null; } } - public bool HasDate { get { throw null; } } - public bool HasServer { get { throw null; } } - public bool HasTransferEncoding { get { throw null; } } - public Microsoft.Extensions.Primitives.StringValues HeaderAcceptRanges { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlAllowCredentials { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlAllowHeaders { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlAllowMethods { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlAllowOrigin { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlExposeHeaders { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAccessControlMaxAge { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAge { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderAllow { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderCacheControl { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderConnection { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentEncoding { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentLanguage { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentLength { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentLocation { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentMD5 { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentRange { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderContentType { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderDate { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderETag { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderExpires { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderKeepAlive { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderLastModified { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderLocation { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderPragma { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderProxyAuthenticate { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderRetryAfter { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderServer { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderSetCookie { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderTrailer { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderTransferEncoding { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderUpgrade { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderVary { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderVia { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderWarning { get { throw null; } set { } } - public Microsoft.Extensions.Primitives.StringValues HeaderWWWAuthenticate { get { throw null; } set { } } - protected override bool AddValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { throw null; } - protected override void ClearFast() { } - internal void CopyTo(ref System.Buffers.BufferWriter buffer) { } - internal void CopyToFast(ref System.Buffers.BufferWriter output) { } - protected override bool CopyToFast(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { throw null; } - protected override int GetCountFast() { throw null; } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders.Enumerator GetEnumerator() { throw null; } - protected override System.Collections.Generic.IEnumerator> GetEnumeratorFast() { throw null; } - protected override bool RemoveFast(string key) { throw null; } - public void SetRawConnection(Microsoft.Extensions.Primitives.StringValues value, byte[] raw) { } - public void SetRawDate(Microsoft.Extensions.Primitives.StringValues value, byte[] raw) { } - public void SetRawServer(Microsoft.Extensions.Primitives.StringValues value, byte[] raw) { } - public void SetRawTransferEncoding(Microsoft.Extensions.Primitives.StringValues value, byte[] raw) { } - protected override void SetValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { } - protected override bool TryGetValueFast(string key, out Microsoft.Extensions.Primitives.StringValues value) { throw null; } - [System.Runtime.CompilerServices.CompilerGeneratedAttribute] - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct Enumerator : System.Collections.Generic.IEnumerator>, System.Collections.IEnumerator, System.IDisposable - { - private readonly Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders _collection; - private readonly long _bits; - private int _next; - private System.Collections.Generic.KeyValuePair _current; - private readonly bool _hasUnknown; - private System.Collections.Generic.Dictionary.Enumerator _unknownEnumerator; - internal Enumerator(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders collection) { throw null; } - public System.Collections.Generic.KeyValuePair Current { get { throw null; } } - object System.Collections.IEnumerator.Current { get { throw null; } } - public void Dispose() { } - public bool MoveNext() { throw null; } - public void Reset() { } - } - } - internal partial class HttpResponseTrailers : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpHeaders - { - public HttpResponseTrailers() { } - public Microsoft.Extensions.Primitives.StringValues HeaderETag { get { throw null; } set { } } - protected override bool AddValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { throw null; } - protected override void ClearFast() { } - protected override bool CopyToFast(System.Collections.Generic.KeyValuePair[] array, int arrayIndex) { throw null; } - protected override int GetCountFast() { throw null; } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseTrailers.Enumerator GetEnumerator() { throw null; } - protected override System.Collections.Generic.IEnumerator> GetEnumeratorFast() { throw null; } - protected override bool RemoveFast(string key) { throw null; } - protected override void SetValueFast(string key, Microsoft.Extensions.Primitives.StringValues value) { } - protected override bool TryGetValueFast(string key, out Microsoft.Extensions.Primitives.StringValues value) { throw null; } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct Enumerator : System.Collections.Generic.IEnumerator>, System.Collections.IEnumerator, System.IDisposable - { - private readonly Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseTrailers _collection; - private readonly long _bits; - private int _next; - private System.Collections.Generic.KeyValuePair _current; - private readonly bool _hasUnknown; - private System.Collections.Generic.Dictionary.Enumerator _unknownEnumerator; - internal Enumerator(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseTrailers collection) { throw null; } - public System.Collections.Generic.KeyValuePair Current { get { throw null; } } - object System.Collections.IEnumerator.Current { get { throw null; } } - public void Dispose() { } - public bool MoveNext() { throw null; } - public void Reset() { } - } - } - internal partial class Http1Connection : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpProtocol, Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinRequestBodyDataRateFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinResponseDataRateFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.IRequestProcessor - { - protected readonly long _keepAliveTicks; - public Http1Connection(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext context) : base (default(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext)) { } - public System.IO.Pipelines.PipeReader Input { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public System.Buffers.MemoryPool MemoryPool { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinRequestBodyDataRateFeature.MinDataRate { get { throw null; } set { } } - Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinResponseDataRateFeature.MinDataRate { get { throw null; } set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate MinResponseDataRate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool RequestTimedOut { get { throw null; } } - public void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason) { } - protected override void ApplicationAbort() { } - protected override bool BeginRead(out System.Threading.Tasks.ValueTask awaitable) { throw null; } - protected override void BeginRequestProcessing() { } - protected override Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody CreateMessageBody() { throw null; } - protected override string CreateRequestId() { throw null; } - internal void EnsureHostHeaderExists() { } - public void HandleReadDataRateTimeout() { } - public void HandleRequestHeadersTimeout() { } - void Microsoft.AspNetCore.Server.Kestrel.Core.Internal.IRequestProcessor.Tick(System.DateTimeOffset now) { } - public void OnInputOrOutputCompleted() { } - protected override void OnRequestProcessingEnded() { } - protected override void OnRequestProcessingEnding() { } - protected override void OnReset() { } - public void OnStartLine(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod method, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion version, System.Span target, System.Span path, System.Span query, System.Span customMethod, bool pathEncoded) { } - public void ParseRequest(in System.Buffers.ReadOnlySequence buffer, out System.SequencePosition consumed, out System.SequencePosition examined) { throw null; } - public void SendTimeoutResponse() { } - public void StopProcessingNextRequest() { } - public bool TakeMessageHeaders(in System.Buffers.ReadOnlySequence buffer, bool trailers, out System.SequencePosition consumed, out System.SequencePosition examined) { throw null; } - public bool TakeStartLine(in System.Buffers.ReadOnlySequence buffer, out System.SequencePosition consumed, out System.SequencePosition examined) { throw null; } - protected override bool TryParseRequest(System.IO.Pipelines.ReadResult result, out bool endConnection) { throw null; } - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal readonly partial struct Http1ParsingHandler : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpHeadersHandler, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpRequestLineHandler - { - public readonly Http1Connection Connection; - public readonly bool Trailers; - public Http1ParsingHandler(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection connection) { throw null; } - public Http1ParsingHandler(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.Http1Connection connection, bool trailers) { throw null; } - public void OnHeader(System.Span name, System.Span value) { } - public void OnHeadersComplete() { } - public void OnStartLine(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod method, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion version, System.Span target, System.Span path, System.Span query, System.Span customMethod, bool pathEncoded) { } - } - internal partial interface IHttpOutputProducer - { - void Advance(int bytes); - void CancelPendingFlush(); - System.Threading.Tasks.ValueTask FirstWriteAsync(int statusCode, string reasonPhrase, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders responseHeaders, bool autoChunk, System.ReadOnlySpan data, System.Threading.CancellationToken cancellationToken); - System.Threading.Tasks.ValueTask FirstWriteChunkedAsync(int statusCode, string reasonPhrase, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders responseHeaders, bool autoChunk, System.ReadOnlySpan data, System.Threading.CancellationToken cancellationToken); - System.Threading.Tasks.ValueTask FlushAsync(System.Threading.CancellationToken cancellationToken); - System.Memory GetMemory(int sizeHint = 0); - System.Span GetSpan(int sizeHint = 0); - void Reset(); - void Stop(); - System.Threading.Tasks.ValueTask Write100ContinueAsync(); - System.Threading.Tasks.ValueTask WriteChunkAsync(System.ReadOnlySpan data, System.Threading.CancellationToken cancellationToken); - System.Threading.Tasks.Task WriteDataAsync(System.ReadOnlySpan data, System.Threading.CancellationToken cancellationToken); - System.Threading.Tasks.ValueTask WriteDataToPipeAsync(System.ReadOnlySpan data, System.Threading.CancellationToken cancellationToken); - void WriteResponseHeaders(int statusCode, string reasonPhrase, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseHeaders responseHeaders, bool autoChunk, bool appCompleted); - System.Threading.Tasks.ValueTask WriteStreamSuffixAsync(); - } - internal partial interface IHttpResponseControl - { - void Advance(int bytes); - void CancelPendingFlush(); - System.Threading.Tasks.Task CompleteAsync(System.Exception exception = null); - System.Threading.Tasks.ValueTask FlushPipeAsync(System.Threading.CancellationToken cancellationToken); - System.Memory GetMemory(int sizeHint = 0); - System.Span GetSpan(int sizeHint = 0); - void ProduceContinue(); - System.Threading.Tasks.ValueTask WritePipeAsync(System.ReadOnlyMemory source, System.Threading.CancellationToken cancellationToken); - } - internal abstract partial class MessageBody - { - protected long _alreadyTimedBytes; - protected bool _backpressure; - protected long _examinedUnconsumedBytes; - protected bool _timingEnabled; - protected MessageBody(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpProtocol context) { } - public virtual bool IsEmpty { get { throw null; } } - protected Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace Log { get { throw null; } } - public bool RequestKeepAlive { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } - public bool RequestUpgrade { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]protected set { } } - public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody ZeroContentLengthClose { get { throw null; } } - public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody ZeroContentLengthKeepAlive { get { throw null; } } - protected void AddAndCheckConsumedBytes(long consumedBytes) { } - public abstract void AdvanceTo(System.SequencePosition consumed); - public abstract void AdvanceTo(System.SequencePosition consumed, System.SequencePosition examined); - public abstract void CancelPendingRead(); - public abstract void Complete(System.Exception exception); - public virtual System.Threading.Tasks.Task ConsumeAsync() { throw null; } - protected void CountBytesRead(long bytesInReadResult) { } - protected long OnAdvance(System.IO.Pipelines.ReadResult readResult, System.SequencePosition consumed, System.SequencePosition examined) { throw null; } - protected virtual System.Threading.Tasks.Task OnConsumeAsync() { throw null; } - protected virtual void OnDataRead(long bytesRead) { } - protected virtual void OnReadStarted() { } - protected virtual void OnReadStarting() { } - protected virtual System.Threading.Tasks.Task OnStopAsync() { throw null; } - public abstract System.Threading.Tasks.ValueTask ReadAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)); - protected System.Threading.Tasks.ValueTask StartTimingReadAsync(System.Threading.Tasks.ValueTask readAwaitable, System.Threading.CancellationToken cancellationToken) { throw null; } - public virtual System.Threading.Tasks.Task StopAsync() { throw null; } - protected void StopTimingRead(long bytesInReadResult) { } - protected void TryProduceContinue() { } - public abstract bool TryRead(out System.IO.Pipelines.ReadResult readResult); - protected void TryStart() { } - protected void TryStop() { } - } - internal enum RequestProcessingStatus - { - RequestPending = 0, - ParsingRequestLine = 1, - ParsingHeaders = 2, - AppStarted = 3, - HeadersCommitted = 4, - HeadersFlushed = 5, - ResponseCompleted = 6, - } - [System.FlagsAttribute] - internal enum TransferCoding - { - None = 0, - Chunked = 1, - Other = 2, - } -} - -namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 -{ - internal static partial class Http2FrameReader - { - public const int HeaderLength = 9; - public const int SettingSize = 6; - public static int GetPayloadFieldsLength(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame) { throw null; } - public static bool ReadFrame(in System.Buffers.ReadOnlySequence readableBuffer, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame, uint maxFrameSize, out System.Buffers.ReadOnlySequence framePayload) { throw null; } - public static System.Collections.Generic.IList ReadSettings(in System.Buffers.ReadOnlySequence payload) { throw null; } - } - internal static partial class Bitshifter - { - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static uint ReadUInt24BigEndian(System.ReadOnlySpan source) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static uint ReadUInt31BigEndian(System.ReadOnlySpan source) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void WriteUInt24BigEndian(System.Span destination, uint value) { } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void WriteUInt31BigEndian(System.Span destination, uint value) { } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void WriteUInt31BigEndian(System.Span destination, uint value, bool preserveHighestBit) { } - } - internal partial class Http2Connection : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpHeadersHandler, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.IHttp2StreamLifetimeHandler, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.IRequestProcessor - { - public Http2Connection(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext context) { } - public static byte[] ClientPreface { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Http.Features.IFeatureCollection ConnectionFeatures { get { throw null; } } - public string ConnectionId { get { throw null; } } - public System.IO.Pipelines.PipeReader Input { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerLimits Limits { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace Log { get { throw null; } } - internal Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2PeerSettings ServerSettings { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ISystemClock SystemClock { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl TimeoutControl { get { throw null; } } - public void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException ex) { } - public void DecrementActiveClientStreamCount() { } - public void HandleReadDataRateTimeout() { } - public void HandleRequestHeadersTimeout() { } - public void IncrementActiveClientStreamCount() { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task ProcessRequestsAsync(Microsoft.AspNetCore.Hosting.Server.IHttpApplication application) { throw null; } - void Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.IHttp2StreamLifetimeHandler.OnStreamCompleted(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Stream stream) { } - void Microsoft.AspNetCore.Server.Kestrel.Core.Internal.IRequestProcessor.Tick(System.DateTimeOffset now) { } - public void OnHeader(System.Span name, System.Span value) { } - public void OnHeadersComplete() { } - public void OnInputOrOutputCompleted() { } - public void StopProcessingNextRequest() { } - public void StopProcessingNextRequest(bool serverInitiated) { } - } - internal partial interface IHttp2StreamLifetimeHandler - { - void DecrementActiveClientStreamCount(); - void OnStreamCompleted(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Stream stream); - } - internal partial class Http2FrameWriter - { - public Http2FrameWriter(System.IO.Pipelines.PipeWriter outputPipeWriter, Microsoft.AspNetCore.Connections.ConnectionContext connectionContext, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Connection http2Connection, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.OutputFlowControl connectionOutputFlowControl, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl timeoutControl, Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate minResponseDataRate, string connectionId, System.Buffers.MemoryPool memoryPool, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace log) { } - public void Abort(Microsoft.AspNetCore.Connections.ConnectionAbortedException error) { } - public void AbortPendingStreamDataWrites(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.StreamOutputFlowControl flowControl) { } - public void Complete() { } - public System.Threading.Tasks.ValueTask FlushAsync(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpOutputAborter outputAborter, System.Threading.CancellationToken cancellationToken) { throw null; } - public bool TryUpdateConnectionWindow(int bytes) { throw null; } - public bool TryUpdateStreamWindow(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.StreamOutputFlowControl flowControl, int bytes) { throw null; } - public void UpdateMaxFrameSize(uint maxFrameSize) { } - public System.Threading.Tasks.ValueTask Write100ContinueAsync(int streamId) { throw null; } - public System.Threading.Tasks.ValueTask WriteDataAsync(int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.StreamOutputFlowControl flowControl, in System.Buffers.ReadOnlySequence data, bool endStream) { throw null; } - public System.Threading.Tasks.ValueTask WriteGoAwayAsync(int lastStreamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode errorCode) { throw null; } - internal static void WriteHeader(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame, System.IO.Pipelines.PipeWriter output) { } - public System.Threading.Tasks.ValueTask WritePingAsync(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2PingFrameFlags flags, in System.Buffers.ReadOnlySequence payload) { throw null; } - public void WriteResponseHeaders(int streamId, int statusCode, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2HeadersFrameFlags headerFrameFlags, Microsoft.AspNetCore.Http.IHeaderDictionary headers) { } - public System.Threading.Tasks.ValueTask WriteResponseTrailers(int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpResponseTrailers headers) { throw null; } - public System.Threading.Tasks.ValueTask WriteRstStreamAsync(int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode errorCode) { throw null; } - internal static void WriteSettings(System.Collections.Generic.IList settings, System.Span destination) { } - public System.Threading.Tasks.ValueTask WriteSettingsAckAsync() { throw null; } - public System.Threading.Tasks.ValueTask WriteSettingsAsync(System.Collections.Generic.IList settings) { throw null; } - public System.Threading.Tasks.ValueTask WriteWindowUpdateAsync(int streamId, int sizeIncrement) { throw null; } - } - internal abstract partial class Http2Stream : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpProtocol, Microsoft.AspNetCore.Http.Features.IHttpResetFeature, Microsoft.AspNetCore.Http.Features.IHttpResponseTrailersFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttp2StreamIdFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinRequestBodyDataRateFeature, System.Threading.IThreadPoolWorkItem - { - public Http2Stream(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2StreamContext context) : base (default(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext)) { } - internal long DrainExpirationTicks { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool EndStreamReceived { get { throw null; } } - public long? InputRemaining { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } - Microsoft.AspNetCore.Http.IHeaderDictionary Microsoft.AspNetCore.Http.Features.IHttpResponseTrailersFeature.Trailers { get { throw null; } set { } } - int Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttp2StreamIdFeature.StreamId { get { throw null; } } - Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate Microsoft.AspNetCore.Server.Kestrel.Core.Features.IHttpMinRequestBodyDataRateFeature.MinDataRate { get { throw null; } set { } } - public bool ReceivedEmptyRequestBody { get { throw null; } } - public System.IO.Pipelines.Pipe RequestBodyPipe { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool RequestBodyStarted { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - internal bool RstStreamReceived { get { throw null; } } - public int StreamId { get { throw null; } } - public void Abort(System.IO.IOException abortReason) { } - public void AbortRstStreamReceived() { } - protected override void ApplicationAbort() { } - protected override Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody CreateMessageBody() { throw null; } - protected override string CreateRequestId() { throw null; } - public void DecrementActiveClientStreamCount() { } - public abstract void Execute(); - void Microsoft.AspNetCore.Http.Features.IHttpResetFeature.Reset(int errorCode) { } - public System.Threading.Tasks.Task OnDataAsync(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame dataFrame, in System.Buffers.ReadOnlySequence payload) { throw null; } - public void OnDataRead(int bytesRead) { } - public void OnEndStreamReceived() { } - protected override void OnErrorAfterResponseStarted() { } - protected override void OnRequestProcessingEnded() { } - protected override void OnReset() { } - internal void ResetAndAbort(Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode error) { } - protected override bool TryParseRequest(System.IO.Pipelines.ReadResult result, out bool endConnection) { throw null; } - public bool TryUpdateOutputWindow(int bytes) { throw null; } - } - internal sealed partial class Http2StreamContext : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.HttpConnectionContext - { - public Http2StreamContext() { } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2PeerSettings ClientPeerSettings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.InputFlowControl ConnectionInputFlowControl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.OutputFlowControl ConnectionOutputFlowControl { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2FrameWriter FrameWriter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2PeerSettings ServerPeerSettings { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int StreamId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.IHttp2StreamLifetimeHandler StreamLifetimeHandler { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - } - internal sealed partial class Http2ConnectionErrorException : System.Exception - { - public Http2ConnectionErrorException(string message, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode errorCode) { } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode ErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - [System.FlagsAttribute] - internal enum Http2ContinuationFrameFlags : byte - { - NONE = (byte)0, - END_HEADERS = (byte)4, - } - [System.FlagsAttribute] - internal enum Http2DataFrameFlags : byte - { - NONE = (byte)0, - END_STREAM = (byte)1, - PADDED = (byte)8, - } - internal enum Http2ErrorCode : uint - { - NO_ERROR = (uint)0, - PROTOCOL_ERROR = (uint)1, - INTERNAL_ERROR = (uint)2, - FLOW_CONTROL_ERROR = (uint)3, - SETTINGS_TIMEOUT = (uint)4, - STREAM_CLOSED = (uint)5, - FRAME_SIZE_ERROR = (uint)6, - REFUSED_STREAM = (uint)7, - CANCEL = (uint)8, - COMPRESSION_ERROR = (uint)9, - CONNECT_ERROR = (uint)10, - ENHANCE_YOUR_CALM = (uint)11, - INADEQUATE_SECURITY = (uint)12, - HTTP_1_1_REQUIRED = (uint)13, - } - internal partial class Http2Frame - { - public Http2Frame() { } - public bool ContinuationEndHeaders { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ContinuationFrameFlags ContinuationFlags { get { throw null; } set { } } - public bool DataEndStream { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2DataFrameFlags DataFlags { get { throw null; } set { } } - public bool DataHasPadding { get { throw null; } } - public byte DataPadLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int DataPayloadLength { get { throw null; } } - public byte Flags { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode GoAwayErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int GoAwayLastStreamId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool HeadersEndHeaders { get { throw null; } } - public bool HeadersEndStream { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2HeadersFrameFlags HeadersFlags { get { throw null; } set { } } - public bool HeadersHasPadding { get { throw null; } } - public bool HeadersHasPriority { get { throw null; } } - public byte HeadersPadLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int HeadersPayloadLength { get { throw null; } } - public byte HeadersPriorityWeight { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int HeadersStreamDependency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int PayloadLength { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool PingAck { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2PingFrameFlags PingFlags { get { throw null; } set { } } - public bool PriorityIsExclusive { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int PriorityStreamDependency { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public byte PriorityWeight { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode RstStreamErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public bool SettingsAck { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2SettingsFrameFlags SettingsFlags { get { throw null; } set { } } - public int StreamId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2FrameType Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public int WindowUpdateSizeIncrement { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public void PrepareContinuation(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ContinuationFrameFlags flags, int streamId) { } - public void PrepareData(int streamId, byte? padLength = default(byte?)) { } - public void PrepareGoAway(int lastStreamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode errorCode) { } - public void PrepareHeaders(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2HeadersFrameFlags flags, int streamId) { } - public void PreparePing(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2PingFrameFlags flags) { } - public void PreparePriority(int streamId, int streamDependency, bool exclusive, byte weight) { } - public void PrepareRstStream(int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode errorCode) { } - public void PrepareSettings(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2SettingsFrameFlags flags) { } - public void PrepareWindowUpdate(int streamId, int sizeIncrement) { } - internal object ShowFlags() { throw null; } - public override string ToString() { throw null; } - } - internal enum Http2FrameType : byte - { - DATA = (byte)0, - HEADERS = (byte)1, - PRIORITY = (byte)2, - RST_STREAM = (byte)3, - SETTINGS = (byte)4, - PUSH_PROMISE = (byte)5, - PING = (byte)6, - GOAWAY = (byte)7, - WINDOW_UPDATE = (byte)8, - CONTINUATION = (byte)9, - } - [System.FlagsAttribute] - internal enum Http2HeadersFrameFlags : byte - { - NONE = (byte)0, - END_STREAM = (byte)1, - END_HEADERS = (byte)4, - PADDED = (byte)8, - PRIORITY = (byte)32, - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal readonly partial struct Http2PeerSetting - { - private readonly int _dummyPrimitive; - public Http2PeerSetting(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2SettingsParameter parameter, uint value) { throw null; } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2SettingsParameter Parameter { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public uint Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - internal partial class Http2PeerSettings - { - public const bool DefaultEnablePush = true; - public const uint DefaultHeaderTableSize = (uint)4096; - public const uint DefaultInitialWindowSize = (uint)65535; - public const uint DefaultMaxConcurrentStreams = (uint)4294967295; - public const uint DefaultMaxFrameSize = (uint)16384; - public const uint DefaultMaxHeaderListSize = (uint)4294967295; - internal const int MaxAllowedMaxFrameSize = 16777215; - public const uint MaxWindowSize = (uint)2147483647; - internal const int MinAllowedMaxFrameSize = 16384; - public Http2PeerSettings() { } - public bool EnablePush { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public uint HeaderTableSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public uint InitialWindowSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public uint MaxConcurrentStreams { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public uint MaxFrameSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public uint MaxHeaderListSize { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - internal System.Collections.Generic.IList GetNonProtocolDefaults() { throw null; } - public void Update(System.Collections.Generic.IList settings) { } - } - [System.FlagsAttribute] - internal enum Http2PingFrameFlags : byte - { - NONE = (byte)0, - ACK = (byte)1, - } - [System.FlagsAttribute] - internal enum Http2SettingsFrameFlags : byte - { - NONE = (byte)0, - ACK = (byte)1, - } - internal enum Http2SettingsParameter : ushort - { - SETTINGS_HEADER_TABLE_SIZE = (ushort)1, - SETTINGS_ENABLE_PUSH = (ushort)2, - SETTINGS_MAX_CONCURRENT_STREAMS = (ushort)3, - SETTINGS_INITIAL_WINDOW_SIZE = (ushort)4, - SETTINGS_MAX_FRAME_SIZE = (ushort)5, - SETTINGS_MAX_HEADER_LIST_SIZE = (ushort)6, - } - internal sealed partial class Http2StreamErrorException : System.Exception - { - public Http2StreamErrorException(int streamId, string message, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode errorCode) { } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode ErrorCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public int StreamId { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} - -namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl -{ - internal partial class OutputFlowControlAwaitable : System.Runtime.CompilerServices.ICriticalNotifyCompletion, System.Runtime.CompilerServices.INotifyCompletion - { - public OutputFlowControlAwaitable() { } - public bool IsCompleted { get { throw null; } } - public void Complete() { } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.OutputFlowControlAwaitable GetAwaiter() { throw null; } - public void GetResult() { } - public void OnCompleted(System.Action continuation) { } - public void UnsafeOnCompleted(System.Action continuation) { } - } - internal partial class StreamOutputFlowControl - { - public StreamOutputFlowControl(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.OutputFlowControl connectionLevelFlowControl, uint initialWindowSize) { } - public int Available { get { throw null; } } - public bool IsAborted { get { throw null; } } - public void Abort() { } - public void Advance(int bytes) { } - public int AdvanceUpToAndWait(long bytes, out Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.OutputFlowControlAwaitable awaitable) { throw null; } - public bool TryUpdateWindow(int bytes) { throw null; } - } - internal partial class OutputFlowControl - { - public OutputFlowControl(uint initialWindowSize) { } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.OutputFlowControlAwaitable AvailabilityAwaitable { get { throw null; } } - public int Available { get { throw null; } } - public bool IsAborted { get { throw null; } } - public void Abort() { } - public void Advance(int bytes) { } - public bool TryUpdateWindow(int bytes) { throw null; } - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal partial struct FlowControl - { - private int _dummyPrimitive; - public FlowControl(uint initialWindowSize) { throw null; } - public int Available { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public bool IsAborted { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public void Abort() { } - public void Advance(int bytes) { } - public bool TryUpdateWindow(int bytes) { throw null; } - } - internal partial class InputFlowControl - { - public InputFlowControl(uint initialWindowSize, uint minWindowSizeIncrement) { } - public bool IsAvailabilityLow { get { throw null; } } - public int Abort() { throw null; } - public void StopWindowUpdates() { } - public bool TryAdvance(int bytes) { throw null; } - public bool TryUpdateWindow(int bytes, out int updateSize) { throw null; } - } -} - -namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack -{ - internal sealed partial class HuffmanDecodingException : System.Exception - { - public HuffmanDecodingException(string message) { } - } - internal static partial class IntegerEncoder - { - public static bool Encode(int i, int n, System.Span buffer, out int length) { throw null; } - } - internal partial class IntegerDecoder - { - public IntegerDecoder() { } - public bool BeginTryDecode(byte b, int prefixLength, out int result) { throw null; } - public static void ThrowIntegerTooBigException() { } - public bool TryDecode(byte b, out int result) { throw null; } - } - internal partial class Huffman - { - public Huffman() { } - public static int Decode(System.ReadOnlySpan src, System.Span dst) { throw null; } - internal static int DecodeValue(uint data, int validBits, out int decodedBits) { throw null; } - public static (uint encoded, int bitLength) Encode(int data) { throw null; } - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal readonly partial struct HeaderField - { - public const int RfcOverhead = 32; - private readonly object _dummy; - public HeaderField(System.Span name, System.Span value) { throw null; } - public int Length { get { throw null; } } - public byte[] Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public byte[] Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static int GetLength(int nameLength, int valueLength) { throw null; } - } - internal partial class HPackEncoder - { - public HPackEncoder() { } - public bool BeginEncode(System.Collections.Generic.IEnumerable> headers, System.Span buffer, out int length) { throw null; } - public bool BeginEncode(int statusCode, System.Collections.Generic.IEnumerable> headers, System.Span buffer, out int length) { throw null; } - public bool Encode(System.Span buffer, out int length) { throw null; } - } - internal partial class DynamicTable - { - public DynamicTable(int maxSize) { } - public int Count { get { throw null; } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack.HeaderField this[int index] { get { throw null; } } - public int MaxSize { get { throw null; } } - public int Size { get { throw null; } } - public void Insert(System.Span name, System.Span value) { } - public void Resize(int maxSize) { } - } - internal partial class HPackDecoder - { - public HPackDecoder(int maxDynamicTableSize, int maxRequestHeaderFieldSize) { } - internal HPackDecoder(int maxDynamicTableSize, int maxRequestHeaderFieldSize, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack.DynamicTable dynamicTable) { } - public void Decode(in System.Buffers.ReadOnlySequence data, bool endHeaders, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpHeadersHandler handler) { } - } - internal sealed partial class HPackDecodingException : System.Exception - { - public HPackDecodingException(string message) { } - public HPackDecodingException(string message, System.Exception innerException) { } - } - internal sealed partial class HPackEncodingException : System.Exception - { - public HPackEncodingException(string message) { } - public HPackEncodingException(string message, System.Exception innerException) { } - } -} - -namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure -{ - internal static partial class Constants - { - public static readonly string DefaultServerAddress; - public static readonly string DefaultServerHttpsAddress; - public const int MaxExceptionDetailSize = 128; - public const string PipeDescriptorPrefix = "pipefd:"; - public static readonly System.TimeSpan RequestBodyDrainTimeout; - public const string ServerName = "Kestrel"; - public const string SocketDescriptorPrefix = "sockfd:"; - public const string UnixPipeHostPrefix = "unix:/"; - } - internal static partial class HttpUtilities - { - public const string Http10Version = "HTTP/1.0"; - public const string Http11Version = "HTTP/1.1"; - public const string Http2Version = "HTTP/2"; - public const string HttpsUriScheme = "https://"; - public const string HttpUriScheme = "http://"; - public static string GetAsciiStringEscaped(this System.Span span, int maxChars) { throw null; } - public static string GetAsciiStringNonNullCharacters(this System.Span span) { throw null; } - public static string GetHeaderName(this System.Span span) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GetKnownHttpScheme(this System.Span span, out Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpScheme knownScheme) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal unsafe static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod GetKnownMethod(byte* data, int length, out int methodLength) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GetKnownMethod(this System.Span span, out Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod method, out int length) { throw null; } - public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod GetKnownMethod(string value) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal unsafe static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion GetKnownVersion(byte* location, int length) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static bool GetKnownVersion(this System.Span span, out Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion knownVersion, out byte length) { throw null; } - public static string GetRequestHeaderStringNonNullCharacters(this System.Span span, bool useLatin1) { throw null; } - public static bool IsHostHeaderValid(string hostText) { throw null; } - public static string MethodToString(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod method) { throw null; } - public static string SchemeToString(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpScheme scheme) { throw null; } - public static string VersionToString(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpVersion httpVersion) { throw null; } - } - internal abstract partial class WriteOnlyStream : System.IO.Stream - { - protected WriteOnlyStream() { } - public override bool CanRead { get { throw null; } } - public override bool CanWrite { get { throw null; } } - public override int ReadTimeout { get { throw null; } set { } } - public override int Read(byte[] buffer, int offset, int count) { throw null; } - public override System.Threading.Tasks.Task ReadAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } - } - internal sealed partial class ThrowingWasUpgradedWriteOnlyStream : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.WriteOnlyStream - { - public ThrowingWasUpgradedWriteOnlyStream() { } - public override bool CanSeek { get { throw null; } } - public override long Length { get { throw null; } } - public override long Position { get { throw null; } set { } } - public override void Flush() { } - public override long Seek(long offset, System.IO.SeekOrigin origin) { throw null; } - public override void SetLength(long value) { } - public override void Write(byte[] buffer, int offset, int count) { } - public override System.Threading.Tasks.Task WriteAsync(byte[] buffer, int offset, int count, System.Threading.CancellationToken cancellationToken) { throw null; } - } - internal partial class Disposable : System.IDisposable - { - public Disposable(System.Action dispose) { } - public void Dispose() { } - protected virtual void Dispose(bool disposing) { } - } - internal sealed partial class DebuggerWrapper : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IDebugger - { - public bool IsAttached { get { throw null; } } - public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IDebugger Singleton { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - internal partial class SystemClock : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ISystemClock - { - public SystemClock() { } - public System.DateTimeOffset UtcNow { get { throw null; } } - public long UtcNowTicks { get { throw null; } } - public System.DateTimeOffset UtcNowUnsynchronized { get { throw null; } } - } - internal partial class HeartbeatManager : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IHeartbeatHandler, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ISystemClock - { - public HeartbeatManager(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ConnectionManager connectionManager) { } - public System.DateTimeOffset UtcNow { get { throw null; } } - public long UtcNowTicks { get { throw null; } } - public System.DateTimeOffset UtcNowUnsynchronized { get { throw null; } } - public void OnHeartbeat(System.DateTimeOffset now) { } - } - - internal partial class StringUtilities - { - public StringUtilities() { } - public static bool BytesOrdinalEqualsStringAndAscii(string previousValue, System.Span newValue) { throw null; } - public static string ConcatAsHexSuffix(string str, char separator, uint number) { throw null; } - public unsafe static bool TryGetAsciiString(byte* input, char* output, int count) { throw null; } - public unsafe static bool TryGetLatin1String(byte* input, char* output, int count) { throw null; } - } - internal partial class TimeoutControl : Microsoft.AspNetCore.Server.Kestrel.Core.Features.IConnectionTimeoutFeature, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutControl - { - public TimeoutControl(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ITimeoutHandler timeoutHandler) { } - internal Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IDebugger Debugger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason TimerReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public void BytesRead(long count) { } - public void BytesWrittenToBuffer(Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate minRate, long count) { } - public void CancelTimeout() { } - internal void Initialize(long nowTicks) { } - public void InitializeHttp2(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.InputFlowControl connectionInputFlowControl) { } - void Microsoft.AspNetCore.Server.Kestrel.Core.Features.IConnectionTimeoutFeature.ResetTimeout(System.TimeSpan timeSpan) { } - void Microsoft.AspNetCore.Server.Kestrel.Core.Features.IConnectionTimeoutFeature.SetTimeout(System.TimeSpan timeSpan) { } - public void ResetTimeout(long ticks, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason timeoutReason) { } - public void SetTimeout(long ticks, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason timeoutReason) { } - public void StartRequestBody(Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate minRate) { } - public void StartTimingRead() { } - public void StartTimingWrite() { } - public void StopRequestBody() { } - public void StopTimingRead() { } - public void StopTimingWrite() { } - public void Tick(System.DateTimeOffset now) { } - } - internal partial class KestrelTrace : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace, Microsoft.Extensions.Logging.ILogger - { - public KestrelTrace(Microsoft.Extensions.Logging.ILogger logger) { } - public virtual void ApplicationAbortedConnection(string connectionId, string traceIdentifier) { } - public virtual void ApplicationError(string connectionId, string traceIdentifier, System.Exception ex) { } - public virtual void ApplicationNeverCompleted(string connectionId) { } - public virtual System.IDisposable BeginScope(TState state) { throw null; } - public virtual void ConnectionAccepted(string connectionId) { } - public virtual void ConnectionBadRequest(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.BadHttpRequestException ex) { } - public virtual void ConnectionDisconnect(string connectionId) { } - public virtual void ConnectionHeadResponseBodyWrite(string connectionId, long count) { } - public virtual void ConnectionKeepAlive(string connectionId) { } - public virtual void ConnectionPause(string connectionId) { } - public virtual void ConnectionRejected(string connectionId) { } - public virtual void ConnectionResume(string connectionId) { } - public virtual void ConnectionStart(string connectionId) { } - public virtual void ConnectionStop(string connectionId) { } - public virtual void HeartbeatSlow(System.TimeSpan interval, System.DateTimeOffset now) { } - public virtual void HPackDecodingError(string connectionId, int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack.HPackDecodingException ex) { } - public virtual void HPackEncodingError(string connectionId, int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack.HPackEncodingException ex) { } - public virtual void Http2ConnectionClosed(string connectionId, int highestOpenedStreamId) { } - public virtual void Http2ConnectionClosing(string connectionId) { } - public virtual void Http2ConnectionError(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ConnectionErrorException ex) { } - public void Http2FrameReceived(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame) { } - public void Http2FrameSending(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame) { } - public virtual void Http2StreamError(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2StreamErrorException ex) { } - public void Http2StreamResetAbort(string traceIdentifier, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode error, Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason) { } - public virtual bool IsEnabled(Microsoft.Extensions.Logging.LogLevel logLevel) { throw null; } - public virtual void Log(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, TState state, System.Exception exception, System.Func formatter) { } - public virtual void NotAllConnectionsAborted() { } - public virtual void NotAllConnectionsClosedGracefully() { } - public virtual void RequestBodyDone(string connectionId, string traceIdentifier) { } - public virtual void RequestBodyDrainTimedOut(string connectionId, string traceIdentifier) { } - public virtual void RequestBodyMinimumDataRateNotSatisfied(string connectionId, string traceIdentifier, double rate) { } - public virtual void RequestBodyNotEntirelyRead(string connectionId, string traceIdentifier) { } - public virtual void RequestBodyStart(string connectionId, string traceIdentifier) { } - public virtual void RequestProcessingError(string connectionId, System.Exception ex) { } - public virtual void ResponseMinimumDataRateNotSatisfied(string connectionId, string traceIdentifier) { } - } - internal partial class BodyControl - { - public BodyControl(Microsoft.AspNetCore.Http.Features.IHttpBodyControlFeature bodyControl, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpResponseControl responseControl) { } - public void Abort(System.Exception error) { } - public (System.IO.Stream request, System.IO.Stream response, System.IO.Pipelines.PipeReader reader, System.IO.Pipelines.PipeWriter writer) Start(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.MessageBody body) { throw null; } - public System.Threading.Tasks.Task StopAsync() { throw null; } - public System.IO.Stream Upgrade() { throw null; } - } - internal partial class ConnectionManager - { - public ConnectionManager(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace trace, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ResourceCounter upgradedConnections) { } - public ConnectionManager(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace trace, long? upgradedConnectionLimit) { } - public Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ResourceCounter UpgradedConnectionCount { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task AbortAllConnectionsAsync() { throw null; } - public void AddConnection(long id, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.KestrelConnection connection) { } - [System.Diagnostics.DebuggerStepThroughAttribute] - public System.Threading.Tasks.Task CloseAllConnectionsAsync(System.Threading.CancellationToken token) { throw null; } - public void RemoveConnection(long id) { } - public void Walk(System.Action callback) { } - } - internal partial class Heartbeat : System.IDisposable - { - public static readonly System.TimeSpan Interval; - public Heartbeat(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IHeartbeatHandler[] callbacks, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ISystemClock systemClock, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IDebugger debugger, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace trace) { } - public void Dispose() { } - internal void OnHeartbeat() { } - public void Start() { } - } - internal partial interface IDebugger - { - bool IsAttached { get; } - } - internal partial interface IHeartbeatHandler - { - void OnHeartbeat(System.DateTimeOffset now); - } - internal partial interface IKestrelTrace : Microsoft.Extensions.Logging.ILogger - { - void ApplicationAbortedConnection(string connectionId, string traceIdentifier); - void ApplicationError(string connectionId, string traceIdentifier, System.Exception ex); - void ApplicationNeverCompleted(string connectionId); - void ConnectionAccepted(string connectionId); - void ConnectionBadRequest(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.BadHttpRequestException ex); - void ConnectionDisconnect(string connectionId); - void ConnectionHeadResponseBodyWrite(string connectionId, long count); - void ConnectionKeepAlive(string connectionId); - void ConnectionPause(string connectionId); - void ConnectionRejected(string connectionId); - void ConnectionResume(string connectionId); - void ConnectionStart(string connectionId); - void ConnectionStop(string connectionId); - void HeartbeatSlow(System.TimeSpan interval, System.DateTimeOffset now); - void HPackDecodingError(string connectionId, int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack.HPackDecodingException ex); - void HPackEncodingError(string connectionId, int streamId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.HPack.HPackEncodingException ex); - void Http2ConnectionClosed(string connectionId, int highestOpenedStreamId); - void Http2ConnectionClosing(string connectionId); - void Http2ConnectionError(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ConnectionErrorException ex); - void Http2FrameReceived(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame); - void Http2FrameSending(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2Frame frame); - void Http2StreamError(string connectionId, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2StreamErrorException ex); - void Http2StreamResetAbort(string traceIdentifier, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.Http2ErrorCode error, Microsoft.AspNetCore.Connections.ConnectionAbortedException abortReason); - void NotAllConnectionsAborted(); - void NotAllConnectionsClosedGracefully(); - void RequestBodyDone(string connectionId, string traceIdentifier); - void RequestBodyDrainTimedOut(string connectionId, string traceIdentifier); - void RequestBodyMinimumDataRateNotSatisfied(string connectionId, string traceIdentifier, double rate); - void RequestBodyNotEntirelyRead(string connectionId, string traceIdentifier); - void RequestBodyStart(string connectionId, string traceIdentifier); - void RequestProcessingError(string connectionId, System.Exception ex); - void ResponseMinimumDataRateNotSatisfied(string connectionId, string traceIdentifier); - } - internal partial interface ISystemClock - { - System.DateTimeOffset UtcNow { get; } - long UtcNowTicks { get; } - System.DateTimeOffset UtcNowUnsynchronized { get; } - } - internal partial interface ITimeoutControl - { - Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason TimerReason { get; } - void BytesRead(long count); - void BytesWrittenToBuffer(Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate minRate, long count); - void CancelTimeout(); - void InitializeHttp2(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl.InputFlowControl connectionInputFlowControl); - void ResetTimeout(long ticks, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason timeoutReason); - void SetTimeout(long ticks, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason timeoutReason); - void StartRequestBody(Microsoft.AspNetCore.Server.Kestrel.Core.MinDataRate minRate); - void StartTimingRead(); - void StartTimingWrite(); - void StopRequestBody(); - void StopTimingRead(); - void StopTimingWrite(); - } - internal partial interface ITimeoutHandler - { - void OnTimeout(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.TimeoutReason reason); - } - internal partial class KestrelConnection : Microsoft.AspNetCore.Connections.Features.IConnectionCompleteFeature, Microsoft.AspNetCore.Connections.Features.IConnectionHeartbeatFeature, Microsoft.AspNetCore.Connections.Features.IConnectionLifetimeNotificationFeature, System.Threading.IThreadPoolWorkItem - { - public KestrelConnection(long id, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.ServiceContext serviceContext, Microsoft.AspNetCore.Connections.ConnectionDelegate connectionDelegate, Microsoft.AspNetCore.Connections.ConnectionContext connectionContext, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.IKestrelTrace logger) { } - public System.Threading.CancellationToken ConnectionClosedRequested { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public System.Threading.Tasks.Task ExecutionTask { get { throw null; } } - public Microsoft.AspNetCore.Connections.ConnectionContext TransportConnection { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } - public void Complete() { } - [System.Diagnostics.DebuggerStepThroughAttribute] - internal System.Threading.Tasks.Task ExecuteAsync() { throw null; } - public System.Threading.Tasks.Task FireOnCompletedAsync() { throw null; } - void Microsoft.AspNetCore.Connections.Features.IConnectionCompleteFeature.OnCompleted(System.Func callback, object state) { } - public void OnHeartbeat(System.Action action, object state) { } - public void RequestClose() { } - void System.Threading.IThreadPoolWorkItem.Execute() { } - public void TickHeartbeat() { } - } - internal abstract partial class ResourceCounter - { - protected ResourceCounter() { } - public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ResourceCounter Unlimited { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public static Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ResourceCounter Quota(long amount) { throw null; } - public abstract void ReleaseOne(); - public abstract bool TryLockOne(); - internal partial class FiniteCounter : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.ResourceCounter - { - public FiniteCounter(long max) { } - internal long Count { get { throw null; } set { } } - public override void ReleaseOne() { } - public override bool TryLockOne() { throw null; } - } - } - internal enum TimeoutReason - { - None = 0, - KeepAlive = 1, - RequestHeaders = 2, - ReadDataRate = 3, - WriteDataRate = 4, - RequestBodyDrain = 5, - TimeoutFeature = 6, - } -} -namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure -{ - [System.Diagnostics.Tracing.EventSourceAttribute(Name="Microsoft-AspNetCore-Server-Kestrel")] - internal sealed partial class KestrelEventSource : System.Diagnostics.Tracing.EventSource - { - public static readonly Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.KestrelEventSource Log; - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)][System.Diagnostics.Tracing.EventAttribute(5, Level=System.Diagnostics.Tracing.EventLevel.Verbose)] - public void ConnectionRejected(string connectionId) { } - [System.Diagnostics.Tracing.NonEventAttribute] - public void ConnectionStart(Microsoft.AspNetCore.Connections.ConnectionContext connection) { } - [System.Diagnostics.Tracing.NonEventAttribute] - public void ConnectionStop(Microsoft.AspNetCore.Connections.ConnectionContext connection) { } - [System.Diagnostics.Tracing.NonEventAttribute] - public void RequestStart(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpProtocol httpProtocol) { } - [System.Diagnostics.Tracing.NonEventAttribute] - public void RequestStop(Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpProtocol httpProtocol) { } - } -} -namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure.PipeWriterHelpers -{ - internal sealed partial class ConcurrentPipeWriter : System.IO.Pipelines.PipeWriter - { - public ConcurrentPipeWriter(System.IO.Pipelines.PipeWriter innerPipeWriter, System.Buffers.MemoryPool pool, object sync) { } - public void Abort() { } - public override void Advance(int bytes) { } - public override void CancelPendingFlush() { } - public override void Complete(System.Exception exception = null) { } - public override System.Threading.Tasks.ValueTask FlushAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } - public override System.Memory GetMemory(int sizeHint = 0) { throw null; } - public override System.Span GetSpan(int sizeHint = 0) { throw null; } - } -} -namespace System.Buffers -{ - internal static partial class BufferExtensions - { - public static System.ArraySegment GetArray(this System.Memory buffer) { throw null; } - public static System.ArraySegment GetArray(this System.ReadOnlyMemory memory) { throw null; } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static System.ReadOnlySpan ToSpan(this in System.Buffers.ReadOnlySequence buffer) { throw null; } - internal static void WriteAsciiNoValidation(this ref System.Buffers.BufferWriter buffer, string data) { } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]internal static void WriteNumeric(this ref System.Buffers.BufferWriter buffer, ulong number) { } - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - internal ref partial struct BufferWriter where T : System.Buffers.IBufferWriter - { - private T _output; - private System.Span _span; - private int _buffered; - private long _bytesCommitted; - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public BufferWriter(T output) { throw null; } - public long BytesCommitted { get { throw null; } } - public System.Span Span { get { throw null; } } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Advance(int count) { } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Commit() { } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Ensure(int count = 1) { } - [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Write(System.ReadOnlySpan source) { } - } -} - -namespace System.Diagnostics -{ - [System.AttributeUsageAttribute(System.AttributeTargets.Class | System.AttributeTargets.Constructor | System.AttributeTargets.Method | System.AttributeTargets.Struct, Inherited=false)] - internal sealed partial class StackTraceHiddenAttribute : System.Attribute - { - public StackTraceHiddenAttribute() { } - } -} diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj index ff37850346..9f8403c50e 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.csproj @@ -5,7 +5,6 @@ - diff --git a/src/Servers/Kestrel/Core/test/UTF8Decoding.cs b/src/Servers/Kestrel/Core/test/UTF8Decoding.cs index 4c4e377400..35043d8322 100644 --- a/src/Servers/Kestrel/Core/test/UTF8Decoding.cs +++ b/src/Servers/Kestrel/Core/test/UTF8Decoding.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests [InlineData(new byte[] { 0xef, 0xbf, 0xbd })] // 3 bytes: Replacement character, highest UTF-8 character currently encoded in the UTF-8 code page private void FullUTF8RangeSupported(byte[] encodedBytes) { - var s = encodedBytes.AsSpan().GetRequestHeaderStringNonNullCharacters(useLatin1: false); + var s = HttpUtilities.GetRequestHeaderStringNonNullCharacters(encodedBytes.AsSpan(), useLatin1: false); Assert.Equal(1, s.Length); } @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var byteRange = Enumerable.Range(1, length).Select(x => (byte)x).ToArray(); Array.Copy(bytes, 0, byteRange, position, bytes.Length); - Assert.Throws(() => byteRange.AsSpan().GetRequestHeaderStringNonNullCharacters(useLatin1: false)); + Assert.Throws(() => HttpUtilities.GetRequestHeaderStringNonNullCharacters(byteRange.AsSpan(), useLatin1: false)); } } } diff --git a/src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj b/src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj index dc7a76c818..9bc5d6b037 100644 --- a/src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj +++ b/src/Servers/Kestrel/Transport.Libuv/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.csproj @@ -7,7 +7,7 @@ aspnetcore;kestrel true CS1591;$(NoWarn) - true + true diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs index 121c43881d..dd7133e0d4 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs @@ -340,7 +340,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests public void OnStaticIndexedHeader(int index) { var knownHeader = H3StaticTable.Instance[index]; - _decodedHeaders[((Span)knownHeader.Name).GetAsciiStringNonNullCharacters()] = ((Span)knownHeader.Value).GetAsciiOrUTF8StringNonNullCharacters(); + _decodedHeaders[((Span)knownHeader.Name).GetAsciiStringNonNullCharacters()] = HttpUtilities.GetAsciiOrUTF8StringNonNullCharacters(knownHeader.Value); } public void OnStaticIndexedHeader(int index, ReadOnlySpan value) diff --git a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj index e287d4c869..c1aca1c275 100644 --- a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj +++ b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj @@ -4,7 +4,7 @@ Client for ASP.NET Core SignalR netstandard2.0;netstandard2.1 Microsoft.AspNetCore.SignalR.Client - true + true diff --git a/src/SignalR/clients/csharp/Client/src/Microsoft.AspNetCore.SignalR.Client.csproj b/src/SignalR/clients/csharp/Client/src/Microsoft.AspNetCore.SignalR.Client.csproj index 7bfb5b895c..56be28a14c 100644 --- a/src/SignalR/clients/csharp/Client/src/Microsoft.AspNetCore.SignalR.Client.csproj +++ b/src/SignalR/clients/csharp/Client/src/Microsoft.AspNetCore.SignalR.Client.csproj @@ -3,7 +3,7 @@ Client for ASP.NET Core SignalR netstandard2.0 - true + true diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj b/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj index 850f263a7d..ee2e93c707 100644 --- a/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj +++ b/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj @@ -3,7 +3,7 @@ Client for ASP.NET Core Connection Handlers netstandard2.0;netstandard2.1 - true + true diff --git a/src/SignalR/clients/java/signalr/.gitignore b/src/SignalR/clients/java/signalr/.gitignore index eabba7738e..3e9534ce39 100644 --- a/src/SignalR/clients/java/signalr/.gitignore +++ b/src/SignalR/clients/java/signalr/.gitignore @@ -2,6 +2,7 @@ .gradletasknamecache .gradle/ build/ +/test-results .settings/ out/ *.class diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index 4b18bba589..b845d83949 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -6,6 +6,7 @@ buildscript { } dependencies { classpath "com.diffplug.spotless:spotless-plugin-gradle:3.14.0" + classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0' } } @@ -16,6 +17,7 @@ plugins { apply plugin: "java-library" apply plugin: "com.diffplug.gradle.spotless" +apply plugin: 'org.junit.platform.gradle.plugin' group 'com.microsoft.signalr' @@ -64,8 +66,8 @@ spotless { } } -test { - useJUnitPlatform() +junitPlatform { + reportsDir file('test-results') } task sourceJar(type: Jar) { diff --git a/src/SignalR/clients/java/signalr/signalr.client.java.javaproj b/src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj similarity index 63% rename from src/SignalR/clients/java/signalr/signalr.client.java.javaproj rename to src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj index 57dfdef488..f7f91926db 100644 --- a/src/SignalR/clients/java/signalr/signalr.client.java.javaproj +++ b/src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj @@ -1,14 +1,17 @@ - - + + true - true + true true $(GradleOptions) -Dorg.gradle.daemon=false + $(OutputPath) + true + @@ -45,15 +48,37 @@ - + + + + + + + + + + + + + + + $(GradleOptions) -PpackageVersion="$(PackageVersion)" + chmod +x ./gradlew && ./gradlew $(GradleOptions) test + call gradlew $(GradleOptions) test + + + + + + diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj index 6314e22990..8f89229340 100644 --- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj @@ -9,6 +9,7 @@ <_TestSauceArgs Condition="'$(BrowserTestHostName)' != ''">$(_TestSauceArgs) --use-hostname "$(BrowserTestHostName)" run test:inner --no-color --configuration $(Configuration) run build:inner + false @@ -18,7 +19,7 @@ - + diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj b/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj index 1a2b2deac3..61d5c7477c 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/signalr-protocol-msgpack.npmproj @@ -5,7 +5,7 @@ @microsoft/signalr-protocol-msgpack true false - true + true true diff --git a/src/SignalR/clients/ts/signalr/signalr.npmproj b/src/SignalR/clients/ts/signalr/signalr.npmproj index dbd62e31c6..2aa54d01fe 100644 --- a/src/SignalR/clients/ts/signalr/signalr.npmproj +++ b/src/SignalR/clients/ts/signalr/signalr.npmproj @@ -5,7 +5,7 @@ @microsoft/signalr true false - true + true diff --git a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj index b76c522f1c..993bb94a5f 100644 --- a/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj +++ b/src/SignalR/common/Protocols.MessagePack/src/Microsoft.AspNetCore.SignalR.Protocols.MessagePack.csproj @@ -5,7 +5,7 @@ netstandard2.0 Microsoft.AspNetCore.SignalR true - true + true diff --git a/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj b/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj index 04f27fbe95..73eff24cd1 100644 --- a/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj +++ b/src/SignalR/common/Protocols.NewtonsoftJson/src/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.csproj @@ -5,7 +5,7 @@ netstandard2.0 Microsoft.AspNetCore.SignalR true - true + true diff --git a/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj b/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj index 69a2c459c3..932181d408 100644 --- a/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj +++ b/src/SignalR/server/Specification.Tests/src/Microsoft.AspNetCore.SignalR.Specification.Tests.csproj @@ -3,7 +3,7 @@ Tests for users to verify their own implementations of SignalR types $(DefaultNetCoreTargetFramework) - true + true false false diff --git a/src/SignalR/server/StackExchangeRedis/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj b/src/SignalR/server/StackExchangeRedis/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj index affff6ae4a..731b94720d 100644 --- a/src/SignalR/server/StackExchangeRedis/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj +++ b/src/SignalR/server/StackExchangeRedis/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj @@ -3,7 +3,7 @@ Provides scale-out support for ASP.NET Core SignalR using a Redis server and the StackExchange.Redis client. $(DefaultNetCoreTargetFramework) - true + true diff --git a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index 743ef0787e..89cf2174e0 100644 --- a/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -15,7 +15,7 @@ true true true - true + true false true diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj index 1e9d628258..6b7e0dc606 100644 --- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj +++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj @@ -12,7 +12,7 @@ $(TargetRuntimeIdentifier) true $(RedistSharedFrameworkLayoutRoot) - true + true true diff --git a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj index c50a0115fa..0c631a6211 100644 --- a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj +++ b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj @@ -8,7 +8,7 @@ $(MSBuildProjectName).nuspec $(MSBuildProjectName) Build Tasks;MSBuild;Swagger;OpenAPI;code generation;Web API client;service reference - true + true netstandard2.0 true false diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj index e0d39cff01..40ddf13258 100644 --- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj +++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj @@ -11,7 +11,7 @@ $(MSBuildProjectName).nuspec $(MSBuildProjectName) MSBuild;Swagger;OpenAPI;code generation;Web API;service reference;document generation - true + true true + false diff --git a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.Manual.cs b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.Manual.cs index 332ae04278..a22df01730 100644 --- a/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.Manual.cs +++ b/src/Mvc/Mvc.RazorPages/ref/Microsoft.AspNetCore.Mvc.RazorPages.Manual.cs @@ -321,10 +321,6 @@ namespace Microsoft.Extensions.DependencyInjection } namespace Microsoft.AspNetCore.Mvc.RazorPages { - public partial class RazorPagesOptions : System.Collections.Generic.IEnumerable, System.Collections.IEnumerable - { - public Microsoft.AspNetCore.Mvc.ApplicationModels.PageConventionCollection Conventions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]internal set { } } - } internal static partial class PageLoggerExtensions { public const string PageFilter = "Page Filter"; diff --git a/src/Servers/Connections.Abstractions/ref/Directory.Build.targets b/src/Servers/Connections.Abstractions/ref/Directory.Build.targets index 1bdedd0c01..1c2059ecd0 100644 --- a/src/Servers/Connections.Abstractions/ref/Directory.Build.targets +++ b/src/Servers/Connections.Abstractions/ref/Directory.Build.targets @@ -1,4 +1,6 @@ + + $(DefaultNetCoreTargetFramework) diff --git a/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs b/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs index f3fd41291e..c00264ea2b 100644 --- a/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs +++ b/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs @@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.SignalR /// public override Task SendAllAsync(string methodName, object[] args, CancellationToken cancellationToken = default) { - return SendToAllConnections(methodName, args, include: null, cancellationToken); + return SendToAllConnections(methodName, args, include: null, state: null, cancellationToken); } private Task SendToAllConnections(string methodName, object[] args, Func include, object state = null, CancellationToken cancellationToken = default) From c2ee4ae8209d217bfe7dd555d10f2fb8bb2c15c6 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 19 Feb 2020 22:43:59 -0800 Subject: [PATCH 111/116] Re-enable source build job - change ref/ projects to build only the default TFM during source builds - avoid errors restoring packages like Microsoft.BCL.AsyncInterfaces - may also speed up source builds slightly --- .azure/pipelines/ci.yml | 2 -- eng/targets/ReferenceAssembly.targets | 6 ++++-- .../Microsoft.AspNetCore.Components.Authorization.csproj | 1 + .../Components/ref/Microsoft.AspNetCore.Components.csproj | 1 + .../Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj | 1 + .../Web/ref/Microsoft.AspNetCore.Components.Web.csproj | 1 + ...Microsoft.AspNetCore.DataProtection.Abstractions.csproj | 1 + .../ref/Microsoft.AspNetCore.Cryptography.Internal.csproj | 1 + .../Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj | 1 + .../ref/Microsoft.AspNetCore.DataProtection.csproj | 1 + .../Microsoft.AspNetCore.DataProtection.Extensions.csproj | 1 + .../ref/Microsoft.AspNetCore.Http.Features.csproj | 1 + src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj | 1 + .../ref/Microsoft.Extensions.Identity.Core.csproj | 1 + .../ref/Microsoft.Extensions.Identity.Stores.csproj | 1 + .../Core/ref/Microsoft.AspNetCore.Authorization.csproj | 1 + .../Connections.Abstractions/ref/Directory.Build.targets | 7 ------- .../Microsoft.AspNetCore.Connections.Abstractions.csproj | 1 + .../Microsoft.AspNetCore.Http.Connections.Common.csproj | 1 + .../ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj | 1 + .../ref/Microsoft.AspNetCore.SignalR.Common.csproj | 1 + 21 files changed, 22 insertions(+), 11 deletions(-) delete mode 100644 src/Servers/Connections.Abstractions/ref/Directory.Build.targets diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 3eec53119e..7c64003843 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -699,8 +699,6 @@ stages: # Source build - job: Source_Build - # Skipping until someone can look into this - condition: false displayName: 'Test: Linux Source Build' container: centos:7 pool: diff --git a/eng/targets/ReferenceAssembly.targets b/eng/targets/ReferenceAssembly.targets index 59568267be..84076d9a41 100644 --- a/eng/targets/ReferenceAssembly.targets +++ b/eng/targets/ReferenceAssembly.targets @@ -23,11 +23,14 @@ + <_TargetFrameworkOverride /> + <_TargetFrameworkOverride + Condition=" @(_ResultTargetFramework->Count()) > 1 ">%0A <TargetFrameworks Condition="'%24(DotNetBuildFromSource)' == 'true'">%24(DefaultNetCoreTargetFramework)</TargetFrameworks> - @(_ResultTargetFramework) + @(_ResultTargetFramework)$(_TargetFrameworkOverride) @(ProjectListContentItem->'%(Identity)', '%0A') @@ -67,7 +70,6 @@ <_GenApiFile>$([MSBuild]::NormalizePath('$(ArtifactsDir)', 'log', 'GenAPI.rsp')) <_GenAPICommand Condition="'$(MSBuildRuntimeType)' == 'core'">"$(DotNetTool)" --roll-forward-on-no-candidate-fx 2 "$(_GenAPIPath)" - <_GenAPICmd>$(_GenAPICommand) <_GenAPICmd>$(_GenAPICommand) @"$(_GenApiFile)" <_GenAPICmd Condition=" '$(AdditionalGenApiCmdOptions)' != '' ">$(_GenAPICmd) $(AdditionalGenApiCmdOptions) diff --git a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj index 3a91e8a4b8..53db4b90de 100644 --- a/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj +++ b/src/Components/Authorization/ref/Microsoft.AspNetCore.Components.Authorization.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj index f1aa3dab10..c535b143b6 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj b/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj index 2ef391ee71..0709f6d84b 100644 --- a/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj +++ b/src/Components/Forms/ref/Microsoft.AspNetCore.Components.Forms.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj index 18b1e18b02..bb71916133 100644 --- a/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj +++ b/src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj index a42a893d8f..a317d80c11 100644 --- a/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj +++ b/src/DataProtection/Abstractions/ref/Microsoft.AspNetCore.DataProtection.Abstractions.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj index 462f2dddf5..5ea2ac05b7 100644 --- a/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj +++ b/src/DataProtection/Cryptography.Internal/ref/Microsoft.AspNetCore.Cryptography.Internal.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj index dc038fa740..93587ee4e0 100644 --- a/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj +++ b/src/DataProtection/Cryptography.KeyDerivation/ref/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj index 06e7d533c7..c3d2e237c7 100644 --- a/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj +++ b/src/DataProtection/DataProtection/ref/Microsoft.AspNetCore.DataProtection.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj index 49dd84084b..df813aaf5f 100644 --- a/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj +++ b/src/DataProtection/Extensions/ref/Microsoft.AspNetCore.DataProtection.Extensions.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj index f2b88f0ca1..3009140234 100644 --- a/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj +++ b/src/Http/Http.Features/ref/Microsoft.AspNetCore.Http.Features.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj b/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj index 2661d12430..75a5dfb139 100644 --- a/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj +++ b/src/Http/Metadata/ref/Microsoft.AspNetCore.Metadata.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj index 1fc6eeebc2..1ddecfe522 100644 --- a/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj +++ b/src/Identity/Extensions.Core/ref/Microsoft.Extensions.Identity.Core.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj index 81e68a47ce..80d0154240 100644 --- a/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj +++ b/src/Identity/Extensions.Stores/ref/Microsoft.Extensions.Identity.Stores.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj index b0cf327ff4..b4543827da 100644 --- a/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj +++ b/src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Servers/Connections.Abstractions/ref/Directory.Build.targets b/src/Servers/Connections.Abstractions/ref/Directory.Build.targets deleted file mode 100644 index 1c2059ecd0..0000000000 --- a/src/Servers/Connections.Abstractions/ref/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - - - $(DefaultNetCoreTargetFramework) - - \ No newline at end of file diff --git a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj index c6a77eb8ef..3451731fed 100644 --- a/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj +++ b/src/Servers/Connections.Abstractions/ref/Microsoft.AspNetCore.Connections.Abstractions.csproj @@ -2,6 +2,7 @@ netstandard2.0;netstandard2.1;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj index 8ae1a927db..83ec067e20 100644 --- a/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj +++ b/src/SignalR/common/Http.Connections.Common/ref/Microsoft.AspNetCore.Http.Connections.Common.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj index 19480b336f..e437919dfb 100644 --- a/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj +++ b/src/SignalR/common/Protocols.Json/ref/Microsoft.AspNetCore.SignalR.Protocols.Json.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj index ce6ebe8ce1..b1ad909f34 100644 --- a/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj +++ b/src/SignalR/common/SignalR.Common/ref/Microsoft.AspNetCore.SignalR.Common.csproj @@ -2,6 +2,7 @@ netstandard2.0;$(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) From f1fbb2d757d756fea07faa189bb13361183fecdf Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 20 Feb 2020 08:35:21 -0800 Subject: [PATCH 112/116] Undo assembly version change for implementation assemblies --- Directory.Build.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 6722516a33..a62e3ed6a4 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -109,8 +109,9 @@ - + + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0.0 From e27f9124538e8072f6d7d5fa2c50123fe530dc2c Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 20 Feb 2020 10:59:17 -0800 Subject: [PATCH 113/116] Explicitly map `@(Reference)` to `@(PackageReference)` for Microsoft.Internal.Extensions.Refs --- eng/targets/ResolveReferences.targets | 18 ++++++++++++++++++ .../ref/Microsoft.AspNetCore.App.Ref.csproj | 1 - 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index a3e4c70df5..9762a9380e 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -210,6 +210,24 @@ Text="Could not resolve this reference. Could not locate the package or project for "%(Reference.Identity)". Did you update baselines and dependencies lists? See docs/ReferenceResolution.md for more details." /> + + <_CompileTfmUsingReferenceAssemblies>false + <_CompileTfmUsingReferenceAssemblies + Condition=" '$(CompileUsingReferenceAssemblies)' != false AND '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">true + + + + + + diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index bf20c86420..ffd0f18293 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -59,7 +59,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant - false From 782b7c5dcda8a7a1cd5a0fc38653140413448fdd Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 20 Feb 2020 11:12:07 -0800 Subject: [PATCH 114/116] Mark BlazorWasm template as non-shipping and disable its associated test --- ...crosoft.AspNetCore.Blazor.Templates.csproj | 1 + .../test/BlazorWasmTemplateTest.cs | 167 ------------------ .../test/ProjectTemplates.Tests.csproj | 1 - 3 files changed, 1 insertion(+), 168 deletions(-) delete mode 100644 src/ProjectTemplates/test/BlazorWasmTemplateTest.cs diff --git a/src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj b/src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj index 3856d047c3..1cce023124 100644 --- a/src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj +++ b/src/ProjectTemplates/BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj @@ -8,6 +8,7 @@ $(DefaultNetCoreTargetFramework) true + false Templates for ASP.NET Core Blazor projects. $(PackageTags);blazor;spa diff --git a/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs deleted file mode 100644 index 0a6ea40f83..0000000000 --- a/src/ProjectTemplates/test/BlazorWasmTemplateTest.cs +++ /dev/null @@ -1,167 +0,0 @@ -// 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.IO; -using System.Net; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.E2ETesting; -using Microsoft.Extensions.CommandLineUtils; -using OpenQA.Selenium; -using Templates.Test.Helpers; -using Xunit; -using Xunit.Abstractions; - -namespace Templates.Test -{ - public class BlazorWasmTemplateTest : BrowserTestBase - { - public BlazorWasmTemplateTest(ProjectFactoryFixture projectFactory, BrowserFixture browserFixture, ITestOutputHelper output) - : base(browserFixture, output) - { - ProjectFactory = projectFactory; - } - - public ProjectFactoryFixture ProjectFactory { get; set; } - - [Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/17681")] - public async Task BlazorWasmStandaloneTemplate_Works() - { - var project = await ProjectFactory.GetOrCreateProject("blazorstandalone", Output); - project.TargetFramework = "netstandard2.1"; - - var createResult = await project.RunDotNetNewAsync("blazorwasm"); - Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", project, createResult)); - - var publishResult = await project.RunDotNetPublishAsync(); - Assert.True(0 == publishResult.ExitCode, ErrorMessages.GetFailedProcessMessage("publish", project, publishResult)); - - var buildResult = await project.RunDotNetBuildAsync(); - Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("build", project, buildResult)); - - await BuildAndRunTest(project.ProjectName, project); - - var publishDir = Path.Combine(project.TemplatePublishDir, project.ProjectName, "dist"); - AspNetProcess.EnsureDevelopmentCertificates(); - - Output.WriteLine("Running dotnet serve on published output..."); - using var serveProcess = ProcessEx.Run(Output, publishDir, DotNetMuxer.MuxerPathOrDefault(), "serve -S"); - - // Todo: Use dynamic port assignment: https://github.com/natemcmaster/dotnet-serve/pull/40/files - var listeningUri = "https://localhost:8080"; - Output.WriteLine($"Opening browser at {listeningUri}..."); - Browser.Navigate().GoToUrl(listeningUri); - TestBasicNavigation(project.ProjectName); - } - - [Fact] - public async Task BlazorWasmHostedTemplate_Works() - { - var project = await ProjectFactory.GetOrCreateProject("blazorhosted", Output); - - var createResult = await project.RunDotNetNewAsync("blazorwasm", args: new[] { "--hosted" }); - Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", project, createResult)); - - var serverProject = GetSubProject(project, "Server", $"{project.ProjectName}.Server"); - - var publishResult = await serverProject.RunDotNetPublishAsync(); - Assert.True(0 == publishResult.ExitCode, ErrorMessages.GetFailedProcessMessage("publish", serverProject, publishResult)); - - var buildResult = await serverProject.RunDotNetBuildAsync(); - Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("build", serverProject, buildResult)); - - await BuildAndRunTest(project.ProjectName, serverProject); - - using var aspNetProcess = serverProject.StartPublishedProjectAsync(); - - Assert.False( - aspNetProcess.Process.HasExited, - ErrorMessages.GetFailedProcessMessageOrEmpty("Run published project", serverProject, aspNetProcess.Process)); - - await aspNetProcess.AssertStatusCode("/", HttpStatusCode.OK, "text/html"); - if (BrowserFixture.IsHostAutomationSupported()) - { - aspNetProcess.VisitInBrowser(Browser); - TestBasicNavigation(project.ProjectName); - } - else - { - BrowserFixture.EnforceSupportedConfigurations(); - } - } - - protected async Task BuildAndRunTest(string appName, Project project) - { - using var aspNetProcess = project.StartBuiltProjectAsync(); - - Assert.False( - aspNetProcess.Process.HasExited, - ErrorMessages.GetFailedProcessMessageOrEmpty("Run built project", project, aspNetProcess.Process)); - - await aspNetProcess.AssertStatusCode("/", HttpStatusCode.OK, "text/html"); - if (BrowserFixture.IsHostAutomationSupported()) - { - aspNetProcess.VisitInBrowser(Browser); - TestBasicNavigation(appName); - } - else - { - BrowserFixture.EnforceSupportedConfigurations(); - } - } - - private void TestBasicNavigation(string appName) - { - // Give components.server enough time to load so that it can replace - // the prerendered content before we start making assertions. - Thread.Sleep(5000); - Browser.Exists(By.TagName("ul")); - - // element gets project ID injected into it during template execution - Browser.Equal(appName.Trim(), () => Browser.Title.Trim()); - - // Initially displays the home page - Browser.Equal("Hello, world!", () => Browser.FindElement(By.TagName("h1")).Text); - - // Can navigate to the counter page - Browser.FindElement(By.PartialLinkText("Counter")).Click(); - Browser.Contains("counter", () => Browser.Url); - Browser.Equal("Counter", () => Browser.FindElement(By.TagName("h1")).Text); - - // Clicking the counter button works - Browser.Equal("Current count: 0", () => Browser.FindElement(By.CssSelector("h1 + p")).Text); - Browser.FindElement(By.CssSelector("p+button")).Click(); - Browser.Equal("Current count: 1", () => Browser.FindElement(By.CssSelector("h1 + p")).Text); - - // Can navigate to the 'fetch data' page - Browser.FindElement(By.PartialLinkText("Fetch data")).Click(); - Browser.Contains("fetchdata", () => Browser.Url); - Browser.Equal("Weather forecast", () => Browser.FindElement(By.TagName("h1")).Text); - - // Asynchronously loads and displays the table of weather forecasts - Browser.Exists(By.CssSelector("table>tbody>tr")); - Browser.Equal(5, () => Browser.FindElements(By.CssSelector("p+table>tbody>tr")).Count); - } - - private Project GetSubProject(Project project, string projectDirectory, string projectName) - { - var subProjectDirectory = Path.Combine(project.TemplateOutputDir, projectDirectory); - if (!Directory.Exists(subProjectDirectory)) - { - throw new DirectoryNotFoundException($"Directory {subProjectDirectory} was not found."); - } - - var subProject = new Project - { - DotNetNewLock = project.DotNetNewLock, - NodeLock = project.NodeLock, - Output = project.Output, - DiagnosticsMessageSink = project.DiagnosticsMessageSink, - ProjectName = projectName, - TemplateOutputDir = subProjectDirectory, - }; - - return subProject; - } - } -} diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index 793022e817..10c6013823 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -48,7 +48,6 @@ <ProjectReference Include="../Web.ItemTemplates/Microsoft.DotNet.Web.ItemTemplates.csproj" ReferenceOutputAssembly="false" /> <ProjectReference Include="../Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj" ReferenceOutputAssembly="false" /> <ProjectReference Include="../Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj" ReferenceOutputAssembly="false" /> - <ProjectReference Include="../BlazorWasm.ProjectTemplates/Microsoft.AspNetCore.Blazor.Templates.csproj" ReferenceOutputAssembly="false" /> </ItemGroup> <ItemGroup> From c8bcb96d59f6c1d42f36a547954a65afd6b9b503 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 20 Feb 2020 11:18:07 -0800 Subject: [PATCH 115/116] Revert location change for `_UseHelixOpenQueues` variable nit: Remove extra `if` --- .azure/pipelines/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 7c64003843..e7e424ae8c 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -31,9 +31,9 @@ variables: value: .NETCORE - name: _DotNetValidationArtifactsCategory value: .NETCORE -- name: _UseHelixOpenQueues - value: 'true' - ${{ if ne(variables['System.TeamProject'], 'internal') }}: + - name: _UseHelixOpenQueues + value: 'true' - name: _BuildArgs value: '' - name: _PublishArgs @@ -53,7 +53,6 @@ variables: # to have it in two different forms - name: _InternalRuntimeDownloadCodeSignArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) -- ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNet-HelixApi-Access - name: _UseHelixOpenQueues value: 'false' From 3c40c64d3dc262a981fce6fbdf8d17ec5b2b73f9 Mon Sep 17 00:00:00 2001 From: Brennan Conroy <brecon@microsoft.com> Date: Thu, 20 Feb 2020 12:43:21 -0800 Subject: [PATCH 116/116] Fix template test --- src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs index 30983a55fc..07db888279 100644 --- a/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs +++ b/src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs @@ -89,7 +89,7 @@ namespace Templates.Test.Helpers .Where(p => _templatePackages.Any(t => Path.GetFileName(p).StartsWith(t, StringComparison.OrdinalIgnoreCase))) .ToArray(); - Assert.Equal(5, builtPackages.Length); + Assert.Equal(4, builtPackages.Length); /* * The templates are indexed by path, for example: