diff --git a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Prerendering.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Prerendering.cshtml
index bd5fff9df2..bda7d3df0e 100644
--- a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Prerendering.cshtml
+++ b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Prerendering.cshtml
@@ -4,7 +4,7 @@
This sample demonstrates how you can invoke a JavaScript module that contains
prerendering logic for a Single-Page Application framework.
-
+
Your prerendering boot function will receive parameters that describe the page
being rendered and any data supplied by the .NET code. The return value should be
a promise that resolves with data to be injected into the page, such as the
diff --git a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
index 8a1916ba5f..fc460f6afe 100644
--- a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
+++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
@@ -3,7 +3,7 @@
Invoke Node.js modules at runtime in ASP.NET Core applications.
netcoreapp3.0
- true
+ true
diff --git a/src/Middleware/ResponseCaching/src/Internal/FastGuid.cs b/src/Middleware/ResponseCaching/src/Internal/FastGuid.cs
index b62ba22f83..571227516b 100644
--- a/src/Middleware/ResponseCaching/src/Internal/FastGuid.cs
+++ b/src/Middleware/ResponseCaching/src/Internal/FastGuid.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.ResponseCaching.Internal
internal class FastGuid
{
// Base32 encoding - in ascii sort order for easy text based sorting
- private static readonly string _encode32Chars = "0123456789ABCDEFGHIJKLMNOPQRSTUV";
+ private static readonly char[] s_encode32Chars = "0123456789ABCDEFGHIJKLMNOPQRSTUV".ToCharArray();
// Global ID
private static long NextId;
@@ -53,28 +53,25 @@ namespace Microsoft.AspNetCore.ResponseCaching.Internal
return new FastGuid(Interlocked.Increment(ref NextId));
}
- private static unsafe string GenerateGuidString(FastGuid guid)
+ private static string GenerateGuidString(FastGuid guid)
{
- // stackalloc to allocate array on stack rather than heap
- char* charBuffer = stackalloc char[13];
-
- // ID
- charBuffer[0] = _encode32Chars[(int)(guid.IdValue >> 60) & 31];
- charBuffer[1] = _encode32Chars[(int)(guid.IdValue >> 55) & 31];
- charBuffer[2] = _encode32Chars[(int)(guid.IdValue >> 50) & 31];
- charBuffer[3] = _encode32Chars[(int)(guid.IdValue >> 45) & 31];
- charBuffer[4] = _encode32Chars[(int)(guid.IdValue >> 40) & 31];
- charBuffer[5] = _encode32Chars[(int)(guid.IdValue >> 35) & 31];
- charBuffer[6] = _encode32Chars[(int)(guid.IdValue >> 30) & 31];
- charBuffer[7] = _encode32Chars[(int)(guid.IdValue >> 25) & 31];
- charBuffer[8] = _encode32Chars[(int)(guid.IdValue >> 20) & 31];
- charBuffer[9] = _encode32Chars[(int)(guid.IdValue >> 15) & 31];
- charBuffer[10] = _encode32Chars[(int)(guid.IdValue >> 10) & 31];
- charBuffer[11] = _encode32Chars[(int)(guid.IdValue >> 5) & 31];
- charBuffer[12] = _encode32Chars[(int)guid.IdValue & 31];
-
- // string ctor overload that takes char*
- return new string(charBuffer, 0, 13);
+ return string.Create(13, guid.IdValue, (buffer, value) =>
+ {
+ char[] encode32Chars = s_encode32Chars;
+ buffer[12] = encode32Chars[value & 31];
+ buffer[11] = encode32Chars[(value >> 5) & 31];
+ buffer[10] = encode32Chars[(value >> 10) & 31];
+ buffer[9] = encode32Chars[(value >> 15) & 31];
+ buffer[8] = encode32Chars[(value >> 20) & 31];
+ buffer[7] = encode32Chars[(value >> 25) & 31];
+ buffer[6] = encode32Chars[(value >> 30) & 31];
+ buffer[5] = encode32Chars[(value >> 35) & 31];
+ buffer[4] = encode32Chars[(value >> 40) & 31];
+ buffer[3] = encode32Chars[(value >> 45) & 31];
+ buffer[2] = encode32Chars[(value >> 50) & 31];
+ buffer[1] = encode32Chars[(value >> 55) & 31];
+ buffer[0] = encode32Chars[(value >> 60) & 31];
+ });
}
}
}
diff --git a/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs b/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs
index 4f5c6bf073..3c6be0aa8e 100644
--- a/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs
+++ b/src/Middleware/ResponseCompression/test/ResponseCompressionMiddlewareTest.cs
@@ -14,6 +14,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.TestHost;
+using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Testing;
@@ -460,7 +461,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
[MemberData(nameof(SupportedEncodingsWithBodyLength))]
public async Task FlushHeaders_SendsHeaders_Compresses(string encoding, int expectedBodyLength)
{
- var responseReceived = new ManualResetEvent(false);
+ var responseReceived = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
var builder = new WebHostBuilder()
.ConfigureServices(services =>
@@ -470,13 +471,13 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
.Configure(app =>
{
app.UseResponseCompression();
- app.Run(context =>
+ app.Run(async context =>
{
context.Response.Headers[HeaderNames.ContentMD5] = "MD5";
context.Response.ContentType = TextPlain;
context.Response.Body.Flush();
- Assert.True(responseReceived.WaitOne(TimeSpan.FromSeconds(3)));
- return context.Response.WriteAsync(new string('a', 100));
+ await responseReceived.Task.TimeoutAfter(TimeSpan.FromSeconds(3));
+ await context.Response.WriteAsync(new string('a', 100));
});
});
@@ -487,7 +488,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
request.Headers.AcceptEncoding.ParseAdd(encoding);
var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
- responseReceived.Set();
+ responseReceived.SetResult(0);
await response.Content.LoadIntoBufferAsync();
@@ -498,7 +499,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
[MemberData(nameof(SupportedEncodingsWithBodyLength))]
public async Task FlushAsyncHeaders_SendsHeaders_Compresses(string encoding, int expectedBodyLength)
{
- var responseReceived = new ManualResetEvent(false);
+ var responseReceived = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
var builder = new WebHostBuilder()
.ConfigureServices(services =>
@@ -513,7 +514,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
context.Response.Headers[HeaderNames.ContentMD5] = "MD5";
context.Response.ContentType = TextPlain;
await context.Response.Body.FlushAsync();
- Assert.True(responseReceived.WaitOne(TimeSpan.FromSeconds(3)));
+ await responseReceived.Task.TimeoutAfter(TimeSpan.FromSeconds(3));
await context.Response.WriteAsync(new string('a', 100));
});
});
@@ -525,7 +526,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
request.Headers.AcceptEncoding.ParseAdd(encoding);
var response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
- responseReceived.Set();
+ responseReceived.SetResult(0);
await response.Content.LoadIntoBufferAsync();
@@ -536,7 +537,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
[MemberData(nameof(SupportedEncodings))]
public async Task FlushBody_CompressesAndFlushes(string encoding)
{
- var responseReceived = new ManualResetEvent(false);
+ var responseReceived = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
var builder = new WebHostBuilder()
.ConfigureServices(services =>
@@ -546,7 +547,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
.Configure(app =>
{
app.UseResponseCompression();
- app.Run(context =>
+ app.Run(async context =>
{
var feature = context.Features.Get();
if (feature != null)
@@ -558,9 +559,8 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
context.Response.ContentType = TextPlain;
context.Response.Body.Write(new byte[10], 0, 10);
context.Response.Body.Flush();
- Assert.True(responseReceived.WaitOne(TimeSpan.FromSeconds(3)));
+ await responseReceived.Task.TimeoutAfter(TimeSpan.FromSeconds(3));
context.Response.Body.Write(new byte[90], 0, 90);
- return Task.FromResult(0);
});
});
@@ -579,7 +579,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
var read = await body.ReadAsync(new byte[100], 0, 100);
Assert.True(read > 0);
- responseReceived.Set();
+ responseReceived.SetResult(0);
read = await body.ReadAsync(new byte[100], 0, 100);
Assert.True(read > 0);
@@ -589,7 +589,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
[MemberData(nameof(SupportedEncodings))]
public async Task FlushAsyncBody_CompressesAndFlushes(string encoding)
{
- var responseReceived = new ManualResetEvent(false);
+ var responseReceived = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
var builder = new WebHostBuilder()
.ConfigureServices(services =>
@@ -605,7 +605,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
context.Response.ContentType = TextPlain;
await context.Response.WriteAsync(new string('a', 10));
await context.Response.Body.FlushAsync();
- Assert.True(responseReceived.WaitOne(TimeSpan.FromSeconds(3)));
+ await responseReceived.Task.TimeoutAfter(TimeSpan.FromSeconds(3));
await context.Response.WriteAsync(new string('a', 90));
});
});
@@ -625,7 +625,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
var read = await body.ReadAsync(new byte[100], 0, 100);
Assert.True(read > 0);
- responseReceived.Set();
+ responseReceived.SetResult(0);
read = await body.ReadAsync(new byte[100], 0, 100);
Assert.True(read > 0);
@@ -637,11 +637,11 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
{
var responseReceived = new[]
{
- new ManualResetEvent(false),
- new ManualResetEvent(false),
- new ManualResetEvent(false),
- new ManualResetEvent(false),
- new ManualResetEvent(false),
+ new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously),
+ new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously),
+ new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously),
+ new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously),
+ new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously),
};
var builder = new WebHostBuilder()
@@ -652,7 +652,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
.Configure(app =>
{
app.UseResponseCompression();
- app.Run(context =>
+ app.Run(async context =>
{
context.Response.Headers[HeaderNames.ContentMD5] = "MD5";
context.Response.ContentType = TextPlain;
@@ -668,9 +668,8 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
{
context.Response.Body.Write(new byte[1], 0, 1);
context.Response.Body.Flush();
- Assert.True(signal.WaitOne(TimeSpan.FromSeconds(3)));
+ await signal.Task.TimeoutAfter(TimeSpan.FromSeconds(3));
}
- return Task.FromResult(0);
});
});
@@ -691,7 +690,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
var read = await body.ReadAsync(new byte[100], 0, 100);
Assert.True(read > 0);
- signal.Set();
+ signal.SetResult(0);
}
}
@@ -701,11 +700,11 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
{
var responseReceived = new[]
{
- new ManualResetEvent(false),
- new ManualResetEvent(false),
- new ManualResetEvent(false),
- new ManualResetEvent(false),
- new ManualResetEvent(false),
+ new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously),
+ new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously),
+ new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously),
+ new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously),
+ new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously),
};
var builder = new WebHostBuilder()
@@ -726,7 +725,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
{
await context.Response.WriteAsync("a");
await context.Response.Body.FlushAsync();
- Assert.True(signal.WaitOne(TimeSpan.FromSeconds(3)));
+ await signal.Task.TimeoutAfter(TimeSpan.FromSeconds(3));
}
});
});
@@ -748,7 +747,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
var read = await body.ReadAsync(new byte[100], 0, 100);
Assert.True(read > 0);
- signal.Set();
+ signal.SetResult(0);
}
}
@@ -918,7 +917,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
[MemberData(nameof(SupportedEncodings))]
public async Task Dispose_SyncWriteOrFlushNotCalled(string encoding)
{
- var responseReceived = new ManualResetEvent(false);
+ var responseReceived = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
var builder = new WebHostBuilder()
.ConfigureServices(services =>
@@ -939,7 +938,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
context.Response.ContentType = TextPlain;
await context.Response.WriteAsync(new string('a', 10));
await context.Response.Body.FlushAsync();
- Assert.True(responseReceived.WaitOne(TimeSpan.FromSeconds(3)));
+ await responseReceived.Task.TimeoutAfter(TimeSpan.FromSeconds(3));
await context.Response.WriteAsync(new string('a', 90));
});
});
@@ -959,7 +958,7 @@ namespace Microsoft.AspNetCore.ResponseCompression.Tests
var read = await body.ReadAsync(new byte[100], 0, 100);
Assert.True(read > 0);
- responseReceived.Set();
+ responseReceived.SetResult(0);
read = await body.ReadAsync(new byte[100], 0, 100);
Assert.True(read > 0);
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 482fb519dd..02741c62dc 100644
--- a/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj
+++ b/src/Middleware/SpaServices.Extensions/src/Microsoft.AspNetCore.SpaServices.Extensions.csproj
@@ -3,13 +3,11 @@
Helpers for building single-page applications on ASP.NET MVC Core.
netcoreapp3.0
+ true
-
-
-
diff --git a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
index a0df83dcfd..94ff1d4f92 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.
netcoreapp3.0
- true
+ true
diff --git a/src/Middleware/StaticFiles/src/StaticFileContext.cs b/src/Middleware/StaticFiles/src/StaticFileContext.cs
index d6f0d72779..7473db4f36 100644
--- a/src/Middleware/StaticFiles/src/StaticFileContext.cs
+++ b/src/Middleware/StaticFiles/src/StaticFileContext.cs
@@ -233,7 +233,7 @@ namespace Microsoft.AspNetCore.StaticFiles
// the Range header field.
if (ifRangeHeader.LastModified.HasValue)
{
- if (_lastModified !=null && _lastModified > ifRangeHeader.LastModified)
+ if (_lastModified > ifRangeHeader.LastModified)
{
_isRangeRequest = 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 3f5e2d4a75..ee5ff33e91 100644
--- a/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj
+++ b/src/Middleware/StaticFiles/test/FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj
@@ -22,12 +22,12 @@
-
+
+
-
diff --git a/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs b/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs
index 268accc699..0f9be47e97 100644
--- a/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs
+++ b/src/Middleware/StaticFiles/test/FunctionalTests/StaticFileMiddlewareTests.cs
@@ -16,6 +16,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Server.IntegrationTesting;
using Microsoft.AspNetCore.Server.IntegrationTesting.Common;
+using Microsoft.AspNetCore.Testing;
using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging.Testing;
@@ -164,25 +165,25 @@ namespace Microsoft.AspNetCore.StaticFiles
};
[Fact]
- public void ClientDisconnect_Kestrel_NoWriteExceptionThrown()
+ public Task ClientDisconnect_Kestrel_NoWriteExceptionThrown()
{
- ClientDisconnect_NoWriteExceptionThrown(ServerType.Kestrel);
+ return ClientDisconnect_NoWriteExceptionThrown(ServerType.Kestrel);
}
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)]
- public void ClientDisconnect_WebListener_NoWriteExceptionThrown()
+ public Task ClientDisconnect_WebListener_NoWriteExceptionThrown()
{
- ClientDisconnect_NoWriteExceptionThrown(ServerType.HttpSys);
+ return ClientDisconnect_NoWriteExceptionThrown(ServerType.HttpSys);
}
- private void ClientDisconnect_NoWriteExceptionThrown(ServerType serverType)
+ private async Task ClientDisconnect_NoWriteExceptionThrown(ServerType serverType)
{
var interval = TimeSpan.FromSeconds(15);
- var requestReceived = new ManualResetEvent(false);
- var requestCancelled = new ManualResetEvent(false);
- var responseComplete = new ManualResetEvent(false);
+ var requestReceived = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var requestCancelled = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var responseComplete = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
Exception exception = null;
var builder = new WebHostBuilder()
.ConfigureServices(services => services.AddSingleton(LoggerFactory))
@@ -193,8 +194,8 @@ namespace Microsoft.AspNetCore.StaticFiles
{
try
{
- requestReceived.Set();
- Assert.True(requestCancelled.WaitOne(interval), "not cancelled");
+ requestReceived.SetResult(0);
+ await requestCancelled.Task.TimeoutAfter(interval);
Assert.True(context.RequestAborted.WaitHandle.WaitOne(interval), "not aborted");
await next();
}
@@ -202,7 +203,7 @@ namespace Microsoft.AspNetCore.StaticFiles
{
exception = ex;
}
- responseComplete.Set();
+ responseComplete.SetResult(0);
});
app.UseStaticFiles();
});
@@ -220,13 +221,13 @@ namespace Microsoft.AspNetCore.StaticFiles
{
// We don't use HttpClient here because it's disconnect behavior varies across platforms.
var socket = SendSocketRequestAsync(server.GetAddress(), "/TestDocument1MB.txt");
- Assert.True(requestReceived.WaitOne(interval), "not received");
+ await requestReceived.Task.TimeoutAfter(interval);
socket.LingerState = new LingerOption(true, 0);
socket.Dispose();
- requestCancelled.Set();
+ requestCancelled.SetResult(0);
- Assert.True(responseComplete.WaitOne(interval), "not completed");
+ await responseComplete.Task.TimeoutAfter(interval);
Assert.Null(exception);
}
}
diff --git a/src/Middleware/WebSockets/src/WebSocketMiddleware.cs b/src/Middleware/WebSockets/src/WebSocketMiddleware.cs
index 8f2c4dd717..bb9d7bea08 100644
--- a/src/Middleware/WebSockets/src/WebSocketMiddleware.cs
+++ b/src/Middleware/WebSockets/src/WebSocketMiddleware.cs
@@ -48,12 +48,6 @@ namespace Microsoft.AspNetCore.WebSockets
// TODO: validate options.
}
- [Obsolete("This constructor has been replaced with an equivalent constructor which requires an ILoggerFactory.")]
- public WebSocketMiddleware(RequestDelegate next, IOptions options)
- : this(next, options, NullLoggerFactory.Instance)
- {
- }
-
public Task Invoke(HttpContext context)
{
// Detect if an opaque upgrade is available. If so, add a websocket upgrade.
diff --git a/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTestApp/AutobahnTestApp.csproj b/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTestApp/AutobahnTestApp.csproj
index ee6c43d6d2..27988f2008 100644
--- a/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTestApp/AutobahnTestApp.csproj
+++ b/src/Middleware/WebSockets/test/ConformanceTests/AutobahnTestApp/AutobahnTestApp.csproj
@@ -10,20 +10,13 @@
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
diff --git a/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj b/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj
index 5b009d7d65..45aefa89d5 100644
--- a/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj
+++ b/src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj
@@ -6,11 +6,10 @@
-
-
+
-
+
diff --git a/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj b/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj
index fd13f1944f..879ed1707b 100644
--- a/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj
+++ b/src/Middleware/WebSockets/test/UnitTests/Microsoft.AspNetCore.WebSockets.Tests.csproj
@@ -5,7 +5,8 @@
-
+
+
diff --git a/src/MusicStore/MusicStore.sln b/src/MusicStore/MusicStore.sln
index 7c9bd93ac3..5e27218a86 100644
--- a/src/MusicStore/MusicStore.sln
+++ b/src/MusicStore/MusicStore.sln
@@ -1,64 +1,1085 @@
+
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.12
MinimumVisualStudioVersion = 15.0.26730.03
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7D749BDA-4638-4517-B66A-D40DEDEEB141}"
- ProjectSection(SolutionItems) = preProject
- .appveyor.yml = .appveyor.yml
- .travis.yml = .travis.yml
- Directory.Build.props = Directory.Build.props
- Directory.Build.targets = Directory.Build.targets
- NuGet.config = NuGet.config
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{B7B176B6-8D4D-4EF1-BBD2-DDA650C78FFF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{363D2681-31A6-48C9-90BB-9ACFF4A41F06}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore", "samples\MusicStore\MusicStore.csproj", "{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore.Test", "test\MusicStore.Test\MusicStore.Test.csproj", "{CA663205-77DE-4E55-B300-85594181B5A9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MusicStore.E2ETests", "test\MusicStore.E2ETests\MusicStore.E2ETests.csproj", "{72A5F455-121F-4954-BF28-D712C6BE88EA}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{88A30728-49E5-46C5-9CEC-9D8FD346A043}"
- ProjectSection(SolutionItems) = preProject
- build\dependencies.props = build\dependencies.props
- build\repo.props = build\repo.props
- build\repo.targets = build\repo.targets
- build\sources.props = build\sources.props
- EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery", "..\Antiforgery\src\Microsoft.AspNetCore.Antiforgery.csproj", "{DECBCA36-8E91-4A46-914D-832ECCE7D3F4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Abstractions", "..\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj", "{28C13B1C-3037-453F-B6CD-B30FC8106E06}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.Internal", "..\DataProtection\Cryptography.Internal\src\Microsoft.AspNetCore.Cryptography.Internal.csproj", "{F189E09E-0C64-4A20-B148-D6502D3CD166}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.KeyDerivation", "..\DataProtection\Cryptography.KeyDerivation\src\Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj", "{809B5BC8-F020-4B78-9FD2-FC8704FA89D9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection", "..\DataProtection\DataProtection\src\Microsoft.AspNetCore.DataProtection.csproj", "{7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore", "..\DefaultBuilder\src\Microsoft.AspNetCore.csproj", "{DB308907-C606-4C31-B55B-E8CC2625FE8A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "..\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "..\Hosting\Server.Abstractions\src\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj", "{C73F656D-41B6-4610-B9DD-8B0F5C2589EC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{7F5C0B6A-006E-456F-A806-1B0F502A9D84}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Html.Abstractions", "..\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj", "{04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Abstractions", "..\Http\Authentication.Abstractions\src\Microsoft.AspNetCore.Authentication.Abstractions.csproj", "{1812726B-6B81-4038-B1A0-C42A7CB6E83E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Core", "..\Http\Authentication.Core\src\Microsoft.AspNetCore.Authentication.Core.csproj", "{A567F04F-2C85-4D09-8C86-26A88F20C729}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "..\Http\Headers\src\Microsoft.Net.Http.Headers.csproj", "{406B4B46-6289-4061-984A-1DD9C9B6D329}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions", "..\Http\Http.Abstractions\src\Microsoft.AspNetCore.Http.Abstractions.csproj", "{CB0A64E2-DD42-43D9-B253-D94C2487BA0E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Extensions", "..\Http\Http.Extensions\src\Microsoft.AspNetCore.Http.Extensions.csproj", "{FC4215EC-D185-4698-AC55-ED953E10B042}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Features", "..\Http\Http.Features\src\Microsoft.AspNetCore.Http.Features.csproj", "{8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{7483F392-F394-46D6-9909-074D84CF09D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "..\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{144D7C8F-AF14-43EE-9720-EA4CF20F9C08}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "..\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj", "{9F2C5373-27A5-4357-8A7A-4F22176AD5D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "..\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "..\Identity\Core\src\Microsoft.AspNetCore.Identity.csproj", "{CF91C6AB-B977-41FE-B26A-D8095BBF4213}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "..\Identity\EntityFrameworkCore\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj", "{95F6D15B-293F-4E23-BCC6-FD81B40E886B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Core", "..\Identity\Extensions.Core\src\Microsoft.Extensions.Identity.Core.csproj", "{3ADD636D-4F44-4941-838E-ED399C080D19}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Identity.Stores", "..\Identity\Extensions.Stores\src\Microsoft.Extensions.Identity.Stores.csproj", "{4D95736B-7CC7-4CBE-BCA4-131F23D5D992}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors", "..\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj", "{004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Abstractions", "..\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj", "{00447948-6BDD-4C7E-829A-06094B6F10D2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore", "..\Middleware\Diagnostics.EntityFrameworkCore\src\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj", "{8D8F84CB-2E48-42D3-8E48-D6213290FFB9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HostFiltering", "..\Middleware\HostFiltering\src\Microsoft.AspNetCore.HostFiltering.csproj", "{353FE180-8B31-4947-9407-3FA1EE8DA8B9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.HttpOverrides", "..\Middleware\HttpOverrides\src\Microsoft.AspNetCore.HttpOverrides.csproj", "{11B29D93-5CD7-4282-98C8-124E5B16DD3F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization", "..\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj", "{7FB812C6-617D-41C3-A08D-57CE93A9AA18}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "..\Middleware\ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj", "{2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session", "..\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj", "{A73934B4-9A86-412B-B619-A6682183DF25}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Abstractions", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Abstractions\Microsoft.AspNetCore.Mvc.Abstractions.csproj", "{4ECBDB74-B257-4B06-9872-28BD4D778735}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Analyzers", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Analyzers\Microsoft.AspNetCore.Mvc.Analyzers.csproj", "{BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ApiExplorer", "..\Mvc\src\Microsoft.AspNetCore.Mvc.ApiExplorer\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj", "{3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Core", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj", "{896752D7-939A-4BE0-BB75-1132A516D41D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Cors", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Cors\Microsoft.AspNetCore.Mvc.Cors.csproj", "{D8ED97C5-C491-4D4B-8B01-435835E7AAA9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.DataAnnotations", "..\Mvc\src\Microsoft.AspNetCore.Mvc.DataAnnotations\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj", "{6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Localization", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Localization\Microsoft.AspNetCore.Mvc.Localization.csproj", "{B6F13159-2E4D-4F86-A2F2-AFD3536105DA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Razor\Microsoft.AspNetCore.Mvc.Razor.csproj", "{3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages", "..\Mvc\src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj", "{688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.TagHelpers", "..\Mvc\src\Microsoft.AspNetCore.Mvc.TagHelpers\Microsoft.AspNetCore.Mvc.TagHelpers.csproj", "{E2589D5F-F774-413F-B26A-DF2173565B6C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.ViewFeatures", "..\Mvc\src\Microsoft.AspNetCore.Mvc.ViewFeatures\Microsoft.AspNetCore.Mvc.ViewFeatures.csproj", "{D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "..\Mvc\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "..\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{C2C58C19-DF71-4E78-A658-84AF01146637}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "..\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj", "{7BDC3249-5402-4DFF-A34B-C2E8262568AB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{2F9FF701-31CA-43D9-9212-21CF3640F54F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication", "..\Security\Authentication\Core\src\Microsoft.AspNetCore.Authentication.csproj", "{50B6D43E-2677-4818-923E-54EF513675F8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Facebook", "..\Security\Authentication\Facebook\src\Microsoft.AspNetCore.Authentication.Facebook.csproj", "{3B68E545-0B46-4089-B46C-29A01EC6BF30}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Google", "..\Security\Authentication\Google\src\Microsoft.AspNetCore.Authentication.Google.csproj", "{1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.MicrosoftAccount", "..\Security\Authentication\MicrosoftAccount\src\Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj", "{121C4468-A224-4DDB-B7C5-704EE0319A26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.OAuth", "..\Security\Authentication\OAuth\src\Microsoft.AspNetCore.Authentication.OAuth.csproj", "{D593E79F-22A8-45A4-A34A-187B3D383A21}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.OpenIdConnect", "..\Security\Authentication\OpenIdConnect\src\Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj", "{42F24A07-6C68-4E5E-B533-01AE81FCFB0D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Twitter", "..\Security\Authentication\Twitter\src\Microsoft.AspNetCore.Authentication.Twitter.csproj", "{8305691A-DD86-4BB3-B79A-DBB28980EE5A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "..\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{99CCB774-5298-4E22-8F56-073B231D0A3D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Policy", "..\Security\Authorization\Policy\src\Microsoft.AspNetCore.Authorization.Policy.csproj", "{39AEA24E-6D73-4EB1-9773-5BCF02957AC7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "..\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{B4C977F0-9027-4728-9F50-C895E71582A5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys", "..\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj", "{D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IIS", "..\Servers\IIS\IIS\src\Microsoft.AspNetCore.Server.IIS.csproj", "{E12AA11A-AD3B-42A3-9200-C22644959EA8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{CA51F9EF-137E-4679-AFBC-298FCDF027E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting.IIS", "..\Servers\IIS\IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj", "{7A3B24E6-3620-4018-A7BE-DE5B3BB38137}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{FFA9F547-B412-47D3-AA65-581B51F765A8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{658DAA95-3941-448A-AF39-C2826043716D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{3F5589F9-5D13-4662-96C6-52367D14061C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{B21EACAA-1EBC-45D3-8831-8A8E7888CD03}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
- RuntimeStore|Any CPU = RuntimeStore|Any CPU
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|x64.ActiveCfg = Debug|x64
+ {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|x64.Build.0 = Debug|x64
+ {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|x86.ActiveCfg = Debug|x86
+ {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|x86.Build.0 = Debug|x86
{3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Any CPU.ActiveCfg = Release|x86
- {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.RuntimeStore|Any CPU.ActiveCfg = RuntimeStore|x86
+ {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|x64.ActiveCfg = Release|x64
+ {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|x64.Build.0 = Release|x64
+ {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|x86.ActiveCfg = Release|x86
+ {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|x86.Build.0 = Release|x86
{CA663205-77DE-4E55-B300-85594181B5A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CA663205-77DE-4E55-B300-85594181B5A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CA663205-77DE-4E55-B300-85594181B5A9}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {CA663205-77DE-4E55-B300-85594181B5A9}.Debug|x64.Build.0 = Debug|Any CPU
+ {CA663205-77DE-4E55-B300-85594181B5A9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {CA663205-77DE-4E55-B300-85594181B5A9}.Debug|x86.Build.0 = Debug|Any CPU
{CA663205-77DE-4E55-B300-85594181B5A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CA663205-77DE-4E55-B300-85594181B5A9}.Release|Any CPU.Build.0 = Release|Any CPU
- {CA663205-77DE-4E55-B300-85594181B5A9}.RuntimeStore|Any CPU.ActiveCfg = Release|Any CPU
- {CA663205-77DE-4E55-B300-85594181B5A9}.RuntimeStore|Any CPU.Build.0 = Release|Any CPU
+ {CA663205-77DE-4E55-B300-85594181B5A9}.Release|x64.ActiveCfg = Release|Any CPU
+ {CA663205-77DE-4E55-B300-85594181B5A9}.Release|x64.Build.0 = Release|Any CPU
+ {CA663205-77DE-4E55-B300-85594181B5A9}.Release|x86.ActiveCfg = Release|Any CPU
+ {CA663205-77DE-4E55-B300-85594181B5A9}.Release|x86.Build.0 = Release|Any CPU
{72A5F455-121F-4954-BF28-D712C6BE88EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{72A5F455-121F-4954-BF28-D712C6BE88EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {72A5F455-121F-4954-BF28-D712C6BE88EA}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {72A5F455-121F-4954-BF28-D712C6BE88EA}.Debug|x64.Build.0 = Debug|Any CPU
+ {72A5F455-121F-4954-BF28-D712C6BE88EA}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {72A5F455-121F-4954-BF28-D712C6BE88EA}.Debug|x86.Build.0 = Debug|Any CPU
{72A5F455-121F-4954-BF28-D712C6BE88EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{72A5F455-121F-4954-BF28-D712C6BE88EA}.Release|Any CPU.Build.0 = Release|Any CPU
- {72A5F455-121F-4954-BF28-D712C6BE88EA}.RuntimeStore|Any CPU.ActiveCfg = Release|Any CPU
- {72A5F455-121F-4954-BF28-D712C6BE88EA}.RuntimeStore|Any CPU.Build.0 = Release|Any CPU
+ {72A5F455-121F-4954-BF28-D712C6BE88EA}.Release|x64.ActiveCfg = Release|Any CPU
+ {72A5F455-121F-4954-BF28-D712C6BE88EA}.Release|x64.Build.0 = Release|Any CPU
+ {72A5F455-121F-4954-BF28-D712C6BE88EA}.Release|x86.ActiveCfg = Release|Any CPU
+ {72A5F455-121F-4954-BF28-D712C6BE88EA}.Release|x86.Build.0 = Release|Any CPU
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4}.Debug|x64.Build.0 = Debug|Any CPU
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4}.Debug|x86.Build.0 = Debug|Any CPU
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4}.Release|x64.ActiveCfg = Release|Any CPU
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4}.Release|x64.Build.0 = Release|Any CPU
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4}.Release|x86.ActiveCfg = Release|Any CPU
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4}.Release|x86.Build.0 = Release|Any CPU
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06}.Debug|x64.Build.0 = Debug|Any CPU
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06}.Debug|x86.Build.0 = Debug|Any CPU
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06}.Release|Any CPU.Build.0 = Release|Any CPU
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06}.Release|x64.ActiveCfg = Release|Any CPU
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06}.Release|x64.Build.0 = Release|Any CPU
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06}.Release|x86.ActiveCfg = Release|Any CPU
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06}.Release|x86.Build.0 = Release|Any CPU
+ {F189E09E-0C64-4A20-B148-D6502D3CD166}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F189E09E-0C64-4A20-B148-D6502D3CD166}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F189E09E-0C64-4A20-B148-D6502D3CD166}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {F189E09E-0C64-4A20-B148-D6502D3CD166}.Debug|x64.Build.0 = Debug|Any CPU
+ {F189E09E-0C64-4A20-B148-D6502D3CD166}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {F189E09E-0C64-4A20-B148-D6502D3CD166}.Debug|x86.Build.0 = Debug|Any CPU
+ {F189E09E-0C64-4A20-B148-D6502D3CD166}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F189E09E-0C64-4A20-B148-D6502D3CD166}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F189E09E-0C64-4A20-B148-D6502D3CD166}.Release|x64.ActiveCfg = Release|Any CPU
+ {F189E09E-0C64-4A20-B148-D6502D3CD166}.Release|x64.Build.0 = Release|Any CPU
+ {F189E09E-0C64-4A20-B148-D6502D3CD166}.Release|x86.ActiveCfg = Release|Any CPU
+ {F189E09E-0C64-4A20-B148-D6502D3CD166}.Release|x86.Build.0 = Release|Any CPU
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9}.Debug|x64.Build.0 = Debug|Any CPU
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9}.Debug|x86.Build.0 = Debug|Any CPU
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9}.Release|x64.ActiveCfg = Release|Any CPU
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9}.Release|x64.Build.0 = Release|Any CPU
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9}.Release|x86.ActiveCfg = Release|Any CPU
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9}.Release|x86.Build.0 = Release|Any CPU
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}.Debug|x64.Build.0 = Debug|Any CPU
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}.Debug|x86.Build.0 = Debug|Any CPU
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}.Release|x64.ActiveCfg = Release|Any CPU
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}.Release|x64.Build.0 = Release|Any CPU
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}.Release|x86.ActiveCfg = Release|Any CPU
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE}.Release|x86.Build.0 = Release|Any CPU
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A}.Debug|x64.Build.0 = Debug|Any CPU
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A}.Debug|x86.Build.0 = Debug|Any CPU
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A}.Release|x64.ActiveCfg = Release|Any CPU
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A}.Release|x64.Build.0 = Release|Any CPU
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A}.Release|x86.ActiveCfg = Release|Any CPU
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A}.Release|x86.Build.0 = Release|Any CPU
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}.Debug|x64.Build.0 = Debug|Any CPU
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}.Debug|x86.Build.0 = Debug|Any CPU
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}.Release|x64.ActiveCfg = Release|Any CPU
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}.Release|x64.Build.0 = Release|Any CPU
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}.Release|x86.ActiveCfg = Release|Any CPU
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623}.Release|x86.Build.0 = Release|Any CPU
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}.Debug|x64.Build.0 = Debug|Any CPU
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}.Debug|x86.Build.0 = Debug|Any CPU
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}.Release|x64.ActiveCfg = Release|Any CPU
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}.Release|x64.Build.0 = Release|Any CPU
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}.Release|x86.ActiveCfg = Release|Any CPU
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F}.Release|x86.Build.0 = Release|Any CPU
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC}.Debug|x64.Build.0 = Debug|Any CPU
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC}.Debug|x86.Build.0 = Debug|Any CPU
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC}.Release|x64.ActiveCfg = Release|Any CPU
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC}.Release|x64.Build.0 = Release|Any CPU
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC}.Release|x86.ActiveCfg = Release|Any CPU
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC}.Release|x86.Build.0 = Release|Any CPU
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84}.Debug|x64.Build.0 = Debug|Any CPU
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84}.Debug|x86.Build.0 = Debug|Any CPU
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84}.Release|x64.ActiveCfg = Release|Any CPU
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84}.Release|x64.Build.0 = Release|Any CPU
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84}.Release|x86.ActiveCfg = Release|Any CPU
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84}.Release|x86.Build.0 = Release|Any CPU
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}.Debug|x64.Build.0 = Debug|Any CPU
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}.Debug|x86.Build.0 = Debug|Any CPU
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}.Release|x64.ActiveCfg = Release|Any CPU
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}.Release|x64.Build.0 = Release|Any CPU
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}.Release|x86.ActiveCfg = Release|Any CPU
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3}.Release|x86.Build.0 = Release|Any CPU
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E}.Debug|x64.Build.0 = Debug|Any CPU
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E}.Debug|x86.Build.0 = Debug|Any CPU
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E}.Release|x64.ActiveCfg = Release|Any CPU
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E}.Release|x64.Build.0 = Release|Any CPU
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E}.Release|x86.ActiveCfg = Release|Any CPU
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E}.Release|x86.Build.0 = Release|Any CPU
+ {A567F04F-2C85-4D09-8C86-26A88F20C729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A567F04F-2C85-4D09-8C86-26A88F20C729}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A567F04F-2C85-4D09-8C86-26A88F20C729}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A567F04F-2C85-4D09-8C86-26A88F20C729}.Debug|x64.Build.0 = Debug|Any CPU
+ {A567F04F-2C85-4D09-8C86-26A88F20C729}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A567F04F-2C85-4D09-8C86-26A88F20C729}.Debug|x86.Build.0 = Debug|Any CPU
+ {A567F04F-2C85-4D09-8C86-26A88F20C729}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A567F04F-2C85-4D09-8C86-26A88F20C729}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A567F04F-2C85-4D09-8C86-26A88F20C729}.Release|x64.ActiveCfg = Release|Any CPU
+ {A567F04F-2C85-4D09-8C86-26A88F20C729}.Release|x64.Build.0 = Release|Any CPU
+ {A567F04F-2C85-4D09-8C86-26A88F20C729}.Release|x86.ActiveCfg = Release|Any CPU
+ {A567F04F-2C85-4D09-8C86-26A88F20C729}.Release|x86.Build.0 = Release|Any CPU
+ {406B4B46-6289-4061-984A-1DD9C9B6D329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {406B4B46-6289-4061-984A-1DD9C9B6D329}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {406B4B46-6289-4061-984A-1DD9C9B6D329}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {406B4B46-6289-4061-984A-1DD9C9B6D329}.Debug|x64.Build.0 = Debug|Any CPU
+ {406B4B46-6289-4061-984A-1DD9C9B6D329}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {406B4B46-6289-4061-984A-1DD9C9B6D329}.Debug|x86.Build.0 = Debug|Any CPU
+ {406B4B46-6289-4061-984A-1DD9C9B6D329}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {406B4B46-6289-4061-984A-1DD9C9B6D329}.Release|Any CPU.Build.0 = Release|Any CPU
+ {406B4B46-6289-4061-984A-1DD9C9B6D329}.Release|x64.ActiveCfg = Release|Any CPU
+ {406B4B46-6289-4061-984A-1DD9C9B6D329}.Release|x64.Build.0 = Release|Any CPU
+ {406B4B46-6289-4061-984A-1DD9C9B6D329}.Release|x86.ActiveCfg = Release|Any CPU
+ {406B4B46-6289-4061-984A-1DD9C9B6D329}.Release|x86.Build.0 = Release|Any CPU
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E}.Debug|x64.Build.0 = Debug|Any CPU
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E}.Debug|x86.Build.0 = Debug|Any CPU
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E}.Release|x64.ActiveCfg = Release|Any CPU
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E}.Release|x64.Build.0 = Release|Any CPU
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E}.Release|x86.ActiveCfg = Release|Any CPU
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E}.Release|x86.Build.0 = Release|Any CPU
+ {FC4215EC-D185-4698-AC55-ED953E10B042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FC4215EC-D185-4698-AC55-ED953E10B042}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FC4215EC-D185-4698-AC55-ED953E10B042}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {FC4215EC-D185-4698-AC55-ED953E10B042}.Debug|x64.Build.0 = Debug|Any CPU
+ {FC4215EC-D185-4698-AC55-ED953E10B042}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FC4215EC-D185-4698-AC55-ED953E10B042}.Debug|x86.Build.0 = Debug|Any CPU
+ {FC4215EC-D185-4698-AC55-ED953E10B042}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FC4215EC-D185-4698-AC55-ED953E10B042}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FC4215EC-D185-4698-AC55-ED953E10B042}.Release|x64.ActiveCfg = Release|Any CPU
+ {FC4215EC-D185-4698-AC55-ED953E10B042}.Release|x64.Build.0 = Release|Any CPU
+ {FC4215EC-D185-4698-AC55-ED953E10B042}.Release|x86.ActiveCfg = Release|Any CPU
+ {FC4215EC-D185-4698-AC55-ED953E10B042}.Release|x86.Build.0 = Release|Any CPU
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}.Debug|x64.Build.0 = Debug|Any CPU
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}.Debug|x86.Build.0 = Debug|Any CPU
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}.Release|x64.ActiveCfg = Release|Any CPU
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}.Release|x64.Build.0 = Release|Any CPU
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}.Release|x86.ActiveCfg = Release|Any CPU
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1}.Release|x86.Build.0 = Release|Any CPU
+ {7483F392-F394-46D6-9909-074D84CF09D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7483F392-F394-46D6-9909-074D84CF09D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7483F392-F394-46D6-9909-074D84CF09D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7483F392-F394-46D6-9909-074D84CF09D3}.Debug|x64.Build.0 = Debug|Any CPU
+ {7483F392-F394-46D6-9909-074D84CF09D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7483F392-F394-46D6-9909-074D84CF09D3}.Debug|x86.Build.0 = Debug|Any CPU
+ {7483F392-F394-46D6-9909-074D84CF09D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7483F392-F394-46D6-9909-074D84CF09D3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7483F392-F394-46D6-9909-074D84CF09D3}.Release|x64.ActiveCfg = Release|Any CPU
+ {7483F392-F394-46D6-9909-074D84CF09D3}.Release|x64.Build.0 = Release|Any CPU
+ {7483F392-F394-46D6-9909-074D84CF09D3}.Release|x86.ActiveCfg = Release|Any CPU
+ {7483F392-F394-46D6-9909-074D84CF09D3}.Release|x86.Build.0 = Release|Any CPU
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08}.Debug|x64.Build.0 = Debug|Any CPU
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08}.Debug|x86.Build.0 = Debug|Any CPU
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08}.Release|Any CPU.Build.0 = Release|Any CPU
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08}.Release|x64.ActiveCfg = Release|Any CPU
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08}.Release|x64.Build.0 = Release|Any CPU
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08}.Release|x86.ActiveCfg = Release|Any CPU
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08}.Release|x86.Build.0 = Release|Any CPU
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7}.Debug|x64.Build.0 = Debug|Any CPU
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7}.Debug|x86.Build.0 = Debug|Any CPU
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7}.Release|x64.ActiveCfg = Release|Any CPU
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7}.Release|x64.Build.0 = Release|Any CPU
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7}.Release|x86.ActiveCfg = Release|Any CPU
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7}.Release|x86.Build.0 = Release|Any CPU
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}.Debug|x64.Build.0 = Debug|Any CPU
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}.Debug|x86.Build.0 = Debug|Any CPU
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}.Release|x64.ActiveCfg = Release|Any CPU
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}.Release|x64.Build.0 = Release|Any CPU
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}.Release|x86.ActiveCfg = Release|Any CPU
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC}.Release|x86.Build.0 = Release|Any CPU
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213}.Debug|x64.Build.0 = Debug|Any CPU
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213}.Debug|x86.Build.0 = Debug|Any CPU
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213}.Release|x64.ActiveCfg = Release|Any CPU
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213}.Release|x64.Build.0 = Release|Any CPU
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213}.Release|x86.ActiveCfg = Release|Any CPU
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213}.Release|x86.Build.0 = Release|Any CPU
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B}.Debug|x64.Build.0 = Debug|Any CPU
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B}.Debug|x86.Build.0 = Debug|Any CPU
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B}.Release|x64.ActiveCfg = Release|Any CPU
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B}.Release|x64.Build.0 = Release|Any CPU
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B}.Release|x86.ActiveCfg = Release|Any CPU
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B}.Release|x86.Build.0 = Release|Any CPU
+ {3ADD636D-4F44-4941-838E-ED399C080D19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3ADD636D-4F44-4941-838E-ED399C080D19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3ADD636D-4F44-4941-838E-ED399C080D19}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {3ADD636D-4F44-4941-838E-ED399C080D19}.Debug|x64.Build.0 = Debug|Any CPU
+ {3ADD636D-4F44-4941-838E-ED399C080D19}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3ADD636D-4F44-4941-838E-ED399C080D19}.Debug|x86.Build.0 = Debug|Any CPU
+ {3ADD636D-4F44-4941-838E-ED399C080D19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3ADD636D-4F44-4941-838E-ED399C080D19}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3ADD636D-4F44-4941-838E-ED399C080D19}.Release|x64.ActiveCfg = Release|Any CPU
+ {3ADD636D-4F44-4941-838E-ED399C080D19}.Release|x64.Build.0 = Release|Any CPU
+ {3ADD636D-4F44-4941-838E-ED399C080D19}.Release|x86.ActiveCfg = Release|Any CPU
+ {3ADD636D-4F44-4941-838E-ED399C080D19}.Release|x86.Build.0 = Release|Any CPU
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992}.Debug|x64.Build.0 = Debug|Any CPU
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992}.Debug|x86.Build.0 = Debug|Any CPU
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992}.Release|x64.ActiveCfg = Release|Any CPU
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992}.Release|x64.Build.0 = Release|Any CPU
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992}.Release|x86.ActiveCfg = Release|Any CPU
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992}.Release|x86.Build.0 = Release|Any CPU
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}.Debug|x64.Build.0 = Debug|Any CPU
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}.Debug|x86.Build.0 = Debug|Any CPU
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}.Release|x64.ActiveCfg = Release|Any CPU
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}.Release|x64.Build.0 = Release|Any CPU
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}.Release|x86.ActiveCfg = Release|Any CPU
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B}.Release|x86.Build.0 = Release|Any CPU
+ {00447948-6BDD-4C7E-829A-06094B6F10D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {00447948-6BDD-4C7E-829A-06094B6F10D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {00447948-6BDD-4C7E-829A-06094B6F10D2}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {00447948-6BDD-4C7E-829A-06094B6F10D2}.Debug|x64.Build.0 = Debug|Any CPU
+ {00447948-6BDD-4C7E-829A-06094B6F10D2}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {00447948-6BDD-4C7E-829A-06094B6F10D2}.Debug|x86.Build.0 = Debug|Any CPU
+ {00447948-6BDD-4C7E-829A-06094B6F10D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {00447948-6BDD-4C7E-829A-06094B6F10D2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {00447948-6BDD-4C7E-829A-06094B6F10D2}.Release|x64.ActiveCfg = Release|Any CPU
+ {00447948-6BDD-4C7E-829A-06094B6F10D2}.Release|x64.Build.0 = Release|Any CPU
+ {00447948-6BDD-4C7E-829A-06094B6F10D2}.Release|x86.ActiveCfg = Release|Any CPU
+ {00447948-6BDD-4C7E-829A-06094B6F10D2}.Release|x86.Build.0 = Release|Any CPU
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9}.Debug|x64.Build.0 = Debug|Any CPU
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9}.Debug|x86.Build.0 = Debug|Any CPU
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9}.Release|x64.ActiveCfg = Release|Any CPU
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9}.Release|x64.Build.0 = Release|Any CPU
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9}.Release|x86.ActiveCfg = Release|Any CPU
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9}.Release|x86.Build.0 = Release|Any CPU
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}.Debug|x64.Build.0 = Debug|Any CPU
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}.Debug|x86.Build.0 = Debug|Any CPU
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}.Release|x64.ActiveCfg = Release|Any CPU
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}.Release|x64.Build.0 = Release|Any CPU
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}.Release|x86.ActiveCfg = Release|Any CPU
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D}.Release|x86.Build.0 = Release|Any CPU
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9}.Debug|x64.Build.0 = Debug|Any CPU
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9}.Debug|x86.Build.0 = Debug|Any CPU
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9}.Release|x64.ActiveCfg = Release|Any CPU
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9}.Release|x64.Build.0 = Release|Any CPU
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9}.Release|x86.ActiveCfg = Release|Any CPU
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9}.Release|x86.Build.0 = Release|Any CPU
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F}.Debug|x64.Build.0 = Debug|Any CPU
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F}.Debug|x86.Build.0 = Debug|Any CPU
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F}.Release|x64.ActiveCfg = Release|Any CPU
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F}.Release|x64.Build.0 = Release|Any CPU
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F}.Release|x86.ActiveCfg = Release|Any CPU
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F}.Release|x86.Build.0 = Release|Any CPU
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18}.Debug|x64.Build.0 = Debug|Any CPU
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18}.Debug|x86.Build.0 = Debug|Any CPU
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18}.Release|x64.ActiveCfg = Release|Any CPU
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18}.Release|x64.Build.0 = Release|Any CPU
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18}.Release|x86.ActiveCfg = Release|Any CPU
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18}.Release|x86.Build.0 = Release|Any CPU
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}.Debug|x64.Build.0 = Debug|Any CPU
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}.Debug|x86.Build.0 = Debug|Any CPU
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}.Release|x64.ActiveCfg = Release|Any CPU
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}.Release|x64.Build.0 = Release|Any CPU
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}.Release|x86.ActiveCfg = Release|Any CPU
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC}.Release|x86.Build.0 = Release|Any CPU
+ {A73934B4-9A86-412B-B619-A6682183DF25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A73934B4-9A86-412B-B619-A6682183DF25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A73934B4-9A86-412B-B619-A6682183DF25}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A73934B4-9A86-412B-B619-A6682183DF25}.Debug|x64.Build.0 = Debug|Any CPU
+ {A73934B4-9A86-412B-B619-A6682183DF25}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A73934B4-9A86-412B-B619-A6682183DF25}.Debug|x86.Build.0 = Debug|Any CPU
+ {A73934B4-9A86-412B-B619-A6682183DF25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A73934B4-9A86-412B-B619-A6682183DF25}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A73934B4-9A86-412B-B619-A6682183DF25}.Release|x64.ActiveCfg = Release|Any CPU
+ {A73934B4-9A86-412B-B619-A6682183DF25}.Release|x64.Build.0 = Release|Any CPU
+ {A73934B4-9A86-412B-B619-A6682183DF25}.Release|x86.ActiveCfg = Release|Any CPU
+ {A73934B4-9A86-412B-B619-A6682183DF25}.Release|x86.Build.0 = Release|Any CPU
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}.Debug|x64.Build.0 = Debug|Any CPU
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}.Debug|x86.Build.0 = Debug|Any CPU
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}.Release|x64.ActiveCfg = Release|Any CPU
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}.Release|x64.Build.0 = Release|Any CPU
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}.Release|x86.ActiveCfg = Release|Any CPU
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D}.Release|x86.Build.0 = Release|Any CPU
+ {4ECBDB74-B257-4B06-9872-28BD4D778735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4ECBDB74-B257-4B06-9872-28BD4D778735}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4ECBDB74-B257-4B06-9872-28BD4D778735}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4ECBDB74-B257-4B06-9872-28BD4D778735}.Debug|x64.Build.0 = Debug|Any CPU
+ {4ECBDB74-B257-4B06-9872-28BD4D778735}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4ECBDB74-B257-4B06-9872-28BD4D778735}.Debug|x86.Build.0 = Debug|Any CPU
+ {4ECBDB74-B257-4B06-9872-28BD4D778735}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4ECBDB74-B257-4B06-9872-28BD4D778735}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4ECBDB74-B257-4B06-9872-28BD4D778735}.Release|x64.ActiveCfg = Release|Any CPU
+ {4ECBDB74-B257-4B06-9872-28BD4D778735}.Release|x64.Build.0 = Release|Any CPU
+ {4ECBDB74-B257-4B06-9872-28BD4D778735}.Release|x86.ActiveCfg = Release|Any CPU
+ {4ECBDB74-B257-4B06-9872-28BD4D778735}.Release|x86.Build.0 = Release|Any CPU
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}.Debug|x64.Build.0 = Debug|Any CPU
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}.Debug|x86.Build.0 = Debug|Any CPU
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}.Release|x64.ActiveCfg = Release|Any CPU
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}.Release|x64.Build.0 = Release|Any CPU
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}.Release|x86.ActiveCfg = Release|Any CPU
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8}.Release|x86.Build.0 = Release|Any CPU
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}.Debug|x64.Build.0 = Debug|Any CPU
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}.Debug|x86.Build.0 = Debug|Any CPU
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}.Release|x64.ActiveCfg = Release|Any CPU
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}.Release|x64.Build.0 = Release|Any CPU
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}.Release|x86.ActiveCfg = Release|Any CPU
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3}.Release|x86.Build.0 = Release|Any CPU
+ {896752D7-939A-4BE0-BB75-1132A516D41D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {896752D7-939A-4BE0-BB75-1132A516D41D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {896752D7-939A-4BE0-BB75-1132A516D41D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {896752D7-939A-4BE0-BB75-1132A516D41D}.Debug|x64.Build.0 = Debug|Any CPU
+ {896752D7-939A-4BE0-BB75-1132A516D41D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {896752D7-939A-4BE0-BB75-1132A516D41D}.Debug|x86.Build.0 = Debug|Any CPU
+ {896752D7-939A-4BE0-BB75-1132A516D41D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {896752D7-939A-4BE0-BB75-1132A516D41D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {896752D7-939A-4BE0-BB75-1132A516D41D}.Release|x64.ActiveCfg = Release|Any CPU
+ {896752D7-939A-4BE0-BB75-1132A516D41D}.Release|x64.Build.0 = Release|Any CPU
+ {896752D7-939A-4BE0-BB75-1132A516D41D}.Release|x86.ActiveCfg = Release|Any CPU
+ {896752D7-939A-4BE0-BB75-1132A516D41D}.Release|x86.Build.0 = Release|Any CPU
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9}.Debug|x64.Build.0 = Debug|Any CPU
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9}.Debug|x86.Build.0 = Debug|Any CPU
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9}.Release|x64.ActiveCfg = Release|Any CPU
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9}.Release|x64.Build.0 = Release|Any CPU
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9}.Release|x86.ActiveCfg = Release|Any CPU
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9}.Release|x86.Build.0 = Release|Any CPU
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}.Debug|x64.Build.0 = Debug|Any CPU
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}.Debug|x86.Build.0 = Debug|Any CPU
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}.Release|x64.ActiveCfg = Release|Any CPU
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}.Release|x64.Build.0 = Release|Any CPU
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}.Release|x86.ActiveCfg = Release|Any CPU
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE}.Release|x86.Build.0 = Release|Any CPU
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA}.Debug|x64.Build.0 = Debug|Any CPU
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA}.Debug|x86.Build.0 = Debug|Any CPU
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA}.Release|x64.ActiveCfg = Release|Any CPU
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA}.Release|x64.Build.0 = Release|Any CPU
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA}.Release|x86.ActiveCfg = Release|Any CPU
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA}.Release|x86.Build.0 = Release|Any CPU
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}.Debug|x64.Build.0 = Debug|Any CPU
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}.Debug|x86.Build.0 = Debug|Any CPU
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}.Release|x64.ActiveCfg = Release|Any CPU
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}.Release|x64.Build.0 = Release|Any CPU
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}.Release|x86.ActiveCfg = Release|Any CPU
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1}.Release|x86.Build.0 = Release|Any CPU
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}.Debug|x64.Build.0 = Debug|Any CPU
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}.Debug|x86.Build.0 = Debug|Any CPU
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}.Release|x64.ActiveCfg = Release|Any CPU
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}.Release|x64.Build.0 = Release|Any CPU
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}.Release|x86.ActiveCfg = Release|Any CPU
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4}.Release|x86.Build.0 = Release|Any CPU
+ {E2589D5F-F774-413F-B26A-DF2173565B6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E2589D5F-F774-413F-B26A-DF2173565B6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E2589D5F-F774-413F-B26A-DF2173565B6C}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {E2589D5F-F774-413F-B26A-DF2173565B6C}.Debug|x64.Build.0 = Debug|Any CPU
+ {E2589D5F-F774-413F-B26A-DF2173565B6C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {E2589D5F-F774-413F-B26A-DF2173565B6C}.Debug|x86.Build.0 = Debug|Any CPU
+ {E2589D5F-F774-413F-B26A-DF2173565B6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E2589D5F-F774-413F-B26A-DF2173565B6C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E2589D5F-F774-413F-B26A-DF2173565B6C}.Release|x64.ActiveCfg = Release|Any CPU
+ {E2589D5F-F774-413F-B26A-DF2173565B6C}.Release|x64.Build.0 = Release|Any CPU
+ {E2589D5F-F774-413F-B26A-DF2173565B6C}.Release|x86.ActiveCfg = Release|Any CPU
+ {E2589D5F-F774-413F-B26A-DF2173565B6C}.Release|x86.Build.0 = Release|Any CPU
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}.Debug|x64.Build.0 = Debug|Any CPU
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}.Debug|x86.Build.0 = Debug|Any CPU
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}.Release|x64.ActiveCfg = Release|Any CPU
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}.Release|x64.Build.0 = Release|Any CPU
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}.Release|x86.ActiveCfg = Release|Any CPU
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3}.Release|x86.Build.0 = Release|Any CPU
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}.Debug|x64.Build.0 = Debug|Any CPU
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}.Debug|x86.Build.0 = Debug|Any CPU
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}.Release|x64.ActiveCfg = Release|Any CPU
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}.Release|x64.Build.0 = Release|Any CPU
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}.Release|x86.ActiveCfg = Release|Any CPU
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F}.Release|x86.Build.0 = Release|Any CPU
+ {C2C58C19-DF71-4E78-A658-84AF01146637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C2C58C19-DF71-4E78-A658-84AF01146637}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C2C58C19-DF71-4E78-A658-84AF01146637}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {C2C58C19-DF71-4E78-A658-84AF01146637}.Debug|x64.Build.0 = Debug|Any CPU
+ {C2C58C19-DF71-4E78-A658-84AF01146637}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C2C58C19-DF71-4E78-A658-84AF01146637}.Debug|x86.Build.0 = Debug|Any CPU
+ {C2C58C19-DF71-4E78-A658-84AF01146637}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C2C58C19-DF71-4E78-A658-84AF01146637}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C2C58C19-DF71-4E78-A658-84AF01146637}.Release|x64.ActiveCfg = Release|Any CPU
+ {C2C58C19-DF71-4E78-A658-84AF01146637}.Release|x64.Build.0 = Release|Any CPU
+ {C2C58C19-DF71-4E78-A658-84AF01146637}.Release|x86.ActiveCfg = Release|Any CPU
+ {C2C58C19-DF71-4E78-A658-84AF01146637}.Release|x86.Build.0 = Release|Any CPU
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB}.Debug|x64.Build.0 = Debug|Any CPU
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB}.Debug|x86.Build.0 = Debug|Any CPU
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB}.Release|x64.ActiveCfg = Release|Any CPU
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB}.Release|x64.Build.0 = Release|Any CPU
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB}.Release|x86.ActiveCfg = Release|Any CPU
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB}.Release|x86.Build.0 = Release|Any CPU
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F}.Debug|x64.Build.0 = Debug|Any CPU
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F}.Debug|x86.Build.0 = Debug|Any CPU
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F}.Release|x64.ActiveCfg = Release|Any CPU
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F}.Release|x64.Build.0 = Release|Any CPU
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F}.Release|x86.ActiveCfg = Release|Any CPU
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F}.Release|x86.Build.0 = Release|Any CPU
+ {50B6D43E-2677-4818-923E-54EF513675F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {50B6D43E-2677-4818-923E-54EF513675F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {50B6D43E-2677-4818-923E-54EF513675F8}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {50B6D43E-2677-4818-923E-54EF513675F8}.Debug|x64.Build.0 = Debug|Any CPU
+ {50B6D43E-2677-4818-923E-54EF513675F8}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {50B6D43E-2677-4818-923E-54EF513675F8}.Debug|x86.Build.0 = Debug|Any CPU
+ {50B6D43E-2677-4818-923E-54EF513675F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {50B6D43E-2677-4818-923E-54EF513675F8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {50B6D43E-2677-4818-923E-54EF513675F8}.Release|x64.ActiveCfg = Release|Any CPU
+ {50B6D43E-2677-4818-923E-54EF513675F8}.Release|x64.Build.0 = Release|Any CPU
+ {50B6D43E-2677-4818-923E-54EF513675F8}.Release|x86.ActiveCfg = Release|Any CPU
+ {50B6D43E-2677-4818-923E-54EF513675F8}.Release|x86.Build.0 = Release|Any CPU
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30}.Debug|x64.Build.0 = Debug|Any CPU
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30}.Debug|x86.Build.0 = Debug|Any CPU
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30}.Release|x64.ActiveCfg = Release|Any CPU
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30}.Release|x64.Build.0 = Release|Any CPU
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30}.Release|x86.ActiveCfg = Release|Any CPU
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30}.Release|x86.Build.0 = Release|Any CPU
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}.Debug|x64.Build.0 = Debug|Any CPU
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}.Debug|x86.Build.0 = Debug|Any CPU
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}.Release|x64.ActiveCfg = Release|Any CPU
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}.Release|x64.Build.0 = Release|Any CPU
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}.Release|x86.ActiveCfg = Release|Any CPU
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7}.Release|x86.Build.0 = Release|Any CPU
+ {121C4468-A224-4DDB-B7C5-704EE0319A26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {121C4468-A224-4DDB-B7C5-704EE0319A26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {121C4468-A224-4DDB-B7C5-704EE0319A26}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {121C4468-A224-4DDB-B7C5-704EE0319A26}.Debug|x64.Build.0 = Debug|Any CPU
+ {121C4468-A224-4DDB-B7C5-704EE0319A26}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {121C4468-A224-4DDB-B7C5-704EE0319A26}.Debug|x86.Build.0 = Debug|Any CPU
+ {121C4468-A224-4DDB-B7C5-704EE0319A26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {121C4468-A224-4DDB-B7C5-704EE0319A26}.Release|Any CPU.Build.0 = Release|Any CPU
+ {121C4468-A224-4DDB-B7C5-704EE0319A26}.Release|x64.ActiveCfg = Release|Any CPU
+ {121C4468-A224-4DDB-B7C5-704EE0319A26}.Release|x64.Build.0 = Release|Any CPU
+ {121C4468-A224-4DDB-B7C5-704EE0319A26}.Release|x86.ActiveCfg = Release|Any CPU
+ {121C4468-A224-4DDB-B7C5-704EE0319A26}.Release|x86.Build.0 = Release|Any CPU
+ {D593E79F-22A8-45A4-A34A-187B3D383A21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D593E79F-22A8-45A4-A34A-187B3D383A21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D593E79F-22A8-45A4-A34A-187B3D383A21}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {D593E79F-22A8-45A4-A34A-187B3D383A21}.Debug|x64.Build.0 = Debug|Any CPU
+ {D593E79F-22A8-45A4-A34A-187B3D383A21}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D593E79F-22A8-45A4-A34A-187B3D383A21}.Debug|x86.Build.0 = Debug|Any CPU
+ {D593E79F-22A8-45A4-A34A-187B3D383A21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D593E79F-22A8-45A4-A34A-187B3D383A21}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D593E79F-22A8-45A4-A34A-187B3D383A21}.Release|x64.ActiveCfg = Release|Any CPU
+ {D593E79F-22A8-45A4-A34A-187B3D383A21}.Release|x64.Build.0 = Release|Any CPU
+ {D593E79F-22A8-45A4-A34A-187B3D383A21}.Release|x86.ActiveCfg = Release|Any CPU
+ {D593E79F-22A8-45A4-A34A-187B3D383A21}.Release|x86.Build.0 = Release|Any CPU
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D}.Debug|x64.Build.0 = Debug|Any CPU
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D}.Debug|x86.Build.0 = Debug|Any CPU
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D}.Release|x64.ActiveCfg = Release|Any CPU
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D}.Release|x64.Build.0 = Release|Any CPU
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D}.Release|x86.ActiveCfg = Release|Any CPU
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D}.Release|x86.Build.0 = Release|Any CPU
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A}.Debug|x64.Build.0 = Debug|Any CPU
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A}.Debug|x86.Build.0 = Debug|Any CPU
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A}.Release|x64.ActiveCfg = Release|Any CPU
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A}.Release|x64.Build.0 = Release|Any CPU
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A}.Release|x86.ActiveCfg = Release|Any CPU
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A}.Release|x86.Build.0 = Release|Any CPU
+ {99CCB774-5298-4E22-8F56-073B231D0A3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {99CCB774-5298-4E22-8F56-073B231D0A3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {99CCB774-5298-4E22-8F56-073B231D0A3D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {99CCB774-5298-4E22-8F56-073B231D0A3D}.Debug|x64.Build.0 = Debug|Any CPU
+ {99CCB774-5298-4E22-8F56-073B231D0A3D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {99CCB774-5298-4E22-8F56-073B231D0A3D}.Debug|x86.Build.0 = Debug|Any CPU
+ {99CCB774-5298-4E22-8F56-073B231D0A3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {99CCB774-5298-4E22-8F56-073B231D0A3D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {99CCB774-5298-4E22-8F56-073B231D0A3D}.Release|x64.ActiveCfg = Release|Any CPU
+ {99CCB774-5298-4E22-8F56-073B231D0A3D}.Release|x64.Build.0 = Release|Any CPU
+ {99CCB774-5298-4E22-8F56-073B231D0A3D}.Release|x86.ActiveCfg = Release|Any CPU
+ {99CCB774-5298-4E22-8F56-073B231D0A3D}.Release|x86.Build.0 = Release|Any CPU
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7}.Debug|x64.Build.0 = Debug|Any CPU
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7}.Debug|x86.Build.0 = Debug|Any CPU
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7}.Release|x64.ActiveCfg = Release|Any CPU
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7}.Release|x64.Build.0 = Release|Any CPU
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7}.Release|x86.ActiveCfg = Release|Any CPU
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7}.Release|x86.Build.0 = Release|Any CPU
+ {B4C977F0-9027-4728-9F50-C895E71582A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B4C977F0-9027-4728-9F50-C895E71582A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B4C977F0-9027-4728-9F50-C895E71582A5}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B4C977F0-9027-4728-9F50-C895E71582A5}.Debug|x64.Build.0 = Debug|Any CPU
+ {B4C977F0-9027-4728-9F50-C895E71582A5}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B4C977F0-9027-4728-9F50-C895E71582A5}.Debug|x86.Build.0 = Debug|Any CPU
+ {B4C977F0-9027-4728-9F50-C895E71582A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B4C977F0-9027-4728-9F50-C895E71582A5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B4C977F0-9027-4728-9F50-C895E71582A5}.Release|x64.ActiveCfg = Release|Any CPU
+ {B4C977F0-9027-4728-9F50-C895E71582A5}.Release|x64.Build.0 = Release|Any CPU
+ {B4C977F0-9027-4728-9F50-C895E71582A5}.Release|x86.ActiveCfg = Release|Any CPU
+ {B4C977F0-9027-4728-9F50-C895E71582A5}.Release|x86.Build.0 = Release|Any CPU
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}.Debug|x64.Build.0 = Debug|Any CPU
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}.Debug|x86.Build.0 = Debug|Any CPU
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}.Release|x64.ActiveCfg = Release|Any CPU
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}.Release|x64.Build.0 = Release|Any CPU
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}.Release|x86.ActiveCfg = Release|Any CPU
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E}.Release|x86.Build.0 = Release|Any CPU
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8}.Debug|x64.Build.0 = Debug|Any CPU
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8}.Debug|x86.Build.0 = Debug|Any CPU
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8}.Release|x64.ActiveCfg = Release|Any CPU
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8}.Release|x64.Build.0 = Release|Any CPU
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8}.Release|x86.ActiveCfg = Release|Any CPU
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8}.Release|x86.Build.0 = Release|Any CPU
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1}.Debug|x64.Build.0 = Debug|Any CPU
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1}.Debug|x86.Build.0 = Debug|Any CPU
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1}.Release|x64.ActiveCfg = Release|Any CPU
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1}.Release|x64.Build.0 = Release|Any CPU
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1}.Release|x86.ActiveCfg = Release|Any CPU
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1}.Release|x86.Build.0 = Release|Any CPU
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137}.Debug|x64.Build.0 = Debug|Any CPU
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137}.Debug|x86.Build.0 = Debug|Any CPU
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137}.Release|x64.ActiveCfg = Release|Any CPU
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137}.Release|x64.Build.0 = Release|Any CPU
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137}.Release|x86.ActiveCfg = Release|Any CPU
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137}.Release|x86.Build.0 = Release|Any CPU
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}.Debug|x64.Build.0 = Debug|Any CPU
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}.Debug|x86.Build.0 = Debug|Any CPU
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}.Release|x64.ActiveCfg = Release|Any CPU
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}.Release|x64.Build.0 = Release|Any CPU
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}.Release|x86.ActiveCfg = Release|Any CPU
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0}.Release|x86.Build.0 = Release|Any CPU
+ {FFA9F547-B412-47D3-AA65-581B51F765A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FFA9F547-B412-47D3-AA65-581B51F765A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FFA9F547-B412-47D3-AA65-581B51F765A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {FFA9F547-B412-47D3-AA65-581B51F765A8}.Debug|x64.Build.0 = Debug|Any CPU
+ {FFA9F547-B412-47D3-AA65-581B51F765A8}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FFA9F547-B412-47D3-AA65-581B51F765A8}.Debug|x86.Build.0 = Debug|Any CPU
+ {FFA9F547-B412-47D3-AA65-581B51F765A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FFA9F547-B412-47D3-AA65-581B51F765A8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FFA9F547-B412-47D3-AA65-581B51F765A8}.Release|x64.ActiveCfg = Release|Any CPU
+ {FFA9F547-B412-47D3-AA65-581B51F765A8}.Release|x64.Build.0 = Release|Any CPU
+ {FFA9F547-B412-47D3-AA65-581B51F765A8}.Release|x86.ActiveCfg = Release|Any CPU
+ {FFA9F547-B412-47D3-AA65-581B51F765A8}.Release|x86.Build.0 = Release|Any CPU
+ {658DAA95-3941-448A-AF39-C2826043716D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {658DAA95-3941-448A-AF39-C2826043716D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {658DAA95-3941-448A-AF39-C2826043716D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {658DAA95-3941-448A-AF39-C2826043716D}.Debug|x64.Build.0 = Debug|Any CPU
+ {658DAA95-3941-448A-AF39-C2826043716D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {658DAA95-3941-448A-AF39-C2826043716D}.Debug|x86.Build.0 = Debug|Any CPU
+ {658DAA95-3941-448A-AF39-C2826043716D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {658DAA95-3941-448A-AF39-C2826043716D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {658DAA95-3941-448A-AF39-C2826043716D}.Release|x64.ActiveCfg = Release|Any CPU
+ {658DAA95-3941-448A-AF39-C2826043716D}.Release|x64.Build.0 = Release|Any CPU
+ {658DAA95-3941-448A-AF39-C2826043716D}.Release|x86.ActiveCfg = Release|Any CPU
+ {658DAA95-3941-448A-AF39-C2826043716D}.Release|x86.Build.0 = Release|Any CPU
+ {3F5589F9-5D13-4662-96C6-52367D14061C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3F5589F9-5D13-4662-96C6-52367D14061C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3F5589F9-5D13-4662-96C6-52367D14061C}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {3F5589F9-5D13-4662-96C6-52367D14061C}.Debug|x64.Build.0 = Debug|Any CPU
+ {3F5589F9-5D13-4662-96C6-52367D14061C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3F5589F9-5D13-4662-96C6-52367D14061C}.Debug|x86.Build.0 = Debug|Any CPU
+ {3F5589F9-5D13-4662-96C6-52367D14061C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3F5589F9-5D13-4662-96C6-52367D14061C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3F5589F9-5D13-4662-96C6-52367D14061C}.Release|x64.ActiveCfg = Release|Any CPU
+ {3F5589F9-5D13-4662-96C6-52367D14061C}.Release|x64.Build.0 = Release|Any CPU
+ {3F5589F9-5D13-4662-96C6-52367D14061C}.Release|x86.ActiveCfg = Release|Any CPU
+ {3F5589F9-5D13-4662-96C6-52367D14061C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0} = {B7B176B6-8D4D-4EF1-BBD2-DDA650C78FFF}
- {CA663205-77DE-4E55-B300-85594181B5A9} = {363D2681-31A6-48C9-90BB-9ACFF4A41F06}
- {72A5F455-121F-4954-BF28-D712C6BE88EA} = {363D2681-31A6-48C9-90BB-9ACFF4A41F06}
+ {DECBCA36-8E91-4A46-914D-832ECCE7D3F4} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {28C13B1C-3037-453F-B6CD-B30FC8106E06} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {F189E09E-0C64-4A20-B148-D6502D3CD166} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {809B5BC8-F020-4B78-9FD2-FC8704FA89D9} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {7F608EFD-817B-4240-A6D4-B82CAC0C1CCE} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {DB308907-C606-4C31-B55B-E8CC2625FE8A} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {6A7A7A6E-7593-44D3-A96F-CCFC6FF4E623} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {6DDE1B56-A1E4-4E3C-BF83-8236C46FB62F} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {C73F656D-41B6-4610-B9DD-8B0F5C2589EC} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {7F5C0B6A-006E-456F-A806-1B0F502A9D84} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {04B04AE5-7AA4-4894-8EA4-C08000A4F9F3} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {1812726B-6B81-4038-B1A0-C42A7CB6E83E} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {A567F04F-2C85-4D09-8C86-26A88F20C729} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {406B4B46-6289-4061-984A-1DD9C9B6D329} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {CB0A64E2-DD42-43D9-B253-D94C2487BA0E} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {FC4215EC-D185-4698-AC55-ED953E10B042} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {8C94398F-BF49-4D0D-8A60-AED8BC6E53A1} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {7483F392-F394-46D6-9909-074D84CF09D3} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {144D7C8F-AF14-43EE-9720-EA4CF20F9C08} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {9F2C5373-27A5-4357-8A7A-4F22176AD5D7} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {7B89A938-E9F0-4D09-8F47-D0E2B6B1E8AC} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {CF91C6AB-B977-41FE-B26A-D8095BBF4213} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {95F6D15B-293F-4E23-BCC6-FD81B40E886B} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {3ADD636D-4F44-4941-838E-ED399C080D19} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {4D95736B-7CC7-4CBE-BCA4-131F23D5D992} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {004D3BCB-6585-4317-BF8E-5BA3F07ACA3B} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {00447948-6BDD-4C7E-829A-06094B6F10D2} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {8D8F84CB-2E48-42D3-8E48-D6213290FFB9} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {FC10BAD6-EC2E-4E9F-9BB7-1E33306A5D4D} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {353FE180-8B31-4947-9407-3FA1EE8DA8B9} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {11B29D93-5CD7-4282-98C8-124E5B16DD3F} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {7FB812C6-617D-41C3-A08D-57CE93A9AA18} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {2AE8210B-8C1E-4C0B-A94E-D4C8209E49EC} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {A73934B4-9A86-412B-B619-A6682183DF25} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {C76336AB-F5C5-4DC2-91AD-A1C891F6FA6D} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {4ECBDB74-B257-4B06-9872-28BD4D778735} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {BBD295AC-C95C-481C-B44B-9EB7C9EB85E8} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {3E75B412-69C0-4BD0-9DF0-2A2C865DAEB3} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {896752D7-939A-4BE0-BB75-1132A516D41D} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {D8ED97C5-C491-4D4B-8B01-435835E7AAA9} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {6192109A-C3D2-4BFC-84FC-BEF2AD074DBE} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {B6F13159-2E4D-4F86-A2F2-AFD3536105DA} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {3E89B6A4-A54F-4ADD-93A0-066D4165F3D1} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {688FC3EF-7A2A-4E20-8AEA-BF9EE02211C4} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {E2589D5F-F774-413F-B26A-DF2173565B6C} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {D564FC69-B6C2-4EA3-ADF0-DAA3C95057B3} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {3FA0A685-B35C-4B9A-B933-BBCFBC945D2F} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {C2C58C19-DF71-4E78-A658-84AF01146637} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {7BDC3249-5402-4DFF-A34B-C2E8262568AB} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {2F9FF701-31CA-43D9-9212-21CF3640F54F} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {50B6D43E-2677-4818-923E-54EF513675F8} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {3B68E545-0B46-4089-B46C-29A01EC6BF30} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {1A54B5FD-6A71-44C5-BC1B-CEA670F684F7} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {121C4468-A224-4DDB-B7C5-704EE0319A26} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {D593E79F-22A8-45A4-A34A-187B3D383A21} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {42F24A07-6C68-4E5E-B533-01AE81FCFB0D} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {8305691A-DD86-4BB3-B79A-DBB28980EE5A} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {99CCB774-5298-4E22-8F56-073B231D0A3D} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {39AEA24E-6D73-4EB1-9773-5BCF02957AC7} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {B4C977F0-9027-4728-9F50-C895E71582A5} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {D3C9F8FC-B101-4CA9-B68C-EE2F2C88CF6E} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {E12AA11A-AD3B-42A3-9200-C22644959EA8} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {CA51F9EF-137E-4679-AFBC-298FCDF027E1} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {7A3B24E6-3620-4018-A7BE-DE5B3BB38137} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {501E13FC-E3BD-4C03-9AFB-DD39A5260DF0} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {FFA9F547-B412-47D3-AA65-581B51F765A8} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {658DAA95-3941-448A-AF39-C2826043716D} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
+ {3F5589F9-5D13-4662-96C6-52367D14061C} = {B21EACAA-1EBC-45D3-8831-8A8E7888CD03}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4AC7A44E-260A-4E70-88A7-77A0027E12A5}
diff --git a/src/MusicStore/samples/MusicStore/Controllers/CheckoutController.cs b/src/MusicStore/samples/MusicStore/Controllers/CheckoutController.cs
index 5f7a5e2ae8..ff26a5ed71 100644
--- a/src/MusicStore/samples/MusicStore/Controllers/CheckoutController.cs
+++ b/src/MusicStore/samples/MusicStore/Controllers/CheckoutController.cs
@@ -66,16 +66,17 @@ namespace MusicStore.Controllers
var cart = ShoppingCart.GetCart(dbContext, HttpContext);
await cart.CreateOrder(order);
- _logger.LogInformation("User {userName} started checkout of {orderId}.", order.Username, order.OrderId);
-
// Save all changes
await dbContext.SaveChangesAsync(requestAborted);
+ _logger.LogInformation("User {userName} started checkout of {orderId}.", order.Username, order.OrderId);
+
return RedirectToAction("Complete", new { id = order.OrderId });
}
}
- catch
+ catch (Exception ex)
{
+ _logger.LogError(ex, "Checkout failed");
//Invalid - redisplay with errors
return View(order);
}
@@ -110,4 +111,4 @@ namespace MusicStore.Controllers
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/MusicStore/samples/MusicStore/Models/ShoppingCart.cs b/src/MusicStore/samples/MusicStore/Models/ShoppingCart.cs
index 5d05325401..cdc21eb01d 100644
--- a/src/MusicStore/samples/MusicStore/Models/ShoppingCart.cs
+++ b/src/MusicStore/samples/MusicStore/Models/ShoppingCart.cs
@@ -18,7 +18,7 @@ namespace MusicStore.Models
_shoppingCartId = id;
}
- public static ShoppingCart GetCart(MusicStoreContext db, HttpContext context)
+ public static ShoppingCart GetCart(MusicStoreContext db, HttpContext context)
=> GetCart(db, GetCartId(context));
public static ShoppingCart GetCart(MusicStoreContext db, string cartId)
@@ -94,7 +94,7 @@ namespace MusicStore.Models
.Include(c => c.Album)
.ToListAsync();
}
-
+
public Task> GetCartAlbumTitles()
{
return _dbContext
@@ -117,7 +117,7 @@ namespace MusicStore.Models
public Task GetTotal()
{
- // Multiply album price by count of that album to get
+ // Multiply album price by count of that album to get
// the current price for each of those albums in the cart
// sum all album price totals to get the cart total
@@ -128,7 +128,7 @@ namespace MusicStore.Models
.SumAsync();
}
- public async Task CreateOrder(Order order)
+ public async Task CreateOrder(Order order)
{
decimal orderTotal = 0;
@@ -143,7 +143,7 @@ namespace MusicStore.Models
var orderDetail = new OrderDetail
{
AlbumId = item.AlbumId,
- OrderId = order.OrderId,
+ Order = order,
UnitPrice = album.Price,
Quantity = item.Count,
};
@@ -159,9 +159,6 @@ namespace MusicStore.Models
// Empty the shopping cart
await EmptyCart();
-
- // Return the OrderId as the confirmation number
- return order.OrderId;
}
// We're using HttpContextBase to allow access to sessions.
@@ -171,7 +168,7 @@ namespace MusicStore.Models
if (cartId == null)
{
- //A GUID to hold the cartId.
+ //A GUID to hold the cartId.
cartId = Guid.NewGuid().ToString();
// Send cart Id as a cookie to the client.
@@ -181,4 +178,4 @@ namespace MusicStore.Models
return cartId;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj
index ca1966649d..f720307d05 100644
--- a/src/MusicStore/samples/MusicStore/MusicStore.csproj
+++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj
@@ -1,4 +1,4 @@
-
+
@@ -6,22 +6,15 @@
Music store application on ASP.NET Core
netcoreapp3.0
$(DefineConstants);DEMO
- true
win7-x86;win7-x64;linux-x64;osx-x64
- Debug;Release;RuntimeStore
true
- AspNetCoreModuleV2
-
-
-
-
-
+
diff --git a/src/MusicStore/startvs.cmd b/src/MusicStore/startvs.cmd
new file mode 100644
index 0000000000..1daed6b6ff
--- /dev/null
+++ b/src/MusicStore/startvs.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvs.cmd %~dp0MusicStore.sln
diff --git a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
index 3603ca8429..d5a887ef27 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
+++ b/src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj
@@ -20,7 +20,7 @@
-
+
diff --git a/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs b/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
index 59d668d09e..aa547f15e8 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/NtlmAuthentationTest.cs
@@ -20,6 +20,7 @@ namespace E2ETests
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30)
.WithAllApplicationTypes()
+ .WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllArchitectures();
[ConditionalTheory]
diff --git a/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs b/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs
index dd47eb8740..9d7ecf2855 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/OpenIdConnectTests.cs
@@ -15,6 +15,7 @@ namespace E2ETests
{
public static TestMatrix TestVariants
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel)
+ .WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithTfms(Tfm.NetCoreApp30);
[ConditionalTheory]
diff --git a/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs b/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs
index 8105744498..3c5254cc0e 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/PublishAndRunTests.cs
@@ -18,7 +18,7 @@ namespace E2ETests
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30)
.WithAllApplicationTypes()
- .WithAllAncmVersions()
+ .WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels()
.WithAllArchitectures();
diff --git a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs
index 7ac9817197..9aac88e225 100644
--- a/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs
+++ b/src/MusicStore/test/MusicStore.E2ETests/SmokeTests.cs
@@ -19,7 +19,7 @@ namespace E2ETests
=> TestMatrix.ForServers(ServerType.IISExpress, ServerType.Kestrel, ServerType.HttpSys)
.WithTfms(Tfm.NetCoreApp30)
.WithAllApplicationTypes()
- .WithAllAncmVersions()
+ .WithAncmVersions(AncmVersion.AspNetCoreModuleV2)
.WithAllHostingModels();
[ConditionalTheory]
diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln
index 316098c927..66b627bbb8 100644
--- a/src/Mvc/Mvc.sln
+++ b/src/Mvc/Mvc.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
-VisualStudioVersion = 16.0.28414.68
+VisualStudioVersion = 16.0.28531.181
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}"
EndProject
@@ -158,90 +158,90 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesClassLibrary", "t
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Views.TestCommon", "test\Microsoft.AspNetCore.Mvc.Views.TestCommon\Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj", "{51E3E785-A9D1-4196-BAFE-A17FF4304B89}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarkapps", "benchmarkapps", "{2859F266-673A-45A2-9E3C-7B39C6DDD38E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicApi", "benchmarkapps\BasicApi\BasicApi.csproj", "{910F023A-88E3-4CB4-8793-AC4005C7B421}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicViews", "benchmarkapps\BasicViews\BasicViews.csproj", "{E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Api.Analyzers.Test", "test\Mvc.Api.Analyzers.Test\Mvc.Api.Analyzers.Test.csproj", "{DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Api.Analyzers", "src\Microsoft.AspNetCore.Mvc.Api.Analyzers\Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj", "{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorRendering", "benchmarkapps\RazorRendering\RazorRendering.csproj", "{D7C6A696-F232-4288-BCCD-367407E4A934}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-getdocument", "src\dotnet-getdocument\dotnet-getdocument.csproj", "{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GetDocumentInsider", "src\GetDocumentInsider\GetDocumentInsider.csproj", "{2F683CF8-B055-46AE-BF83-9D1307F8D45F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApiDescription.Design", "src\Microsoft.Extensions.ApiDescription.Design\Microsoft.Extensions.ApiDescription.Design.csproj", "{34E3C302-B767-40C8-B538-3EE2BD4000C4}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Html.Abstractions", "..\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj", "{0930C2EA-FA36-4EDF-A571-215765D1F2C7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{A273BAAB-DA92-401D-B781-ADA9E3B7717C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors", "..\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj", "{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{2E18C4FD-9982-4BD9-A067-3CE56E68C450}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{BCD18147-D96D-4240-A89F-5F890392E58E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "..\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{986BF4FD-D0E3-48AE-917C-6C168D6395D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching", "..\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj", "{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session", "..\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj", "{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization.Routing", "..\Middleware\Localization.Routing\src\Microsoft.AspNetCore.Localization.Routing.csproj", "{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "..\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{9F2C52EA-1869-4610-921F-5FD654582019}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{AA074523-64D3-4CA7-8C2E-EACD977D2B19}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication", "..\Security\Authentication\Core\src\Microsoft.AspNetCore.Authentication.csproj", "{72D40CFE-93B5-4877-92DC-E79203641342}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{62952E87-88DB-45BA-9FE0-8A24FA983750}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "..\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Policy", "..\Security\Authorization\Policy\src\Microsoft.AspNetCore.Authorization.Policy.csproj", "{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "..\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj", "{457D7B8F-C81D-4F0C-BE88-B0516374944E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "..\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{69D6513F-66AD-44C6-BD3F-8DE78CB4398F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.JwtBearer", "..\Security\Authentication\JwtBearer\src\Microsoft.AspNetCore.Authentication.JwtBearer.csproj", "{1348A3AB-8401-4DAE-90CC-A5907ED52A36}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "..\Hosting\Server.Abstractions\src\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj", "{1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "..\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{94A04746-8698-4DEF-BCFC-8BA2D3F8A451}"
+EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance.Views", "benchmarks\Microsoft.AspNetCore.Mvc.Performance.Views\Microsoft.AspNetCore.Mvc.Performance.Views.csproj", "{0CA44B59-6538-4668-BB5E-D586946426F3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.JsonPatch", "..\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj", "{0F41EB10-BD4E-443C-868B-95109F0843E0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization", "..\Middleware\Localization\src\Microsoft.AspNetCore.Localization.csproj", "{68C06221-185E-41E3-B2C8-B4A1B3D20631}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "..\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{AFA70552-7405-4655-8899-FED6B5F393BD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "..\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{47F3C605-0674-4943-A378-45B4A54B5F14}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Antiforgery", "..\Antiforgery\src\Microsoft.AspNetCore.Antiforgery.csproj", "{9C584DF9-CDF2-4522-A0A5-55AAE36820EC}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Html.Abstractions", "..\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj", "{CFEFED8B-D109-4628-BE40-B02A3A659AB0}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Abstractions", "..\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj", "{C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors", "..\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj", "{5C838817-4DEC-4BA0-BACC-2F512B8245AC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "..\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "..\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj", "{E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Extensions", "..\Http\Http.Extensions\src\Microsoft.AspNetCore.Http.Extensions.csproj", "{0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching.Abstractions", "..\Middleware\ResponseCaching.Abstractions\src\Microsoft.AspNetCore.ResponseCaching.Abstractions.csproj", "{A04124E5-E4AA-4311-8049-DAF371871B31}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Policy", "..\Security\Authorization\Policy\src\Microsoft.AspNetCore.Authorization.Policy.csproj", "{A6018CDE-37DD-4317-80EB-01DB306EA5B9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{B3AE9A77-1198-4974-AA78-531CE6C568F3}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Core", "..\Http\Authentication.Core\src\Microsoft.AspNetCore.Authentication.Core.csproj", "{F95DC77B-CA52-4BBB-817E-79ABFE330C5C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Http.Headers", "..\Http\Headers\src\Microsoft.Net.Http.Headers.csproj", "{1024A6BE-E0AF-4170-B61D-E6C092780195}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{0F04DD66-08B7-47F4-9826-66CD8FD539FF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{9328599D-A7AF-43BC-BE08-7503DF9B8CE6}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", "..\Servers\Kestrel\Transport.Sockets\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "{449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Core", "..\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj", "{39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "..\Hosting\Server.Abstractions\src\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj", "{CC2FF678-438C-4343-A1A7-BF3E75470EB9}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions", "..\Http\Http.Abstractions\src\Microsoft.AspNetCore.Http.Abstractions.csproj", "{8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{C185A2B1-64C0-491B-9AAE-382C24F9B4AE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{B37FF37D-0A47-494A-B5ED-497F273B9067}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{22F657F5-7D95-438A-985A-A390938E7843}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{731B64B8-AB91-4A05-AE5C-929996D58A52}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{2D665D68-BF48-41E0-B74C-A88A83F8AFD5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication", "..\Security\Authentication\Core\src\Microsoft.AspNetCore.Authentication.csproj", "{E07090BD-05AF-4DC0-9D59-35EF70EBC764}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.JwtBearer", "..\Security\Authentication\JwtBearer\src\Microsoft.AspNetCore.Authentication.JwtBearer.csproj", "{22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session", "..\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj", "{E335D925-771A-4FB9-A94C-1D74A8F01DCE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "..\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{FF88FB5E-0096-4096-A0D7-FCFE5D55F164}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization.Routing", "..\Middleware\Localization.Routing\src\Microsoft.AspNetCore.Localization.Routing.csproj", "{4D04F472-8E7C-487D-8B57-9533B1F7F3DE}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization", "..\Security\Authorization\Core\src\Microsoft.AspNetCore.Authorization.csproj", "{7DBA484B-BA85-4768-9002-68F49C2D9A86}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Abstractions", "..\Http\Authentication.Abstractions\src\Microsoft.AspNetCore.Authentication.Abstractions.csproj", "{60FC5D94-2FE1-47B4-BDBA-72611BFD7C90}"
@@ -250,8 +250,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.F
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", "..\Servers\Kestrel\Transport.Abstractions\src\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj", "{DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "..\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{47C60935-CF5B-459C-B6C4-760350F3904B}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "..\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj", "{12D0BEB8-A1C6-4712-8368-83BC65428CA8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection", "..\DataProtection\DataProtection\src\Microsoft.AspNetCore.DataProtection.csproj", "{CC355676-B7EF-4A0E-9659-BCB50127E850}"
@@ -264,12 +262,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Crypto
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Abstractions", "..\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj", "{C75C6E51-4FFD-4902-8739-9109E51875B4}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching", "..\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj", "{11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{35AE5599-AD99-4198-AC91-C599459E9023}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenericHostWebSite", "test\WebSites\GenericHostWebSite\GenericHostWebSite.csproj", "{D9BE3E50-5CE8-4D8D-BA19-AA219D009752}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation", "src\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj", "{F2D4A859-7B84-403E-9745-01032EC705C5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test", "test\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test\Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj", "{23A6033D-2AA6-4629-BC1B-14694E3794FF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components", "..\Components\Components\src\Microsoft.AspNetCore.Components.csproj", "{69E18B21-E4B9-4866-ABDA-3C2D9664D24C}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -928,30 +928,6 @@ Global
{51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|x86.ActiveCfg = Release|Any CPU
{51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|x86.Build.0 = Release|Any CPU
- {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|x86.ActiveCfg = Debug|Any CPU
- {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|x86.Build.0 = Debug|Any CPU
- {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|Any CPU.Build.0 = Release|Any CPU
- {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|x86.ActiveCfg = Release|Any CPU
- {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|x86.Build.0 = Release|Any CPU
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|x86.Build.0 = Debug|Any CPU
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|Any CPU.Build.0 = Release|Any CPU
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|x86.ActiveCfg = Release|Any CPU
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|x86.Build.0 = Release|Any CPU
{DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -976,18 +952,6 @@ Global
{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|x86.ActiveCfg = Release|Any CPU
{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|x86.Build.0 = Release|Any CPU
- {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|x86.ActiveCfg = Debug|Any CPU
- {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|x86.Build.0 = Debug|Any CPU
- {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|Any CPU.Build.0 = Release|Any CPU
- {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|x86.ActiveCfg = Release|Any CPU
- {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|x86.Build.0 = Release|Any CPU
{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1024,6 +988,294 @@ Global
{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|x86.ActiveCfg = Release|Any CPU
{34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|x86.Build.0 = Release|Any CPU
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|x86.Build.0 = Debug|Any CPU
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|x86.ActiveCfg = Release|Any CPU
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|x86.Build.0 = Release|Any CPU
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|x86.Build.0 = Debug|Any CPU
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|x86.ActiveCfg = Release|Any CPU
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|x86.Build.0 = Release|Any CPU
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|x86.Build.0 = Debug|Any CPU
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|x86.ActiveCfg = Release|Any CPU
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|x86.Build.0 = Release|Any CPU
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|x86.Build.0 = Debug|Any CPU
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|x86.ActiveCfg = Release|Any CPU
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|x86.Build.0 = Release|Any CPU
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|x86.Build.0 = Debug|Any CPU
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|x86.ActiveCfg = Release|Any CPU
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|x86.Build.0 = Release|Any CPU
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|x86.Build.0 = Debug|Any CPU
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|x86.ActiveCfg = Release|Any CPU
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|x86.Build.0 = Release|Any CPU
+ {BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|x86.Build.0 = Debug|Any CPU
+ {BCD18147-D96D-4240-A89F-5F890392E58E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BCD18147-D96D-4240-A89F-5F890392E58E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BCD18147-D96D-4240-A89F-5F890392E58E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {BCD18147-D96D-4240-A89F-5F890392E58E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {BCD18147-D96D-4240-A89F-5F890392E58E}.Release|x86.ActiveCfg = Release|Any CPU
+ {BCD18147-D96D-4240-A89F-5F890392E58E}.Release|x86.Build.0 = Release|Any CPU
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|x86.Build.0 = Debug|Any CPU
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|x86.ActiveCfg = Release|Any CPU
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|x86.Build.0 = Release|Any CPU
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|x86.Build.0 = Debug|Any CPU
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|x86.ActiveCfg = Release|Any CPU
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|x86.Build.0 = Release|Any CPU
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|x86.Build.0 = Debug|Any CPU
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|x86.ActiveCfg = Release|Any CPU
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|x86.Build.0 = Release|Any CPU
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|x86.Build.0 = Debug|Any CPU
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|x86.ActiveCfg = Release|Any CPU
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|x86.Build.0 = Release|Any CPU
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|x86.Build.0 = Debug|Any CPU
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|x86.ActiveCfg = Release|Any CPU
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|x86.Build.0 = Release|Any CPU
+ {9F2C52EA-1869-4610-921F-5FD654582019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9F2C52EA-1869-4610-921F-5FD654582019}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9F2C52EA-1869-4610-921F-5FD654582019}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {9F2C52EA-1869-4610-921F-5FD654582019}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {9F2C52EA-1869-4610-921F-5FD654582019}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9F2C52EA-1869-4610-921F-5FD654582019}.Debug|x86.Build.0 = Debug|Any CPU
+ {9F2C52EA-1869-4610-921F-5FD654582019}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9F2C52EA-1869-4610-921F-5FD654582019}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9F2C52EA-1869-4610-921F-5FD654582019}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {9F2C52EA-1869-4610-921F-5FD654582019}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {9F2C52EA-1869-4610-921F-5FD654582019}.Release|x86.ActiveCfg = Release|Any CPU
+ {9F2C52EA-1869-4610-921F-5FD654582019}.Release|x86.Build.0 = Release|Any CPU
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|x86.Build.0 = Debug|Any CPU
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|x86.ActiveCfg = Release|Any CPU
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|x86.Build.0 = Release|Any CPU
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|x86.Build.0 = Debug|Any CPU
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|x86.ActiveCfg = Release|Any CPU
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|x86.Build.0 = Release|Any CPU
+ {72D40CFE-93B5-4877-92DC-E79203641342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {72D40CFE-93B5-4877-92DC-E79203641342}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {72D40CFE-93B5-4877-92DC-E79203641342}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {72D40CFE-93B5-4877-92DC-E79203641342}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {72D40CFE-93B5-4877-92DC-E79203641342}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {72D40CFE-93B5-4877-92DC-E79203641342}.Debug|x86.Build.0 = Debug|Any CPU
+ {72D40CFE-93B5-4877-92DC-E79203641342}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {72D40CFE-93B5-4877-92DC-E79203641342}.Release|Any CPU.Build.0 = Release|Any CPU
+ {72D40CFE-93B5-4877-92DC-E79203641342}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {72D40CFE-93B5-4877-92DC-E79203641342}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {72D40CFE-93B5-4877-92DC-E79203641342}.Release|x86.ActiveCfg = Release|Any CPU
+ {72D40CFE-93B5-4877-92DC-E79203641342}.Release|x86.Build.0 = Release|Any CPU
+ {62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|x86.Build.0 = Debug|Any CPU
+ {62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|Any CPU.Build.0 = Release|Any CPU
+ {62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|x86.ActiveCfg = Release|Any CPU
+ {62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|x86.Build.0 = Release|Any CPU
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|x86.Build.0 = Debug|Any CPU
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|x86.ActiveCfg = Release|Any CPU
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|x86.Build.0 = Release|Any CPU
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|x86.Build.0 = Debug|Any CPU
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|x86.ActiveCfg = Release|Any CPU
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|x86.Build.0 = Release|Any CPU
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Debug|x86.Build.0 = Debug|Any CPU
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Release|x86.ActiveCfg = Release|Any CPU
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Release|x86.Build.0 = Release|Any CPU
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Debug|x86.Build.0 = Debug|Any CPU
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Release|x86.ActiveCfg = Release|Any CPU
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Release|x86.Build.0 = Release|Any CPU
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Debug|x86.Build.0 = Debug|Any CPU
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Release|x86.ActiveCfg = Release|Any CPU
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Release|x86.Build.0 = Release|Any CPU
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Debug|x86.Build.0 = Debug|Any CPU
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Release|x86.ActiveCfg = Release|Any CPU
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Release|x86.Build.0 = Release|Any CPU
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Debug|x86.Build.0 = Debug|Any CPU
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Release|Any CPU.Build.0 = Release|Any CPU
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Release|x86.ActiveCfg = Release|Any CPU
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Release|x86.Build.0 = Release|Any CPU
{0CA44B59-6538-4668-BB5E-D586946426F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0CA44B59-6538-4668-BB5E-D586946426F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0CA44B59-6538-4668-BB5E-D586946426F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1060,30 +1312,6 @@ Global
{68C06221-185E-41E3-B2C8-B4A1B3D20631}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{68C06221-185E-41E3-B2C8-B4A1B3D20631}.Release|x86.ActiveCfg = Release|Any CPU
{68C06221-185E-41E3-B2C8-B4A1B3D20631}.Release|x86.Build.0 = Release|Any CPU
- {AFA70552-7405-4655-8899-FED6B5F393BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AFA70552-7405-4655-8899-FED6B5F393BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AFA70552-7405-4655-8899-FED6B5F393BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {AFA70552-7405-4655-8899-FED6B5F393BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {AFA70552-7405-4655-8899-FED6B5F393BD}.Debug|x86.ActiveCfg = Debug|Any CPU
- {AFA70552-7405-4655-8899-FED6B5F393BD}.Debug|x86.Build.0 = Debug|Any CPU
- {AFA70552-7405-4655-8899-FED6B5F393BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AFA70552-7405-4655-8899-FED6B5F393BD}.Release|Any CPU.Build.0 = Release|Any CPU
- {AFA70552-7405-4655-8899-FED6B5F393BD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {AFA70552-7405-4655-8899-FED6B5F393BD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {AFA70552-7405-4655-8899-FED6B5F393BD}.Release|x86.ActiveCfg = Release|Any CPU
- {AFA70552-7405-4655-8899-FED6B5F393BD}.Release|x86.Build.0 = Release|Any CPU
- {47F3C605-0674-4943-A378-45B4A54B5F14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {47F3C605-0674-4943-A378-45B4A54B5F14}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {47F3C605-0674-4943-A378-45B4A54B5F14}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {47F3C605-0674-4943-A378-45B4A54B5F14}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {47F3C605-0674-4943-A378-45B4A54B5F14}.Debug|x86.ActiveCfg = Debug|Any CPU
- {47F3C605-0674-4943-A378-45B4A54B5F14}.Debug|x86.Build.0 = Debug|Any CPU
- {47F3C605-0674-4943-A378-45B4A54B5F14}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {47F3C605-0674-4943-A378-45B4A54B5F14}.Release|Any CPU.Build.0 = Release|Any CPU
- {47F3C605-0674-4943-A378-45B4A54B5F14}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {47F3C605-0674-4943-A378-45B4A54B5F14}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {47F3C605-0674-4943-A378-45B4A54B5F14}.Release|x86.ActiveCfg = Release|Any CPU
- {47F3C605-0674-4943-A378-45B4A54B5F14}.Release|x86.Build.0 = Release|Any CPU
{9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1096,18 +1324,6 @@ Global
{9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Release|x86.ActiveCfg = Release|Any CPU
{9C584DF9-CDF2-4522-A0A5-55AAE36820EC}.Release|x86.Build.0 = Release|Any CPU
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Debug|x86.ActiveCfg = Debug|Any CPU
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Debug|x86.Build.0 = Debug|Any CPU
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Release|Any CPU.Build.0 = Release|Any CPU
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Release|x86.ActiveCfg = Release|Any CPU
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0}.Release|x86.Build.0 = Release|Any CPU
{C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1120,42 +1336,6 @@ Global
{C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Release|x86.ActiveCfg = Release|Any CPU
{C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE}.Release|x86.Build.0 = Release|Any CPU
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Debug|x86.ActiveCfg = Debug|Any CPU
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Debug|x86.Build.0 = Debug|Any CPU
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Release|Any CPU.Build.0 = Release|Any CPU
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Release|x86.ActiveCfg = Release|Any CPU
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC}.Release|x86.Build.0 = Release|Any CPU
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Debug|x86.ActiveCfg = Debug|Any CPU
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Debug|x86.Build.0 = Debug|Any CPU
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Release|Any CPU.Build.0 = Release|Any CPU
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Release|x86.ActiveCfg = Release|Any CPU
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A}.Release|x86.Build.0 = Release|Any CPU
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Debug|x86.Build.0 = Debug|Any CPU
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Release|Any CPU.Build.0 = Release|Any CPU
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Release|x86.ActiveCfg = Release|Any CPU
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE}.Release|x86.Build.0 = Release|Any CPU
{0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0500845C-2F0F-4380-8D48-FC1CC5C3A9F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1180,30 +1360,6 @@ Global
{A04124E5-E4AA-4311-8049-DAF371871B31}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{A04124E5-E4AA-4311-8049-DAF371871B31}.Release|x86.ActiveCfg = Release|Any CPU
{A04124E5-E4AA-4311-8049-DAF371871B31}.Release|x86.Build.0 = Release|Any CPU
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Debug|x86.Build.0 = Debug|Any CPU
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Release|Any CPU.Build.0 = Release|Any CPU
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Release|x86.ActiveCfg = Release|Any CPU
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9}.Release|x86.Build.0 = Release|Any CPU
- {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Debug|x86.ActiveCfg = Debug|Any CPU
- {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Debug|x86.Build.0 = Debug|Any CPU
- {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Release|Any CPU.Build.0 = Release|Any CPU
- {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Release|x86.ActiveCfg = Release|Any CPU
- {B3AE9A77-1198-4974-AA78-531CE6C568F3}.Release|x86.Build.0 = Release|Any CPU
{F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F95DC77B-CA52-4BBB-817E-79ABFE330C5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1228,18 +1384,6 @@ Global
{1024A6BE-E0AF-4170-B61D-E6C092780195}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{1024A6BE-E0AF-4170-B61D-E6C092780195}.Release|x86.ActiveCfg = Release|Any CPU
{1024A6BE-E0AF-4170-B61D-E6C092780195}.Release|x86.Build.0 = Release|Any CPU
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Debug|x86.Build.0 = Debug|Any CPU
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Release|Any CPU.Build.0 = Release|Any CPU
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Release|x86.ActiveCfg = Release|Any CPU
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF}.Release|x86.Build.0 = Release|Any CPU
{449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1264,18 +1408,6 @@ Global
{39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Release|x86.ActiveCfg = Release|Any CPU
{39F64AD3-9F14-4898-B9C5-5A2900D0E9C6}.Release|x86.Build.0 = Release|Any CPU
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Debug|x86.ActiveCfg = Debug|Any CPU
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Debug|x86.Build.0 = Debug|Any CPU
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Release|Any CPU.Build.0 = Release|Any CPU
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Release|x86.ActiveCfg = Release|Any CPU
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9}.Release|x86.Build.0 = Release|Any CPU
{8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1288,126 +1420,6 @@ Global
{8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Release|x86.ActiveCfg = Release|Any CPU
{8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4}.Release|x86.Build.0 = Release|Any CPU
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|x86.ActiveCfg = Debug|Any CPU
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Debug|x86.Build.0 = Debug|Any CPU
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Release|Any CPU.Build.0 = Release|Any CPU
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Release|x86.ActiveCfg = Release|Any CPU
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE}.Release|x86.Build.0 = Release|Any CPU
- {B37FF37D-0A47-494A-B5ED-497F273B9067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B37FF37D-0A47-494A-B5ED-497F273B9067}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B37FF37D-0A47-494A-B5ED-497F273B9067}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {B37FF37D-0A47-494A-B5ED-497F273B9067}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {B37FF37D-0A47-494A-B5ED-497F273B9067}.Debug|x86.ActiveCfg = Debug|Any CPU
- {B37FF37D-0A47-494A-B5ED-497F273B9067}.Debug|x86.Build.0 = Debug|Any CPU
- {B37FF37D-0A47-494A-B5ED-497F273B9067}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B37FF37D-0A47-494A-B5ED-497F273B9067}.Release|Any CPU.Build.0 = Release|Any CPU
- {B37FF37D-0A47-494A-B5ED-497F273B9067}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {B37FF37D-0A47-494A-B5ED-497F273B9067}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {B37FF37D-0A47-494A-B5ED-497F273B9067}.Release|x86.ActiveCfg = Release|Any CPU
- {B37FF37D-0A47-494A-B5ED-497F273B9067}.Release|x86.Build.0 = Release|Any CPU
- {22F657F5-7D95-438A-985A-A390938E7843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {22F657F5-7D95-438A-985A-A390938E7843}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {22F657F5-7D95-438A-985A-A390938E7843}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {22F657F5-7D95-438A-985A-A390938E7843}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {22F657F5-7D95-438A-985A-A390938E7843}.Debug|x86.ActiveCfg = Debug|Any CPU
- {22F657F5-7D95-438A-985A-A390938E7843}.Debug|x86.Build.0 = Debug|Any CPU
- {22F657F5-7D95-438A-985A-A390938E7843}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {22F657F5-7D95-438A-985A-A390938E7843}.Release|Any CPU.Build.0 = Release|Any CPU
- {22F657F5-7D95-438A-985A-A390938E7843}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {22F657F5-7D95-438A-985A-A390938E7843}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {22F657F5-7D95-438A-985A-A390938E7843}.Release|x86.ActiveCfg = Release|Any CPU
- {22F657F5-7D95-438A-985A-A390938E7843}.Release|x86.Build.0 = Release|Any CPU
- {731B64B8-AB91-4A05-AE5C-929996D58A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {731B64B8-AB91-4A05-AE5C-929996D58A52}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {731B64B8-AB91-4A05-AE5C-929996D58A52}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {731B64B8-AB91-4A05-AE5C-929996D58A52}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {731B64B8-AB91-4A05-AE5C-929996D58A52}.Debug|x86.ActiveCfg = Debug|Any CPU
- {731B64B8-AB91-4A05-AE5C-929996D58A52}.Debug|x86.Build.0 = Debug|Any CPU
- {731B64B8-AB91-4A05-AE5C-929996D58A52}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {731B64B8-AB91-4A05-AE5C-929996D58A52}.Release|Any CPU.Build.0 = Release|Any CPU
- {731B64B8-AB91-4A05-AE5C-929996D58A52}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {731B64B8-AB91-4A05-AE5C-929996D58A52}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {731B64B8-AB91-4A05-AE5C-929996D58A52}.Release|x86.ActiveCfg = Release|Any CPU
- {731B64B8-AB91-4A05-AE5C-929996D58A52}.Release|x86.Build.0 = Release|Any CPU
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Debug|x86.ActiveCfg = Debug|Any CPU
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Debug|x86.Build.0 = Debug|Any CPU
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Release|Any CPU.Build.0 = Release|Any CPU
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Release|x86.ActiveCfg = Release|Any CPU
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5}.Release|x86.Build.0 = Release|Any CPU
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Debug|x86.Build.0 = Debug|Any CPU
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Release|Any CPU.Build.0 = Release|Any CPU
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Release|x86.ActiveCfg = Release|Any CPU
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764}.Release|x86.Build.0 = Release|Any CPU
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Debug|x86.ActiveCfg = Debug|Any CPU
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Debug|x86.Build.0 = Debug|Any CPU
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Release|Any CPU.Build.0 = Release|Any CPU
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Release|x86.ActiveCfg = Release|Any CPU
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257}.Release|x86.Build.0 = Release|Any CPU
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Debug|x86.Build.0 = Debug|Any CPU
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Release|Any CPU.Build.0 = Release|Any CPU
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Release|x86.ActiveCfg = Release|Any CPU
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE}.Release|x86.Build.0 = Release|Any CPU
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Debug|x86.ActiveCfg = Debug|Any CPU
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Debug|x86.Build.0 = Debug|Any CPU
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Release|Any CPU.Build.0 = Release|Any CPU
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Release|x86.ActiveCfg = Release|Any CPU
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164}.Release|x86.Build.0 = Release|Any CPU
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Debug|x86.ActiveCfg = Debug|Any CPU
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Debug|x86.Build.0 = Debug|Any CPU
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Release|Any CPU.Build.0 = Release|Any CPU
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Release|x86.ActiveCfg = Release|Any CPU
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE}.Release|x86.Build.0 = Release|Any CPU
{7DBA484B-BA85-4768-9002-68F49C2D9A86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DBA484B-BA85-4768-9002-68F49C2D9A86}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DBA484B-BA85-4768-9002-68F49C2D9A86}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1456,18 +1468,6 @@ Global
{DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|x86.ActiveCfg = Release|Any CPU
{DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1}.Release|x86.Build.0 = Release|Any CPU
- {47C60935-CF5B-459C-B6C4-760350F3904B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {47C60935-CF5B-459C-B6C4-760350F3904B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {47C60935-CF5B-459C-B6C4-760350F3904B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {47C60935-CF5B-459C-B6C4-760350F3904B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {47C60935-CF5B-459C-B6C4-760350F3904B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {47C60935-CF5B-459C-B6C4-760350F3904B}.Debug|x86.Build.0 = Debug|Any CPU
- {47C60935-CF5B-459C-B6C4-760350F3904B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {47C60935-CF5B-459C-B6C4-760350F3904B}.Release|Any CPU.Build.0 = Release|Any CPU
- {47C60935-CF5B-459C-B6C4-760350F3904B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {47C60935-CF5B-459C-B6C4-760350F3904B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {47C60935-CF5B-459C-B6C4-760350F3904B}.Release|x86.ActiveCfg = Release|Any CPU
- {47C60935-CF5B-459C-B6C4-760350F3904B}.Release|x86.Build.0 = Release|Any CPU
{12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{12D0BEB8-A1C6-4712-8368-83BC65428CA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1540,30 +1540,6 @@ Global
{C75C6E51-4FFD-4902-8739-9109E51875B4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C75C6E51-4FFD-4902-8739-9109E51875B4}.Release|x86.ActiveCfg = Release|Any CPU
{C75C6E51-4FFD-4902-8739-9109E51875B4}.Release|x86.Build.0 = Release|Any CPU
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Debug|x86.ActiveCfg = Debug|Any CPU
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Debug|x86.Build.0 = Debug|Any CPU
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|Any CPU.Build.0 = Release|Any CPU
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|x86.ActiveCfg = Release|Any CPU
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189}.Release|x86.Build.0 = Release|Any CPU
- {35AE5599-AD99-4198-AC91-C599459E9023}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {35AE5599-AD99-4198-AC91-C599459E9023}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {35AE5599-AD99-4198-AC91-C599459E9023}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {35AE5599-AD99-4198-AC91-C599459E9023}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {35AE5599-AD99-4198-AC91-C599459E9023}.Debug|x86.ActiveCfg = Debug|Any CPU
- {35AE5599-AD99-4198-AC91-C599459E9023}.Debug|x86.Build.0 = Debug|Any CPU
- {35AE5599-AD99-4198-AC91-C599459E9023}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {35AE5599-AD99-4198-AC91-C599459E9023}.Release|Any CPU.Build.0 = Release|Any CPU
- {35AE5599-AD99-4198-AC91-C599459E9023}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {35AE5599-AD99-4198-AC91-C599459E9023}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {35AE5599-AD99-4198-AC91-C599459E9023}.Release|x86.ActiveCfg = Release|Any CPU
- {35AE5599-AD99-4198-AC91-C599459E9023}.Release|x86.Build.0 = Release|Any CPU
{D9BE3E50-5CE8-4D8D-BA19-AA219D009752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D9BE3E50-5CE8-4D8D-BA19-AA219D009752}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D9BE3E50-5CE8-4D8D-BA19-AA219D009752}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1576,6 +1552,42 @@ Global
{D9BE3E50-5CE8-4D8D-BA19-AA219D009752}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D9BE3E50-5CE8-4D8D-BA19-AA219D009752}.Release|x86.ActiveCfg = Release|Any CPU
{D9BE3E50-5CE8-4D8D-BA19-AA219D009752}.Release|x86.Build.0 = Release|Any CPU
+ {F2D4A859-7B84-403E-9745-01032EC705C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F2D4A859-7B84-403E-9745-01032EC705C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F2D4A859-7B84-403E-9745-01032EC705C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {F2D4A859-7B84-403E-9745-01032EC705C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {F2D4A859-7B84-403E-9745-01032EC705C5}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {F2D4A859-7B84-403E-9745-01032EC705C5}.Debug|x86.Build.0 = Debug|Any CPU
+ {F2D4A859-7B84-403E-9745-01032EC705C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F2D4A859-7B84-403E-9745-01032EC705C5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F2D4A859-7B84-403E-9745-01032EC705C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {F2D4A859-7B84-403E-9745-01032EC705C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {F2D4A859-7B84-403E-9745-01032EC705C5}.Release|x86.ActiveCfg = Release|Any CPU
+ {F2D4A859-7B84-403E-9745-01032EC705C5}.Release|x86.Build.0 = Release|Any CPU
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF}.Debug|x86.Build.0 = Debug|Any CPU
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF}.Release|x86.ActiveCfg = Release|Any CPU
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF}.Release|x86.Build.0 = Release|Any CPU
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Debug|x86.Build.0 = Debug|Any CPU
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Release|x86.ActiveCfg = Release|Any CPU
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1639,60 +1651,61 @@ Global
{E3E09D2F-1FCF-4396-9B09-5A62CA8CC831} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
{17122147-ADFD-41C8-87D9-CCC582CCA8F9} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
{51E3E785-A9D1-4196-BAFE-A17FF4304B89} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
- {910F023A-88E3-4CB4-8793-AC4005C7B421} = {2859F266-673A-45A2-9E3C-7B39C6DDD38E}
- {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB} = {2859F266-673A-45A2-9E3C-7B39C6DDD38E}
{DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
{3B550487-10E4-4E6D-9CEF-B1B4CA1253DA} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
- {D7C6A696-F232-4288-BCCD-367407E4A934} = {2859F266-673A-45A2-9E3C-7B39C6DDD38E}
{4EDC489F-3EC5-4AE3-9841-A285F40F5FF6} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
{2F683CF8-B055-46AE-BF83-9D1307F8D45F} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
{34E3C302-B767-40C8-B538-3EE2BD4000C4} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+ {0930C2EA-FA36-4EDF-A571-215765D1F2C7} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {A273BAAB-DA92-401D-B781-ADA9E3B7717C} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {E07B7D3A-1D4D-4644-84C2-06FEDB64885B} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {2E18C4FD-9982-4BD9-A067-3CE56E68C450} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {BCD18147-D96D-4240-A89F-5F890392E58E} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {986BF4FD-D0E3-48AE-917C-6C168D6395D3} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {F4846AC2-384E-4C0B-8DE5-9784715E4A9F} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {68C9E09E-F7FA-4853-B512-6BCD02BB69C1} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {9F2C52EA-1869-4610-921F-5FD654582019} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {AA074523-64D3-4CA7-8C2E-EACD977D2B19} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {47D5BF2A-7B05-4630-8C7C-A682382EA6F1} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {72D40CFE-93B5-4877-92DC-E79203641342} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {62952E87-88DB-45BA-9FE0-8A24FA983750} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {157F16EA-C5C1-4BDF-A81C-44A7771A13D7} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {457D7B8F-C81D-4F0C-BE88-B0516374944E} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {69D6513F-66AD-44C6-BD3F-8DE78CB4398F} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {1348A3AB-8401-4DAE-90CC-A5907ED52A36} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {94A04746-8698-4DEF-BCFC-8BA2D3F8A451} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
{0CA44B59-6538-4668-BB5E-D586946426F3} = {FDC66952-A3EA-4074-899E-C29816BF7C1F}
- {0F41EB10-BD4E-443C-868B-95109F0843E0} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {68C06221-185E-41E3-B2C8-B4A1B3D20631} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {AFA70552-7405-4655-8899-FED6B5F393BD} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {47F3C605-0674-4943-A378-45B4A54B5F14} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {9C584DF9-CDF2-4522-A0A5-55AAE36820EC} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {CFEFED8B-D109-4628-BE40-B02A3A659AB0} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {5C838817-4DEC-4BA0-BACC-2F512B8245AC} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {0FFF6859-E8EF-485C-9F61-CE64BAE8E95A} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {E78D6ACC-439B-44ED-9EB0-98A93B40A7FE} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {A04124E5-E4AA-4311-8049-DAF371871B31} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {A6018CDE-37DD-4317-80EB-01DB306EA5B9} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {B3AE9A77-1198-4974-AA78-531CE6C568F3} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {F95DC77B-CA52-4BBB-817E-79ABFE330C5C} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {1024A6BE-E0AF-4170-B61D-E6C092780195} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {0F04DD66-08B7-47F4-9826-66CD8FD539FF} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {CC2FF678-438C-4343-A1A7-BF3E75470EB9} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {C185A2B1-64C0-491B-9AAE-382C24F9B4AE} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {B37FF37D-0A47-494A-B5ED-497F273B9067} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {22F657F5-7D95-438A-985A-A390938E7843} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {731B64B8-AB91-4A05-AE5C-929996D58A52} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {2D665D68-BF48-41E0-B74C-A88A83F8AFD5} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {E07090BD-05AF-4DC0-9D59-35EF70EBC764} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {22D26FB5-C5AE-4B0C-B1CB-AAE1C3519257} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {E335D925-771A-4FB9-A94C-1D74A8F01DCE} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {FF88FB5E-0096-4096-A0D7-FCFE5D55F164} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {4D04F472-8E7C-487D-8B57-9533B1F7F3DE} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {7DBA484B-BA85-4768-9002-68F49C2D9A86} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {C72560B4-C9AC-49EA-B202-89BCD3826EB8} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {47C60935-CF5B-459C-B6C4-760350F3904B} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {12D0BEB8-A1C6-4712-8368-83BC65428CA8} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {CC355676-B7EF-4A0E-9659-BCB50127E850} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {9401F793-F2F3-45C6-8232-EF40700DA0A4} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {848E2620-EAF9-4BFD-8810-4AF71E09A8FB} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {C75C6E51-4FFD-4902-8739-9109E51875B4} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {11D8DEBD-2E84-4EF2-8039-4B4BAC58F189} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
- {35AE5599-AD99-4198-AC91-C599459E9023} = {9328599D-A7AF-43BC-BE08-7503DF9B8CE6}
+ {0F41EB10-BD4E-443C-868B-95109F0843E0} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {68C06221-185E-41E3-B2C8-B4A1B3D20631} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {9C584DF9-CDF2-4522-A0A5-55AAE36820EC} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {C1A7CBEB-06C9-40DD-B1A0-3FD61045B3AE} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {0500845C-2F0F-4380-8D48-FC1CC5C3A9F3} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {A04124E5-E4AA-4311-8049-DAF371871B31} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {F95DC77B-CA52-4BBB-817E-79ABFE330C5C} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {1024A6BE-E0AF-4170-B61D-E6C092780195} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {449AD5B2-9CC7-4542-A28C-8BF2DAB96AC6} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {39F64AD3-9F14-4898-B9C5-5A2900D0E9C6} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {8BA78D3C-4474-4FC5-B36F-9B19A7D6BCA4} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {7DBA484B-BA85-4768-9002-68F49C2D9A86} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {60FC5D94-2FE1-47B4-BDBA-72611BFD7C90} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {C72560B4-C9AC-49EA-B202-89BCD3826EB8} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {DCB4C407-1121-4AB0-A6B6-DF28B8EBCBD1} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {12D0BEB8-A1C6-4712-8368-83BC65428CA8} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {CC355676-B7EF-4A0E-9659-BCB50127E850} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {D4ED031D-12F4-4522-BDDA-1D36E0E75D8C} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {9401F793-F2F3-45C6-8232-EF40700DA0A4} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {848E2620-EAF9-4BFD-8810-4AF71E09A8FB} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
+ {C75C6E51-4FFD-4902-8739-9109E51875B4} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
{D9BE3E50-5CE8-4D8D-BA19-AA219D009752} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C}
+ {F2D4A859-7B84-403E-9745-01032EC705C5} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E}
+ {23A6033D-2AA6-4629-BC1B-14694E3794FF} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}
+ {69E18B21-E4B9-4866-ABDA-3C2D9664D24C} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {63D344F6-F86D-40E6-85B9-0AABBE338C4A}
diff --git a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj
index 6e5e88e453..5cc6259844 100644
--- a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj
+++ b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj
@@ -6,7 +6,8 @@
$(DefineConstants);GENERATE_SQL_SCRIPTS
$(DefineConstants);__RemoveThisBitTo__GENERATE_SQL_SCRIPTS
- CS8002;$(WarningsNotAsErrors)
+
+ false
true
@@ -17,6 +18,8 @@
+
+
diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
index 10a068db81..ef8b17d1e2 100644
--- a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
+++ b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
@@ -6,21 +6,20 @@
$(DefineConstants);GENERATE_SQL_SCRIPTS
$(DefineConstants);__RemoveThisBitTo__GENERATE_SQL_SCRIPTS
- CS8002;$(WarningsNotAsErrors)
+
+ false
true
-
-
-
-
+
+
diff --git a/src/Mvc/benchmarkapps/Directory.Build.props b/src/Mvc/benchmarkapps/Directory.Build.props
new file mode 100644
index 0000000000..56a40aaa38
--- /dev/null
+++ b/src/Mvc/benchmarkapps/Directory.Build.props
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Mvc/benchmarkapps/Directory.Build.targets b/src/Mvc/benchmarkapps/Directory.Build.targets
new file mode 100644
index 0000000000..2e3fb2fa71
--- /dev/null
+++ b/src/Mvc/benchmarkapps/Directory.Build.targets
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/src/Mvc/samples/MvcSandbox/HealthChecks/HealthChecksEndpointRouteBuilderExtensions.cs b/src/Mvc/samples/MvcSandbox/HealthChecks/HealthChecksEndpointRouteBuilderExtensions.cs
deleted file mode 100644
index b89acdd2b4..0000000000
--- a/src/Mvc/samples/MvcSandbox/HealthChecks/HealthChecksEndpointRouteBuilderExtensions.cs
+++ /dev/null
@@ -1,28 +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.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
-
-namespace Microsoft.AspNetCore.Builder
-{
- public static class HealthChecksEndpointRouteBuilderExtensions
- {
- private static readonly Random _random = new Random();
-
- public static IEndpointConventionBuilder MapHealthChecks(this IEndpointRouteBuilder builder, string pattern)
- {
- return builder.MapGet(
- pattern,
- async httpContext =>
- {
- await httpContext.Response.WriteAsync(_random.Next() % 2 == 0 ? "Up!" : "Down!");
- });
- }
- }
-}
diff --git a/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj
index 3e0d928151..9d3ee6d844 100644
--- a/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj
+++ b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj
@@ -7,6 +7,7 @@
+
@@ -14,7 +15,7 @@
-
+
diff --git a/src/Mvc/samples/MvcSandbox/Startup.cs b/src/Mvc/samples/MvcSandbox/Startup.cs
index c958e06b8e..d6c039de1a 100644
--- a/src/Mvc/samples/MvcSandbox/Startup.cs
+++ b/src/Mvc/samples/MvcSandbox/Startup.cs
@@ -26,7 +26,9 @@ namespace MvcSandbox
{
options.ConstraintMap["slugify"] = typeof(SlugifyParameterTransformer);
});
- services.AddMvc().SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Latest);
+ services.AddMvc()
+ .AddRazorRuntimeCompilation()
+ .SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Latest);
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -65,8 +67,6 @@ namespace MvcSandbox
});
builder.MapApplication();
-
- builder.MapHealthChecks("/healthz");
});
app.UseDeveloperExceptionPage();
diff --git a/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj b/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj
index 81f0d939d7..3b09c3a0db 100644
--- a/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj
+++ b/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj
@@ -18,7 +18,9 @@
-
+
+ true
+
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
index 23c329ceb2..4d9d6e4ea2 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
@@ -2,7 +2,7 @@
CSharp Analyzers for ASP.NET Core MVC.
aspnetcore;aspnetcoremvc
- true
+ true
netstandard1.3
false
@@ -15,10 +15,6 @@
-
-
-
-
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
index 35900f7360..f874b02d1e 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
@@ -2,7 +2,7 @@
CSharp Analyzers for ASP.NET Core MVC.
aspnetcore;aspnetcoremvc
- true
+ true
netstandard1.3
false
@@ -20,10 +20,6 @@
-
-
-
-
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
index 4623d67090..333033d00d 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
@@ -231,6 +231,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
var state = TemplateParserState.Plaintext;
int? tokenStart = null;
+ var scope = 0;
// We'll run the loop one extra time with 'null' to detect the end of the string.
for (var i = 0; i <= template.Length; i++)
@@ -241,6 +242,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
case TemplateParserState.Plaintext:
if (c == '[')
{
+ scope++;
state = TemplateParserState.SeenLeft;
break;
}
@@ -321,6 +323,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
}
else if (c == ']')
{
+ --scope;
state = TemplateParserState.InsideToken | TemplateParserState.SeenRight;
break;
}
@@ -353,7 +356,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
throw new InvalidOperationException(message);
}
case TemplateParserState.InsideToken | TemplateParserState.SeenRight:
- if (c == ']')
+ if (c == ']' && scope == 0)
{
// This is an escaped right-bracket
state = TemplateParserState.InsideToken;
@@ -402,6 +405,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
state = TemplateParserState.Plaintext;
}
+ scope = 0;
tokenStart = null;
break;
}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
index 22078bb2a5..359b43c14d 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
@@ -221,8 +221,7 @@ namespace Microsoft.AspNetCore.Mvc
}
///
- /// Creates a object with by specifying a
- /// string.
+ /// Creates a object by specifying a string.
///
/// The content to write to the response.
/// The created object for the response.
@@ -231,7 +230,7 @@ namespace Microsoft.AspNetCore.Mvc
=> Content(content, (MediaTypeHeaderValue)null);
///
- /// Creates a object with by specifying a
+ /// Creates a object by specifying a
/// string and a content type.
///
/// The content to write to the response.
@@ -242,7 +241,7 @@ namespace Microsoft.AspNetCore.Mvc
=> Content(content, MediaTypeHeaderValue.Parse(contentType));
///
- /// Creates a object with by specifying a
+ /// Creates a object by specifying a
/// string, a , and .
///
/// The content to write to the response.
@@ -262,7 +261,7 @@ namespace Microsoft.AspNetCore.Mvc
}
///
- /// Creates a object with by specifying a
+ /// Creates a object by specifying a
/// string and a .
///
/// The content to write to the response.
@@ -282,7 +281,7 @@ namespace Microsoft.AspNetCore.Mvc
///
/// Creates a object that produces an empty
- /// response.
+ /// response.
///
/// The created object for the response.
[NonAction]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs
index 0eaf3b92c8..70aa099cfe 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs
@@ -448,17 +448,8 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
private static IEnumerable GetIndexNamesFromValueProviderResult(ValueProviderResult valueProviderResult)
{
- IEnumerable indexNames = null;
- if (valueProviderResult != null)
- {
- var indexes = (string[])valueProviderResult;
- if (indexes != null && indexes.Length > 0)
- {
- indexNames = indexes;
- }
- }
-
- return indexNames;
+ var indexes = (string[])valueProviderResult;
+ return (indexes == null || indexes.Length == 0) ? null : indexes;
}
}
}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs
index 40c673da8c..7767263b9d 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs
@@ -117,8 +117,8 @@ namespace Microsoft.AspNetCore.Mvc
///
///
/// This method uses the value of to populate the host section of the generated URI.
- /// Relying on the value of the current request can allow untrusted input to influence the resulting URI unless
- /// the Host header has been validated. See the deployment documentation for instructions on how to properly
+ /// Relying on the value of the current request can allow untrusted input to influence the resulting URI unless
+ /// the Host header has been validated. See the deployment documentation for instructions on how to properly
/// validate the Host header in your deployment environment.
///
///
@@ -286,8 +286,8 @@ namespace Microsoft.AspNetCore.Mvc
///
///
/// This method uses the value of to populate the host section of the generated URI.
- /// Relying on the value of the current request can allow untrusted input to influence the resulting URI unless
- /// the Host header has been validated. See the deployment documentation for instructions on how to properly
+ /// Relying on the value of the current request can allow untrusted input to influence the resulting URI unless
+ /// the Host header has been validated. See the deployment documentation for instructions on how to properly
/// validate the Host header in your deployment environment.
///
///
@@ -443,8 +443,8 @@ namespace Microsoft.AspNetCore.Mvc
///
///
/// This method uses the value of to populate the host section of the generated URI.
- /// Relying on the value of the current request can allow untrusted input to influence the resulting URI unless
- /// the Host header has been validated. See the deployment documentation for instructions on how to properly
+ /// Relying on the value of the current request can allow untrusted input to influence the resulting URI unless
+ /// the Host header has been validated. See the deployment documentation for instructions on how to properly
/// validate the Host header in your deployment environment.
///
///
@@ -457,7 +457,7 @@ namespace Microsoft.AspNetCore.Mvc
=> Page(urlHelper, pageName, pageHandler, values, protocol, host: null, fragment: null);
///
- /// Generates a URL with an absolute path for the specified . See the remarks section for
+ /// Generates a URL with an absolute path for the specified . See the remarks section for
/// important security information.
///
/// The .
@@ -530,5 +530,109 @@ namespace Microsoft.AspNetCore.Mvc
host: host,
fragment: fragment);
}
+
+ ///
+ /// Generates an absolute URL for an action method, which contains the specified
+ /// name, name, route ,
+ /// to use, name, and .
+ /// Generates an absolute URL if the and are
+ /// non-null. See the remarks section for important security information.
+ ///
+ /// The .
+ /// The name of the action method. When , defaults to the current executing action.
+ /// The name of the controller. When , defaults to the current executing controller.
+ /// An object that contains route values.
+ /// The protocol for the URL, such as "http" or "https".
+ /// The host name for the URL.
+ /// The fragment for the URL.
+ /// The generated URL.
+ ///
+ ///
+ /// The value of should be a trusted value. Relying on the value of the current request
+ /// can allow untrusted input to influence the resulting URI unless the Host header has been validated.
+ /// See the deployment documentation for instructions on how to properly validate the Host header in
+ /// your deployment environment.
+ ///
+ ///
+ public static string ActionLink(
+ this IUrlHelper helper,
+ string action = null,
+ string controller = null,
+ object values = null,
+ string protocol = null,
+ string host = null,
+ string fragment = null)
+ {
+ if (helper == null)
+ {
+ throw new ArgumentNullException(nameof(helper));
+ }
+
+ var httpContext = helper.ActionContext.HttpContext;
+
+ if (protocol == null)
+ {
+ protocol = httpContext.Request.Protocol;
+ }
+
+ if (host == null)
+ {
+ host = httpContext.Request.Host.ToUriComponent();
+ }
+
+ return Action(helper, action, controller, values, protocol, host, fragment);
+ }
+
+ ///
+ /// Generates an absolute URL for a page, which contains the specified
+ /// , , route ,
+ /// to use, name, and .
+ /// Generates an absolute URL if the and are
+ /// non-null. See the remarks section for important security information.
+ ///
+ /// The .
+ /// The page name to generate the url for. When , defaults to the current executing page.
+ /// The handler to generate the url for. When , defaults to the current executing handler.
+ /// An object that contains route values.
+ /// The protocol for the URL, such as "http" or "https".
+ /// The host name for the URL.
+ /// The fragment for the URL.
+ /// The generated URL.
+ ///
+ ///
+ /// The value of should be a trusted value. Relying on the value of the current request
+ /// can allow untrusted input to influence the resulting URI unless the Host header has been validated.
+ /// See the deployment documentation for instructions on how to properly validate the Host header in
+ /// your deployment environment.
+ ///
+ ///
+ public static string PageLink(
+ this IUrlHelper urlHelper,
+ string pageName = null,
+ string pageHandler = null,
+ object values = null,
+ string protocol = null,
+ string host = null,
+ string fragment = null)
+ {
+ if (urlHelper == null)
+ {
+ throw new ArgumentNullException(nameof(urlHelper));
+ }
+
+ var httpContext = urlHelper.ActionContext.HttpContext;
+
+ if (protocol == null)
+ {
+ protocol = httpContext.Request.Protocol;
+ }
+
+ if (host == null)
+ {
+ host = httpContext.Request.Host.ToUriComponent();
+ }
+
+ return Page(urlHelper, pageName, pageHandler, values, protocol, host, fragment);
+ }
}
}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj
index 9bb08478c3..e1645892c9 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.NewtonsoftJson/Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj
@@ -6,6 +6,7 @@
$(NoWarn);CS1591
true
aspnetcore;aspnetcoremvc;json
+ true
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CSharpCompiler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CSharpCompiler.cs
new file mode 100644
index 0000000000..4aeb006421
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CSharpCompiler.cs
@@ -0,0 +1,226 @@
+// 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.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Emit;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.Extensions.DependencyModel;
+using DependencyContextCompilationOptions = Microsoft.Extensions.DependencyModel.CompilationOptions;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal class CSharpCompiler
+ {
+ private readonly RazorReferenceManager _referenceManager;
+ private readonly IHostingEnvironment _hostingEnvironment;
+ private bool _optionsInitialized;
+ private CSharpParseOptions _parseOptions;
+ private CSharpCompilationOptions _compilationOptions;
+ private EmitOptions _emitOptions;
+ private bool _emitPdb;
+
+ public CSharpCompiler(RazorReferenceManager manager, IHostingEnvironment hostingEnvironment)
+ {
+ _referenceManager = manager ?? throw new ArgumentNullException(nameof(manager));
+ _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
+ }
+
+ public virtual CSharpParseOptions ParseOptions
+ {
+ get
+ {
+ EnsureOptions();
+ return _parseOptions;
+ }
+ }
+
+ public virtual CSharpCompilationOptions CSharpCompilationOptions
+ {
+ get
+ {
+ EnsureOptions();
+ return _compilationOptions;
+ }
+ }
+
+ public virtual bool EmitPdb
+ {
+ get
+ {
+ EnsureOptions();
+ return _emitPdb;
+ }
+ }
+
+ public virtual EmitOptions EmitOptions
+ {
+ get
+ {
+ EnsureOptions();
+ return _emitOptions;
+ }
+ }
+
+ public SyntaxTree CreateSyntaxTree(SourceText sourceText)
+ {
+ return CSharpSyntaxTree.ParseText(
+ sourceText,
+ options: ParseOptions);
+ }
+
+ public CSharpCompilation CreateCompilation(string assemblyName)
+ {
+ return CSharpCompilation.Create(
+ assemblyName,
+ options: CSharpCompilationOptions,
+ references: _referenceManager.CompilationReferences);
+ }
+
+ // Internal for unit testing.
+ protected internal virtual DependencyContextCompilationOptions GetDependencyContextCompilationOptions()
+ {
+ if (!string.IsNullOrEmpty(_hostingEnvironment.ApplicationName))
+ {
+ var applicationAssembly = Assembly.Load(new AssemblyName(_hostingEnvironment.ApplicationName));
+ var dependencyContext = DependencyContext.Load(applicationAssembly);
+ if (dependencyContext?.CompilationOptions != null)
+ {
+ return dependencyContext.CompilationOptions;
+ }
+ }
+
+ return DependencyContextCompilationOptions.Default;
+ }
+
+ private void EnsureOptions()
+ {
+ if (!_optionsInitialized)
+ {
+ var dependencyContextOptions = GetDependencyContextCompilationOptions();
+ _parseOptions = GetParseOptions(_hostingEnvironment, dependencyContextOptions);
+ _compilationOptions = GetCompilationOptions(_hostingEnvironment, dependencyContextOptions);
+ _emitOptions = GetEmitOptions(dependencyContextOptions);
+
+ _optionsInitialized = true;
+ }
+ }
+
+ private EmitOptions GetEmitOptions(DependencyContextCompilationOptions dependencyContextOptions)
+ {
+ // Assume we're always producing pdbs unless DebugType = none
+ _emitPdb = true;
+ DebugInformationFormat debugInformationFormat;
+ if (string.IsNullOrEmpty(dependencyContextOptions.DebugType))
+ {
+ debugInformationFormat = DebugInformationFormat.PortablePdb;
+ }
+ else
+ {
+ // Based on https://github.com/dotnet/roslyn/blob/1d28ff9ba248b332de3c84d23194a1d7bde07e4d/src/Compilers/CSharp/Portable/CommandLine/CSharpCommandLineParser.cs#L624-L640
+ switch (dependencyContextOptions.DebugType.ToLower())
+ {
+ case "none":
+ // There isn't a way to represent none in DebugInformationFormat.
+ // We'll set EmitPdb to false and let callers handle it by setting a null pdb-stream.
+ _emitPdb = false;
+ return new EmitOptions();
+ case "portable":
+ debugInformationFormat = DebugInformationFormat.PortablePdb;
+ break;
+ case "embedded":
+ // Roslyn does not expose enough public APIs to produce a binary with embedded pdbs.
+ // We'll produce PortablePdb instead to continue providing a reasonable user experience.
+ debugInformationFormat = DebugInformationFormat.PortablePdb;
+ break;
+ case "full":
+ case "pdbonly":
+ debugInformationFormat = DebugInformationFormat.PortablePdb;
+ break;
+ default:
+ throw new InvalidOperationException(Resources.FormatUnsupportedDebugInformationFormat(dependencyContextOptions.DebugType));
+ }
+ }
+
+ var emitOptions = new EmitOptions(debugInformationFormat: debugInformationFormat);
+ return emitOptions;
+ }
+
+ private static CSharpCompilationOptions GetCompilationOptions(
+ IHostingEnvironment hostingEnvironment,
+ DependencyContextCompilationOptions dependencyContextOptions)
+ {
+ var csharpCompilationOptions = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary);
+
+ // Disable 1702 until roslyn turns this off by default
+ csharpCompilationOptions = csharpCompilationOptions.WithSpecificDiagnosticOptions(
+ new Dictionary
+ {
+ {"CS1701", ReportDiagnostic.Suppress}, // Binding redirects
+ {"CS1702", ReportDiagnostic.Suppress},
+ {"CS1705", ReportDiagnostic.Suppress}
+ });
+
+ if (dependencyContextOptions.AllowUnsafe.HasValue)
+ {
+ csharpCompilationOptions = csharpCompilationOptions.WithAllowUnsafe(
+ dependencyContextOptions.AllowUnsafe.Value);
+ }
+
+ OptimizationLevel optimizationLevel;
+ if (dependencyContextOptions.Optimize.HasValue)
+ {
+ optimizationLevel = dependencyContextOptions.Optimize.Value ?
+ OptimizationLevel.Release :
+ OptimizationLevel.Debug;
+ }
+ else
+ {
+ optimizationLevel = hostingEnvironment.IsDevelopment() ?
+ OptimizationLevel.Debug :
+ OptimizationLevel.Release;
+ }
+ csharpCompilationOptions = csharpCompilationOptions.WithOptimizationLevel(optimizationLevel);
+
+ if (dependencyContextOptions.WarningsAsErrors.HasValue)
+ {
+ var reportDiagnostic = dependencyContextOptions.WarningsAsErrors.Value ?
+ ReportDiagnostic.Error :
+ ReportDiagnostic.Default;
+ csharpCompilationOptions = csharpCompilationOptions.WithGeneralDiagnosticOption(reportDiagnostic);
+ }
+
+ return csharpCompilationOptions;
+ }
+
+ private static CSharpParseOptions GetParseOptions(
+ IHostingEnvironment hostingEnvironment,
+ DependencyContextCompilationOptions dependencyContextOptions)
+ {
+ var configurationSymbol = hostingEnvironment.IsDevelopment() ? "DEBUG" : "RELEASE";
+ var defines = dependencyContextOptions.Defines.Concat(new[] { configurationSymbol });
+
+ var parseOptions = new CSharpParseOptions(preprocessorSymbols: defines);
+
+ if (!string.IsNullOrEmpty(dependencyContextOptions.LanguageVersion))
+ {
+ if (LanguageVersionFacts.TryParse(dependencyContextOptions.LanguageVersion, out var languageVersion))
+ {
+ parseOptions = parseOptions.WithLanguageVersion(languageVersion);
+ }
+ else
+ {
+ Debug.Fail($"LanguageVersion {languageVersion} specified in the deps file could not be parsed.");
+ }
+ }
+
+ return parseOptions;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/ChecksumValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/ChecksumValidator.cs
new file mode 100644
index 0000000000..220d803151
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/ChecksumValidator.cs
@@ -0,0 +1,122 @@
+// 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 Microsoft.AspNetCore.Razor.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal static class ChecksumValidator
+ {
+ public static bool IsRecompilationSupported(RazorCompiledItem item)
+ {
+ if (item == null)
+ {
+ throw new ArgumentNullException(nameof(item));
+ }
+
+ // A Razor item only supports recompilation if its primary source file has a checksum.
+ //
+ // Other files (view imports) may or may not have existed at the time of compilation,
+ // so we may not have checksums for them.
+ var checksums = item.GetChecksumMetadata();
+ return checksums.Any(c => string.Equals(item.Identifier, c.Identifier, StringComparison.OrdinalIgnoreCase));
+ }
+
+ // Validates that we can use an existing precompiled view by comparing checksums with files on
+ // disk.
+ public static bool IsItemValid(RazorProjectFileSystem fileSystem, RazorCompiledItem item)
+ {
+ if (fileSystem == null)
+ {
+ throw new ArgumentNullException(nameof(fileSystem));
+ }
+
+ if (item == null)
+ {
+ throw new ArgumentNullException(nameof(item));
+ }
+
+ var checksums = item.GetChecksumMetadata();
+
+ // The checksum that matches 'Item.Identity' in this list is significant. That represents the main file.
+ //
+ // We don't really care about the validation unless the main file exists. This is because we expect
+ // most sites to have some _ViewImports in common location. That means that in the case you're
+ // using views from a 3rd party library, you'll always have **some** conflicts.
+ //
+ // The presence of the main file with the same content is a very strong signal that you're in a
+ // development scenario.
+ var primaryChecksum = checksums
+ .FirstOrDefault(c => string.Equals(item.Identifier, c.Identifier, StringComparison.OrdinalIgnoreCase));
+ if (primaryChecksum == null)
+ {
+ // No primary checksum, assume valid.
+ return true;
+ }
+
+ var projectItem = fileSystem.GetItem(primaryChecksum.Identifier);
+ if (!projectItem.Exists)
+ {
+ // Main file doesn't exist - assume valid.
+ return true;
+ }
+
+ var sourceDocument = RazorSourceDocument.ReadFrom(projectItem);
+ if (!string.Equals(sourceDocument.GetChecksumAlgorithm(), primaryChecksum.ChecksumAlgorithm) ||
+ !ChecksumsEqual(primaryChecksum.Checksum, sourceDocument.GetChecksum()))
+ {
+ // Main file exists, but checksums not equal.
+ return false;
+ }
+
+ for (var i = 0; i < checksums.Count; i++)
+ {
+ var checksum = checksums[i];
+ if (string.Equals(item.Identifier, checksum.Identifier, StringComparison.OrdinalIgnoreCase))
+ {
+ // Ignore primary checksum on this pass.
+ continue;
+ }
+
+ var importItem = fileSystem.GetItem(checksum.Identifier);
+ if (!importItem.Exists)
+ {
+ // Import file doesn't exist - assume invalid.
+ return false;
+ }
+
+ sourceDocument = RazorSourceDocument.ReadFrom(importItem);
+ if (!string.Equals(sourceDocument.GetChecksumAlgorithm(), checksum.ChecksumAlgorithm) ||
+ !ChecksumsEqual(checksum.Checksum, sourceDocument.GetChecksum()))
+ {
+ // Import file exists, but checksums not equal.
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ private static bool ChecksumsEqual(string checksum, byte[] bytes)
+ {
+ if (bytes.Length * 2 != checksum.Length)
+ {
+ return false;
+ }
+
+ for (var i = 0; i < bytes.Length; i++)
+ {
+ var text = bytes[i].ToString("x2");
+ if (checksum[i * 2] != text[0] || checksum[i * 2 + 1] != text[1])
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CompilationFailedException.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CompilationFailedException.cs
new file mode 100644
index 0000000000..bb5dac8d2f
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CompilationFailedException.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.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Diagnostics;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal class CompilationFailedException : Exception, ICompilationException
+ {
+ public CompilationFailedException(
+ IEnumerable compilationFailures)
+ : base(FormatMessage(compilationFailures))
+ {
+ if (compilationFailures == null)
+ {
+ throw new ArgumentNullException(nameof(compilationFailures));
+ }
+
+ CompilationFailures = compilationFailures;
+ }
+
+ public IEnumerable CompilationFailures { get; }
+
+ private static string FormatMessage(IEnumerable compilationFailures)
+ {
+ return Resources.CompilationFailed + Environment.NewLine +
+ string.Join(
+ Environment.NewLine,
+ compilationFailures.SelectMany(f => f.Messages).Select(message => message.FormattedMessage));
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CompilationFailedExceptionFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CompilationFailedExceptionFactory.cs
new file mode 100644
index 0000000000..86cfc0a223
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/CompilationFailedExceptionFactory.cs
@@ -0,0 +1,157 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal static class CompilationFailedExceptionFactory
+ {
+ // error CS0234: The type or namespace name 'C' does not exist in the namespace 'N' (are you missing
+ // an assembly reference?)
+ private const string CS0234 = nameof(CS0234);
+ // error CS0246: The type or namespace name 'T' could not be found (are you missing a using directive
+ // or an assembly reference?)
+ private const string CS0246 = nameof(CS0246);
+
+ public static CompilationFailedException Create(
+ RazorCodeDocument codeDocument,
+ IEnumerable diagnostics)
+ {
+ // If a SourceLocation does not specify a file path, assume it is produced from parsing the current file.
+ var messageGroups = diagnostics.GroupBy(
+ razorError => razorError.Span.FilePath ?? codeDocument.Source.FilePath,
+ StringComparer.Ordinal);
+
+ var failures = new List();
+ foreach (var group in messageGroups)
+ {
+ var filePath = group.Key;
+ var fileContent = ReadContent(codeDocument, filePath);
+ var compilationFailure = new CompilationFailure(
+ filePath,
+ fileContent,
+ compiledContent: string.Empty,
+ messages: group.Select(parserError => CreateDiagnosticMessage(parserError, filePath)));
+ failures.Add(compilationFailure);
+ }
+
+ return new CompilationFailedException(failures);
+ }
+
+ public static CompilationFailedException Create(
+ RazorCodeDocument codeDocument,
+ string compilationContent,
+ string assemblyName,
+ IEnumerable diagnostics)
+ {
+ var diagnosticGroups = diagnostics
+ .Where(diagnostic => diagnostic.IsWarningAsError || diagnostic.Severity == DiagnosticSeverity.Error)
+ .GroupBy(diagnostic => GetFilePath(codeDocument, diagnostic), StringComparer.Ordinal);
+
+ var failures = new List();
+ foreach (var group in diagnosticGroups)
+ {
+ var sourceFilePath = group.Key;
+ string sourceFileContent;
+ if (string.Equals(assemblyName, sourceFilePath, StringComparison.Ordinal))
+ {
+ // The error is in the generated code and does not have a mapping line pragma
+ sourceFileContent = compilationContent;
+ sourceFilePath = Resources.GeneratedCodeFileName;
+ }
+ else
+ {
+ sourceFileContent = ReadContent(codeDocument, sourceFilePath);
+ }
+
+ string additionalMessage = null;
+ if (group.Any(g =>
+ string.Equals(CS0234, g.Id, StringComparison.OrdinalIgnoreCase) ||
+ string.Equals(CS0246, g.Id, StringComparison.OrdinalIgnoreCase)))
+ {
+ additionalMessage = Resources.FormatCompilation_MissingReferences(
+ "CopyRefAssembliesToPublishDirectory");
+ }
+
+ var compilationFailure = new CompilationFailure(
+ sourceFilePath,
+ sourceFileContent,
+ compilationContent,
+ group.Select(GetDiagnosticMessage),
+ additionalMessage);
+
+ failures.Add(compilationFailure);
+ }
+
+ return new CompilationFailedException(failures);
+ }
+
+ private static string ReadContent(RazorCodeDocument codeDocument, string filePath)
+ {
+ RazorSourceDocument sourceDocument;
+ if (string.IsNullOrEmpty(filePath) || string.Equals(codeDocument.Source.FilePath, filePath, StringComparison.Ordinal))
+ {
+ sourceDocument = codeDocument.Source;
+ }
+ else
+ {
+ sourceDocument = codeDocument.Imports.FirstOrDefault(f => string.Equals(f.FilePath, filePath, StringComparison.Ordinal));
+ }
+
+ if (sourceDocument != null)
+ {
+ var contentChars = new char[sourceDocument.Length];
+ sourceDocument.CopyTo(0, contentChars, 0, sourceDocument.Length);
+ return new string(contentChars);
+ }
+
+ return string.Empty;
+ }
+
+ private static DiagnosticMessage GetDiagnosticMessage(Diagnostic diagnostic)
+ {
+ var mappedLineSpan = diagnostic.Location.GetMappedLineSpan();
+ return new DiagnosticMessage(
+ diagnostic.GetMessage(),
+ CSharpDiagnosticFormatter.Instance.Format(diagnostic),
+ mappedLineSpan.Path,
+ mappedLineSpan.StartLinePosition.Line + 1,
+ mappedLineSpan.StartLinePosition.Character + 1,
+ mappedLineSpan.EndLinePosition.Line + 1,
+ mappedLineSpan.EndLinePosition.Character + 1);
+ }
+
+ private static DiagnosticMessage CreateDiagnosticMessage(
+ RazorDiagnostic razorDiagnostic,
+ string filePath)
+ {
+ var sourceSpan = razorDiagnostic.Span;
+ var message = razorDiagnostic.GetMessage();
+ return new DiagnosticMessage(
+ message: message,
+ formattedMessage: razorDiagnostic.ToString(),
+ filePath: filePath,
+ startLine: sourceSpan.LineIndex + 1,
+ startColumn: sourceSpan.CharacterIndex,
+ endLine: sourceSpan.LineIndex + 1,
+ endColumn: sourceSpan.CharacterIndex + sourceSpan.Length);
+ }
+
+ private static string GetFilePath(RazorCodeDocument codeDocument, Diagnostic diagnostic)
+ {
+ if (diagnostic.Location == Location.None)
+ {
+ return codeDocument.Source.FilePath;
+ }
+
+ return diagnostic.Location.GetMappedLineSpan().Path;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/MvcRazorRuntimeCompilationOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/MvcRazorRuntimeCompilationOptionsSetup.cs
new file mode 100644
index 0000000000..e18689ccb3
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/MvcRazorRuntimeCompilationOptionsSetup.cs
@@ -0,0 +1,29 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal class MvcRazorRuntimeCompilationOptionsSetup : IConfigureOptions
+ {
+ private readonly IHostingEnvironment _hostingEnvironment;
+
+ public MvcRazorRuntimeCompilationOptionsSetup(IHostingEnvironment hostingEnvironment)
+ {
+ _hostingEnvironment = hostingEnvironment ?? throw new ArgumentNullException(nameof(hostingEnvironment));
+ }
+
+ public void Configure(MvcRazorRuntimeCompilationOptions options)
+ {
+ if (options == null)
+ {
+ throw new ArgumentNullException(nameof(options));
+ }
+
+ options.FileProviders.Add(_hostingEnvironment.ContentRootFileProvider);
+ }
+ }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs
new file mode 100644
index 0000000000..a673954e3d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/RazorRuntimeCompilationMvcBuilderExtensions.cs
@@ -0,0 +1,50 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+ public static class RazorRuntimeCompilationMvcBuilderExtensions
+ {
+ ///
+ /// Configures to support runtime compilation of Razor views and Razor Pages.
+ ///
+ /// The .
+ /// The .
+ public static IMvcBuilder AddRazorRuntimeCompilation(this IMvcBuilder builder)
+ {
+ if (builder == null)
+ {
+ throw new ArgumentNullException(nameof(builder));
+ }
+
+ RazorRuntimeCompilationMvcCoreBuilderExtensions.AddServices(builder.Services);
+ return builder;
+ }
+
+ ///
+ /// Configures to support runtime compilation of Razor views and Razor Pages.
+ ///
+ /// The .
+ /// An action to configure the .
+ /// The .
+ public static IMvcBuilder AddRazorRuntimeCompilation(this IMvcBuilder builder, Action setupAction)
+ {
+ if (builder == null)
+ {
+ throw new ArgumentNullException(nameof(builder));
+ }
+
+ if (setupAction == null)
+ {
+ throw new ArgumentNullException(nameof(setupAction));
+ }
+
+ RazorRuntimeCompilationMvcCoreBuilderExtensions.AddServices(builder.Services);
+ builder.Services.Configure(setupAction);
+ return builder;
+ }
+ }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs
new file mode 100644
index 0000000000..bd42adb829
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensions.cs
@@ -0,0 +1,113 @@
+// 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 Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions;
+using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Razor;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+ public static class RazorRuntimeCompilationMvcCoreBuilderExtensions
+ {
+ ///
+ /// Configures to support runtime compilation of Razor views and Razor Pages.
+ ///
+ /// The .
+ /// The .
+ public static IMvcCoreBuilder AddRazorRuntimeCompilation(this IMvcCoreBuilder builder)
+ {
+ if (builder == null)
+ {
+ throw new ArgumentNullException(nameof(builder));
+ }
+
+ AddServices(builder.Services);
+ return builder;
+ }
+
+ ///
+ /// Configures to support runtime compilation of Razor views and Razor Pages.
+ ///
+ /// The .
+ /// An action to configure the .
+ /// The .
+ public static IMvcCoreBuilder AddRazorRuntimeCompilation(this IMvcCoreBuilder builder, Action setupAction)
+ {
+ if (builder == null)
+ {
+ throw new ArgumentNullException(nameof(builder));
+ }
+
+ if (setupAction == null)
+ {
+ throw new ArgumentNullException(nameof(setupAction));
+ }
+
+ AddServices(builder.Services);
+ builder.Services.Configure(setupAction);
+ return builder;
+ }
+
+ // Internal for testing.
+ internal static void AddServices(IServiceCollection services)
+ {
+ services.TryAddEnumerable(
+ ServiceDescriptor.Transient, MvcRazorRuntimeCompilationOptionsSetup>());
+
+ var compilerProvider = services.FirstOrDefault(f =>
+ f.ServiceType == typeof(IViewCompilerProvider) &&
+ f.ImplementationType?.Assembly == typeof(IViewCompilerProvider).Assembly &&
+ f.ImplementationType.FullName == "Microsoft.AspNetCore.Mvc.Razor.Compilation.DefaultViewCompilerProvider");
+
+ if (compilerProvider != null)
+ {
+ // Replace the default implementation of IViewCompilerProvider
+ services.Remove(compilerProvider);
+ }
+
+ services.TryAddSingleton();
+
+ services.TryAddSingleton();
+ services.TryAddSingleton();
+ services.TryAddSingleton();
+
+ services.TryAddSingleton();
+ services.TryAddSingleton(s =>
+ {
+ var fileSystem = s.GetRequiredService();
+ var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem, builder =>
+ {
+ RazorExtensions.Register(builder);
+
+ // Roslyn + TagHelpers infrastructure
+ var referenceManager = s.GetRequiredService();
+ builder.Features.Add(new LazyMetadataReferenceFeature(referenceManager));
+ builder.Features.Add(new CompilationTagHelperFeature());
+
+ // TagHelperDescriptorProviders (actually do tag helper discovery)
+ builder.Features.Add(new DefaultTagHelperDescriptorProvider());
+ builder.Features.Add(new ViewComponentTagHelperDescriptorProvider());
+ });
+
+ return projectEngine;
+ });
+
+ //
+ // Razor Pages
+ //
+ services.TryAddEnumerable(
+ ServiceDescriptor.Singleton());
+
+ services.TryAddEnumerable(
+ ServiceDescriptor.Singleton());
+ }
+ }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/FileProviderRazorProjectFileSystem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/FileProviderRazorProjectFileSystem.cs
new file mode 100644
index 0000000000..f15d523b21
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/FileProviderRazorProjectFileSystem.cs
@@ -0,0 +1,93 @@
+// 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.IO;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.FileProviders;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal class FileProviderRazorProjectFileSystem : RazorProjectFileSystem
+ {
+ private const string RazorFileExtension = ".cshtml";
+ private readonly RuntimeCompilationFileProvider _fileProvider;
+ private readonly IHostingEnvironment _hostingEnvironment;
+
+ public FileProviderRazorProjectFileSystem(RuntimeCompilationFileProvider fileProvider, IHostingEnvironment hostingEnvironment)
+ {
+ if (fileProvider == null)
+ {
+ throw new ArgumentNullException(nameof(fileProvider));
+ }
+
+ if (hostingEnvironment == null)
+ {
+ throw new ArgumentNullException(nameof(hostingEnvironment));
+ }
+
+ _fileProvider = fileProvider;
+ _hostingEnvironment = hostingEnvironment;
+ }
+
+ public IFileProvider FileProvider => _fileProvider.FileProvider;
+
+ public override RazorProjectItem GetItem(string path)
+ {
+ path = NormalizeAndEnsureValidPath(path);
+ var fileInfo = FileProvider.GetFileInfo(path);
+
+ return new FileProviderRazorProjectItem(fileInfo, basePath: string.Empty, filePath: path, root: _hostingEnvironment.ContentRootPath);
+ }
+
+ public override IEnumerable EnumerateItems(string path)
+ {
+ path = NormalizeAndEnsureValidPath(path);
+ return EnumerateFiles(FileProvider.GetDirectoryContents(path), path, prefix: string.Empty);
+ }
+
+ private IEnumerable EnumerateFiles(IDirectoryContents directory, string basePath, string prefix)
+ {
+ if (directory.Exists)
+ {
+ foreach (var fileInfo in directory)
+ {
+ if (fileInfo.IsDirectory)
+ {
+ var relativePath = prefix + "/" + fileInfo.Name;
+ var subDirectory = FileProvider.GetDirectoryContents(JoinPath(basePath, relativePath));
+ var children = EnumerateFiles(subDirectory, basePath, relativePath);
+ foreach (var child in children)
+ {
+ yield return child;
+ }
+ }
+ else if (string.Equals(RazorFileExtension, Path.GetExtension(fileInfo.Name), StringComparison.OrdinalIgnoreCase))
+ {
+ var filePath = prefix + "/" + fileInfo.Name;
+
+ yield return new FileProviderRazorProjectItem(fileInfo, basePath, filePath: filePath, root: _hostingEnvironment.ContentRootPath);
+ }
+ }
+ }
+ }
+
+ private static string JoinPath(string path1, string path2)
+ {
+ var hasTrailingSlash = path1.EndsWith("/", StringComparison.Ordinal);
+ var hasLeadingSlash = path2.StartsWith("/", StringComparison.Ordinal);
+ if (hasLeadingSlash && hasTrailingSlash)
+ {
+ return path1 + path2.Substring(1);
+ }
+ else if (hasLeadingSlash || hasTrailingSlash)
+ {
+ return path1 + path2;
+ }
+
+ return path1 + "/" + path2;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/FileProviderRazorProjectItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/FileProviderRazorProjectItem.cs
new file mode 100644
index 0000000000..f616dd4d06
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/FileProviderRazorProjectItem.cs
@@ -0,0 +1,65 @@
+// 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.IO;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.FileProviders;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ public class FileProviderRazorProjectItem : RazorProjectItem
+ {
+ private string _root;
+ private string _relativePhysicalPath;
+ private bool _isRelativePhysicalPathSet;
+
+ public FileProviderRazorProjectItem(IFileInfo fileInfo, string basePath, string filePath, string root)
+ {
+ FileInfo = fileInfo;
+ BasePath = basePath;
+ FilePath = filePath;
+ _root = root;
+ }
+
+ public IFileInfo FileInfo { get; }
+
+ public override string BasePath { get; }
+
+ public override string FilePath { get; }
+
+ public override bool Exists => FileInfo.Exists;
+
+ public override string PhysicalPath => FileInfo.PhysicalPath;
+
+ public override string RelativePhysicalPath
+ {
+ get
+ {
+ if (!_isRelativePhysicalPathSet)
+ {
+ _isRelativePhysicalPathSet = true;
+
+ if (Exists)
+ {
+ if (_root != null &&
+ !string.IsNullOrEmpty(PhysicalPath) &&
+ PhysicalPath.StartsWith(_root, StringComparison.OrdinalIgnoreCase) &&
+ PhysicalPath.Length > _root.Length &&
+ (PhysicalPath[_root.Length] == Path.DirectorySeparatorChar || PhysicalPath[_root.Length] == Path.AltDirectorySeparatorChar))
+ {
+ _relativePhysicalPath = PhysicalPath.Substring(_root.Length + 1); // Include leading separator
+ }
+ }
+ }
+
+ return _relativePhysicalPath;
+ }
+ }
+
+ public override Stream Read()
+ {
+ return FileInfo.CreateReadStream();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/LazyMetadataReferenceFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/LazyMetadataReferenceFeature.cs
new file mode 100644
index 0000000000..3f150a9a5d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/LazyMetadataReferenceFeature.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.
+
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal class LazyMetadataReferenceFeature : IMetadataReferenceFeature
+ {
+ private readonly RazorReferenceManager _referenceManager;
+
+ public LazyMetadataReferenceFeature(RazorReferenceManager referenceManager)
+ {
+ _referenceManager = referenceManager;
+ }
+
+ ///
+ /// Invoking ensures that compilation
+ /// references are lazily evaluated.
+ ///
+ public IReadOnlyList References => _referenceManager.CompilationReferences;
+
+ public RazorEngine Engine { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
new file mode 100644
index 0000000000..680bed7d5a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj
@@ -0,0 +1,23 @@
+
+
+
+ Runtime compilation support for Razor views and Razor Pages in ASP.NET Core MVC.
+ netcoreapp3.0
+ $(NoWarn);CS1591
+ true
+ aspnetcore;aspnetcoremvc;razor
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/MvcRazorRuntimeCompilationOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/MvcRazorRuntimeCompilationOptions.cs
new file mode 100644
index 0000000000..237d9554ca
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/MvcRazorRuntimeCompilationOptions.cs
@@ -0,0 +1,31 @@
+// 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 Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.FileProviders;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ public class MvcRazorRuntimeCompilationOptions
+ {
+ ///
+ /// Gets the instances used to locate Razor files.
+ ///
+ ///
+ /// At startup, this collection is initialized to include an instance of
+ /// that is rooted at the application root.
+ ///
+ public IList FileProviders { get; } = new List();
+
+ ///
+ /// Gets paths to additional references used during runtime compilation of Razor files.
+ ///
+ ///
+ /// By default, the runtime compiler to gather references
+ /// uses to compile a Razor file. This API allows providing additional references to the compiler.
+ ///
+ public IList AdditionalReferencePaths { get; } = new List();
+ }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/PageActionDescriptorChangeProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/PageActionDescriptorChangeProvider.cs
new file mode 100644
index 0000000000..b8224d7c97
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/PageActionDescriptorChangeProvider.cs
@@ -0,0 +1,98 @@
+// 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.Diagnostics;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal class PageActionDescriptorChangeProvider : IActionDescriptorChangeProvider
+ {
+ private readonly RuntimeCompilationFileProvider _fileProvider;
+ private readonly string[] _searchPatterns;
+ private readonly string[] _additionalFilesToTrack;
+
+ public PageActionDescriptorChangeProvider(
+ RazorProjectEngine projectEngine,
+ RuntimeCompilationFileProvider fileProvider,
+ IOptions razorPagesOptions)
+ {
+ if (projectEngine == null)
+ {
+ throw new ArgumentNullException(nameof(projectEngine));
+ }
+
+ if (fileProvider == null)
+ {
+ throw new ArgumentNullException(nameof(fileProvider));
+ }
+
+ if (razorPagesOptions == null)
+ {
+ throw new ArgumentNullException(nameof(razorPagesOptions));
+ }
+
+ _fileProvider = fileProvider;
+
+ var rootDirectory = razorPagesOptions.Value.RootDirectory;
+ Debug.Assert(!string.IsNullOrEmpty(rootDirectory));
+ rootDirectory = rootDirectory.TrimEnd('/');
+
+ // Search pattern that matches all cshtml files under the Pages RootDirectory
+ var pagesRootSearchPattern = rootDirectory + "/**/*.cshtml";
+
+ // Search pattern that matches all cshtml files under the Pages AreaRootDirectory
+ var areaRootSearchPattern = "/Areas/**/*.cshtml";
+
+ _searchPatterns = new[]
+ {
+ pagesRootSearchPattern,
+ areaRootSearchPattern
+ };
+
+ // pagesRootSearchPattern will miss _ViewImports outside the RootDirectory despite these influencing
+ // compilation. e.g. when RootDirectory = /Dir1/Dir2, the search pattern will ignore changes to
+ // [/_ViewImports.cshtml, /Dir1/_ViewImports.cshtml]. We need to additionally account for these.
+ var importFeatures = projectEngine.ProjectFeatures.OfType().ToArray();
+ var fileAtPagesRoot = projectEngine.FileSystem.GetItem(rootDirectory + "/Index.cshtml");
+
+ _additionalFilesToTrack = GetImports(importFeatures, fileAtPagesRoot);
+ }
+
+ public IChangeToken GetChangeToken()
+ {
+ var fileProvider = _fileProvider.FileProvider;
+
+ var changeTokens = new IChangeToken[_additionalFilesToTrack.Length + _searchPatterns.Length];
+ for (var i = 0; i < _additionalFilesToTrack.Length; i++)
+ {
+ changeTokens[i] = fileProvider.Watch(_additionalFilesToTrack[i]);
+ }
+
+ for (var i = 0; i < _searchPatterns.Length; i++)
+ {
+ var wildcardChangeToken = fileProvider.Watch(_searchPatterns[i]);
+ changeTokens[_additionalFilesToTrack.Length + i] = wildcardChangeToken;
+ }
+
+ return new CompositeChangeToken(changeTokens);
+ }
+
+ private static string[] GetImports(
+ IImportProjectFeature[] importFeatures,
+ RazorProjectItem file)
+ {
+ return importFeatures
+ .SelectMany(f => f.GetImports(file))
+ .Where(f => f.FilePath != null)
+ .Select(f => f.FilePath)
+ .ToArray();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/PageDirectiveFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/PageDirectiveFeature.cs
new file mode 100644
index 0000000000..e1d5f12c30
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/PageDirectiveFeature.cs
@@ -0,0 +1,110 @@
+// 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.IO;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal static class PageDirectiveFeature
+ {
+ private static readonly RazorProjectEngine PageDirectiveEngine = RazorProjectEngine.Create(RazorConfiguration.Default, new EmptyRazorProjectFileSystem(), builder =>
+ {
+ for (var i = builder.Phases.Count - 1; i >= 0; i--)
+ {
+ var phase = builder.Phases[i];
+ builder.Phases.RemoveAt(i);
+ if (phase is IRazorDocumentClassifierPhase)
+ {
+ break;
+ }
+ }
+
+ RazorExtensions.Register(builder);
+ builder.Features.Add(new PageDirectiveParserOptionsFeature());
+ });
+
+ public static bool TryGetPageDirective(ILogger logger, RazorProjectItem projectItem, out string template)
+ {
+ if (projectItem == null)
+ {
+ throw new ArgumentNullException(nameof(projectItem));
+ }
+
+ var codeDocument = PageDirectiveEngine.Process(projectItem);
+
+ var documentIRNode = codeDocument.GetDocumentIntermediateNode();
+ if (PageDirective.TryGetPageDirective(documentIRNode, out var pageDirective))
+ {
+ if (pageDirective.DirectiveNode is MalformedDirectiveIntermediateNode malformedNode)
+ {
+ logger.MalformedPageDirective(projectItem.FilePath, malformedNode.Diagnostics);
+ }
+
+ template = pageDirective.RouteTemplate;
+ return true;
+ }
+
+ template = null;
+ return false;
+ }
+
+ private class PageDirectiveParserOptionsFeature : RazorEngineFeatureBase, IConfigureRazorParserOptionsFeature
+ {
+ public int Order { get; }
+
+ public void Configure(RazorParserOptionsBuilder options)
+ {
+ options.ParseLeadingDirectives = true;
+ }
+ }
+
+ private class EmptyRazorProjectFileSystem : RazorProjectFileSystem
+ {
+ public override IEnumerable EnumerateItems(string basePath)
+ {
+ return Enumerable.Empty();
+ }
+
+ public override IEnumerable FindHierarchicalItems(string basePath, string path, string fileName)
+ {
+ return Enumerable.Empty();
+ }
+
+ public override RazorProjectItem GetItem(string path)
+ {
+ return new NotFoundProjectItem(string.Empty, path);
+ }
+
+ private class NotFoundProjectItem : RazorProjectItem
+ {
+ public NotFoundProjectItem(string basePath, string path)
+ {
+ BasePath = basePath;
+ FilePath = path;
+ }
+
+ ///
+ public override string BasePath { get; }
+
+ ///
+ public override string FilePath { get; }
+
+ ///
+ public override bool Exists => false;
+
+ ///
+ public override string PhysicalPath => throw new NotSupportedException();
+
+ ///
+ public override Stream Read() => throw new NotSupportedException();
+ }
+ }
+ }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..472b09032a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Properties/AssemblyInfo.cs
@@ -0,0 +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.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..ce4fec5608
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Properties/Resources.Designer.cs
@@ -0,0 +1,100 @@
+//
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ using System.Globalization;
+ using System.Reflection;
+ using System.Resources;
+
+ internal static class Resources
+ {
+ private static readonly ResourceManager _resourceManager
+ = new ResourceManager("Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Resources", typeof(Resources).GetTypeInfo().Assembly);
+
+ ///
+ /// One or more compilation failures occurred:
+ ///
+ internal static string CompilationFailed
+ {
+ get => GetString("CompilationFailed");
+ }
+
+ ///
+ /// One or more compilation failures occurred:
+ ///
+ internal static string FormatCompilationFailed()
+ => GetString("CompilationFailed");
+
+ ///
+ /// One or more compilation references may be missing. If you're seeing this in a published application, set '{0}' to true in your project file to ensure files in the refs directory are published.
+ ///
+ internal static string Compilation_MissingReferences
+ {
+ get => GetString("Compilation_MissingReferences");
+ }
+
+ ///
+ /// One or more compilation references may be missing. If you're seeing this in a published application, set '{0}' to true in your project file to ensure files in the refs directory are published.
+ ///
+ internal static string FormatCompilation_MissingReferences(object p0)
+ => string.Format(CultureInfo.CurrentCulture, GetString("Compilation_MissingReferences"), p0);
+
+ ///
+ /// '{0}.{1}' must not be empty. At least one '{2}' is required to locate a view for rendering.
+ ///
+ internal static string FileProvidersAreRequired
+ {
+ get => GetString("FileProvidersAreRequired");
+ }
+
+ ///
+ /// '{0}.{1}' must not be empty. At least one '{2}' is required to locate a view for rendering.
+ ///
+ internal static string FormatFileProvidersAreRequired(object p0, object p1, object p2)
+ => string.Format(CultureInfo.CurrentCulture, GetString("FileProvidersAreRequired"), p0, p1, p2);
+
+ ///
+ /// Generated Code
+ ///
+ internal static string GeneratedCodeFileName
+ {
+ get => GetString("GeneratedCodeFileName");
+ }
+
+ ///
+ /// Generated Code
+ ///
+ internal static string FormatGeneratedCodeFileName()
+ => GetString("GeneratedCodeFileName");
+
+ ///
+ /// The debug type specified in the dependency context could be parsed. The debug type value '{0}' is not supported.
+ ///
+ internal static string UnsupportedDebugInformationFormat
+ {
+ get => GetString("UnsupportedDebugInformationFormat");
+ }
+
+ ///
+ /// The debug type specified in the dependency context could be parsed. The debug type value '{0}' is not supported.
+ ///
+ internal static string FormatUnsupportedDebugInformationFormat(object p0)
+ => string.Format(CultureInfo.CurrentCulture, GetString("UnsupportedDebugInformationFormat"), p0);
+
+ private static string GetString(string name, params string[] formatterNames)
+ {
+ var value = _resourceManager.GetString(name);
+
+ System.Diagnostics.Debug.Assert(value != null);
+
+ if (formatterNames != null)
+ {
+ for (var i = 0; i < formatterNames.Length; i++)
+ {
+ value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
+ }
+ }
+
+ return value;
+ }
+ }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorProjectPageRouteModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorProjectPageRouteModelProvider.cs
new file mode 100644
index 0000000000..a3b63ed6a8
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorProjectPageRouteModelProvider.cs
@@ -0,0 +1,107 @@
+// 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 Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal class RazorProjectPageRouteModelProvider : IPageRouteModelProvider
+ {
+ private const string AreaRootDirectory = "/Areas";
+ private readonly RazorProjectFileSystem _razorFileSystem;
+ private readonly RazorPagesOptions _pagesOptions;
+ private readonly PageRouteModelFactory _routeModelFactory;
+ private readonly ILogger _logger;
+
+ public RazorProjectPageRouteModelProvider(
+ RazorProjectFileSystem razorFileSystem,
+ IOptions pagesOptionsAccessor,
+ ILoggerFactory loggerFactory)
+ {
+ _razorFileSystem = razorFileSystem;
+ _pagesOptions = pagesOptionsAccessor.Value;
+ _logger = loggerFactory.CreateLogger();
+ _routeModelFactory = new PageRouteModelFactory(_pagesOptions, _logger);
+ }
+
+ ///
+ /// Ordered to execute after .
+ ///
+ public int Order => -1000 + 10;
+
+ public void OnProvidersExecuted(PageRouteModelProviderContext context)
+ {
+ }
+
+ public void OnProvidersExecuting(PageRouteModelProviderContext context)
+ {
+ // When RootDirectory and AreaRootDirectory overlap, e.g. RootDirectory = /, AreaRootDirectory = /Areas;
+ // we need to ensure that the page is only route-able via the area route. By adding area routes first,
+ // we'll ensure non area routes get skipped when it encounters an IsAlreadyRegistered check.
+
+ AddAreaPageModels(context);
+ AddPageModels(context);
+ }
+
+ private void AddPageModels(PageRouteModelProviderContext context)
+ {
+ foreach (var item in _razorFileSystem.EnumerateItems(_pagesOptions.RootDirectory))
+ {
+ var relativePath = item.CombinedPath;
+ if (context.RouteModels.Any(m => string.Equals(relativePath, m.RelativePath, StringComparison.OrdinalIgnoreCase)))
+ {
+ // A route for this file was already registered either by the CompiledPageRouteModel or as an area route.
+ // by this provider. Skip registering an additional entry.
+
+ // Note: We're comparing duplicates based on root-relative paths. This eliminates a page from being discovered
+ // by overlapping area and non-area routes where ViewEnginePath would be different.
+ continue;
+ }
+
+ if (!PageDirectiveFeature.TryGetPageDirective(_logger, item, out var routeTemplate))
+ {
+ // .cshtml pages without @page are not RazorPages.
+ continue;
+ }
+
+ var routeModel = _routeModelFactory.CreateRouteModel(relativePath, routeTemplate);
+ if (routeModel != null)
+ {
+ context.RouteModels.Add(routeModel);
+ }
+ }
+ }
+
+ private void AddAreaPageModels(PageRouteModelProviderContext context)
+ {
+ foreach (var item in _razorFileSystem.EnumerateItems(AreaRootDirectory))
+ {
+ var relativePath = item.CombinedPath;
+ if (context.RouteModels.Any(m => string.Equals(relativePath, m.RelativePath, StringComparison.OrdinalIgnoreCase)))
+ {
+ // A route for this file was already registered either by the CompiledPageRouteModel.
+ // Skip registering an additional entry.
+ continue;
+ }
+
+ if (!PageDirectiveFeature.TryGetPageDirective(_logger, item, out var routeTemplate))
+ {
+ // .cshtml pages without @page are not RazorPages.
+ continue;
+ }
+
+ var routeModel = _routeModelFactory.CreateAreaRouteModel(relativePath, routeTemplate);
+ if (routeModel != null)
+ {
+ context.RouteModels.Add(routeModel);
+ }
+ }
+ }
+ }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorReferenceManager.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorReferenceManager.cs
new file mode 100644
index 0000000000..ce0094a911
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorReferenceManager.cs
@@ -0,0 +1,79 @@
+// 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.IO;
+using System.Linq;
+using System.Reflection.PortableExecutable;
+using System.Threading;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal class RazorReferenceManager
+ {
+ private readonly ApplicationPartManager _partManager;
+ private readonly MvcRazorRuntimeCompilationOptions _options;
+ private object _compilationReferencesLock = new object();
+ private bool _compilationReferencesInitialized;
+ private IReadOnlyList _compilationReferences;
+
+ public RazorReferenceManager(
+ ApplicationPartManager partManager,
+ IOptions options)
+ {
+ _partManager = partManager;
+ _options = options.Value;
+ }
+
+ public virtual IReadOnlyList CompilationReferences
+ {
+ get
+ {
+ return LazyInitializer.EnsureInitialized(
+ ref _compilationReferences,
+ ref _compilationReferencesInitialized,
+ ref _compilationReferencesLock,
+ GetCompilationReferences);
+ }
+ }
+
+ private IReadOnlyList GetCompilationReferences()
+ {
+ var referencePaths = GetReferencePaths();
+
+ return referencePaths
+ .Select(CreateMetadataReference)
+ .ToList();
+ }
+
+ // For unit testing
+ internal IEnumerable GetReferencePaths()
+ {
+ var referencesFromApplicationParts = _partManager
+ .ApplicationParts
+ .OfType()
+ .SelectMany(part => part.GetReferencePaths());
+
+ var referencePaths = referencesFromApplicationParts
+ .Concat(_options.AdditionalReferencePaths)
+ .Distinct(StringComparer.OrdinalIgnoreCase);
+
+ return referencePaths;
+ }
+
+ private static MetadataReference CreateMetadataReference(string path)
+ {
+ using (var stream = File.OpenRead(path))
+ {
+ var moduleMetadata = ModuleMetadata.CreateFromStream(stream, PEStreamOptions.PrefetchMetadata);
+ var assemblyMetadata = AssemblyMetadata.Create(moduleMetadata);
+
+ return assemblyMetadata.GetReference(filePath: path);
+ }
+ }
+ }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorRuntimeCompilationLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorRuntimeCompilationLoggerExtensions.cs
new file mode 100644
index 0000000000..51ae2dc03d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RazorRuntimeCompilationLoggerExtensions.cs
@@ -0,0 +1,179 @@
+// 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.Diagnostics;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal static class MvcRazorLoggerExtensions
+ {
+ private static readonly double TimestampToTicks = TimeSpan.TicksPerSecond / (double)Stopwatch.Frequency;
+
+ private static readonly Action _generatedCodeToAssemblyCompilationStart;
+ private static readonly Action _generatedCodeToAssemblyCompilationEnd;
+ private static readonly Action _malformedPageDirective;
+ private static readonly Action _viewCompilerLocatedCompiledView;
+ private static readonly Action _viewCompilerNoCompiledViewsFound;
+ private static readonly Action _viewCompilerLocatedCompiledViewForPath;
+ private static readonly Action _viewCompilerRecompilingCompiledView;
+ private static readonly Action _viewCompilerCouldNotFindFileToCompileForPath;
+ private static readonly Action _viewCompilerFoundFileToCompileForPath;
+ private static readonly Action _viewCompilerInvalidatingCompiledFile;
+
+ private static readonly Action _viewLookupCacheMiss;
+ private static readonly Action _viewLookupCacheHit;
+ private static readonly Action _precompiledViewFound;
+
+ static MvcRazorLoggerExtensions()
+ {
+ _viewCompilerLocatedCompiledView = LoggerMessage.Define(
+ LogLevel.Debug,
+ 3,
+ "Initializing Razor view compiler with compiled view: '{ViewName}'.");
+
+ _viewCompilerNoCompiledViewsFound = LoggerMessage.Define(
+ LogLevel.Debug,
+ 4,
+ "Initializing Razor view compiler with no compiled views.");
+
+ _viewCompilerLocatedCompiledViewForPath = LoggerMessage.Define(
+ LogLevel.Trace,
+ 5,
+ "Located compiled view for view at path '{Path}'.");
+
+ _viewCompilerLocatedCompiledViewForPath = LoggerMessage.Define(
+ LogLevel.Trace,
+ 5,
+ "Located compiled view for view at path '{Path}'.");
+
+ _viewCompilerRecompilingCompiledView = LoggerMessage.Define(
+ LogLevel.Trace,
+ 6,
+ "Invalidating compiled view for view at path '{Path}'.");
+
+ _viewCompilerCouldNotFindFileToCompileForPath = LoggerMessage.Define(
+ LogLevel.Trace,
+ 7,
+ "Could not find a file for view at path '{Path}'.");
+
+ _viewCompilerFoundFileToCompileForPath = LoggerMessage.Define(
+ LogLevel.Trace,
+ 8,
+ "Found file at path '{Path}'.");
+
+ _viewCompilerInvalidatingCompiledFile = LoggerMessage.Define(
+ LogLevel.Trace,
+ 9,
+ "Invalidating compiled view at path '{Path}' with a file since the checksum did not match.");
+
+ _viewLookupCacheMiss = LoggerMessage.Define(
+ LogLevel.Debug,
+ 1,
+ "View lookup cache miss for view '{ViewName}' in controller '{ControllerName}'.");
+
+ _viewLookupCacheHit = LoggerMessage.Define(
+ LogLevel.Debug,
+ 2,
+ "View lookup cache hit for view '{ViewName}' in controller '{ControllerName}'.");
+
+ _precompiledViewFound = LoggerMessage.Define(
+ LogLevel.Debug,
+ 3,
+ "Using precompiled view for '{RelativePath}'.");
+
+ _generatedCodeToAssemblyCompilationStart = LoggerMessage.Define(
+ LogLevel.Debug,
+ 1,
+ "Compilation of the generated code for the Razor file at '{FilePath}' started.");
+
+ _generatedCodeToAssemblyCompilationEnd = LoggerMessage.Define(
+ LogLevel.Debug,
+ 2,
+ "Compilation of the generated code for the Razor file at '{FilePath}' completed in {ElapsedMilliseconds}ms.");
+
+ _malformedPageDirective = LoggerMessage.Define(
+ LogLevel.Warning,
+ new EventId(104, "MalformedPageDirective"),
+ "The page directive at '{FilePath}' is malformed. Please fix the following issues: {Diagnostics}");
+ }
+
+ public static void ViewCompilerLocatedCompiledView(this ILogger logger, string view)
+ {
+ _viewCompilerLocatedCompiledView(logger, view, null);
+ }
+
+ public static void ViewCompilerNoCompiledViewsFound(this ILogger logger)
+ {
+ _viewCompilerNoCompiledViewsFound(logger, null);
+ }
+
+ public static void ViewCompilerLocatedCompiledViewForPath(this ILogger logger, string path)
+ {
+ _viewCompilerLocatedCompiledViewForPath(logger, path, null);
+ }
+
+ public static void ViewCompilerCouldNotFindFileAtPath(this ILogger logger, string path)
+ {
+ _viewCompilerCouldNotFindFileToCompileForPath(logger, path, null);
+ }
+
+ public static void ViewCompilerFoundFileToCompile(this ILogger logger, string path)
+ {
+ _viewCompilerFoundFileToCompileForPath(logger, path, null);
+ }
+
+ public static void ViewCompilerInvalidingCompiledFile(this ILogger logger, string path)
+ {
+ _viewCompilerInvalidatingCompiledFile(logger, path, null);
+ }
+
+ public static void ViewLookupCacheMiss(this ILogger logger, string viewName, string controllerName)
+ {
+ _viewLookupCacheMiss(logger, viewName, controllerName, null);
+ }
+
+ public static void ViewLookupCacheHit(this ILogger logger, string viewName, string controllerName)
+ {
+ _viewLookupCacheHit(logger, viewName, controllerName, null);
+ }
+
+ public static void PrecompiledViewFound(this ILogger logger, string relativePath)
+ {
+ _precompiledViewFound(logger, relativePath, null);
+ }
+
+ public static void GeneratedCodeToAssemblyCompilationStart(this ILogger logger, string filePath)
+ {
+ _generatedCodeToAssemblyCompilationStart(logger, filePath, null);
+ }
+
+ public static void GeneratedCodeToAssemblyCompilationEnd(this ILogger logger, string filePath, long startTimestamp)
+ {
+ // Don't log if logging wasn't enabled at start of request as time will be wildly wrong.
+ if (startTimestamp != 0)
+ {
+ var currentTimestamp = Stopwatch.GetTimestamp();
+ var elapsed = new TimeSpan((long)(TimestampToTicks * (currentTimestamp - startTimestamp)));
+ _generatedCodeToAssemblyCompilationEnd(logger, filePath, elapsed.TotalMilliseconds, null);
+ }
+ }
+
+ public static void MalformedPageDirective(this ILogger logger, string filePath, IList diagnostics)
+ {
+ if (logger.IsEnabled(LogLevel.Warning))
+ {
+ var messages = new string[diagnostics.Count];
+ for (var i = 0; i < diagnostics.Count; i++)
+ {
+ messages[i] = diagnostics[i].GetMessage();
+ }
+
+ _malformedPageDirective(logger, filePath, messages, null);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Resources.resx
new file mode 100644
index 0000000000..48eb29a54d
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/Resources.resx
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ One or more compilation failures occurred:
+
+
+ One or more compilation references may be missing. If you're seeing this in a published application, set '{0}' to true in your project file to ensure files in the refs directory are published.
+
+
+ '{0}.{1}' must not be empty. At least one '{2}' is required to locate a view for rendering.
+
+
+ Generated Code
+
+
+ The debug type specified in the dependency context could be parsed. The debug type value '{0}' is not supported.
+
+
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeCompilationFileProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeCompilationFileProvider.cs
new file mode 100644
index 0000000000..ea7372bd1a
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeCompilationFileProvider.cs
@@ -0,0 +1,57 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal class RuntimeCompilationFileProvider
+ {
+ private readonly MvcRazorRuntimeCompilationOptions _options;
+ private IFileProvider _compositeFileProvider;
+
+ public RuntimeCompilationFileProvider(IOptions options)
+ {
+ if (options == null)
+ {
+ throw new ArgumentNullException(nameof(options));
+ }
+
+ _options = options.Value;
+ }
+
+ public IFileProvider FileProvider
+ {
+ get
+ {
+ if (_compositeFileProvider == null)
+ {
+ _compositeFileProvider = GetCompositeFileProvider(_options);
+ }
+
+ return _compositeFileProvider;
+ }
+ }
+
+ private static IFileProvider GetCompositeFileProvider(MvcRazorRuntimeCompilationOptions options)
+ {
+ var fileProviders = options.FileProviders;
+ if (fileProviders.Count == 0)
+ {
+ var message = Resources.FormatFileProvidersAreRequired(
+ typeof(MvcRazorRuntimeCompilationOptions).FullName,
+ nameof(MvcRazorRuntimeCompilationOptions.FileProviders),
+ typeof(IFileProvider).FullName);
+ throw new InvalidOperationException(message);
+ }
+ else if (fileProviders.Count == 1)
+ {
+ return fileProviders[0];
+ }
+
+ return new CompositeFileProvider(fileProviders);
+ }
+ }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeViewCompiler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeViewCompiler.cs
new file mode 100644
index 0000000000..4f417df6eb
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeViewCompiler.cs
@@ -0,0 +1,434 @@
+// 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.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Razor.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Emit;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Primitives;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal class RuntimeViewCompiler : IViewCompiler
+ {
+ private readonly object _cacheLock = new object();
+ private readonly Dictionary _precompiledViews;
+ private readonly ConcurrentDictionary _normalizedPathCache;
+ private readonly IFileProvider _fileProvider;
+ private readonly RazorProjectEngine _projectEngine;
+ private readonly IMemoryCache _cache;
+ private readonly ILogger _logger;
+ private readonly CSharpCompiler _csharpCompiler;
+
+ public RuntimeViewCompiler(
+ IFileProvider fileProvider,
+ RazorProjectEngine projectEngine,
+ CSharpCompiler csharpCompiler,
+ IList precompiledViews,
+ ILogger logger)
+ {
+ if (fileProvider == null)
+ {
+ throw new ArgumentNullException(nameof(fileProvider));
+ }
+
+ if (projectEngine == null)
+ {
+ throw new ArgumentNullException(nameof(projectEngine));
+ }
+
+ if (csharpCompiler == null)
+ {
+ throw new ArgumentNullException(nameof(csharpCompiler));
+ }
+
+ if (precompiledViews == null)
+ {
+ throw new ArgumentNullException(nameof(precompiledViews));
+ }
+
+ if (logger == null)
+ {
+ throw new ArgumentNullException(nameof(logger));
+ }
+
+ _fileProvider = fileProvider;
+ _projectEngine = projectEngine;
+ _csharpCompiler = csharpCompiler;
+ _logger = logger;
+
+
+ _normalizedPathCache = new ConcurrentDictionary(StringComparer.Ordinal);
+
+ // This is our L0 cache, and is a durable store. Views migrate into the cache as they are requested
+ // from either the set of known precompiled views, or by being compiled.
+ _cache = new MemoryCache(new MemoryCacheOptions());
+
+ // We need to validate that the all of the precompiled views are unique by path (case-insensitive).
+ // We do this because there's no good way to canonicalize paths on windows, and it will create
+ // problems when deploying to linux. Rather than deal with these issues, we just don't support
+ // views that differ only by case.
+ _precompiledViews = new Dictionary(
+ precompiledViews.Count,
+ StringComparer.OrdinalIgnoreCase);
+
+ foreach (var precompiledView in precompiledViews)
+ {
+ logger.ViewCompilerLocatedCompiledView(precompiledView.RelativePath);
+
+ if (!_precompiledViews.ContainsKey(precompiledView.RelativePath))
+ {
+ // View ordering has precedence semantics, a view with a higher precedence was
+ // already added to the list.
+ _precompiledViews.Add(precompiledView.RelativePath, precompiledView);
+ }
+ }
+
+ if (_precompiledViews.Count == 0)
+ {
+ logger.ViewCompilerNoCompiledViewsFound();
+ }
+ }
+
+ public Task CompileAsync(string relativePath)
+ {
+ if (relativePath == null)
+ {
+ throw new ArgumentNullException(nameof(relativePath));
+ }
+
+ // Attempt to lookup the cache entry using the passed in path. This will succeed if the path is already
+ // normalized and a cache entry exists.
+ if (_cache.TryGetValue(relativePath, out Task cachedResult))
+ {
+ return cachedResult;
+ }
+
+ var normalizedPath = GetNormalizedPath(relativePath);
+ if (_cache.TryGetValue(normalizedPath, out cachedResult))
+ {
+ return cachedResult;
+ }
+
+ // Entry does not exist. Attempt to create one.
+ cachedResult = OnCacheMiss(normalizedPath);
+ return cachedResult;
+ }
+
+ private Task OnCacheMiss(string normalizedPath)
+ {
+ ViewCompilerWorkItem item;
+ TaskCompletionSource taskSource;
+ MemoryCacheEntryOptions cacheEntryOptions;
+
+ // Safe races cannot be allowed when compiling Razor pages. To ensure only one compilation request succeeds
+ // per file, we'll lock the creation of a cache entry. Creating the cache entry should be very quick. The
+ // actual work for compiling files happens outside the critical section.
+ lock (_cacheLock)
+ {
+ // Double-checked locking to handle a possible race.
+ if (_cache.TryGetValue(normalizedPath, out Task result))
+ {
+ return result;
+ }
+
+ if (_precompiledViews.TryGetValue(normalizedPath, out var precompiledView))
+ {
+ _logger.ViewCompilerLocatedCompiledViewForPath(normalizedPath);
+ item = CreatePrecompiledWorkItem(normalizedPath, precompiledView);
+ }
+ else
+ {
+ item = CreateRuntimeCompilationWorkItem(normalizedPath);
+ }
+
+ // At this point, we've decided what to do - but we should create the cache entry and
+ // release the lock first.
+ cacheEntryOptions = new MemoryCacheEntryOptions();
+
+ Debug.Assert(item.ExpirationTokens != null);
+ for (var i = 0; i < item.ExpirationTokens.Count; i++)
+ {
+ cacheEntryOptions.ExpirationTokens.Add(item.ExpirationTokens[i]);
+ }
+
+ taskSource = new TaskCompletionSource(creationOptions: TaskCreationOptions.RunContinuationsAsynchronously);
+ if (item.SupportsCompilation)
+ {
+ // We'll compile in just a sec, be patient.
+ }
+ else
+ {
+ // If we can't compile, we should have already created the descriptor
+ Debug.Assert(item.Descriptor != null);
+ taskSource.SetResult(item.Descriptor);
+ }
+
+ _cache.Set(normalizedPath, taskSource.Task, cacheEntryOptions);
+ }
+
+ // Now the lock has been released so we can do more expensive processing.
+ if (item.SupportsCompilation)
+ {
+ Debug.Assert(taskSource != null);
+
+ if (item.Descriptor?.Item != null &&
+ ChecksumValidator.IsItemValid(_projectEngine.FileSystem, item.Descriptor.Item))
+ {
+ // If the item has checksums to validate, we should also have a precompiled view.
+ Debug.Assert(item.Descriptor != null);
+
+ taskSource.SetResult(item.Descriptor);
+ return taskSource.Task;
+ }
+
+ _logger.ViewCompilerInvalidingCompiledFile(item.NormalizedPath);
+ try
+ {
+ var descriptor = CompileAndEmit(normalizedPath);
+ descriptor.ExpirationTokens = cacheEntryOptions.ExpirationTokens;
+ taskSource.SetResult(descriptor);
+ }
+ catch (Exception ex)
+ {
+ taskSource.SetException(ex);
+ }
+ }
+
+ return taskSource.Task;
+ }
+
+ private ViewCompilerWorkItem CreatePrecompiledWorkItem(string normalizedPath, CompiledViewDescriptor precompiledView)
+ {
+ // We have a precompiled view - but we're not sure that we can use it yet.
+ //
+ // We need to determine first if we have enough information to 'recompile' this view. If that's the case
+ // we'll create change tokens for all of the files.
+ //
+ // Then we'll attempt to validate if any of those files have different content than the original sources
+ // based on checksums.
+ if (precompiledView.Item == null || !ChecksumValidator.IsRecompilationSupported(precompiledView.Item))
+ {
+ return new ViewCompilerWorkItem()
+ {
+ // If we don't have a checksum for the primary source file we can't recompile.
+ SupportsCompilation = false,
+
+ ExpirationTokens = Array.Empty(), // Never expire because we can't recompile.
+ Descriptor = precompiledView, // This will be used as-is.
+ };
+ }
+
+ var item = new ViewCompilerWorkItem()
+ {
+ SupportsCompilation = true,
+
+ Descriptor = precompiledView, // This might be used, if the checksums match.
+
+ // Used to validate and recompile
+ NormalizedPath = normalizedPath,
+
+ ExpirationTokens = GetExpirationTokens(precompiledView),
+ };
+
+ // We also need to create a new descriptor, because the original one doesn't have expiration tokens on
+ // it. These will be used by the view location cache, which is like an L1 cache for views (this class is
+ // the L2 cache).
+ item.Descriptor = new CompiledViewDescriptor()
+ {
+ ExpirationTokens = item.ExpirationTokens,
+ Item = precompiledView.Item,
+ RelativePath = precompiledView.RelativePath,
+ };
+
+ return item;
+ }
+
+ private ViewCompilerWorkItem CreateRuntimeCompilationWorkItem(string normalizedPath)
+ {
+ IList expirationTokens = new List
+ {
+ _fileProvider.Watch(normalizedPath),
+ };
+
+ var projectItem = _projectEngine.FileSystem.GetItem(normalizedPath);
+ if (!projectItem.Exists)
+ {
+ _logger.ViewCompilerCouldNotFindFileAtPath(normalizedPath);
+
+ // If the file doesn't exist, we can't do compilation right now - we still want to cache
+ // the fact that we tried. This will allow us to re-trigger compilation if the view file
+ // is added.
+ return new ViewCompilerWorkItem()
+ {
+ // We don't have enough information to compile
+ SupportsCompilation = false,
+
+ Descriptor = new CompiledViewDescriptor()
+ {
+ RelativePath = normalizedPath,
+ ExpirationTokens = expirationTokens,
+ },
+
+ // We can try again if the file gets created.
+ ExpirationTokens = expirationTokens,
+ };
+ }
+
+ _logger.ViewCompilerFoundFileToCompile(normalizedPath);
+
+ GetChangeTokensFromImports(expirationTokens, projectItem);
+
+ return new ViewCompilerWorkItem()
+ {
+ SupportsCompilation = true,
+
+ NormalizedPath = normalizedPath,
+ ExpirationTokens = expirationTokens,
+ };
+ }
+
+ private IList GetExpirationTokens(CompiledViewDescriptor precompiledView)
+ {
+ var checksums = precompiledView.Item.GetChecksumMetadata();
+ var expirationTokens = new List(checksums.Count);
+
+ for (var i = 0; i < checksums.Count; i++)
+ {
+ // We rely on Razor to provide the right set of checksums. Trust the compiler, it has to do a good job,
+ // so it probably will.
+ expirationTokens.Add(_fileProvider.Watch(checksums[i].Identifier));
+ }
+
+ return expirationTokens;
+ }
+
+ private void GetChangeTokensFromImports(IList expirationTokens, RazorProjectItem projectItem)
+ {
+ // OK this means we can do compilation. For now let's just identify the other files we need to watch
+ // so we can create the cache entry. Compilation will happen after we release the lock.
+ var importFeature = _projectEngine.ProjectFeatures.OfType().ToArray();
+ foreach (var feature in importFeature)
+ {
+ foreach (var file in feature.GetImports(projectItem))
+ {
+ if (file.FilePath != null)
+ {
+ expirationTokens.Add(_fileProvider.Watch(file.FilePath));
+ }
+ }
+ }
+ }
+
+ protected virtual CompiledViewDescriptor CompileAndEmit(string relativePath)
+ {
+ var projectItem = _projectEngine.FileSystem.GetItem(relativePath);
+ var codeDocument = _projectEngine.Process(projectItem);
+ var cSharpDocument = codeDocument.GetCSharpDocument();
+
+ if (cSharpDocument.Diagnostics.Count > 0)
+ {
+ throw CompilationFailedExceptionFactory.Create(
+ codeDocument,
+ cSharpDocument.Diagnostics);
+ }
+
+ var assembly = CompileAndEmit(codeDocument, cSharpDocument.GeneratedCode);
+
+ // Anything we compile from source will use Razor 2.1 and so should have the new metadata.
+ var loader = new RazorCompiledItemLoader();
+ var item = loader.LoadItems(assembly).SingleOrDefault();
+ return new CompiledViewDescriptor(item);
+ }
+
+ internal Assembly CompileAndEmit(RazorCodeDocument codeDocument, string generatedCode)
+ {
+ _logger.GeneratedCodeToAssemblyCompilationStart(codeDocument.Source.FilePath);
+
+ var startTimestamp = _logger.IsEnabled(LogLevel.Debug) ? Stopwatch.GetTimestamp() : 0;
+
+ var assemblyName = Path.GetRandomFileName();
+ var compilation = CreateCompilation(generatedCode, assemblyName);
+
+ var emitOptions = _csharpCompiler.EmitOptions;
+ var emitPdbFile = _csharpCompiler.EmitPdb && emitOptions.DebugInformationFormat != DebugInformationFormat.Embedded;
+
+ using (var assemblyStream = new MemoryStream())
+ using (var pdbStream = emitPdbFile ? new MemoryStream() : null)
+ {
+ var result = compilation.Emit(
+ assemblyStream,
+ pdbStream,
+ options: emitOptions);
+
+ if (!result.Success)
+ {
+ throw CompilationFailedExceptionFactory.Create(
+ codeDocument,
+ generatedCode,
+ assemblyName,
+ result.Diagnostics);
+ }
+
+ assemblyStream.Seek(0, SeekOrigin.Begin);
+ pdbStream?.Seek(0, SeekOrigin.Begin);
+
+ var assembly = Assembly.Load(assemblyStream.ToArray(), pdbStream?.ToArray());
+ _logger.GeneratedCodeToAssemblyCompilationEnd(codeDocument.Source.FilePath, startTimestamp);
+
+ return assembly;
+ }
+ }
+
+ private CSharpCompilation CreateCompilation(string compilationContent, string assemblyName)
+ {
+ var sourceText = SourceText.From(compilationContent, Encoding.UTF8);
+ var syntaxTree = _csharpCompiler.CreateSyntaxTree(sourceText).WithFilePath(assemblyName);
+ return _csharpCompiler
+ .CreateCompilation(assemblyName)
+ .AddSyntaxTrees(syntaxTree);
+ }
+
+ private string GetNormalizedPath(string relativePath)
+ {
+ Debug.Assert(relativePath != null);
+ if (relativePath.Length == 0)
+ {
+ return relativePath;
+ }
+
+ if (!_normalizedPathCache.TryGetValue(relativePath, out var normalizedPath))
+ {
+ normalizedPath = ViewPath.NormalizePath(relativePath);
+ _normalizedPathCache[relativePath] = normalizedPath;
+ }
+
+ return normalizedPath;
+ }
+
+ private class ViewCompilerWorkItem
+ {
+ public bool SupportsCompilation { get; set; }
+
+ public string NormalizedPath { get; set; }
+
+ public IList ExpirationTokens { get; set; }
+
+ public CompiledViewDescriptor Descriptor { get; set; }
+ }
+ }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeViewCompilerProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeViewCompilerProvider.cs
new file mode 100644
index 0000000000..4202da6bd7
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation/RuntimeViewCompilerProvider.cs
@@ -0,0 +1,64 @@
+// 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.Threading;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal class RuntimeViewCompilerProvider : IViewCompilerProvider
+ {
+ private readonly RazorProjectEngine _razorProjectEngine;
+ private readonly ApplicationPartManager _applicationPartManager;
+ private readonly CSharpCompiler _csharpCompiler;
+ private readonly RuntimeCompilationFileProvider _fileProvider;
+ private readonly ILogger _logger;
+ private readonly Func _createCompiler;
+
+ private object _initializeLock = new object();
+ private bool _initialized;
+ private IViewCompiler _compiler;
+
+ public RuntimeViewCompilerProvider(
+ ApplicationPartManager applicationPartManager,
+ RazorProjectEngine razorProjectEngine,
+ RuntimeCompilationFileProvider fileProvider,
+ CSharpCompiler csharpCompiler,
+ ILoggerFactory loggerFactory)
+ {
+ _applicationPartManager = applicationPartManager;
+ _razorProjectEngine = razorProjectEngine;
+ _csharpCompiler = csharpCompiler;
+ _fileProvider = fileProvider;
+
+ _logger = loggerFactory.CreateLogger();
+ _createCompiler = CreateCompiler;
+ }
+
+ public IViewCompiler GetCompiler()
+ {
+ return LazyInitializer.EnsureInitialized(
+ ref _compiler,
+ ref _initialized,
+ ref _initializeLock,
+ _createCompiler);
+ }
+
+ private IViewCompiler CreateCompiler()
+ {
+ var feature = new ViewsFeature();
+ _applicationPartManager.PopulateFeature(feature);
+
+ return new RuntimeViewCompiler(
+ _fileProvider.FileProvider,
+ _razorProjectEngine,
+ _csharpCompiler,
+ feature.ViewDescriptors,
+ _logger);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompiler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultViewCompiler.cs
similarity index 97%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompiler.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultViewCompiler.cs
index 7afc53edab..1819015a16 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompiler.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultViewCompiler.cs
@@ -14,13 +14,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
///
/// Caches the result of runtime compilation of Razor files for the duration of the application lifetime.
///
- internal class RazorViewCompiler : IViewCompiler
+ internal class DefaultViewCompiler : IViewCompiler
{
private readonly Dictionary> _compiledViews;
private readonly ConcurrentDictionary _normalizedPathCache;
private readonly ILogger _logger;
- public RazorViewCompiler(
+ public DefaultViewCompiler(
IList compiledViews,
ILogger logger)
{
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompilerProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultViewCompilerProvider.cs
similarity index 67%
rename from src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompilerProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultViewCompilerProvider.cs
index 64965e6f72..b92077ad69 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompilerProvider.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultViewCompilerProvider.cs
@@ -6,18 +6,18 @@ using Microsoft.Extensions.Logging;
namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
{
- internal class RazorViewCompilerProvider : IViewCompilerProvider
+ internal class DefaultViewCompilerProvider : IViewCompilerProvider
{
- private readonly RazorViewCompiler _compiler;
+ private readonly DefaultViewCompiler _compiler;
- public RazorViewCompilerProvider(
+ public DefaultViewCompilerProvider(
ApplicationPartManager applicationPartManager,
ILoggerFactory loggerFactory)
{
var feature = new ViewsFeature();
applicationPartManager.PopulateFeature(feature);
- _compiler = new RazorViewCompiler(feature.ViewDescriptors, loggerFactory.CreateLogger());
+ _compiler = new DefaultViewCompiler(feature.ViewDescriptors, loggerFactory.CreateLogger());
}
public IViewCompiler GetCompiler() => _compiler;
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
index 46139a28a0..7b3ee93a3a 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
@@ -141,7 +141,7 @@ namespace Microsoft.Extensions.DependencyInjection
ServiceDescriptor.Transient, RazorViewEngineOptionsSetup>());
services.TryAddSingleton();
- services.TryAddSingleton();
+ services.TryAddSingleton();
// In the default scenario the following services are singleton by virtue of being initialized as part of
// creating the singleton RazorViewEngine instance.
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs
index 5bd88d4693..db40b79a34 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs
@@ -8,6 +8,7 @@ using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
index 8f2a98defa..f8277dca22 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
@@ -762,7 +762,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor
public bool Suppressed { get; set; }
}
- private struct TagHelperScopeInfo
+ private readonly struct TagHelperScopeInfo
{
public TagHelperScopeInfo(ViewBuffer buffer, HtmlEncoder encoder, TextWriter writer)
{
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs
index 0ababdcddc..46d86127cc 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs
@@ -3,16 +3,31 @@
namespace Microsoft.AspNetCore.Mvc.ApplicationModels
{
- // This is used to store the uncombined parts of the final page route
- internal class PageRouteMetadata
+ ///
+ /// Metadata used to construct an endpoint route to the page.
+ ///
+ // Note: This type name is referenced by name in AuthorizationMiddleware, do not change this without addressing https://github.com/aspnet/AspNetCore/issues/7011
+ public sealed class PageRouteMetadata
{
+ ///
+ /// Initializes a new instance of .
+ ///
+ /// The page route.
+ /// The route template specified by the page.
public PageRouteMetadata(string pageRoute, string routeTemplate)
{
PageRoute = pageRoute;
RouteTemplate = routeTemplate;
}
+ ///
+ /// Gets the page route.
+ ///
public string PageRoute { get; }
+
+ ///
+ /// Gets the route template specified by the page.
+ ///
public string RouteTemplate { get; }
}
}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs
index b2650063b7..1838d0ad9c 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs
@@ -7,18 +7,27 @@ using System.IO;
using Microsoft.AspNetCore.Mvc.Razor;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Primitives;
namespace Microsoft.AspNetCore.Mvc.ApplicationModels
{
internal class PageRouteModelFactory
{
+ private static readonly Action _unsupportedAreaPath;
+
private static readonly string IndexFileName = "Index" + RazorViewEngine.ViewExtension;
private readonly RazorPagesOptions _options;
private readonly ILogger _logger;
private readonly string _normalizedRootDirectory;
private readonly string _normalizedAreaRootDirectory;
+ static PageRouteModelFactory()
+ {
+ _unsupportedAreaPath = LoggerMessage.Define(
+ LogLevel.Warning,
+ new EventId(1, "UnsupportedAreaPath"),
+ "The page at '{FilePath}' is located under the area root directory '/Areas/' but does not follow the path format '/Areas/AreaName/Pages/Directory/FileName.cshtml");
+ }
+
public PageRouteModelFactory(
RazorPagesOptions options,
ILogger logger)
@@ -96,7 +105,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
areaRootEndIndex >= relativePath.Length - 1 || // There's at least one token after the area root.
!relativePath.StartsWith(_normalizedAreaRootDirectory, StringComparison.OrdinalIgnoreCase)) // The path must start with area root.
{
- _logger.UnsupportedAreaPath(relativePath);
+ _unsupportedAreaPath(_logger, relativePath, null);
return false;
}
@@ -104,7 +113,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
var areaEndIndex = relativePath.IndexOf('/', startIndex: areaRootEndIndex + 1);
if (areaEndIndex == -1 || areaEndIndex == relativePath.Length)
{
- _logger.UnsupportedAreaPath(relativePath);
+ _unsupportedAreaPath(_logger, relativePath, null);
return false;
}
@@ -112,7 +121,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
// Ensure the next token is the "Pages" directory
if (string.Compare(relativePath, areaEndIndex, AreaPagesRoot, 0, AreaPagesRoot.Length, StringComparison.OrdinalIgnoreCase) != 0)
{
- _logger.UnsupportedAreaPath(relativePath);
+ _unsupportedAreaPath(_logger, relativePath, null);
return false;
}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs
index 23a449e731..61ab2a7a07 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs
@@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Mvc.Abstractions;
using Microsoft.AspNetCore.Mvc.ApplicationModels;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.Routing;
-using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs
index 825dc0c190..9c965f3244 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs
@@ -18,8 +18,6 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages
private static readonly Action _handlerMethodExecuted;
private static readonly Action _implicitHandlerMethodExecuted;
private static readonly Action _pageFilterShortCircuit;
- private static readonly Action _malformedPageDirective;
- private static readonly Action _unsupportedAreaPath;
private static readonly Action _notMostEffectiveFilter;
private static readonly Action _beforeExecutingMethodOnFilter;
private static readonly Action _afterExecutingMethodOnFilter;
@@ -53,11 +51,6 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages
new EventId(3, "PageFilterShortCircuited"),
"Request was short circuited at page filter '{PageFilter}'.");
- _malformedPageDirective = LoggerMessage.Define(
- LogLevel.Warning,
- new EventId(104, "MalformedPageDirective"),
- "The page directive at '{FilePath}' is malformed. Please fix the following issues: {Diagnostics}");
-
_notMostEffectiveFilter = LoggerMessage.Define(
LogLevel.Debug,
new EventId(1, "NotMostEffectiveFilter"),
@@ -72,11 +65,6 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages
LogLevel.Trace,
new EventId(2, "AfterExecutingMethodOnFilter"),
"{FilterType}: After executing {Method} on filter {Filter}.");
-
- _unsupportedAreaPath = LoggerMessage.Define(
- LogLevel.Warning,
- new EventId(1, "UnsupportedAreaPath"),
- "The page at '{FilePath}' is located under the area root directory '/Areas/' but does not follow the path format '/Areas/AreaName/Pages/Directory/FileName.cshtml");
}
public static void ExecutingHandlerMethod(this ILogger logger, PageContext context, HandlerMethodDescriptor handler, object[] arguments)
@@ -153,13 +141,5 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages
{
_notMostEffectiveFilter(logger, policyType, null);
}
-
- public static void UnsupportedAreaPath(this ILogger logger, string filePath)
- {
- if (logger.IsEnabled(LogLevel.Warning))
- {
- _unsupportedAreaPath(logger, filePath, null);
- }
- }
}
}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
index 36f14c1bc8..25a1229f2f 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
@@ -6,7 +6,7 @@
$(NoWarn);CS1591
true
aspnetcore;aspnetcoremvc;aspnetcoremvctesting
- true
+ true
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperComponentExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperComponentExtensions.cs
new file mode 100644
index 0000000000..dd45a46688
--- /dev/null
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperComponentExtensions.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.
+
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures
+{
+ ///
+ /// Extensions for rendering components.
+ ///
+ public static class HtmlHelperComponentExtensions
+ {
+ ///
+ /// Renders the .
+ ///
+ /// The .
+ /// The HTML produced by the rendered .
+ public static Task RenderComponentAsync(this IHtmlHelper htmlHelper) where TComponent : IComponent
+ {
+ if (htmlHelper == null)
+ {
+ throw new System.ArgumentNullException(nameof(htmlHelper));
+ }
+
+ return htmlHelper.RenderComponentAsync(null);
+ }
+
+ ///
+ /// Renders the .
+ ///
+ /// The .
+ /// An containing the parameters to pass
+ /// to the component.
+ /// The HTML produced by the rendered .
+ public static async Task RenderComponentAsync(
+ this IHtmlHelper htmlHelper,
+ object parameters) where TComponent : IComponent
+ {
+ if (htmlHelper == null)
+ {
+ throw new System.ArgumentNullException(nameof(htmlHelper));
+ }
+
+ var serviceProvider = htmlHelper.ViewContext.HttpContext.RequestServices;
+ var encoder = serviceProvider.GetRequiredService();
+ using (var htmlRenderer = new HtmlRenderer(serviceProvider, encoder.Encode))
+ {
+ var result = await htmlRenderer.RenderComponentAsync(
+ parameters == null ?
+ ParameterCollection.Empty :
+ ParameterCollection.FromDictionary(HtmlHelper.ObjectToDictionary(parameters)));
+
+ return new ComponentHtmlContent(result);
+ }
+ }
+
+ private class ComponentHtmlContent : IHtmlContent
+ {
+ private readonly IEnumerable _componentResult;
+
+ public ComponentHtmlContent(IEnumerable componentResult)
+ {
+ _componentResult = componentResult;
+ }
+
+ public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+ {
+ foreach (var element in _componentResult)
+ {
+ writer.Write(element);
+ }
+ }
+ }
+ }
+}
diff --git a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
index 2bbb0d2944..5dbf2094c3 100644
--- a/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
+++ b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
@@ -21,6 +21,7 @@ Microsoft.AspNetCore.Mvc.ViewComponent
+
diff --git a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj
index 486fc9d28e..d0976a5eaa 100644
--- a/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj
+++ b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj
@@ -15,7 +15,7 @@
$(MSBuildProjectName).nuspec
$(MSBuildProjectName)
Build Tasks;MSBuild;Swagger;Open API;code generation; Web API client
- true
+ true
$(ExperimentalPackageVersion)
$(AssemblyName)
netstandard2.0;net461
@@ -25,48 +25,8 @@
-
-
-
-
-
-
- $(AssemblySigningCertName)
- tasks/$(TargetFramework)/$(TargetFileName)
- $(AssemblySigningStrongName)
-
-
-
-
-
-
- $(AssemblySigningCertName)
- tools/dotnet-getdocument.dll
- $(AssemblySigningStrongName)
-
-
- $(AssemblySigningCertName)
- tools/net461/GetDocument.Insider.exe
- $(AssemblySigningStrongName)
-
-
- $(AssemblySigningCertName)
- tools/net461-x86/GetDocument.Insider.exe
- $(AssemblySigningStrongName)
-
-
- $(AssemblySigningCertName)
- tools/netcoreapp2.0/GetDocument.Insider.exe
- $(AssemblySigningStrongName)
-
-
-
- tools/Newtonsoft.Json.dll"
- $(AssemblySigning3rdPartyCertName)
-
+
+
diff --git a/src/Mvc/startvs.cmd b/src/Mvc/startvs.cmd
new file mode 100644
index 0000000000..83db3aaa8a
--- /dev/null
+++ b/src/Mvc/startvs.cmd
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+%~dp0..\..\startvs.cmd %~dp0Mvc.sln
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs
index b637350e3f..e72dea57e4 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs
@@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
public class ModelMetadataTest
{
// IsComplexType
- private struct IsComplexTypeModel
+ private readonly struct IsComplexTypeModel
{
}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AttributeRouteModelTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AttributeRouteModelTests.cs
index dc312a50bd..c6646c110a 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AttributeRouteModelTests.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AttributeRouteModelTests.cs
@@ -590,6 +590,83 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
},
"Home/Index/{id}"
};
+
+ yield return new object[]
+ {
+ "[controller]/[[[action]]]/{id}",
+ new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { "controller", "Home" },
+ { "action", "Index" }
+ },
+ "Home/[Index]/{id}"
+ };
+
+ yield return new object[]
+ {
+ "[controller]/[[[[[action]]]]]/{id}",
+ new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { "controller", "Home" },
+ { "action", "Index" }
+ },
+ "Home/[[Index]]/{id}"
+ };
+
+ yield return new object[]
+ {
+ "[controller]/[[[[[[[action]]]]]]]/{id}",
+ new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { "controller", "Home" },
+ { "action", "Index" }
+ },
+ "Home/[[[Index]]]/{id}"
+ };
+
+ yield return new object[]
+ {
+ "[controller]/[[[[[action]]]]]]]/{id}",
+ new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { "controller", "Home" },
+ { "action", "Index" }
+ },
+ "Home/[[Index]]]/{id}"
+ };
+
+ yield return new object[]
+ {
+ "[controller]/[[[[[[[action]]]]]/{id}",
+ new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { "controller", "Home" },
+ { "action", "Index" }
+ },
+ "Home/[[[Index]]/{id}"
+ };
+
+ yield return new object[]
+ {
+ "[controller]/[[[action]]]]]/{id}",
+ new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { "controller", "Home" },
+ { "action", "Index" }
+ },
+ "Home/[Index]]/{id}"
+ };
+
+ yield return new object[]
+ {
+ "[controller]/[[[[[[[action]]]/{id}",
+ new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { "controller", "Home" },
+ { "action", "Index" }
+ },
+ "Home/[[[Index]/{id}"
+ };
}
}
@@ -655,6 +732,61 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
new Dictionary(StringComparer.OrdinalIgnoreCase),
"An empty replacement token ('[]') is not allowed.",
};
+
+ yield return new object[]
+ {
+ "[controller]/[[[action]]/{id}",
+ new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { "controller", "Home" },
+ { "action", "Index" }
+ },
+ "Token delimiters ('[', ']') are imbalanced.",
+ };
+
+ yield return new object[]
+ {
+ "[controller]/[[[action]]]]/{id}",
+ new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { "controller", "Home" },
+ { "action", "Index" }
+ },
+ "Token delimiters ('[', ']') are imbalanced.",
+ };
+
+ yield return new object[]
+ {
+ "[controller]/[[action]]]/{id}",
+ new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { "controller", "Home" },
+ { "action", "Index" }
+ },
+ "Token delimiters ('[', ']') are imbalanced.",
+ };
+
+ yield return new object[]
+ {
+ "[controller]/[[[[[[[action]]]]]]/{id}",
+ new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { "controller", "Home" },
+ { "action", "Index" }
+ },
+ "Token delimiters ('[', ']') are imbalanced.",
+ };
+
+ yield return new object[]
+ {
+ "[controller]/[[[[[[action]]]]]]]/{id}",
+ new Dictionary(StringComparer.OrdinalIgnoreCase)
+ {
+ { "controller", "Home" },
+ { "action", "Index" }
+ },
+ "Token delimiters ('[', ']') are imbalanced.",
+ };
}
}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs
index 8488a08dc2..8774ba896f 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs
@@ -1277,13 +1277,14 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
public PointStruct Point { get; set; }
}
- private struct PointStruct
+ private readonly struct PointStruct
{
public PointStruct(double x, double y)
{
X = x;
Y = y;
}
+
public double X { get; }
public double Y { get; }
}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs
index 642082eb67..98b2825970 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs
@@ -195,7 +195,6 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
{
throw new ArgumentNullException(nameof(bindingContext));
}
- Debug.Assert(bindingContext.Result == null);
throw new NotImplementedException();
}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperBaseTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperBaseTest.cs
index 1e0f48bf34..a57daa314d 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperBaseTest.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperBaseTest.cs
@@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Abstractions;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.ObjectPool;
using Xunit;
namespace Microsoft.AspNetCore.Mvc.Routing
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperExtensionsTest.cs
index b63c66e0fe..2f170b1c56 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperExtensionsTest.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperExtensionsTest.cs
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Abstractions;
using Microsoft.AspNetCore.Mvc.Routing;
using Microsoft.AspNetCore.Routing;
@@ -601,6 +602,257 @@ namespace Microsoft.AspNetCore.Mvc.Core.Test.Routing
});
}
+ [Fact]
+ public void ActionLink_WithActionName_Works()
+ {
+ // Arrange
+ var expectedAction = "TestAction";
+ var expectedProtocol = "testprotocol://";
+ var expectedHost = "www.example.com";
+ UrlActionContext actual = null;
+
+ var httpContext = new DefaultHttpContext
+ {
+ Request =
+ {
+ Protocol = expectedProtocol,
+ Host = new HostString(expectedHost),
+ }
+ };
+ var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+ var urlHelper = CreateMockUrlHelper(actionContext);
+ urlHelper.Setup(h => h.Action(It.IsAny()))
+ .Callback((UrlActionContext context) => actual = context);
+
+ // Act
+ urlHelper.Object.ActionLink(expectedAction);
+
+ // Assert
+ urlHelper.Verify();
+ Assert.NotNull(actual);
+ Assert.Equal(expectedAction, actual.Action);
+ Assert.Null(actual.Controller);
+ Assert.Null(actual.Values);
+
+ Assert.Equal(expectedProtocol, actual.Protocol);
+ Assert.Equal(expectedHost, actual.Host);
+ }
+
+ [Fact]
+ public void ActionLink_UsesSpecifiedProtocol()
+ {
+ // Arrange
+ var expectedProtocol = "testprotocol://";
+ var expectedHost = "www.example.com";
+ UrlActionContext actual = null;
+
+ var httpContext = new DefaultHttpContext
+ {
+ Request =
+ {
+ Protocol = "http://",
+ Host = new HostString(expectedHost),
+ }
+ };
+ var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+ var urlHelper = CreateMockUrlHelper(actionContext);
+ urlHelper.Setup(h => h.Action(It.IsAny()))
+ .Callback((UrlActionContext context) => actual = context);
+
+ // Act
+ urlHelper.Object.ActionLink(protocol: expectedProtocol);
+
+ // Assert
+ urlHelper.Verify();
+ Assert.NotNull(actual);
+ Assert.Null(actual.Action);
+ Assert.Null(actual.Controller);
+ Assert.Null(actual.Values);
+
+ Assert.Equal(expectedProtocol, actual.Protocol);
+ Assert.Equal(expectedHost, actual.Host);
+ }
+
+ [Fact]
+ public void ActionLink_UsesSpecifiedHost()
+ {
+ // Arrange
+ var expectedProtocol = "testprotocol://";
+ var expectedHost = "www.example.com";
+ UrlActionContext actual = null;
+
+ var httpContext = new DefaultHttpContext
+ {
+ Request =
+ {
+ Protocol = expectedProtocol,
+ Host = new HostString("www.asp.net"),
+ }
+ };
+ var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+ var urlHelper = CreateMockUrlHelper(actionContext);
+ urlHelper.Setup(h => h.Action(It.IsAny()))
+ .Callback((UrlActionContext context) => actual = context);
+
+ // Act
+ urlHelper.Object.ActionLink(host: expectedHost);
+
+ // Assert
+ urlHelper.Verify();
+ Assert.NotNull(actual);
+ Assert.Null(actual.Action);
+ Assert.Null(actual.Controller);
+ Assert.Null(actual.Values);
+
+ Assert.Equal(expectedProtocol, actual.Protocol);
+ Assert.Equal(expectedHost, actual.Host);
+ }
+
+ [Fact]
+ public void PageLink_WithPageName_Works()
+ {
+ // Arrange
+ var expectedPage = "/TestPage";
+ var expectedProtocol = "testprotocol://";
+ var expectedHost = "www.example.com";
+ UrlRouteContext actual = null;
+
+ var actionContext = new ActionContext
+ {
+ HttpContext = new DefaultHttpContext
+ {
+ Request =
+ {
+ Protocol = expectedProtocol,
+ Host = new HostString(expectedHost),
+ }
+ },
+ RouteData = new RouteData
+ {
+ Values =
+ {
+ { "page", "ambient-page" },
+ }
+ },
+ };
+ var urlHelper = CreateMockUrlHelper(actionContext);
+ urlHelper.Setup(h => h.RouteUrl(It.IsAny()))
+ .Callback((UrlRouteContext context) => actual = context);
+
+ // Act
+ urlHelper.Object.PageLink(expectedPage);
+
+ // Assert
+ urlHelper.Verify();
+ Assert.NotNull(actual);
+ Assert.Collection(Assert.IsType(actual.Values),
+ value =>
+ {
+ Assert.Equal("page", value.Key);
+ Assert.Equal(expectedPage, value.Value);
+ });
+ Assert.Null(actual.RouteName);
+
+ Assert.Equal(expectedProtocol, actual.Protocol);
+ Assert.Equal(expectedHost, actual.Host);
+ }
+
+ [Fact]
+ public void PageLink_UsesSpecifiedProtocol()
+ {
+ // Arrange
+ var expectedProtocol = "testprotocol://";
+ var expectedHost = "www.example.com";
+ UrlRouteContext actual = null;
+
+ var actionContext = new ActionContext
+ {
+ HttpContext = new DefaultHttpContext
+ {
+ Request =
+ {
+ Protocol = "http://",
+ Host = new HostString(expectedHost),
+ }
+ },
+ RouteData = new RouteData
+ {
+ Values =
+ {
+ { "page", "ambient-page" },
+ }
+ },
+ };
+ var urlHelper = CreateMockUrlHelper(actionContext);
+ urlHelper.Setup(h => h.RouteUrl(It.IsAny()))
+ .Callback((UrlRouteContext context) => actual = context);
+
+ // Act
+ urlHelper.Object.PageLink(protocol: expectedProtocol);
+
+ // Assert
+ urlHelper.Verify();
+ Assert.NotNull(actual);
+ Assert.Collection(Assert.IsType(actual.Values),
+ value =>
+ {
+ Assert.Equal("page", value.Key);
+ Assert.Equal("ambient-page", value.Value);
+ });
+ Assert.Null(actual.RouteName);
+
+ Assert.Equal(expectedProtocol, actual.Protocol);
+ Assert.Equal(expectedHost, actual.Host);
+ }
+
+ [Fact]
+ public void PageLink_UsesSpecifiedHost()
+ {
+ // Arrange
+ var expectedProtocol = "testprotocol://";
+ var expectedHost = "www.example.com";
+ UrlRouteContext actual = null;
+
+ var actionContext = new ActionContext
+ {
+ HttpContext = new DefaultHttpContext
+ {
+ Request =
+ {
+ Protocol = expectedProtocol,
+ Host = new HostString("www.asp.net"),
+ }
+ },
+ RouteData = new RouteData
+ {
+ Values =
+ {
+ { "page", "ambient-page" },
+ }
+ },
+ };
+ var urlHelper = CreateMockUrlHelper(actionContext);
+ urlHelper.Setup(h => h.RouteUrl(It.IsAny()))
+ .Callback((UrlRouteContext context) => actual = context);
+
+ // Act
+ urlHelper.Object.PageLink(host: expectedHost);
+
+ // Assert
+ urlHelper.Verify();
+ Assert.NotNull(actual);
+ Assert.Collection(Assert.IsType(actual.Values),
+ value =>
+ {
+ Assert.Equal("page", value.Key);
+ Assert.Equal("ambient-page", value.Value);
+ });
+ Assert.Null(actual.RouteName);
+
+ Assert.Equal(expectedProtocol, actual.Protocol);
+ Assert.Equal(expectedHost, actual.Host);
+ }
+
private static Mock CreateMockUrlHelper(ActionContext context = null)
{
if (context == null)
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTestBase.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTestBase.cs
index dd57e88248..b1e21e515c 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTestBase.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTestBase.cs
@@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Mvc.Abstractions;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.ObjectPool;
using Moq;
using Xunit;
@@ -952,6 +951,19 @@ namespace Microsoft.AspNetCore.Mvc.Routing
Assert.Equal("/b/Store/Checkout", url);
}
+ [Fact]
+ public void ActionLink_ReturnsAbsoluteUrlToAction()
+ {
+ // Arrange
+ var urlHelper = CreateUrlHelperWithDefaultRoutes();
+
+ // Act
+ var url = urlHelper.ActionLink("contact", "home");
+
+ // Assert
+ Assert.Equal("http://localhost/app/home/contact", url);
+ }
+
protected abstract IServiceProvider CreateServices();
protected abstract IUrlHelper CreateUrlHelper(ActionContext actionContext);
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs
deleted file mode 100644
index 42d2a5a5ce..0000000000
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs
+++ /dev/null
@@ -1,223 +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.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Net.Http.Headers;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Mvc.FunctionalTests
-{
- public class BasicApiTest : IClassFixture
- {
- private static readonly byte[] PetBytes = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false)
- .GetBytes(@"{
- ""category"" : {
- ""name"" : ""Cats""
- },
- ""images"": [
- {
- ""url"": ""http://example.com/images/fluffy1.png""
- },
- {
- ""url"": ""http://example.com/images/fluffy2.png""
- },
- ],
- ""tags"": [
- {
- ""name"": ""orange""
- },
- {
- ""name"": ""kitty""
- }
- ],
- ""age"": 2,
- ""hasVaccinations"": ""true"",
- ""name"" : ""fluffy"",
- ""status"" : ""available""
-}");
-
- public BasicApiTest(BasicApiFixture fixture)
- {
- Client = fixture.CreateClient();
- }
-
- public HttpClient Client { get; }
-
- [Fact]
- public async Task Token_WithUnknownUser_ReturnsForbidden()
- {
- // Arrange & Act
- var response = await Client.GetAsync("/token?username=fallguy@example.com");
-
- // Assert
- Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode);
- }
-
- [Fact]
- public async Task Token_WithKnownUser_ReturnsOkAndToken()
- {
- // Arrange & Act
- var response = await Client.GetAsync("/token?username=reader@example.com");
-
- // Assert
- Assert.Equal(HttpStatusCode.OK, response.StatusCode);
- Assert.Equal("text/plain", response.Content.Headers.ContentType.MediaType);
-
- var token = await response.Content.ReadAsStringAsync();
- Assert.NotNull(token);
- Assert.NotEmpty(token);
- }
-
- [Fact]
- public async Task FindByStatus_WithNoToken_ReturnsUnauthorized()
- {
- // Arrange & Act
- var response = await Client.GetAsync("/pet/findByStatus?status=available");
-
- // Assert
- Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
- }
-
- [Theory]
- [InlineData("reader@example.com")]
- [InlineData("writer@example.com")]
- public async Task FindByStatus_WithToken_ReturnsOkAndPet(string username)
- {
- // Arrange & Act 1
- var token = await Client.GetStringAsync($"/token?username={username}");
-
- // Assert 1 (guard)
- Assert.NotEmpty(token);
-
- // Arrange 2
- var request = new HttpRequestMessage(HttpMethod.Get, "/pet/findByStatus?status=available");
- request.Headers.Add(HeaderNames.Authorization, $"Bearer {token}");
-
- // Act 2
- var response = await Client.SendAsync(request);
-
- // Assert 2
- Assert.Equal(HttpStatusCode.OK, response.StatusCode);
- Assert.Equal("application/json", response.Content.Headers.ContentType.MediaType);
-
- var json = await response.Content.ReadAsStringAsync();
- Assert.NotNull(json);
- Assert.NotEmpty(json);
- }
-
- [Fact]
- public async Task FindById_WithInvalidPetId_ReturnsNotFound()
- {
- // Arrange & Act 1
- var token = await Client.GetStringAsync("/token?username=reader@example.com");
-
- // Assert 1 (guard)
- Assert.NotEmpty(token);
-
- // Arrange 2
- var request = new HttpRequestMessage(HttpMethod.Get, "/pet/100");
- request.Headers.Add(HeaderNames.Authorization, $"Bearer {token}");
-
- // Act 2
- var response = await Client.SendAsync(request);
-
- // Assert 2
- Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
- }
-
- [Fact]
- public async Task FindById_WithValidPetId_ReturnsOkAndPet()
- {
- // Arrange & Act 1
- var token = await Client.GetStringAsync("/token?username=reader@example.com");
-
- // Assert 1 (guard)
- Assert.NotEmpty(token);
-
- // Arrange 2
- var request = new HttpRequestMessage(HttpMethod.Get, "/pet/-1");
- request.Headers.Add(HeaderNames.Authorization, $"Bearer {token}");
-
- // Act 2
- var response = await Client.SendAsync(request);
-
- // Assert 2
- Assert.Equal(HttpStatusCode.OK, response.StatusCode);
- Assert.Equal("application/json", response.Content.Headers.ContentType.MediaType);
-
- var json = await response.Content.ReadAsStringAsync();
- Assert.NotNull(json);
- Assert.NotEmpty(json);
- }
-
- [Fact]
- public async Task AddPet_WithInsufficientClaims_ReturnsForbidden()
- {
- // Arrange & Act 1
- var token = await Client.GetStringAsync("/token?username=reader@example.com");
-
- // Assert 1 (guard)
- Assert.NotEmpty(token);
-
- // Arrange 2
- var request = new HttpRequestMessage(HttpMethod.Post, "/pet")
- {
- Content = new ByteArrayContent(PetBytes)
- {
- Headers =
- {
- { "Content-Type", "application/json" },
- },
- },
- Headers =
- {
- { HeaderNames.Authorization, $"Bearer {token}" },
- },
- };
-
- // Act 2
- var response = await Client.SendAsync(request);
-
- // Assert 2
- Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode);
- }
-
- [Fact]
- public async Task AddPet_WithValidClaims_ReturnsCreated()
- {
- // Arrange & Act 1
- var token = await Client.GetStringAsync("/token?username=writer@example.com");
-
- // Assert 1 (guard)
- Assert.NotEmpty(token);
-
- // Arrange 2
- var request = new HttpRequestMessage(HttpMethod.Post, "/pet")
- {
- Content = new ByteArrayContent(PetBytes)
- {
- Headers =
- {
- { HeaderNames.ContentType, "application/json" },
- },
- },
- Headers =
- {
- { HeaderNames.Authorization, $"Bearer {token}" },
- },
- };
-
- // Act 2
- var response = await Client.SendAsync(request);
-
- // Assert 2
- Assert.Equal(HttpStatusCode.Created, response.StatusCode);
- var location = response.Headers.Location.ToString();
- Assert.NotNull(location);
- Assert.EndsWith("/1", location);
- }
- }
-}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicViewsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicViewsTest.cs
deleted file mode 100644
index 5f9b0bbcd8..0000000000
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicViewsTest.cs
+++ /dev/null
@@ -1,83 +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.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Mvc.FunctionalTests
-{
- public class BasicViewsTest : IClassFixture
- {
- public BasicViewsTest(BasicViewsFixture fixture)
- {
- Client = fixture.CreateClient();
- }
-
- public HttpClient Client { get; }
-
- [Theory]
- [InlineData("/")]
- [InlineData("/Home/HtmlHelpers")]
- public async Task Get_ReturnsOkAndAntiforgeryToken(string path)
- {
- // Arrange & Act
- var response = await Client.GetAsync(path);
-
- // Assert
- Assert.Equal(HttpStatusCode.OK, response.StatusCode);
- Assert.Equal("text/html", response.Content.Headers.ContentType.MediaType);
-
- var html = await response.Content.ReadAsStringAsync();
- Assert.NotNull(html);
- Assert.NotEmpty(html);
-
- var token = AntiforgeryTestHelper.RetrieveAntiforgeryToken(html, "/");
- Assert.NotNull(token);
- Assert.NotEmpty(token);
- }
-
- [Theory]
- [InlineData("/")]
- [InlineData("/Home/HtmlHelpers")]
- public async Task Post_ReturnsOkAndNewPerson(string path)
- {
- // Arrange & Act 1
- var html = await Client.GetStringAsync(path);
-
- // Assert 1 (guard)
- Assert.NotEmpty(html);
-
- // Arrange 2
- var token = AntiforgeryTestHelper.RetrieveAntiforgeryToken(html, "/");
- var name = Guid.NewGuid().ToString();
- name = name.Substring(startIndex: 0, length: name.LastIndexOf('-'));
- var form = new Dictionary
- {
- { "__RequestVerificationToken", token },
- { "Age", "12" },
- { "BirthDate", "2006-03-01T09:51:43.041-07:00" },
- { "Name", name },
- };
-
- var content = new FormUrlEncodedContent(form);
- var request = new HttpRequestMessage(HttpMethod.Post, path)
- {
- Content = content,
- };
-
- // Act 2
- var response = await Client.SendAsync(request);
-
- // Assert 2
- Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-
- var body = await response.Content.ReadAsStringAsync();
- Assert.NotNull(body);
- Assert.Contains($@"value=""{name}""", body);
- }
- }
-}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs
new file mode 100644
index 0000000000..d6f95edc2e
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ComponentRenderingFunctionalTests.cs
@@ -0,0 +1,139 @@
+// 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.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using AngleSharp.Parser.Html;
+using BasicWebSite.Services;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+ public class ComponentRenderingFunctionalTests : IClassFixture>
+ {
+ public ComponentRenderingFunctionalTests(MvcTestFixture fixture)
+ {
+ Client = Client ?? CreateClient(fixture);
+ }
+
+ public HttpClient Client { get; }
+
+ [Fact]
+ public async Task Renders_BasicComponent()
+ {
+ // Arrange & Act
+ var response = await Client.GetAsync("http://localhost/components");
+
+ // Assert
+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+ var content = await response.Content.ReadAsStringAsync();
+
+ AssertComponent("\n Hello world!
\n", "Greetings", content);
+ }
+
+ [Fact]
+ public async Task Renders_AsyncComponent()
+ {
+ // Arrange & Act
+ var expectedHtml = @"
+ Weather forecast
+
+This component demonstrates fetching data from the server.
+
+ Weather data for 01/15/2019
+
+
+
+ | Date |
+ Temp. (C) |
+ Temp. (F) |
+ Summary |
+
+
+
+
+ | 06/05/2018 |
+ 1 |
+ 33 |
+ Freezing |
+
+
+ | 07/05/2018 |
+ 14 |
+ 57 |
+ Bracing |
+
+
+ | 08/05/2018 |
+ -13 |
+ 9 |
+ Freezing |
+
+
+ | 09/05/2018 |
+ -16 |
+ 4 |
+ Balmy |
+
+
+ | 10/05/2018 |
+ 2 |
+ 29 |
+ Chilly |
+
+
+
+
+";
+
+ var response = await Client.GetAsync("http://localhost/components");
+
+ // Assert
+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+ var content = await response.Content.ReadAsStringAsync();
+
+ AssertComponent(expectedHtml, "FetchData", content);
+ }
+
+ private void AssertComponent(string expectedConent, string divId, string responseContent)
+ {
+ var parser = new HtmlParser();
+ var htmlDocument = parser.Parse(responseContent);
+ var div = htmlDocument.Body.QuerySelector($"#{divId}");
+ Assert.Equal(
+ expectedConent.Replace("\r\n","\n"),
+ div.InnerHtml.Replace("\r\n","\n"));
+ }
+
+ // A simple delegating handler used in setting up test services so that we can configure
+ // services that talk back to the TestServer using HttpClient.
+ private class LoopHttpHandler : DelegatingHandler
+ {
+ }
+
+ private HttpClient CreateClient(MvcTestFixture fixture)
+ {
+ var loopHandler = new LoopHttpHandler();
+
+ var client = fixture
+ .WithWebHostBuilder(builder => builder.ConfigureServices(ConfigureTestWeatherForecastService))
+ .CreateClient();
+
+ // We configure the inner handler with a handler to this TestServer instance so that calls to the
+ // server can get routed properly.
+ loopHandler.InnerHandler = fixture.Server.CreateHandler();
+
+ void ConfigureTestWeatherForecastService(IServiceCollection services) =>
+ // We configure the test service here with an HttpClient that uses this loopback handler to talk
+ // to this TestServer instance.
+ services.AddSingleton(new WeatherForecastService(new HttpClient(loopHandler)
+ {
+ BaseAddress = fixture.ClientOptions.BaseAddress
+ }));
+
+ return client;
+ }
+ }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicApiFixture.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicApiFixture.cs
deleted file mode 100644
index 56294311a7..0000000000
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicApiFixture.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.
-
-using BasicApi;
-
-namespace Microsoft.AspNetCore.Mvc.FunctionalTests
-{
- public class BasicApiFixture : MvcTestFixture
- {
- // Do not leave .db file behind. Also, ensure added pet gets expected id (1) in subsequent runs.
- protected override void Dispose(bool disposing)
- {
- if (disposing)
- {
- Startup.DropDatabase(Server.Host.Services);
- }
-
- base.Dispose(disposing);
- }
- }
-}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicViewsFixture.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicViewsFixture.cs
deleted file mode 100644
index 3ea0c60835..0000000000
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicViewsFixture.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.
-
-using BasicViews;
-
-namespace Microsoft.AspNetCore.Mvc.FunctionalTests
-{
- public class BasicViewsFixture : MvcTestFixture
- {
- // Do not leave .db file behind.
- protected override void Dispose(bool disposing)
- {
- if (disposing)
- {
- Startup.DropDatabase(Server.Host.Services);
- }
-
- base.Dispose(disposing);
- }
- }
-}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
index b4e4e33ab0..34afae6bb9 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
@@ -6,6 +6,8 @@
$(DefineConstants);GENERATE_BASELINES
$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES
+
+ false
@@ -24,8 +26,6 @@
-
-
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs
index e90c761c83..ba90b35947 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.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.Net;
using System.Net.Http;
using System.Threading.Tasks;
@@ -17,7 +19,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
public HttpClient Client { get; }
- [Fact(Skip = "https://github.com/aspnet/Mvc/issues/8753")]
+ [Fact]
public async Task Rzc_LocalPageWithDifferentContent_IsUsed()
{
// Act
@@ -29,7 +31,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.Equal("Hello from runtime-compiled rzc page!", responseBody.Trim());
}
- [Fact(Skip = "https://github.com/aspnet/Mvc/issues/8753")]
+ [Fact]
public async Task Rzc_LocalViewWithDifferentContent_IsUsed()
{
// Act
@@ -53,5 +55,89 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
Assert.Equal("Hello from buildtime-compiled rzc view!", responseBody.Trim());
}
+
+ [Fact]
+ public async Task RazorViews_AreUpdatedOnChange()
+ {
+ // Arrange
+ var expected1 = "Original content";
+ var path = "/Views/UpdateableViews/Index.cshtml";
+
+ // Act - 1
+ var body = await Client.GetStringAsync("/UpdateableViews");
+
+ // Assert - 1
+ Assert.Equal(expected1, body.Trim(), ignoreLineEndingDifferences: true);
+
+ // Act - 2
+ await UpdateFile(path, "@GetType().Assembly");
+ body = await Client.GetStringAsync("/UpdateableViews");
+
+ // Assert - 2
+ var actual2 = body.Trim();
+ Assert.NotEqual(expected1, actual2);
+
+ // Act - 3
+ // With all things being the same, expect a cached compilation
+ body = await Client.GetStringAsync("/UpdateableViews");
+
+ // Assert - 3
+ Assert.Equal(actual2, body.Trim(), ignoreLineEndingDifferences: true);
+
+ // Act - 4
+ // Trigger a change in ViewImports
+ await UpdateFile("/Views/UpdateableViews/_ViewImports.cshtml", "new content");
+ body = await Client.GetStringAsync("/UpdateableViews");
+
+ // Assert - 4
+ Assert.NotEqual(actual2, body.Trim());
+ }
+
+ [Fact]
+ public async Task RazorPages_AreUpdatedOnChange()
+ {
+ // Arrange
+ var expected1 = "Original content";
+
+ // Act - 1
+ var body = await Client.GetStringAsync("/UpdateablePage");
+
+ // Assert - 1
+ Assert.Equal(expected1, body.Trim(), ignoreLineEndingDifferences: true);
+
+ // Act - 2
+ await UpdateRazorPages();
+ await UpdateFile("/Pages/UpdateablePage.cshtml", "@page" + Environment.NewLine + "@GetType().Assembly");
+ body = await Client.GetStringAsync("/UpdateablePage");
+
+ // Assert - 2
+ var actual2 = body.Trim();
+ Assert.NotEqual(expected1, actual2);
+
+ // Act - 3
+ // With all things being unchanged, we should get the cached page.
+ body = await Client.GetStringAsync("/UpdateablePage");
+
+ // Assert - 3
+ Assert.Equal(actual2, body.Trim(), ignoreLineEndingDifferences: true);
+ }
+
+ private async Task UpdateFile(string path, string content)
+ {
+ var updateContent = new FormUrlEncodedContent(new Dictionary
+ {
+ { "path", path },
+ { "content", content },
+ });
+
+ var response = await Client.PostAsync($"/UpdateableViews/Update", updateContent);
+ response.EnsureSuccessStatusCode();
+ }
+
+ private async Task UpdateRazorPages()
+ {
+ var response = await Client.PostAsync($"/UpdateableViews/UpdateRazorPages", new StringContent(string.Empty));
+ response.EnsureSuccessStatusCode();
+ }
}
}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
index b36fe5af37..56e8785254 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
@@ -1190,11 +1190,11 @@ Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary`1[AspNetCore.InjectedPa
public async Task AuthFiltersAppliedToPageModel_AreExecuted()
{
// Act
- var response = await Client.GetAsync("/ModelWithAuthFilter");
+ var response = await Client.GetAsync("/Pages/ModelWithAuthFilter");
// Assert
Assert.Equal(HttpStatusCode.Redirect, response.StatusCode);
- Assert.Equal("/Login?ReturnUrl=%2FModelWithAuthFilter", response.Headers.Location.PathAndQuery);
+ Assert.Equal("/Login?ReturnUrl=%2FPages%2FModelWithAuthFilter", response.Headers.Location.PathAndQuery);
}
[Fact]
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithEndpointRoutingTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithEndpointRoutingTest.cs
new file mode 100644
index 0000000000..6e7be902ff
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithEndpointRoutingTest.cs
@@ -0,0 +1,66 @@
+// 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.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.FunctionalTests
+{
+ public class RazorPagesWithEndpointRoutingTest : IClassFixture>
+ {
+ public RazorPagesWithEndpointRoutingTest(MvcTestFixture fixture)
+ {
+ Client = fixture.CreateDefaultClient();
+ }
+
+ public HttpClient Client { get; }
+
+ [Fact]
+ public async Task Authorize_AppliedUsingConvention_Works()
+ {
+ // Act
+ var response = await Client.GetAsync("/Conventions/AuthFolder");
+
+ // Assert
+ await response.AssertStatusCodeAsync(HttpStatusCode.Redirect);
+ Assert.Equal("/Login?ReturnUrl=%2FConventions%2FAuthFolder", response.Headers.Location.PathAndQuery);
+ }
+
+ [Fact]
+ public async Task Authorize_AppliedUsingConvention_CanByOverridenByAllowAnonymousAppliedToModel()
+ {
+ // Act
+ var response = await Client.GetAsync("/Conventions/AuthFolder/AnonymousViaModel");
+
+ // Assert
+ await response.AssertStatusCodeAsync(HttpStatusCode.OK);
+
+ var content = await response.Content.ReadAsStringAsync();
+ Assert.Equal("Hello from Anonymous", content.Trim());
+ }
+
+ [Fact]
+ public async Task Authorize_AppliedUsingAttributeOnModel_Works()
+ {
+ // Act
+ var response = await Client.GetAsync("/ModelWithAuthFilter");
+
+ // Assert
+ await response.AssertStatusCodeAsync(HttpStatusCode.Redirect);
+ Assert.Equal("/Login?ReturnUrl=%2FModelWithAuthFilter", response.Headers.Location.PathAndQuery);
+ }
+
+ [Fact]
+ public async Task Authorize_WithEndpointRouting_WorksForControllers()
+ {
+ // Act
+ var response = await Client.GetAsync("/AuthorizedAction/Index");
+
+ // Assert
+ await response.AssertStatusCodeAsync(HttpStatusCode.Redirect);
+ Assert.Equal("/Login?ReturnUrl=%2FAuthorizedAction%2FIndex", response.Headers.Location.PathAndQuery);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTestsBase.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTestsBase.cs
index ca40dc6ea8..d7d51e19c3 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTestsBase.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTestsBase.cs
@@ -48,6 +48,32 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
Assert.Equal(expectedUrl, Assert.Single(result.ExpectedUrls));
}
+ [Fact]
+ public async Task ConventionalRoutedAction_RouteHasNonParameterConstraint_RouteConstraintRun_Allowed()
+ {
+ // Arrange & Act
+ var response = await Client.GetAsync("http://localhost/NonParameterConstraintRoute/NonParameterConstraint/Index?allowed=true");
+
+ // Assert
+ Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+
+ var body = await response.Content.ReadAsStringAsync();
+ var result = JsonConvert.DeserializeObject(body);
+
+ Assert.Equal("NonParameterConstraint", result.Controller);
+ Assert.Equal("Index", result.Action);
+ }
+
+ [Fact]
+ public async Task ConventionalRoutedAction_RouteHasNonParameterConstraint_RouteConstraintRun_Denied()
+ {
+ // Arrange & Act
+ var response = await Client.GetAsync("http://localhost/NonParameterConstraintRoute/NonParameterConstraint/Index?allowed=false");
+
+ // Assert
+ Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+ }
+
[Fact]
public async Task ConventionalRoutedAction_RouteContainsPage_RouteNotMatched()
{
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
index 84283fe77a..e2c9f20430 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
@@ -252,30 +252,6 @@ ViewWithNestedLayout-Content
Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
}
- [Fact(Skip = "https://github.com/aspnet/Mvc/issues/8754")]
- public Task RazorViewEngine_RendersViewsFromEmbeddedFileProvider_WhenLookedupByName()
- => RazorViewEngine_RendersIndexViewsFromEmbeddedFileProvider("/EmbeddedViews/LookupByName");
-
- [Fact(Skip = "https://github.com/aspnet/Mvc/issues/8754")]
- public Task RazorViewEngine_RendersViewsFromEmbeddedFileProvider_WhenLookedupByPath()
- => RazorViewEngine_RendersIndexViewsFromEmbeddedFileProvider("/EmbeddedViews/LookupByPath");
-
- private async Task RazorViewEngine_RendersIndexViewsFromEmbeddedFileProvider(string requestPath)
- {
- // Arrange
- var expected =
-@"Hello from EmbeddedShared/_Partial
-Hello from Shared/_EmbeddedPartial
-Tag Helper Link
-";
-
- // Act
- var body = await Client.GetStringAsync(requestPath);
-
- // Assert
- Assert.Equal(expected, body.Trim(), ignoreLineEndingDifferences: true);
- }
-
[Fact]
public async Task LayoutValueIsPassedBetweenNestedViewStarts()
{
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/CSharpCompilerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/CSharpCompilerTest.cs
new file mode 100644
index 0000000000..3f87554209
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/CSharpCompilerTest.cs
@@ -0,0 +1,319 @@
+// 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.Hosting;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Emit;
+using Microsoft.CodeAnalysis.Text;
+using Moq;
+using Xunit;
+using DependencyContextCompilationOptions = Microsoft.Extensions.DependencyModel.CompilationOptions;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ public class CSharpCompilerTest
+ {
+ private readonly RazorReferenceManager ReferenceManager = new TestRazorReferenceManager();
+
+ [Theory]
+ [InlineData(null)]
+ [InlineData("")]
+ public void GetCompilationOptions_ReturnsDefaultOptionsIfApplicationNameIsNullOrEmpty(string name)
+ {
+ // Arrange
+ var hostingEnvironment = Mock.Of(e => e.ApplicationName == name);
+ var compiler = new CSharpCompiler(ReferenceManager, hostingEnvironment);
+
+ // Act
+ var options = compiler.GetDependencyContextCompilationOptions();
+
+ // Assert
+ Assert.Same(DependencyContextCompilationOptions.Default, options);
+ }
+
+ [Fact]
+ public void GetCompilationOptions_ReturnsDefaultOptionsIfApplicationDoesNotHaveDependencyContext()
+ {
+ // Arrange
+ var hostingEnvironment = Mock.Of();
+ var compiler = new CSharpCompiler(ReferenceManager, hostingEnvironment);
+
+ // Act
+ var options = compiler.GetDependencyContextCompilationOptions();
+
+ // Assert
+ Assert.Same(DependencyContextCompilationOptions.Default, options);
+ }
+
+ [Theory]
+ [InlineData("Development", OptimizationLevel.Debug)]
+ [InlineData("Staging", OptimizationLevel.Release)]
+ [InlineData("Production", OptimizationLevel.Release)]
+ public void Constructor_SetsOptimizationLevelBasedOnEnvironment(
+ string environment,
+ OptimizationLevel expected)
+ {
+ // Arrange
+ var options = new RazorViewEngineOptions();
+ var hostingEnvironment = new Mock();
+ hostingEnvironment.SetupGet(e => e.EnvironmentName)
+ .Returns(environment);
+ var compiler = new CSharpCompiler(ReferenceManager, hostingEnvironment.Object);
+
+ // Act & Assert
+ var compilationOptions = compiler.CSharpCompilationOptions;
+ Assert.Equal(expected, compilationOptions.OptimizationLevel);
+ }
+
+ [Theory]
+ [InlineData("Development", "DEBUG")]
+ [InlineData("Staging", "RELEASE")]
+ [InlineData("Production", "RELEASE")]
+ public void EnsureOptions_SetsPreprocessorSymbols(string environment, string expectedConfiguration)
+ {
+ // Arrange
+ var options = new RazorViewEngineOptions();
+ var hostingEnvironment = new Mock();
+ hostingEnvironment.SetupGet(e => e.EnvironmentName)
+ .Returns(environment);
+ var compiler = new CSharpCompiler(ReferenceManager, hostingEnvironment.Object);
+
+ // Act & Assert
+ var parseOptions = compiler.ParseOptions;
+ Assert.Equal(new[] { expectedConfiguration }, parseOptions.PreprocessorSymbolNames);
+ }
+
+ [Fact]
+ public void EnsureOptions_ConfiguresDefaultCompilationOptions()
+ {
+ // Arrange
+ var hostingEnvironment = Mock.Of(h => h.EnvironmentName == "Development");
+ var compiler = new CSharpCompiler(ReferenceManager, hostingEnvironment);
+
+ // Act & Assert
+ var compilationOptions = compiler.CSharpCompilationOptions;
+ Assert.False(compilationOptions.AllowUnsafe);
+ Assert.Equal(ReportDiagnostic.Default, compilationOptions.GeneralDiagnosticOption);
+ Assert.Equal(OptimizationLevel.Debug, compilationOptions.OptimizationLevel);
+ Assert.Collection(compilationOptions.SpecificDiagnosticOptions.OrderBy(d => d.Key),
+ item =>
+ {
+ Assert.Equal("CS1701", item.Key);
+ Assert.Equal(ReportDiagnostic.Suppress, item.Value);
+ },
+ item =>
+ {
+ Assert.Equal("CS1702", item.Key);
+ Assert.Equal(ReportDiagnostic.Suppress, item.Value);
+ },
+ item =>
+ {
+ Assert.Equal("CS1705", item.Key);
+ Assert.Equal(ReportDiagnostic.Suppress, item.Value);
+ });
+ }
+
+ [Fact]
+ public void EnsureOptions_ConfiguresDefaultParseOptions()
+ {
+ // Arrange
+ var hostingEnvironment = Mock.Of(h => h.EnvironmentName == "Development");
+ var compiler = new CSharpCompiler(ReferenceManager, hostingEnvironment);
+
+ // Act & Assert
+ var parseOptions = compiler.ParseOptions;
+ Assert.Equal(LanguageVersion.CSharp7, parseOptions.LanguageVersion);
+ Assert.Equal(new[] { "DEBUG" }, parseOptions.PreprocessorSymbolNames);
+ }
+
+ [Fact]
+ public void Constructor_ConfiguresPreprocessorSymbolNames()
+ {
+ // Arrange
+ var hostingEnvironment = Mock.Of();
+ var dependencyContextOptions = GetDependencyContextCompilationOptions("SOME_TEST_DEFINE");
+
+ var compiler = new TestCSharpCompiler(ReferenceManager, hostingEnvironment, dependencyContextOptions);
+
+ // Act & Assert
+ var parseOptions = compiler.ParseOptions;
+ Assert.Contains("SOME_TEST_DEFINE", parseOptions.PreprocessorSymbolNames);
+ }
+
+ [Fact]
+ public void Constructor_ConfiguresLanguageVersion()
+ {
+ // Arrange
+ var dependencyContextOptions = GetDependencyContextCompilationOptions(languageVersion: "7.1");
+ var hostingEnvironment = Mock.Of();
+
+ var compiler = new TestCSharpCompiler(ReferenceManager, hostingEnvironment, dependencyContextOptions);
+
+ // Act & Assert
+ var compilationOptions = compiler.ParseOptions;
+ Assert.Equal(LanguageVersion.CSharp7_1, compilationOptions.LanguageVersion);
+ }
+
+
+ [Fact]
+ public void EmitOptions_ReadsDebugTypeFromDependencyContext()
+ {
+ // Arrange
+ var dependencyContextOptions = GetDependencyContextCompilationOptions(debugType: "portable");
+ var hostingEnvironment = Mock.Of();
+
+ var compiler = new TestCSharpCompiler(ReferenceManager, hostingEnvironment, dependencyContextOptions);
+
+ // Act & Assert
+ var emitOptions = compiler.EmitOptions;
+ Assert.Equal(DebugInformationFormat.PortablePdb, emitOptions.DebugInformationFormat);
+ Assert.True(compiler.EmitPdb);
+ }
+
+ [Fact]
+ public void EmitOptions_SetsDebugInformationFormatToPortable_WhenDebugTypeIsEmbedded()
+ {
+ // Arrange
+ var dependencyContextOptions = GetDependencyContextCompilationOptions(debugType: "embedded");
+ var hostingEnvironment = Mock.Of();
+
+ var compiler = new TestCSharpCompiler(ReferenceManager, hostingEnvironment, dependencyContextOptions);
+
+ // Act & Assert
+ var emitOptions = compiler.EmitOptions;
+ Assert.Equal(DebugInformationFormat.PortablePdb, emitOptions.DebugInformationFormat);
+ Assert.True(compiler.EmitPdb);
+ }
+
+ [Fact]
+ public void EmitOptions_DoesNotSetEmitPdb_IfDebugTypeIsNone()
+ {
+ // Arrange
+ var dependencyContextOptions = GetDependencyContextCompilationOptions(debugType: "none");
+ var hostingEnvironment = Mock.Of();
+
+ var compiler = new TestCSharpCompiler(ReferenceManager, hostingEnvironment, dependencyContextOptions);
+
+ // Act & Assert
+ Assert.False(compiler.EmitPdb);
+ }
+
+ [Fact]
+ public void Constructor_ConfiguresAllowUnsafe()
+ {
+ // Arrange
+ var dependencyContextOptions = GetDependencyContextCompilationOptions(allowUnsafe: true);
+ var hostingEnvironment = Mock.Of();
+
+ var compiler = new TestCSharpCompiler(ReferenceManager, hostingEnvironment, dependencyContextOptions);
+
+ // Act & Assert
+ var compilationOptions = compiler.CSharpCompilationOptions;
+ Assert.True(compilationOptions.AllowUnsafe);
+ }
+
+ [Fact]
+ public void Constructor_SetsDiagnosticOption()
+ {
+ // Arrange
+ var dependencyContextOptions = GetDependencyContextCompilationOptions(warningsAsErrors: true);
+ var hostingEnvironment = Mock.Of();
+
+ var compiler = new TestCSharpCompiler(ReferenceManager, hostingEnvironment, dependencyContextOptions);
+
+ // Act & Assert
+ var compilationOptions = compiler.CSharpCompilationOptions;
+ Assert.Equal(ReportDiagnostic.Error, compilationOptions.GeneralDiagnosticOption);
+ }
+
+ [Fact]
+ public void Constructor_SetsOptimizationLevel()
+ {
+ // Arrange
+ var dependencyContextOptions = GetDependencyContextCompilationOptions(optimize: true);
+ var hostingEnvironment = Mock.Of();
+
+ var compiler = new TestCSharpCompiler(ReferenceManager, hostingEnvironment, dependencyContextOptions);
+
+ // Act & Assert
+ var compilationOptions = compiler.CSharpCompilationOptions;
+ Assert.Equal(OptimizationLevel.Release, compilationOptions.OptimizationLevel);
+ }
+
+ [Fact]
+ public void Constructor_SetsDefines()
+ {
+ // Arrange
+ var dependencyContextOptions = GetDependencyContextCompilationOptions("MyDefine");
+ var hostingEnvironment = Mock.Of();
+ var compiler = new TestCSharpCompiler(ReferenceManager, hostingEnvironment, dependencyContextOptions);
+
+ // Act & Assert
+ var parseOptions = compiler.ParseOptions;
+ Assert.Equal(new[] { "MyDefine", "RELEASE" }, parseOptions.PreprocessorSymbolNames);
+ }
+
+ [Fact]
+ public void Compile_UsesApplicationsCompilationSettings_ForParsingAndCompilation()
+ {
+ // Arrange
+ var content = "public class Test {}";
+ var define = "MY_CUSTOM_DEFINE";
+ var dependencyContextOptions = GetDependencyContextCompilationOptions(define);
+ var hostingEnvironment = Mock.Of();
+ var compiler = new TestCSharpCompiler(ReferenceManager, hostingEnvironment, dependencyContextOptions);
+
+ // Act
+ var syntaxTree = compiler.CreateSyntaxTree(SourceText.From(content));
+
+ // Assert
+ Assert.Contains(define, syntaxTree.Options.PreprocessorSymbolNames);
+ }
+
+ private static DependencyContextCompilationOptions GetDependencyContextCompilationOptions(
+ string define = null,
+ string languageVersion = null,
+ string platform = null,
+ bool? allowUnsafe = null,
+ bool? warningsAsErrors = null,
+ bool? optimize = null,
+ string keyFile = null,
+ bool? delaySign = null,
+ bool? publicSign = null,
+ string debugType = null)
+ {
+ return new DependencyContextCompilationOptions(
+ new[] { define },
+ languageVersion,
+ platform,
+ allowUnsafe,
+ warningsAsErrors,
+ optimize,
+ keyFile,
+ delaySign,
+ publicSign,
+ debugType,
+ emitEntryPoint: null,
+ generateXmlDocumentation: null);
+ }
+
+ private class TestCSharpCompiler : CSharpCompiler
+ {
+ private readonly DependencyContextCompilationOptions _options;
+
+ public TestCSharpCompiler(
+ RazorReferenceManager referenceManager,
+ IHostingEnvironment hostingEnvironment,
+ DependencyContextCompilationOptions options)
+ : base(referenceManager, hostingEnvironment)
+ {
+ _options = options;
+ }
+
+ protected internal override DependencyContextCompilationOptions GetDependencyContextCompilationOptions()
+ => _options;
+ }
+ }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/ChecksumValidatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/ChecksumValidatorTest.cs
new file mode 100644
index 0000000000..4a37fee2bf
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/ChecksumValidatorTest.cs
@@ -0,0 +1,190 @@
+// 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.Razor.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Hosting.TestRazorCompiledItem;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ public class ChecksumValidatorTest
+ {
+ private VirtualRazorProjectFileSystem ProjectFileSystem { get; } = new VirtualRazorProjectFileSystem();
+
+ [Fact]
+ public void IsRecompilationSupported_NoChecksumAttributes_ReturnsFalse()
+ {
+ // Arrange
+ var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[] { });
+
+ // Act
+ var result = ChecksumValidator.IsRecompilationSupported(item);
+
+ // Assert
+ Assert.False(result);
+ }
+
+ [Fact]
+ public void IsRecompilationSupported_NoPrimaryChecksumAttribute_ReturnsFalse()
+ {
+ // Arrange
+ var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+ });
+
+ // Act
+ var result = ChecksumValidator.IsRecompilationSupported(item);
+
+ // Assert
+ Assert.False(result);
+ }
+
+ [Fact]
+ public void IsRecompilationSupported_HasPrimaryChecksumAttribute_ReturnsTrue()
+ {
+ // Arrange
+ var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/Index.cstml"),
+ });
+
+ // Act
+ var result = ChecksumValidator.IsRecompilationSupported(item);
+
+ // Assert
+ Assert.True(result);
+ }
+
+ [Fact]
+ public void IsItemValid_NoChecksumAttributes_ReturnsTrue()
+ {
+ // Arrange
+ var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[] { });
+
+ // Act
+ var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+ // Assert
+ Assert.True(result);
+ }
+
+ [Fact]
+ public void IsItemValid_NoPrimaryChecksumAttribute_ReturnsTrue()
+ {
+ // Arrange
+ var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/About.cstml"),
+ });
+
+ // Act
+ var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+ // Assert
+ Assert.True(result);
+ }
+
+ [Fact]
+ public void IsItemValid_PrimaryFileDoesNotExist_ReturnsTrue()
+ {
+ // Arrange
+ var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/Index.cstml"),
+ });
+
+ ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/_ViewImports.cstml", "dkdkfkdf")); // This will be ignored
+
+ // Act
+ var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+ // Assert
+ Assert.True(result);
+ }
+
+ [Fact]
+ public void IsItemValid_PrimaryFileExistsButDoesNotMatch_ReturnsFalse()
+ {
+ // Arrange
+ var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/Index.cstml"),
+ });
+
+ ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/Index.cstml", "other content"));
+
+ // Act
+ var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+ // Assert
+ Assert.False(result);
+ }
+
+ [Fact]
+ public void IsItemValid_ImportFileDoesNotExist_ReturnsFalse()
+ {
+ // Arrange
+ var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/Index.cstml"),
+ });
+
+ ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/Index.cstml", "some content"));
+
+ // Act
+ var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+ // Assert
+ Assert.False(result);
+ }
+
+ [Fact]
+ public void IsItemValid_ImportFileExistsButDoesNotMatch_ReturnsFalse()
+ {
+ // Arrange
+ var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/Index.cstml"),
+ });
+
+ ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/Index.cstml", "some content"));
+ ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/_ViewImports.cstml", "some other import"));
+
+ // Act
+ var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+ // Assert
+ Assert.False(result);
+ }
+
+ [Fact]
+ public void IsItemValid_AllFilesMatch_ReturnsTrue()
+ {
+ // Arrange
+ var item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", "/Views/Home/Index.cstml", new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some other import"), "/Views/_ViewImports.cstml"),
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), "/Views/Home/_ViewImports.cstml"),
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), "/Views/Home/Index.cstml"),
+ });
+
+ ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/Index.cstml", "some content"));
+ ProjectFileSystem.Add(new TestRazorProjectItem("/Views/Home/_ViewImports.cstml", "some import"));
+ ProjectFileSystem.Add(new TestRazorProjectItem("/Views/_ViewImports.cstml", "some other import"));
+
+ // Act
+ var result = ChecksumValidator.IsItemValid(ProjectFileSystem, item);
+
+ // Assert
+ Assert.True(result);
+ }
+ }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/CompilerFailedExceptionFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/CompilerFailedExceptionFactoryTest.cs
new file mode 100644
index 0000000000..6bba1c26e1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/CompilerFailedExceptionFactoryTest.cs
@@ -0,0 +1,355 @@
+// 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.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.Text;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ public class CompilerFailedExceptionFactoryTest
+ {
+ [Fact]
+ public void GetCompilationFailedResult_ReadsRazorErrorsFromPage()
+ {
+ // Arrange
+ var viewPath = "/Views/Home/Index.cshtml";
+
+ var fileSystem = new VirtualRazorProjectFileSystem();
+ var projectItem = new TestRazorProjectItem(viewPath, "");
+
+ var razorEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem).Engine;
+ var codeDocument = GetCodeDocument(projectItem);
+
+ // Act
+ razorEngine.Process(codeDocument);
+ var csharpDocument = codeDocument.GetCSharpDocument();
+ var compilationResult = CompilationFailedExceptionFactory.Create(codeDocument, csharpDocument.Diagnostics);
+
+ // Assert
+ var failure = Assert.Single(compilationResult.CompilationFailures);
+ Assert.Equal(viewPath, failure.SourceFilePath);
+ Assert.Collection(failure.Messages,
+ message => Assert.StartsWith(
+ @"Unterminated string literal.",
+ message.Message),
+ message => Assert.StartsWith(
+ @"The explicit expression block is missing a closing "")"" character.",
+ message.Message));
+ }
+
+ [Fact]
+ public void GetCompilationFailedResult_WithMissingReferences()
+ {
+ // Arrange
+ var expected = "One or more compilation references may be missing. 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.";
+ var compilation = CSharpCompilation.Create("Test", options: new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
+ var syntaxTree = CSharpSyntaxTree.ParseText("@class Test { public string Test { get; set; } }");
+ compilation = compilation.AddSyntaxTrees(syntaxTree);
+ var emitResult = compilation.Emit(new MemoryStream());
+
+ // Act
+ var exception = CompilationFailedExceptionFactory.Create(
+ RazorCodeDocument.Create(RazorSourceDocument.Create("Test", "Index.cshtml"), Enumerable.Empty()),
+ syntaxTree.ToString(),
+ "Test",
+ emitResult.Diagnostics);
+
+ // Assert
+ Assert.Collection(
+ exception.CompilationFailures,
+ failure => Assert.Equal(expected, failure.FailureSummary));
+ }
+
+ [Fact]
+ public void GetCompilationFailedResult_UsesPhysicalPath()
+ {
+ // Arrange
+ var viewPath = "/Views/Home/Index.cshtml";
+ var physicalPath = @"x:\myapp\views\home\index.cshtml";
+
+ var projectItem = new TestRazorProjectItem(viewPath, "", physicalPath: physicalPath);
+
+ var codeDocument = GetCodeDocument(projectItem);
+ var csharpDocument = codeDocument.GetCSharpDocument();
+
+ // Act
+ var compilationResult = CompilationFailedExceptionFactory.Create(codeDocument, csharpDocument.Diagnostics);
+
+ // Assert
+ var failure = Assert.Single(compilationResult.CompilationFailures);
+ Assert.Equal(physicalPath, failure.SourceFilePath);
+ }
+
+ [Fact]
+ public void GetCompilationFailedResult_ReadsContentFromSourceDocuments()
+ {
+ // Arrange
+ var viewPath = "/Views/Home/Index.cshtml";
+ var fileContent =
+@"
+@if (User.IsAdmin)
+{
+
+}
+";
+
+ var projectItem = new TestRazorProjectItem(viewPath, fileContent);
+ var codeDocument = GetCodeDocument(projectItem);
+ var csharpDocument = codeDocument.GetCSharpDocument();
+
+ // Act
+ var compilationResult = CompilationFailedExceptionFactory.Create(codeDocument, csharpDocument.Diagnostics);
+
+ // Assert
+ var failure = Assert.Single(compilationResult.CompilationFailures);
+ Assert.Equal(fileContent, failure.SourceFileContent);
+ }
+
+ [Fact]
+ public void GetCompilationFailedResult_ReadsContentFromImports()
+ {
+ // Arrange
+ var viewPath = "/Views/Home/Index.cshtml";
+ var importsPath = "/Views/_MyImports.cshtml";
+ var fileContent = "@ ";
+ var importsContent = "@(abc";
+
+ var projectItem = new TestRazorProjectItem(viewPath, fileContent);
+ var importsItem = new TestRazorProjectItem(importsPath, importsContent);
+ var codeDocument = GetCodeDocument(projectItem, importsItem);
+ var csharpDocument = codeDocument.GetCSharpDocument();
+
+ // Act
+ var compilationResult = CompilationFailedExceptionFactory.Create(codeDocument, csharpDocument.Diagnostics);
+
+ // Assert
+ Assert.Collection(
+ compilationResult.CompilationFailures,
+ failure =>
+ {
+ Assert.Equal(viewPath, failure.SourceFilePath);
+ Assert.Collection(failure.Messages,
+ message =>
+ {
+ Assert.Equal(@"A space or line break was encountered after the ""@"" character. Only valid identifiers, keywords, comments, ""("" and ""{"" are valid at the start of a code block and they must occur immediately following ""@"" with no space in between.",
+ message.Message);
+ });
+ },
+ failure =>
+ {
+ Assert.Equal(importsPath, failure.SourceFilePath);
+ Assert.Collection(failure.Messages,
+ message =>
+ {
+ Assert.Equal(@"The explicit expression block is missing a closing "")"" character. Make sure you have a matching "")"" character for all the ""("" characters within this block, and that none of the "")"" characters are being interpreted as markup.",
+ message.Message);
+ });
+ });
+ }
+
+ [Fact]
+ public void GetCompilationFailedResult_GroupsMessages()
+ {
+ // Arrange
+ var viewPath = "views/index.razor";
+ var viewImportsPath = "views/global.import.cshtml";
+ var codeDocument = RazorCodeDocument.Create(
+ Create(viewPath, "View Content"),
+ new[] { Create(viewImportsPath, "Global Import Content") });
+ var diagnostics = new[]
+ {
+ GetRazorDiagnostic("message-1", new SourceLocation(1, 2, 17), length: 1),
+ GetRazorDiagnostic("message-2", new SourceLocation(viewPath, 1, 4, 6), length: 7),
+ GetRazorDiagnostic("message-3", SourceLocation.Undefined, length: -1),
+ GetRazorDiagnostic("message-4", new SourceLocation(viewImportsPath, 1, 3, 8), length: 4),
+ };
+
+ // Act
+ var result = CompilationFailedExceptionFactory.Create(codeDocument, diagnostics);
+
+ // Assert
+ Assert.Collection(result.CompilationFailures,
+ failure =>
+ {
+ Assert.Equal(viewPath, failure.SourceFilePath);
+ Assert.Equal("View Content", failure.SourceFileContent);
+ Assert.Collection(failure.Messages,
+ message =>
+ {
+ Assert.Equal(diagnostics[0].GetMessage(), message.Message);
+ Assert.Equal(viewPath, message.SourceFilePath);
+ Assert.Equal(3, message.StartLine);
+ Assert.Equal(17, message.StartColumn);
+ Assert.Equal(3, message.EndLine);
+ Assert.Equal(18, message.EndColumn);
+ },
+ message =>
+ {
+ Assert.Equal(diagnostics[1].GetMessage(), message.Message);
+ Assert.Equal(viewPath, message.SourceFilePath);
+ Assert.Equal(5, message.StartLine);
+ Assert.Equal(6, message.StartColumn);
+ Assert.Equal(5, message.EndLine);
+ Assert.Equal(13, message.EndColumn);
+ },
+ message =>
+ {
+ Assert.Equal(diagnostics[2].GetMessage(), message.Message);
+ Assert.Equal(viewPath, message.SourceFilePath);
+ Assert.Equal(0, message.StartLine);
+ Assert.Equal(-1, message.StartColumn);
+ Assert.Equal(0, message.EndLine);
+ Assert.Equal(-2, message.EndColumn);
+ });
+ },
+ failure =>
+ {
+ Assert.Equal(viewImportsPath, failure.SourceFilePath);
+ Assert.Equal("Global Import Content", failure.SourceFileContent);
+ Assert.Collection(failure.Messages,
+ message =>
+ {
+ Assert.Equal(diagnostics[3].GetMessage(), message.Message);
+ Assert.Equal(viewImportsPath, message.SourceFilePath);
+ Assert.Equal(4, message.StartLine);
+ Assert.Equal(8, message.StartColumn);
+ Assert.Equal(4, message.EndLine);
+ Assert.Equal(12, message.EndColumn);
+ });
+ });
+ }
+
+ [Fact]
+ public void GetCompilationFailedResult_ReturnsCompilationResult_WithGroupedMessages()
+ {
+ // Arrange
+ var viewPath = "Views/Home/Index";
+ var generatedCodeFileName = "Generated Code";
+ var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("view-content", viewPath));
+ var assemblyName = "random-assembly-name";
+
+ var diagnostics = new[]
+ {
+ Diagnostic.Create(
+ GetRoslynDiagnostic("message-1"),
+ Location.Create(
+ viewPath,
+ new TextSpan(10, 5),
+ new LinePositionSpan(new LinePosition(10, 1), new LinePosition(10, 2)))),
+ Diagnostic.Create(
+ GetRoslynDiagnostic("message-2"),
+ Location.Create(
+ assemblyName,
+ new TextSpan(1, 6),
+ new LinePositionSpan(new LinePosition(1, 2), new LinePosition(3, 4)))),
+ Diagnostic.Create(
+ GetRoslynDiagnostic("message-3"),
+ Location.Create(
+ viewPath,
+ new TextSpan(40, 50),
+ new LinePositionSpan(new LinePosition(30, 5), new LinePosition(40, 12)))),
+ };
+
+ // Act
+ var compilationResult = CompilationFailedExceptionFactory.Create(
+ codeDocument,
+ "compilation-content",
+ assemblyName,
+ diagnostics);
+
+ // Assert
+ Assert.Collection(compilationResult.CompilationFailures,
+ failure =>
+ {
+ Assert.Equal(viewPath, failure.SourceFilePath);
+ Assert.Equal("view-content", failure.SourceFileContent);
+ Assert.Collection(failure.Messages,
+ message =>
+ {
+ Assert.Equal("message-1", message.Message);
+ Assert.Equal(viewPath, message.SourceFilePath);
+ Assert.Equal(11, message.StartLine);
+ Assert.Equal(2, message.StartColumn);
+ Assert.Equal(11, message.EndLine);
+ Assert.Equal(3, message.EndColumn);
+ },
+ message =>
+ {
+ Assert.Equal("message-3", message.Message);
+ Assert.Equal(viewPath, message.SourceFilePath);
+ Assert.Equal(31, message.StartLine);
+ Assert.Equal(6, message.StartColumn);
+ Assert.Equal(41, message.EndLine);
+ Assert.Equal(13, message.EndColumn);
+ });
+ },
+ failure =>
+ {
+ Assert.Equal(generatedCodeFileName, failure.SourceFilePath);
+ Assert.Equal("compilation-content", failure.SourceFileContent);
+ Assert.Collection(failure.Messages,
+ message =>
+ {
+ Assert.Equal("message-2", message.Message);
+ Assert.Equal(assemblyName, message.SourceFilePath);
+ Assert.Equal(2, message.StartLine);
+ Assert.Equal(3, message.StartColumn);
+ Assert.Equal(4, message.EndLine);
+ Assert.Equal(5, message.EndColumn);
+ });
+ });
+ }
+
+ private static RazorSourceDocument Create(string path, string template)
+ {
+ var stream = new MemoryStream(Encoding.UTF8.GetBytes(template));
+ return RazorSourceDocument.ReadFrom(stream, path);
+ }
+
+ private static RazorDiagnostic GetRazorDiagnostic(string message, SourceLocation sourceLocation, int length)
+ {
+ var diagnosticDescriptor = new RazorDiagnosticDescriptor("test-id", () => message, RazorDiagnosticSeverity.Error);
+ var sourceSpan = new SourceSpan(sourceLocation, length);
+
+ return RazorDiagnostic.Create(diagnosticDescriptor, sourceSpan);
+ }
+
+ private static DiagnosticDescriptor GetRoslynDiagnostic(string messageFormat)
+ {
+ return new DiagnosticDescriptor(
+ id: "someid",
+ title: "sometitle",
+ messageFormat: messageFormat,
+ category: "some-category",
+ defaultSeverity: DiagnosticSeverity.Error,
+ isEnabledByDefault: true);
+ }
+
+ private static RazorCodeDocument GetCodeDocument(TestRazorProjectItem projectItem, TestRazorProjectItem imports = null)
+ {
+ var sourceDocument = RazorSourceDocument.ReadFrom(projectItem);
+ var fileSystem = new VirtualRazorProjectFileSystem();
+ fileSystem.Add(projectItem);
+
+ var codeDocument = RazorCodeDocument.Create(sourceDocument);
+
+ if (imports != null)
+ {
+ fileSystem.Add(imports);
+ codeDocument = RazorCodeDocument.Create(sourceDocument, new[] { RazorSourceDocument.ReadFrom(imports) });
+ }
+
+ var razorEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem).Engine;
+
+ razorEngine.Process(codeDocument);
+ return codeDocument;
+ }
+
+ }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensionsTest.cs
new file mode 100644
index 0000000000..f74cfb8bf0
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/DependencyInjection/RazorRuntimeCompilationMvcCoreBuilderExtensionsTest.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 Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
+using Xunit;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+ public class RazorRuntimeCompilationMvcCoreBuilderExtensionsTest
+ {
+ [Fact]
+ public void AddServices_ReplacesRazorViewCompiler()
+ {
+ // Arrange
+ var services = new ServiceCollection()
+ .AddSingleton();
+
+ // Act
+ RazorRuntimeCompilationMvcCoreBuilderExtensions.AddServices(services);
+
+ // Assert
+ var serviceDescriptor = Assert.Single(services, service => service.ServiceType == typeof(IViewCompilerProvider));
+ Assert.Equal(typeof(RuntimeViewCompilerProvider), serviceDescriptor.ImplementationType);
+ }
+ }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/FileProviderRazorProjectFileSystemTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/FileProviderRazorProjectFileSystemTest.cs
new file mode 100644
index 0000000000..94abf8068a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/FileProviderRazorProjectFileSystemTest.cs
@@ -0,0 +1,260 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ public class FileProviderRazorProjectFileSystemTest
+ {
+ [Fact]
+ public void EnumerateFiles_ReturnsEmptySequenceIfNoCshtmlFilesArePresent()
+ {
+ // Arrange
+ var fileProvider = new TestFileProvider("BasePath");
+ var file1 = fileProvider.AddFile("/File1.txt", "content");
+ var file2 = fileProvider.AddFile("/File2.js", "content");
+ fileProvider.AddDirectoryContent("/", new IFileInfo[] { file1, file2 });
+
+ var fileSystem = GetRazorProjectFileSystem(fileProvider);
+
+ // Act
+ var razorFiles = fileSystem.EnumerateItems("/");
+
+ // Assert
+ Assert.Empty(razorFiles);
+ }
+
+ [Fact]
+ public void EnumerateFiles_ReturnsCshtmlFiles()
+ {
+ // Arrange
+ var fileProvider = new TestFileProvider("BasePath");
+ var file1 = fileProvider.AddFile("/File1.cshtml", "content");
+ var file2 = fileProvider.AddFile("/File2.js", "content");
+ var file3 = fileProvider.AddFile("/File3.cshtml", "content");
+ fileProvider.AddDirectoryContent("/", new IFileInfo[] { file1, file2, file3 });
+
+ var fileSystem = GetRazorProjectFileSystem(fileProvider);
+
+ // Act
+ var razorFiles = fileSystem.EnumerateItems("/");
+
+ // Assert
+ Assert.Collection(
+ razorFiles.OrderBy(f => f.FilePath),
+ file =>
+ {
+ Assert.Equal("/File1.cshtml", file.FilePath);
+ Assert.Equal("/", file.BasePath);
+ Assert.Equal(Path.Combine("BasePath", "File1.cshtml"), file.PhysicalPath);
+ Assert.Equal("File1.cshtml", file.RelativePhysicalPath);
+ },
+ file =>
+ {
+ Assert.Equal("/File3.cshtml", file.FilePath);
+ Assert.Equal("/", file.BasePath);
+ Assert.Equal(Path.Combine("BasePath", "File3.cshtml"), file.PhysicalPath);
+ Assert.Equal("File3.cshtml", file.RelativePhysicalPath);
+ });
+ }
+
+ [Fact]
+ public void EnumerateFiles_IteratesOverAllCshtmlUnderRoot()
+ {
+ // Arrange
+ var fileProvider = new TestFileProvider("BasePath");
+ var directory1 = new TestDirectoryFileInfo
+ {
+ Name = "Level1-Dir1",
+ };
+ var file1 = fileProvider.AddFile("File1.cshtml", "content");
+ var directory2 = new TestDirectoryFileInfo
+ {
+ Name = "Level1-Dir2",
+ };
+ fileProvider.AddDirectoryContent("/", new IFileInfo[] { directory1, file1, directory2 });
+
+ var file2 = fileProvider.AddFile("/Level1-Dir1/File2.cshtml", "content");
+ var file3 = fileProvider.AddFile("/Level1-Dir1/File3.cshtml", "content");
+ var file4 = fileProvider.AddFile("/Level1-Dir1/File4.txt", "content");
+ var directory3 = new TestDirectoryFileInfo
+ {
+ Name = "Level2-Dir1"
+ };
+ fileProvider.AddDirectoryContent("/Level1-Dir1", new IFileInfo[] { file2, directory3, file3, file4 });
+ var file5 = fileProvider.AddFile(Path.Combine("Level1-Dir2", "File5.cshtml"), "content");
+ fileProvider.AddDirectoryContent("/Level1-Dir2", new IFileInfo[] { file5 });
+ fileProvider.AddDirectoryContent("/Level1/Level2", new IFileInfo[0]);
+
+ var fileSystem = GetRazorProjectFileSystem(fileProvider);
+
+ // Act
+ var razorFiles = fileSystem.EnumerateItems("/");
+
+ // Assert
+ Assert.Collection(razorFiles.OrderBy(f => f.FilePath),
+ file =>
+ {
+ Assert.Equal("/File1.cshtml", file.FilePath);
+ Assert.Equal("/", file.BasePath);
+ Assert.Equal(Path.Combine("BasePath", "File1.cshtml"), file.PhysicalPath);
+ Assert.Equal("File1.cshtml", file.RelativePhysicalPath);
+ },
+ file =>
+ {
+ Assert.Equal("/Level1-Dir1/File2.cshtml", file.FilePath);
+ Assert.Equal("/", file.BasePath);
+ Assert.Equal(Path.Combine("BasePath", "Level1-Dir1", "File2.cshtml"), file.PhysicalPath);
+ Assert.Equal(Path.Combine("Level1-Dir1", "File2.cshtml"), file.RelativePhysicalPath);
+ },
+ file =>
+ {
+ Assert.Equal("/Level1-Dir1/File3.cshtml", file.FilePath);
+ Assert.Equal("/", file.BasePath);
+ Assert.Equal(Path.Combine("BasePath", "Level1-Dir1", "File3.cshtml"), file.PhysicalPath);
+ Assert.Equal(Path.Combine("Level1-Dir1", "File3.cshtml"), file.RelativePhysicalPath);
+ },
+ file =>
+ {
+ Assert.Equal("/Level1-Dir2/File5.cshtml", file.FilePath);
+ Assert.Equal("/", file.BasePath);
+ Assert.Equal(Path.Combine("BasePath", "Level1-Dir2", "File5.cshtml"), file.PhysicalPath);
+ Assert.Equal(Path.Combine("Level1-Dir2", "File5.cshtml"), file.RelativePhysicalPath);
+ });
+ }
+
+ [Fact]
+ public void EnumerateFiles_IteratesOverAllCshtmlUnderPath()
+ {
+ // Arrange
+ var fileProvider = new TestFileProvider("BasePath");
+ var directory1 = new TestDirectoryFileInfo
+ {
+ Name = "Level1-Dir1",
+ };
+ var file1 = fileProvider.AddFile("/File1.cshtml", "content");
+ var directory2 = new TestDirectoryFileInfo
+ {
+ Name = "Level1-Dir2",
+ };
+ fileProvider.AddDirectoryContent("/", new IFileInfo[] { directory1, file1, directory2 });
+
+ var file2 = fileProvider.AddFile("/Level1-Dir1/File2.cshtml", "content");
+ var file3 = fileProvider.AddFile("/Level1-Dir1/File3.cshtml", "content");
+ var file4 = fileProvider.AddFile("/Level1-Dir1/File4.txt", "content");
+ var directory3 = new TestDirectoryFileInfo
+ {
+ Name = "Level2-Dir1"
+ };
+ fileProvider.AddDirectoryContent("/Level1-Dir1", new IFileInfo[] { file2, directory3, file3, file4 });
+ var file5 = fileProvider.AddFile(Path.Combine("Level1-Dir2", "File5.cshtml"), "content");
+ fileProvider.AddDirectoryContent("/Level1-Dir2", new IFileInfo[] { file5 });
+ fileProvider.AddDirectoryContent("/Level1/Level2", new IFileInfo[0]);
+
+ var fileSystem = GetRazorProjectFileSystem(fileProvider);
+
+ // Act
+ var razorFiles = fileSystem.EnumerateItems("/Level1-Dir1");
+
+ // Assert
+ Assert.Collection(razorFiles.OrderBy(f => f.FilePath),
+ file =>
+ {
+ Assert.Equal("/File2.cshtml", file.FilePath);
+ Assert.Equal("/Level1-Dir1", file.BasePath);
+ Assert.Equal(Path.Combine("BasePath", "Level1-Dir1", "File2.cshtml"), file.PhysicalPath);
+ Assert.Equal(Path.Combine("Level1-Dir1", "File2.cshtml"), file.RelativePhysicalPath);
+ },
+ file =>
+ {
+ Assert.Equal("/File3.cshtml", file.FilePath);
+ Assert.Equal("/Level1-Dir1", file.BasePath);
+ Assert.Equal(Path.Combine("BasePath", "Level1-Dir1", "File3.cshtml"), file.PhysicalPath);
+ Assert.Equal(Path.Combine("Level1-Dir1", "File3.cshtml"), file.RelativePhysicalPath);
+ });
+ }
+
+ [Fact]
+ public void GetItem_ReturnsFileFromDisk()
+ {
+ var fileProvider = new TestFileProvider("BasePath");
+ var file1 = fileProvider.AddFile("/File1.cshtml", "content");
+ var file2 = fileProvider.AddFile("/File2.js", "content");
+ var file3 = fileProvider.AddFile("/File3.cshtml", "content");
+ fileProvider.AddDirectoryContent("/", new IFileInfo[] { file1, file2, file3 });
+
+ var fileSystem = GetRazorProjectFileSystem(fileProvider);
+
+ // Act
+ var item = fileSystem.GetItem("/File3.cshtml");
+
+ // Assert
+ Assert.True(item.Exists);
+ Assert.Equal("/File3.cshtml", item.FilePath);
+ Assert.Equal(string.Empty, item.BasePath);
+ Assert.Equal(Path.Combine("BasePath", "File3.cshtml"), item.PhysicalPath);
+ Assert.Equal("File3.cshtml", item.RelativePhysicalPath);
+ }
+
+ [Fact]
+ public void GetItem_PhysicalPathDoesNotStartWithContentRoot_ReturnsNull()
+ {
+ var fileProvider = new TestFileProvider("BasePath2");
+ var file1 = fileProvider.AddFile("/File1.cshtml", "content");
+ var file2 = fileProvider.AddFile("/File2.js", "content");
+ var file3 = fileProvider.AddFile("/File3.cshtml", "content");
+ fileProvider.AddDirectoryContent("/", new IFileInfo[] { file1, file2, file3 });
+
+ var fileSystem = GetRazorProjectFileSystem(fileProvider);
+
+ // Act
+ var item = fileSystem.GetItem("/File3.cshtml");
+
+ // Assert
+ Assert.True(item.Exists);
+ Assert.Equal("/File3.cshtml", item.FilePath);
+ Assert.Equal(string.Empty, item.BasePath);
+ Assert.Equal(Path.Combine("BasePath2", "File3.cshtml"), item.PhysicalPath);
+ Assert.Null(item.RelativePhysicalPath);
+ }
+
+ [Fact]
+ public void GetItem_ReturnsNotFoundResult()
+ {
+ // Arrange
+ var fileProvider = new TestFileProvider("BasePath");
+ var file = fileProvider.AddFile("/SomeFile.cshtml", "content");
+ fileProvider.AddDirectoryContent("/", new IFileInfo[] { file });
+
+ var fileSystem = GetRazorProjectFileSystem(fileProvider);
+
+ // Act
+ var item = fileSystem.GetItem("/NotFound.cshtml");
+
+ // Assert
+ Assert.False(item.Exists);
+ }
+
+ private static FileProviderRazorProjectFileSystem GetRazorProjectFileSystem(
+ TestFileProvider fileProvider,
+ string contentRootPath = "BasePath")
+ {
+ var options = Options.Create(new MvcRazorRuntimeCompilationOptions
+ {
+ FileProviders = { fileProvider }
+ });
+ var compilationFileProvider = new RuntimeCompilationFileProvider(options);
+ var fileSystem = new FileProviderRazorProjectFileSystem(
+ compilationFileProvider,
+ Mock.Of(e => e.ContentRootPath == contentRootPath));
+ return fileSystem;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj
new file mode 100644
index 0000000000..70b0187a85
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test.csproj
@@ -0,0 +1,13 @@
+
+
+
+ netcoreapp3.0
+ true
+
+
+
+
+
+
+
+
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RazorReferenceManagerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RazorReferenceManagerTest.cs
new file mode 100644
index 0000000000..e28e974162
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RazorReferenceManagerTest.cs
@@ -0,0 +1,52 @@
+// 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.Mvc.ApplicationParts;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ public class RazorReferenceManagerTest
+ {
+ private static readonly string ApplicationPartReferencePath = "some-path";
+
+ [Fact]
+ public void GetCompilationReferences_CombinesApplicationPartAndOptionMetadataReferences()
+ {
+ // Arrange
+ var options = new MvcRazorRuntimeCompilationOptions();
+ var additionalReferencePath = "additional-path";
+ options.AdditionalReferencePaths.Add(additionalReferencePath);
+
+ var applicationPartManager = GetApplicationPartManager();
+ var referenceManager = new RazorReferenceManager(
+ applicationPartManager,
+ Options.Create(options));
+
+ var expected = new[] { ApplicationPartReferencePath, additionalReferencePath };
+
+ // Act
+ var references = referenceManager.GetReferencePaths();
+
+ // Assert
+ Assert.Equal(expected, references);
+ }
+
+ private static ApplicationPartManager GetApplicationPartManager()
+ {
+ var applicationPartManager = new ApplicationPartManager();
+ var part = new Mock();
+
+ part.As()
+ .Setup(p => p.GetReferencePaths())
+ .Returns(new[] { ApplicationPartReferencePath });
+
+ applicationPartManager.ApplicationParts.Add(part.Object);
+
+ return applicationPartManager;
+ }
+ }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RuntimeCompilationFileProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RuntimeCompilationFileProviderTest.cs
new file mode 100644
index 0000000000..61b9b22290
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RuntimeCompilationFileProviderTest.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ public class RuntimeCompilationFileProviderTest
+ {
+ [Fact]
+ public void GetFileProvider_ThrowsIfNoConfiguredFileProviders()
+ {
+ // Arrange
+ var expected =
+ $"'{typeof(MvcRazorRuntimeCompilationOptions).FullName}.{nameof(MvcRazorRuntimeCompilationOptions.FileProviders)}' must " +
+ $"not be empty. At least one '{typeof(IFileProvider).FullName}' is required to locate a view for " +
+ "rendering.";
+ var options = Options.Create(new MvcRazorRuntimeCompilationOptions());
+
+ var fileProvider = new RuntimeCompilationFileProvider(options);
+
+ // Act & Assert
+ var exception = Assert.Throws(
+ () => fileProvider.FileProvider);
+ Assert.Equal(expected, exception.Message);
+ }
+ }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RuntimeViewCompilerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RuntimeViewCompilerTest.cs
new file mode 100644
index 0000000000..5ac9e61bed
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/RuntimeViewCompilerTest.cs
@@ -0,0 +1,908 @@
+// 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;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions;
+using Microsoft.AspNetCore.Razor.Hosting;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Emit;
+using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+using static Microsoft.AspNetCore.Razor.Hosting.TestRazorCompiledItem;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ public class RuntimeViewCompilerTest
+ {
+ [Fact]
+ public async Task CompileAsync_ReturnsResultWithNullAttribute_IfFileIsNotFoundInFileSystem()
+ {
+ // Arrange
+ var path = "/file/does-not-exist";
+ var fileProvider = new TestFileProvider();
+ var viewCompiler = GetViewCompiler(fileProvider);
+
+ // Act
+ var result1 = await viewCompiler.CompileAsync(path);
+ var result2 = await viewCompiler.CompileAsync(path);
+
+ // Assert
+ Assert.Same(result1, result2);
+ Assert.Null(result1.Item);
+ var token = Assert.Single(result1.ExpirationTokens);
+ Assert.Same(fileProvider.GetChangeToken(path), token);
+ }
+
+ [Fact]
+ public async Task CompileAsync_ReturnsResultWithExpirationToken()
+ {
+ // Arrange
+ var path = "/file/does-not-exist";
+ var fileProvider = new TestFileProvider();
+ var viewCompiler = GetViewCompiler(fileProvider);
+
+ // Act
+ var result1 = await viewCompiler.CompileAsync(path);
+ var result2 = await viewCompiler.CompileAsync(path);
+
+ // Assert
+ Assert.Same(result1, result2);
+ Assert.Null(result1.Item);
+ Assert.Collection(
+ result1.ExpirationTokens,
+ token => Assert.Equal(fileProvider.GetChangeToken(path), token));
+ }
+
+ [Fact]
+ public async Task CompileAsync_AddsChangeTokensForViewStartsIfFileExists()
+ {
+ // Arrange
+ var path = "/file/exists/FilePath.cshtml";
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+ var viewCompiler = GetViewCompiler(fileProvider);
+
+ // Act
+ var result = await viewCompiler.CompileAsync(path);
+
+ // Assert
+ Assert.NotNull(result.Item);
+ Assert.Collection(
+ result.ExpirationTokens,
+ token => Assert.Same(fileProvider.GetChangeToken(path), token),
+ token => Assert.Same(fileProvider.GetChangeToken("/_ViewImports.cshtml"), token),
+ token => Assert.Same(fileProvider.GetChangeToken("/file/_ViewImports.cshtml"), token),
+ token => Assert.Same(fileProvider.GetChangeToken("/file/exists/_ViewImports.cshtml"), token));
+ }
+
+ [Theory]
+ [InlineData("/Areas/Finances/Views/Home/Index.cshtml")]
+ [InlineData(@"Areas\Finances\Views\Home\Index.cshtml")]
+ [InlineData(@"\Areas\Finances\Views\Home\Index.cshtml")]
+ [InlineData(@"\Areas\Finances\Views/Home\Index.cshtml")]
+ public async Task CompileAsync_NormalizesPathSeparatorForPaths(string relativePath)
+ {
+ // Arrange
+ var viewPath = "/Areas/Finances/Views/Home/Index.cshtml";
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(viewPath, "some content");
+ var viewCompiler = GetViewCompiler(fileProvider);
+
+ // Act - 1
+ var result1 = await viewCompiler.CompileAsync(@"Areas\Finances\Views\Home\Index.cshtml");
+
+ // Act - 2
+ viewCompiler.Compile = _ => throw new Exception("Can't call me");
+ var result2 = await viewCompiler.CompileAsync(relativePath);
+
+ // Assert - 2
+ Assert.Same(result1, result2);
+ }
+
+ [Fact]
+ public async Task CompileAsync_InvalidatesCache_IfChangeTokenExpires()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+ var fileProvider = new TestFileProvider();
+ var fileNode = fileProvider.AddFile(path, "some content");
+ var viewCompiler = GetViewCompiler(fileProvider);
+
+ // Act 1
+ var result1 = await viewCompiler.CompileAsync(path);
+
+ // Assert 1
+ Assert.NotNull(result1.Item);
+
+ // Act 2
+ // Simulate deleting the file
+ fileProvider.GetChangeToken(path).HasChanged = true;
+ fileProvider.DeleteFile(path);
+
+ viewCompiler.Compile = _ => throw new Exception("Can't call me");
+ var result2 = await viewCompiler.CompileAsync(path);
+
+ // Assert 2
+ Assert.NotSame(result1, result2);
+ Assert.Null(result2.Item);
+ }
+
+ [Fact]
+ public async Task CompileAsync_ReturnsNewResultIfFileWasModified()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+ var viewCompiler = GetViewCompiler(fileProvider);
+ var expected2 = new CompiledViewDescriptor();
+
+ // Act 1
+ var result1 = await viewCompiler.CompileAsync(path);
+
+ // Assert 1
+ Assert.NotNull(result1.Item);
+
+ // Act 2
+ fileProvider.GetChangeToken(path).HasChanged = true;
+ viewCompiler.Compile = _ => expected2;
+ var result2 = await viewCompiler.CompileAsync(path);
+
+ // Assert 2
+ Assert.NotSame(result1, result2);
+ Assert.Same(expected2, result2);
+ }
+
+ [Fact]
+ public async Task CompileAsync_ReturnsNewResult_IfAncestorViewImportsWereModified()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+ var viewCompiler = GetViewCompiler(fileProvider);
+ var expected2 = new CompiledViewDescriptor();
+
+ // Act 1
+ var result1 = await viewCompiler.CompileAsync(path);
+
+ // Assert 1
+ Assert.NotNull(result1.Item);
+
+ // Act 2
+ fileProvider.GetChangeToken("/Views/_ViewImports.cshtml").HasChanged = true;
+ viewCompiler.Compile = _ => expected2;
+ var result2 = await viewCompiler.CompileAsync(path);
+
+ // Assert 2
+ Assert.NotSame(result1, result2);
+ Assert.Same(expected2, result2);
+ }
+
+ [Fact]
+ public async Task CompileAsync_ReturnsPrecompiledViews()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+ var precompiledView = new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ };
+ var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+ // Act
+ var result = await viewCompiler.CompileAsync(path);
+
+ // Assert
+ Assert.Same(precompiledView, result);
+
+ // This view doesn't have checksums so it can't be recompiled.
+ Assert.Null(precompiledView.ExpirationTokens);
+ }
+
+ [Theory]
+ [InlineData("/views/home/index.cshtml")]
+ [InlineData("/VIEWS/HOME/INDEX.CSHTML")]
+ [InlineData("/viEws/HoME/inDex.cshtml")]
+ public async Task CompileAsync_PerformsCaseInsensitiveLookupsForPrecompiledViews(string lookupPath)
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+ var precompiledView = new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ };
+ var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+ // Act
+ var result = await viewCompiler.CompileAsync(lookupPath);
+
+ // Assert
+ Assert.Same(precompiledView, result);
+ }
+
+ [Fact]
+ public async Task CompileAsync_PerformsCaseInsensitiveLookupsForPrecompiledViews_WithNonNormalizedPaths()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+ var precompiledView = new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ };
+ var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+ // Act
+ var result = await viewCompiler.CompileAsync("Views\\Home\\Index.cshtml");
+
+ // Assert
+ Assert.Same(precompiledView, result);
+ }
+
+ [Fact]
+ public async Task CompileAsync_PrecompiledViewWithoutChecksumForMainSource_DoesNotSupportRecompilation()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+
+ var precompiledView = new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+ {
+ new RazorSourceChecksumAttribute("sha1", GetChecksum("some content"), "/Views/Some-Other-View"),
+ }),
+ };
+
+ var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+ // Act - 1
+ var result = await viewCompiler.CompileAsync(path);
+
+ // Assert - 1
+ Assert.Same(precompiledView.Item, result.Item);
+
+ // Act - 2
+ fileProvider.Watch(path);
+ fileProvider.GetChangeToken(path).HasChanged = true;
+ result = await viewCompiler.CompileAsync(path);
+
+ // Assert - 2
+ Assert.Same(precompiledView.Item, result.Item);
+
+ // This view doesn't have checksums so it can't be recompiled.
+ Assert.Null(result.ExpirationTokens);
+ }
+
+ [Fact]
+ public async Task CompileAsync_PrecompiledViewWithoutAnyChecksum_DoesNotSupportRecompilation()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+
+ var precompiledView = new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[] { }),
+ };
+
+ var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+ // Act - 1
+ var result = await viewCompiler.CompileAsync(path);
+
+ // Assert - 1
+ Assert.Same(precompiledView, result);
+
+ // Act - 2
+ fileProvider.Watch(path);
+ fileProvider.GetChangeToken(path).HasChanged = true;
+ result = await viewCompiler.CompileAsync(path);
+
+ // Assert - 2
+ Assert.Same(precompiledView, result);
+
+ // This view doesn't have checksums so it can't be recompiled.
+ Assert.Null(result.ExpirationTokens);
+ }
+
+ [Fact]
+ public async Task CompileAsync_PrecompiledViewWithChecksum_UsesPrecompiledViewWhenChecksumIsMatch()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+
+ var precompiledView = new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), path),
+ }),
+ };
+
+ var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+ // Act
+ var result = await viewCompiler.CompileAsync(path);
+
+ // Assert
+ Assert.Same(precompiledView.Item, result.Item);
+
+ // This view has checksums so it should also have tokens
+ Assert.Collection(
+ result.ExpirationTokens,
+ token => Assert.Same(fileProvider.GetChangeToken(path), token));
+ }
+
+ [Fact]
+ public async Task CompileAsync_PrecompiledViewWithChecksum_CanRejectWhenChecksumFails()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+
+ var expected = new CompiledViewDescriptor();
+
+ var precompiledView = new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some other content"), path),
+ }),
+ };
+
+ var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+ viewCompiler.Compile = _ => expected;
+
+ // Act
+ var result = await viewCompiler.CompileAsync(path);
+
+ // Assert
+ Assert.Same(expected, result);
+ }
+
+ [Fact]
+ public async Task CompileAsync_PrecompiledViewWithChecksum_AddsExpirationTokensForFilesInChecksumAttributes()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+
+ var precompiledView = new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), path),
+ }),
+ };
+
+ var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+ // Act
+ var result = await viewCompiler.CompileAsync(path);
+
+ // Assert
+ Assert.Same(precompiledView.Item, result.Item);
+ var token = Assert.Single(result.ExpirationTokens);
+ Assert.Same(fileProvider.GetChangeToken(path), token);
+ }
+
+ [Fact]
+ public async Task CompileAsync_PrecompiledViewWithChecksum_CanRecompile()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+
+ var fileProvider = new TestFileProvider();
+ var file = fileProvider.AddFile(path, "some content");
+ var expected2 = new CompiledViewDescriptor();
+
+ var precompiledView = new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), path),
+ }),
+ };
+
+ var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+ // Act - 1
+ var result = await viewCompiler.CompileAsync(path);
+
+ // Assert - 1
+ Assert.Same(precompiledView.Item, result.Item);
+ Assert.NotEmpty(result.ExpirationTokens);
+
+ // Act - 2
+ file.Content = "different";
+ fileProvider.GetChangeToken(path).HasChanged = true;
+ viewCompiler.Compile = _ => expected2;
+ result = await viewCompiler.CompileAsync(path);
+
+ // Assert - 2
+ Assert.Same(expected2, result);
+ }
+
+ [Fact]
+ public async Task CompileAsync_PrecompiledViewWithChecksum_DoesNotRecompiledWithoutContentChange()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+
+ var precompiledView = new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), path),
+ }),
+ };
+
+ var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+ // Act - 1
+ var result = await viewCompiler.CompileAsync(path);
+
+ // Assert - 1
+ Assert.Same(precompiledView.Item, result.Item);
+
+ // Act - 2
+ fileProvider.GetChangeToken(path).HasChanged = true;
+ result = await viewCompiler.CompileAsync(path);
+
+ // Assert - 2
+ Assert.Same(precompiledView.Item, result.Item);
+ }
+
+ [Fact]
+ public async Task CompileAsync_PrecompiledViewWithChecksum_CanReusePrecompiledViewIfContentChangesToMatch()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+
+ var fileProvider = new TestFileProvider();
+ var file = fileProvider.AddFile(path, "different content");
+
+ var expected1 = new CompiledViewDescriptor();
+
+ var precompiledView = new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), path),
+ }),
+ };
+
+ var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+ viewCompiler.Compile = _ => expected1;
+
+ // Act - 1
+ var result = await viewCompiler.CompileAsync(path);
+
+ // Assert - 1
+ Assert.Same(expected1, result);
+
+ // Act - 2
+ file.Content = "some content";
+ fileProvider.GetChangeToken(path).HasChanged = true;
+ result = await viewCompiler.CompileAsync(path);
+
+ // Assert - 2
+ Assert.Same(precompiledView.Item, result.Item);
+ }
+
+ [Fact]
+ public async Task CompileAsync_PrecompiledViewWithChecksum_CanRecompileWhenViewImportChanges()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+ var importPath = "/Views/_ViewImports.cshtml";
+
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+ var importFile = fileProvider.AddFile(importPath, "some import");
+
+ var expected2 = new CompiledViewDescriptor();
+
+ var precompiledView = new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ Item = new TestRazorCompiledItem(typeof(string), "mvc.1.0.view", path, new object[]
+ {
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some content"), path),
+ new RazorSourceChecksumAttribute("SHA1", GetChecksum("some import"), importPath),
+ }),
+ };
+
+ var viewCompiler = GetViewCompiler(fileProvider, precompiledViews: new[] { precompiledView });
+
+ // Act - 1
+ var result = await viewCompiler.CompileAsync(path);
+
+ // Assert - 1
+ Assert.Same(precompiledView.Item, result.Item);
+
+ // Act - 2
+ importFile.Content = "different content";
+ fileProvider.GetChangeToken(importPath).HasChanged = true;
+ viewCompiler.Compile = _ => expected2;
+ result = await viewCompiler.CompileAsync(path);
+
+ // Assert - 2
+ Assert.Same(expected2, result);
+ }
+
+ [Fact]
+ public async Task GetOrAdd_AllowsConcurrentCompilationOfMultipleRazorPages()
+ {
+ // Arrange
+ var path1 = "/Views/Home/Index.cshtml";
+ var path2 = "/Views/Home/About.cshtml";
+ var waitDuration = TimeSpan.FromSeconds(20);
+
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path1, "some content");
+ fileProvider.AddFile(path2, "some content");
+
+ var resetEvent1 = new AutoResetEvent(initialState: false);
+ var resetEvent2 = new ManualResetEvent(initialState: false);
+
+ var compilingOne = false;
+ var compilingTwo = false;
+
+ var result1 = new CompiledViewDescriptor();
+ var result2 = new CompiledViewDescriptor();
+
+ var compiler = GetViewCompiler(fileProvider);
+
+ compiler.Compile = path =>
+ {
+ if (path == path1)
+ {
+ compilingOne = true;
+
+ // Event 2
+ Assert.True(resetEvent1.WaitOne(waitDuration));
+
+ // Event 3
+ Assert.True(resetEvent2.Set());
+
+ // Event 6
+ Assert.True(resetEvent1.WaitOne(waitDuration));
+
+ Assert.True(compilingTwo);
+
+ return result1;
+ }
+ else if (path == path2)
+ {
+ compilingTwo = true;
+
+ // Event 4
+ Assert.True(resetEvent2.WaitOne(waitDuration));
+
+ // Event 5
+ Assert.True(resetEvent1.Set());
+
+ Assert.True(compilingOne);
+
+ return result2;
+ }
+ else
+ {
+ throw new Exception();
+ }
+ };
+
+ // Act
+ var task1 = Task.Run(() => compiler.CompileAsync(path1));
+ var task2 = Task.Run(() => compiler.CompileAsync(path2));
+
+ // Event 1
+ resetEvent1.Set();
+
+ await Task.WhenAll(task1, task2);
+
+ // Assert
+ Assert.True(compilingOne);
+ Assert.True(compilingTwo);
+ Assert.Same(result1, task1.Result);
+ Assert.Same(result2, task2.Result);
+ }
+
+ [Fact]
+ public async Task CompileAsync_DoesNotCreateMultipleCompilationResults_ForConcurrentInvocations()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+ var waitDuration = TimeSpan.FromSeconds(20);
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+ var resetEvent1 = new ManualResetEvent(initialState: false);
+ var resetEvent2 = new ManualResetEvent(initialState: false);
+ var compiler = GetViewCompiler(fileProvider);
+
+ compiler.Compile = _ =>
+ {
+ // Event 2
+ resetEvent1.WaitOne(waitDuration);
+
+ // Event 3
+ resetEvent2.Set();
+ return new CompiledViewDescriptor();
+ };
+
+ // Act
+ var task1 = Task.Run(() => compiler.CompileAsync(path));
+ var task2 = Task.Run(() =>
+ {
+ // Event 4
+ Assert.True(resetEvent2.WaitOne(waitDuration));
+ return compiler.CompileAsync(path);
+ });
+
+ // Event 1
+ resetEvent1.Set();
+ await Task.WhenAll(task1, task2);
+
+ // Assert
+ var result1 = task1.Result;
+ var result2 = task2.Result;
+ Assert.Same(result1, result2);
+ }
+
+ [Fact]
+ public async Task GetOrAdd_CachesCompilationExceptions()
+ {
+ // Arrange
+ var path = "/Views/Home/Index.cshtml";
+ var fileProvider = new TestFileProvider();
+ fileProvider.AddFile(path, "some content");
+ var exception = new InvalidTimeZoneException();
+ var compiler = GetViewCompiler(fileProvider);
+ compiler.Compile = _ => throw exception;
+
+ // Act and Assert - 1
+ var actual = await Assert.ThrowsAsync(
+ () => compiler.CompileAsync(path));
+ Assert.Same(exception, actual);
+
+ // Act and Assert - 2
+ compiler.Compile = _ => throw new Exception("Shouldn't be called");
+
+ actual = await Assert.ThrowsAsync(
+ () => compiler.CompileAsync(path));
+ Assert.Same(exception, actual);
+ }
+
+ [Fact]
+ public void Compile_SucceedsForCSharp7()
+ {
+ // Arrange
+ var content = @"
+public class MyTestType
+{
+ private string _name;
+
+ public string Name
+ {
+ get => _name;
+ set => _name = value ?? throw new System.ArgumentNullException(nameof(value));
+ }
+}";
+ var compiler = GetViewCompiler(new TestFileProvider());
+ var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("razor-content", "filename"));
+
+ // Act
+ var result = compiler.CompileAndEmit(codeDocument, content);
+
+ // Assert
+ var exportedType = Assert.Single(result.ExportedTypes);
+ Assert.Equal("MyTestType", exportedType.Name);
+ }
+
+ [Fact]
+ public void Compile_ReturnsCompilationFailureWithPathsFromLinePragmas()
+ {
+ // Arrange
+ var viewPath = "some-relative-path";
+ var fileContent = "test file content";
+ var content = $@"
+#line 1 ""{viewPath}""
+this should fail";
+
+ var compiler = GetViewCompiler(new TestFileProvider());
+ var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(fileContent, viewPath));
+
+ // Act & Assert
+ var ex = Assert.Throws(() => compiler.CompileAndEmit(codeDocument, content));
+
+ var compilationFailure = Assert.Single(ex.CompilationFailures);
+ Assert.Equal(viewPath, compilationFailure.SourceFilePath);
+ Assert.Equal(fileContent, compilationFailure.SourceFileContent);
+ }
+
+ [Fact]
+ public void Compile_ReturnsGeneratedCodePath_IfLinePragmaIsNotAvailable()
+ {
+ // Arrange
+ var viewPath = "some-relative-path";
+ var fileContent = "file content";
+ var content = "this should fail";
+
+ var compiler = GetViewCompiler(new TestFileProvider());
+ var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(fileContent, viewPath));
+
+ // Act & Assert
+ var ex = Assert.Throws(() => compiler.CompileAndEmit(codeDocument, content));
+
+ var compilationFailure = Assert.Single(ex.CompilationFailures);
+ Assert.Equal("Generated Code", compilationFailure.SourceFilePath);
+ Assert.Equal(content, compilationFailure.SourceFileContent);
+ }
+
+ [Fact]
+ public void CompileAndEmit_DoesNotThrowIfDebugTypeIsEmbedded()
+ {
+ // Arrange
+ var referenceManager = CreateReferenceManager();
+ var csharpCompiler = new TestCSharpCompiler(referenceManager, Mock.Of())
+ {
+ EmitOptionsSettable = new EmitOptions(debugInformationFormat: DebugInformationFormat.Embedded),
+ };
+
+ var compiler = GetViewCompiler(csharpCompiler: csharpCompiler);
+ var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("Hello world", "some-relative-path.cshtml"));
+
+ // Act
+ var result = compiler.CompileAndEmit(codeDocument, "public class Test{}");
+
+ // Assert
+ Assert.NotNull(result);
+ }
+
+ [Fact]
+ public void CompileAndEmit_WorksIfEmitPdbIsNotSet()
+ {
+ // Arrange
+ var referenceManager = CreateReferenceManager();
+ var csharpCompiler = new TestCSharpCompiler(referenceManager, Mock.Of())
+ {
+ EmitPdbSettable = false,
+ };
+
+ var compiler = GetViewCompiler(csharpCompiler: csharpCompiler);
+ var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create("Hello world", "some-relative-path.cshtml"));
+
+ // Act
+ var result = compiler.CompileAndEmit(codeDocument, "public class Test{}");
+
+ // Assert
+ Assert.NotNull(result);
+ }
+
+ private static TestRazorViewCompiler GetViewCompiler(
+ TestFileProvider fileProvider = null,
+ RazorReferenceManager referenceManager = null,
+ IList precompiledViews = null,
+ CSharpCompiler csharpCompiler = null)
+ {
+ fileProvider = fileProvider ?? new TestFileProvider();
+ var options = Options.Create(new MvcRazorRuntimeCompilationOptions
+ {
+ FileProviders = { fileProvider }
+ });
+ var compilationFileProvider = new RuntimeCompilationFileProvider(options);
+
+
+ referenceManager = referenceManager ?? CreateReferenceManager();
+ precompiledViews = precompiledViews ?? Array.Empty();
+
+ var hostingEnvironment = Mock.Of(e => e.ContentRootPath == "BasePath");
+ var fileSystem = new FileProviderRazorProjectFileSystem(compilationFileProvider, hostingEnvironment);
+ var projectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem, builder =>
+ {
+ RazorExtensions.Register(builder);
+ });
+
+ csharpCompiler = csharpCompiler ?? new CSharpCompiler(referenceManager, hostingEnvironment);
+
+ return new TestRazorViewCompiler(
+ fileProvider,
+ projectEngine,
+ csharpCompiler,
+ precompiledViews);
+ }
+
+ private static RazorReferenceManager CreateReferenceManager()
+ {
+ var applicationPartManager = new ApplicationPartManager();
+ var assembly = typeof(RuntimeViewCompilerTest).Assembly;
+ applicationPartManager.ApplicationParts.Add(new AssemblyPart(assembly));
+
+ return new RazorReferenceManager(applicationPartManager, Options.Create(new MvcRazorRuntimeCompilationOptions()));
+ }
+
+ private class TestRazorViewCompiler : RuntimeViewCompiler
+ {
+ public TestRazorViewCompiler(
+ TestFileProvider fileProvider,
+ RazorProjectEngine projectEngine,
+ CSharpCompiler csharpCompiler,
+ IList precompiledViews,
+ Func compile = null)
+ : base(fileProvider, projectEngine, csharpCompiler, precompiledViews, NullLogger.Instance)
+ {
+ Compile = compile;
+ if (Compile == null)
+ {
+ Compile = path => new CompiledViewDescriptor
+ {
+ RelativePath = path,
+ Item = CreateForView(path),
+ };
+ }
+ }
+
+ public Func Compile { get; set; }
+
+ protected override CompiledViewDescriptor CompileAndEmit(string relativePath)
+ {
+ return Compile(relativePath);
+ }
+ }
+
+ private class TestCSharpCompiler : CSharpCompiler
+ {
+ public TestCSharpCompiler(RazorReferenceManager manager, IHostingEnvironment hostingEnvironment)
+ : base(manager, hostingEnvironment)
+ {
+ }
+
+ public EmitOptions EmitOptionsSettable { get; set; }
+
+ public bool EmitPdbSettable { get; set; }
+
+ public override EmitOptions EmitOptions => EmitOptionsSettable;
+
+ public override bool EmitPdb => EmitPdbSettable;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/DirectoryNode.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/DirectoryNode.cs
new file mode 100644
index 0000000000..4cd98796c2
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/DirectoryNode.cs
@@ -0,0 +1,168 @@
+// 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.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+ // Internal for testing
+ [DebuggerDisplay("{Path}")]
+ internal class DirectoryNode
+ {
+ public DirectoryNode(string path)
+ {
+ Path = path;
+ }
+
+ public string Path { get; }
+
+ public List Directories { get; } = new List();
+
+ public List Files { get; } = new List();
+
+ public void AddFile(FileNode fileNode)
+ {
+ var filePath = fileNode.Path;
+ if (!filePath.StartsWith(Path, StringComparison.OrdinalIgnoreCase))
+ {
+ throw new InvalidOperationException($"File {fileNode.Path} does not belong to {Path}.");
+ }
+
+ // Look for the first / that appears in the path after the current directory path.
+ var directoryPath = GetDirectoryPath(filePath);
+ var directory = GetOrAddDirectory(this, directoryPath, createIfNotExists: true);
+ Debug.Assert(directory != null);
+ directory.Files.Add(fileNode);
+ fileNode.Directory = directory;
+ }
+
+ public DirectoryNode GetDirectory(string path)
+ {
+ if (!path.StartsWith(Path, StringComparison.OrdinalIgnoreCase))
+ {
+ throw new InvalidOperationException($"File {path} does not belong to {Path}.");
+ }
+
+ return GetOrAddDirectory(this, path);
+ }
+
+ public IEnumerable EnumerateItems()
+ {
+ foreach (var file in Files)
+ {
+ yield return file.ProjectItem;
+ }
+
+ foreach (var directory in Directories)
+ {
+ foreach (var file in directory.EnumerateItems())
+ {
+ yield return file;
+ }
+ }
+ }
+
+ public RazorProjectItem GetItem(string path)
+ {
+ if (!path.StartsWith(Path, StringComparison.OrdinalIgnoreCase))
+ {
+ throw new InvalidOperationException($"File {path} does not belong to {Path}.");
+ }
+
+ var directoryPath = GetDirectoryPath(path);
+ var directory = GetOrAddDirectory(this, directoryPath);
+ if (directory == null)
+ {
+ return new NotFoundProjectItem("/", path);
+ }
+
+ foreach (var file in directory.Files)
+ {
+ var filePath = file.Path;
+ var directoryLength = directory.Path.Length;
+
+ // path, filePath -> /Views/Home/Index.cshtml
+ // directory.Path -> /Views/Home/
+ // We only need to match the file name portion since we've already matched the directory segment.
+ if (string.Compare(path, directoryLength, filePath, directoryLength, path.Length - directoryLength, StringComparison.OrdinalIgnoreCase) == 0)
+ {
+ return file.ProjectItem;
+ }
+ }
+
+ return new NotFoundProjectItem("/", path);
+ }
+
+ private static string GetDirectoryPath(string path)
+ {
+ // /dir1/dir2/file.cshtml -> /dir1/dir2/
+ var fileNameIndex = path.LastIndexOf('/');
+ if (fileNameIndex == -1)
+ {
+ return path;
+ }
+
+ return path.Substring(0, fileNameIndex + 1);
+ }
+
+ private static DirectoryNode GetOrAddDirectory(
+ DirectoryNode directory,
+ string path,
+ bool createIfNotExists = false)
+ {
+ Debug.Assert(!string.IsNullOrEmpty(path));
+ if (path[path.Length - 1] != '/')
+ {
+ path += '/';
+ }
+
+ int index;
+ while ((index = path.IndexOf('/', directory.Path.Length)) != -1 && index != path.Length)
+ {
+ var subDirectory = FindSubDirectory(directory, path);
+
+ if (subDirectory == null)
+ {
+ if (createIfNotExists)
+ {
+ var directoryPath = path.Substring(0, index + 1); // + 1 to include trailing slash
+ subDirectory = new DirectoryNode(directoryPath);
+ directory.Directories.Add(subDirectory);
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ directory = subDirectory;
+ }
+
+ return directory;
+ }
+
+ private static DirectoryNode FindSubDirectory(DirectoryNode parentDirectory, string path)
+ {
+ for (var i = 0; i < parentDirectory.Directories.Count; i++)
+ {
+ // ParentDirectory.Path -> /Views/Home/
+ // CurrentDirectory.Path -> /Views/Home/SubDir/
+ // Path -> /Views/Home/SubDir/MorePath/File.cshtml
+ // Each invocation of FindSubDirectory returns the immediate subdirectory along the path to the file.
+
+ var currentDirectory = parentDirectory.Directories[i];
+ var directoryPath = currentDirectory.Path;
+ var startIndex = parentDirectory.Path.Length;
+
+ if (string.Compare(path, startIndex, directoryPath, startIndex, directoryPath.Length - startIndex, StringComparison.OrdinalIgnoreCase) == 0)
+ {
+ return currentDirectory;
+ }
+ }
+
+ return null;
+ }
+ }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/FileNode.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/FileNode.cs
new file mode 100644
index 0000000000..583281794a
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/FileNode.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.Diagnostics;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+ // Internal for testing
+ [DebuggerDisplay("{Path}")]
+ internal class FileNode
+ {
+ public FileNode(string path, RazorProjectItem projectItem)
+ {
+ Path = path;
+ ProjectItem = projectItem;
+ }
+
+ public DirectoryNode Directory { get; set; }
+
+ public string Path { get; }
+
+ public RazorProjectItem ProjectItem { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/NotFoundProjectItem.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/NotFoundProjectItem.cs
new file mode 100644
index 0000000000..84ea7f01cf
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/NotFoundProjectItem.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;
+using System.IO;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+ internal class NotFoundProjectItem : RazorProjectItem
+ {
+ public NotFoundProjectItem(string basePath, string path)
+ {
+ BasePath = basePath;
+ FilePath = path;
+ }
+
+ public override string BasePath { get; }
+
+ public override string FilePath { get; }
+
+ public override bool Exists => false;
+
+ public override string PhysicalPath => throw new NotSupportedException();
+
+ public override Stream Read() => throw new NotSupportedException();
+ }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/TestRazorProjectItem.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/TestRazorProjectItem.cs
new file mode 100644
index 0000000000..c30b761464
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/TestRazorProjectItem.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 System.IO;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+ public class TestRazorProjectItem : RazorProjectItem
+ {
+ public TestRazorProjectItem(
+ string filePath,
+ string content = "Default content",
+ string physicalPath = null,
+ string relativePhysicalPath = null,
+ string basePath = "/")
+ {
+ FilePath = filePath;
+ PhysicalPath = physicalPath;
+ RelativePhysicalPath = relativePhysicalPath;
+ BasePath = basePath;
+ Content = content;
+ }
+
+ public override string BasePath { get; }
+
+ public override string FilePath { get; }
+
+ public override string PhysicalPath { get; }
+
+ public override string RelativePhysicalPath { get; }
+
+ public override bool Exists => true;
+
+ public string Content { get; set; }
+
+ public override Stream Read()
+ {
+ var stream = new MemoryStream(Encoding.UTF8.GetBytes(Content));
+
+ return stream;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/TestRazorReferenceManager.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/TestRazorReferenceManager.cs
new file mode 100644
index 0000000000..91a44bcfeb
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/TestRazorReferenceManager.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;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.CodeAnalysis;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation
+{
+ internal class TestRazorReferenceManager : RazorReferenceManager
+ {
+ public TestRazorReferenceManager()
+ : base(
+ new ApplicationPartManager(),
+ Options.Create(new MvcRazorRuntimeCompilationOptions()))
+ {
+ CompilationReferences = Array.Empty();
+ }
+
+ public override IReadOnlyList CompilationReferences { get; }
+ }
+}
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/VirtualRazorProjectFileSystem.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/VirtualRazorProjectFileSystem.cs
new file mode 100644
index 0000000000..fe662d3b3f
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.Test/TestInfrastructure/VirtualRazorProjectFileSystem.cs
@@ -0,0 +1,39 @@
+// 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.Linq;
+using Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation;
+
+namespace Microsoft.AspNetCore.Razor.Language
+{
+ internal class VirtualRazorProjectFileSystem : RazorProjectFileSystem
+ {
+ private readonly DirectoryNode _root = new DirectoryNode("/");
+
+ public override IEnumerable EnumerateItems(string basePath)
+ {
+ basePath = NormalizeAndEnsureValidPath(basePath);
+ var directory = _root.GetDirectory(basePath);
+ return directory?.EnumerateItems() ?? Enumerable.Empty();
+ }
+
+ public override RazorProjectItem GetItem(string path)
+ {
+ path = NormalizeAndEnsureValidPath(path);
+ return _root.GetItem(path) ?? new NotFoundProjectItem(string.Empty, path);
+ }
+
+ public void Add(RazorProjectItem projectItem)
+ {
+ if (projectItem == null)
+ {
+ throw new ArgumentNullException(nameof(projectItem));
+ }
+
+ var filePath = NormalizeAndEnsureValidPath(projectItem.FilePath);
+ _root.AddFile(new FileNode(filePath, projectItem));
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultViewCompilerTest.cs
similarity index 96%
rename from src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultViewCompilerTest.cs
index 790efd95dd..003bd6ddab 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerTest.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultViewCompilerTest.cs
@@ -9,7 +9,7 @@ using Xunit;
namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
{
- public class RazorViewCompilerTest
+ public class DefaultViewCompilerTest
{
[Fact]
public async Task CompileAsync_ReturnsResultWithNullAttribute_IfFileIsNotFoundInFileSystem()
@@ -94,7 +94,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
return viewCompiler;
}
- private class TestRazorViewCompiler : RazorViewCompiler
+ private class TestRazorViewCompiler : DefaultViewCompiler
{
public TestRazorViewCompiler(IList compiledViews) :
base(compiledViews, NullLogger.Instance)
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
index 9d43784485..78e3645a24 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
@@ -17,6 +17,7 @@ using Microsoft.AspNetCore.Mvc.ViewEngines;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Internal;
using Microsoft.Extensions.Primitives;
@@ -545,9 +546,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// Arrange
var id = "unique-id";
var childContent = "some-content";
- var resetEvent1 = new ManualResetEvent(false);
- var resetEvent2 = new ManualResetEvent(false);
- var resetEvent3 = new ManualResetEvent(false);
+ var event1 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var event2 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var event3 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
var calls = 0;
var cache = new MemoryCache(new MemoryCacheOptions());
@@ -560,7 +561,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
getChildContentAsync: (useCachedResult, encoder) =>
{
calls++;
- resetEvent2.Set();
+ event2.SetResult(0);
var tagHelperContent = new DefaultTagHelperContent();
tagHelperContent.SetHtmlContent(childContent);
@@ -570,14 +571,14 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var tagHelperOutput2 = new TagHelperOutput(
"cache",
new TagHelperAttributeList(),
- getChildContentAsync: (useCachedResult, encoder) =>
+ getChildContentAsync: async (useCachedResult, encoder) =>
{
calls++;
- resetEvent3.WaitOne(5000);
+ await event3.Task.TimeoutAfter(TimeSpan.FromSeconds(5));
var tagHelperContent = new DefaultTagHelperContent();
tagHelperContent.SetHtmlContent(childContent);
- return Task.FromResult(tagHelperContent);
+ return tagHelperContent;
});
var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
@@ -596,18 +597,18 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var task1 = Task.Run(async () =>
{
- resetEvent1.WaitOne(5000);
+ await event1.Task.TimeoutAfter(TimeSpan.FromSeconds(5));
await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
- resetEvent3.Set();
+ event3.SetResult(0);
});
var task2 = Task.Run(async () =>
{
- resetEvent2.WaitOne(5000);
+ await event2.Task.TimeoutAfter(TimeSpan.FromSeconds(5));
await cacheTagHelper2.ProcessAsync(tagHelperContext1, tagHelperOutput2);
});
- resetEvent1.Set();
+ event1.SetResult(0);
await Task.WhenAll(task1, task2);
// Assert
@@ -630,9 +631,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// Arrange
var id = "unique-id";
var childContent = "some-content";
- var resetEvent1 = new ManualResetEvent(false);
- var resetEvent2 = new ManualResetEvent(false);
- var resetEvent3 = new ManualResetEvent(false);
+ var event1 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var event2 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var event3 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
var calls = 0;
var cache = new MemoryCache(new MemoryCacheOptions());
@@ -645,7 +646,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
getChildContentAsync: (useCachedResult, encoder) =>
{
calls++;
- resetEvent2.Set();
+ event2.SetResult(0);
throw new Exception();
});
@@ -653,14 +654,14 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var tagHelperOutput2 = new TagHelperOutput(
"cache",
new TagHelperAttributeList(),
- getChildContentAsync: (useCachedResult, encoder) =>
+ getChildContentAsync: async (useCachedResult, encoder) =>
{
calls++;
- resetEvent3.WaitOne(5000);
+ await event3.Task.TimeoutAfter(TimeSpan.FromSeconds(5));
var tagHelperContent = new DefaultTagHelperContent();
tagHelperContent.SetHtmlContent(childContent);
- return Task.FromResult(tagHelperContent);
+ return tagHelperContent;
});
var cacheTagHelper1 = new CacheTagHelper(new CacheTagHelperMemoryCacheFactory(cache), new HtmlTestEncoder())
@@ -679,18 +680,18 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var task1 = Task.Run(async () =>
{
- resetEvent1.WaitOne(5000);
+ await event1.Task.TimeoutAfter(TimeSpan.FromSeconds(5));
await Assert.ThrowsAsync(() => cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1));
- resetEvent3.Set();
+ event3.SetResult(0);
});
var task2 = Task.Run(async () =>
{
- resetEvent2.WaitOne(5000);
+ await event2.Task.TimeoutAfter(TimeSpan.FromSeconds(5));
await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
});
- resetEvent1.Set();
+ event1.SetResult(0);
await Task.WhenAll(task1, task2);
// Assert
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs
index 19d56fb5af..410e4f149c 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs
@@ -17,6 +17,7 @@ using Microsoft.AspNetCore.Mvc.ViewEngines;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Internal;
@@ -538,9 +539,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{
// Arrange
var childContent = "some-content";
- var resetEvent1 = new ManualResetEvent(false);
- var resetEvent2 = new ManualResetEvent(false);
- var resetEvent3 = new ManualResetEvent(false);
+ var event1 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var event2 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var event3 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
var calls = 0;
var formatter = GetFormatter();
var storage = GetStorage();
@@ -559,7 +560,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
getChildContentAsync: (useCachedResult, encoder) =>
{
calls++;
- resetEvent2.Set();
+ event2.SetResult(0);
var tagHelperContent = new DefaultTagHelperContent();
tagHelperContent.SetHtmlContent(childContent);
@@ -569,14 +570,14 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var tagHelperOutput2 = new TagHelperOutput(
"distributed-cache",
new TagHelperAttributeList(),
- getChildContentAsync: (useCachedResult, encoder) =>
+ getChildContentAsync: async (useCachedResult, encoder) =>
{
calls++;
- resetEvent3.WaitOne(5000);
+ await event3.Task.TimeoutAfter(TimeSpan.FromSeconds(5));
var tagHelperContent = new DefaultTagHelperContent();
tagHelperContent.SetHtmlContent(childContent);
- return Task.FromResult(tagHelperContent);
+ return tagHelperContent;
});
var cacheTagHelper1 = new DistributedCacheTagHelper(
@@ -599,18 +600,18 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var task1 = Task.Run(async () =>
{
- resetEvent1.WaitOne(5000);
+ await event1.Task.TimeoutAfter(TimeSpan.FromSeconds(5));
await cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1);
- resetEvent3.Set();
+ event3.SetResult(0);
});
var task2 = Task.Run(async () =>
{
- resetEvent2.WaitOne(5000);
+ await event2.Task.TimeoutAfter(TimeSpan.FromSeconds(5));
await cacheTagHelper2.ProcessAsync(tagHelperContext1, tagHelperOutput2);
});
- resetEvent1.Set();
+ event1.SetResult(0);
await Task.WhenAll(task1, task2);
// Assert
@@ -632,9 +633,9 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
{
// Arrange
var childContent = "some-content";
- var resetEvent1 = new ManualResetEvent(false);
- var resetEvent2 = new ManualResetEvent(false);
- var resetEvent3 = new ManualResetEvent(false);
+ var event1 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var event2 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var event3 = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
var calls = 0;
var formatter = GetFormatter();
var storage = GetStorage();
@@ -653,7 +654,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
getChildContentAsync: (useCachedResult, encoder) =>
{
calls++;
- resetEvent2.Set();
+ event2.SetResult(0);
throw new Exception();
});
@@ -661,14 +662,14 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var tagHelperOutput2 = new TagHelperOutput(
"distributed-cache",
new TagHelperAttributeList(),
- getChildContentAsync: (useCachedResult, encoder) =>
+ getChildContentAsync: async (useCachedResult, encoder) =>
{
calls++;
- resetEvent3.WaitOne(5000);
+ await event3.Task.TimeoutAfter(TimeSpan.FromSeconds(5));
var tagHelperContent = new DefaultTagHelperContent();
tagHelperContent.SetHtmlContent(childContent);
- return Task.FromResult(tagHelperContent);
+ return tagHelperContent;
});
var cacheTagHelper1 = new DistributedCacheTagHelper(
@@ -691,18 +692,18 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
var task1 = Task.Run(async () =>
{
- resetEvent1.WaitOne(5000);
+ await event1.Task.TimeoutAfter(TimeSpan.FromSeconds(5));
await Assert.ThrowsAsync(() => cacheTagHelper1.ProcessAsync(tagHelperContext1, tagHelperOutput1));
- resetEvent3.Set();
+ event3.SetResult(0);
});
var task2 = Task.Run(async () =>
{
- resetEvent2.WaitOne(5000);
+ await event2.Task.TimeoutAfter(TimeSpan.FromSeconds(5));
await cacheTagHelper2.ProcessAsync(tagHelperContext2, tagHelperOutput2);
});
- resetEvent1.Set();
+ event1.SetResult(0);
await Task.WhenAll(task1, task2);
// Assert
diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlHelperComponentExtensionsTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlHelperComponentExtensionsTests.cs
new file mode 100644
index 0000000000..b9439dbae1
--- /dev/null
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlHelperComponentExtensionsTests.cs
@@ -0,0 +1,309 @@
+// 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.IO;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Test
+{
+ public class HtmlHelperComponentExtensionsTests
+ {
+ [Fact]
+ public async Task CanRender_ParameterlessComponent()
+ {
+ // Arrange
+ var helper = CreateHelper();
+ var writer = new StringWriter();
+
+ // Act
+ var result = await helper.RenderComponentAsync();
+ result.WriteTo(writer, HtmlEncoder.Default);
+ var content = writer.ToString();
+
+ // Assert
+ Assert.Equal("Hello world!
", content);
+ }
+
+ [Fact]
+ public async Task CanRender_ComponentWithParametersObject()
+ {
+ // Arrange
+ var helper = CreateHelper();
+ var writer = new StringWriter();
+
+ // Act
+ var result = await helper.RenderComponentAsync(new
+ {
+ Name = "Steve"
+ });
+ result.WriteTo(writer, HtmlEncoder.Default);
+ var content = writer.ToString();
+
+ // Assert
+ Assert.Equal("Hello Steve!
", content);
+ }
+
+ [Fact]
+ public async Task CanRender_AsyncComponent()
+ {
+ // Arrange
+ var helper = CreateHelper();
+ var writer = new StringWriter();
+ var expectedContent = @"
+
+
+| Date |
+Summary |
+F |
+C |
+
+
+
+
+| 06/05/2018 |
+Freezing |
+33 |
+33 |
+
+
+| 07/05/2018 |
+Bracing |
+57 |
+57 |
+
+
+| 08/05/2018 |
+Freezing |
+9 |
+9 |
+
+
+| 09/05/2018 |
+Balmy |
+4 |
+4 |
+
+
+| 10/05/2018 |
+Chilly |
+29 |
+29 |
+
+
+
";
+
+ // Act
+ var result = await helper.RenderComponentAsync();
+ result.WriteTo(writer, HtmlEncoder.Default);
+ var content = writer.ToString();
+
+ // Assert
+ Assert.Equal(expectedContent.Replace("\r\n","\n"), content);
+ }
+
+ private static IHtmlHelper CreateHelper(Action configureServices = null)
+ {
+ var serviceCollection = new ServiceCollection();
+ serviceCollection.AddSingleton(HtmlEncoder.Default);
+ configureServices?.Invoke(serviceCollection);
+
+ var helper = new Mock();
+ helper.Setup(h => h.ViewContext)
+ .Returns(new ViewContext()
+ {
+ HttpContext = new DefaultHttpContext()
+ {
+ RequestServices = serviceCollection.BuildServiceProvider()
+ }
+ });
+ return helper.Object;
+ }
+
+ private class TestComponent : IComponent
+ {
+ private RenderHandle _renderHandle;
+
+ public void Configure(RenderHandle renderHandle)
+ {
+ _renderHandle = renderHandle;
+ }
+
+ public Task SetParametersAsync(ParameterCollection parameters)
+ {
+ _renderHandle.Render(builder =>
+ {
+ var s = 0;
+ builder.OpenElement(s++, "h1");
+ builder.AddContent(s++, "Hello world!");
+ builder.CloseElement();
+ });
+ return Task.CompletedTask;
+ }
+ }
+
+ private class GreetingComponent : ComponentBase
+ {
+ [Parameter] public string Name { get; set; }
+
+ protected override void OnParametersSet()
+ {
+ base.OnParametersSet();
+ }
+
+ protected override void BuildRenderTree(RenderTreeBuilder builder)
+ {
+ var s = 0;
+ base.BuildRenderTree(builder);
+ builder.OpenElement(s++, "p");
+ builder.AddContent(s++, $"Hello {Name}!");
+ builder.CloseElement();
+ }
+ }
+
+ private class AsyncComponent : ComponentBase
+ {
+ private static WeatherRow[] _weatherData = new[]
+ {
+ new WeatherRow
+ {
+ DateFormatted = "06/05/2018",
+ TemperatureC = 1,
+ Summary = "Freezing",
+ TemperatureF = 33
+ },
+ new WeatherRow
+ {
+ DateFormatted = "07/05/2018",
+ TemperatureC = 14,
+ Summary = "Bracing",
+ TemperatureF = 57
+ },
+ new WeatherRow
+ {
+ DateFormatted = "08/05/2018",
+ TemperatureC = -13,
+ Summary = "Freezing",
+ TemperatureF = 9
+ },
+ new WeatherRow
+ {
+ DateFormatted = "09/05/2018",
+ TemperatureC = -16,
+ Summary = "Balmy",
+ TemperatureF = 4
+ },
+ new WeatherRow
+ {
+ DateFormatted = "10/05/2018",
+ TemperatureC = 2,
+ Summary = "Chilly",
+ TemperatureF = 29
+ }
+ };
+
+ public class WeatherRow
+ {
+ public string DateFormatted { get; set; }
+ public int TemperatureC { get; set; }
+ public string Summary { get; set; }
+ public int TemperatureF { get; set; }
+ }
+
+ public WeatherRow[] RowsToDisplay { get; set; }
+
+ protected override async Task OnParametersSetAsync()
+ {
+ // Simulate an async workflow.
+ await Task.Yield();
+ RowsToDisplay = _weatherData;
+ }
+
+ protected override void BuildRenderTree(RenderTreeBuilder builder)
+ {
+ base.BuildRenderTree(builder);
+ var s = 0;
+ builder.OpenElement(s++, "table");
+ builder.AddMarkupContent(s++, "\n");
+ builder.OpenElement(s++, "thead");
+ builder.AddMarkupContent(s++, "\n");
+ builder.OpenElement(s++, "tr");
+ builder.AddMarkupContent(s++, "\n");
+
+ builder.OpenElement(s++, "th");
+ builder.AddContent(s++, "Date");
+ builder.CloseElement();
+ builder.AddMarkupContent(s++, "\n");
+
+ builder.OpenElement(s++, "th");
+ builder.AddContent(s++, "Summary");
+ builder.CloseElement();
+ builder.AddMarkupContent(s++, "\n");
+
+ builder.OpenElement(s++, "th");
+ builder.AddContent(s++, "F");
+ builder.CloseElement();
+ builder.AddMarkupContent(s++, "\n");
+
+ builder.OpenElement(s++, "th");
+ builder.AddContent(s++, "C");
+ builder.CloseElement();
+ builder.AddMarkupContent(s++, "\n");
+
+ builder.CloseElement();
+ builder.AddMarkupContent(s++, "\n");
+ builder.CloseElement();
+ builder.AddMarkupContent(s++, "\n");
+ builder.OpenElement(s++, "tbody");
+ builder.AddMarkupContent(s++, "\n");
+ if (RowsToDisplay != null)
+ {
+ var s2 = s;
+ foreach (var element in RowsToDisplay)
+ {
+ s = s2;
+ builder.OpenElement(s++, "tr");
+ builder.AddMarkupContent(s++, "\n");
+
+ builder.OpenElement(s++, "td");
+ builder.AddContent(s++, element.DateFormatted);
+ builder.CloseElement();
+ builder.AddMarkupContent(s++, "\n");
+
+ builder.OpenElement(s++, "td");
+ builder.AddContent(s++, element.Summary);
+ builder.CloseElement();
+ builder.AddMarkupContent(s++, "\n");
+
+ builder.OpenElement(s++, "td");
+ builder.AddContent(s++, element.TemperatureF);
+ builder.CloseElement();
+ builder.AddMarkupContent(s++, "\n");
+
+ builder.OpenElement(s++, "td");
+ builder.AddContent(s++, element.TemperatureF);
+ builder.CloseElement();
+ builder.AddMarkupContent(s++, "\n");
+
+ builder.CloseElement();
+ builder.AddMarkupContent(s++, "\n");
+ }
+ }
+
+ builder.CloseElement();
+ builder.AddMarkupContent(s++, "\n");
+
+ builder.CloseElement();
+ }
+ }
+ }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ComponentsController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ComponentsController.cs
new file mode 100644
index 0000000000..99ba2690ee
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ComponentsController.cs
@@ -0,0 +1,74 @@
+// 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.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BasicWebSite.Controllers
+{
+ public class ComponentsController : Controller
+ {
+ private static WeatherRow[] _weatherData = new[]
+ {
+ new WeatherRow
+ {
+ DateFormatted = "06/05/2018",
+ TemperatureC = 1,
+ Summary = "Freezing",
+ TemperatureF = 33
+ },
+ new WeatherRow
+ {
+ DateFormatted = "07/05/2018",
+ TemperatureC = 14,
+ Summary = "Bracing",
+ TemperatureF = 57
+ },
+ new WeatherRow
+ {
+ DateFormatted = "08/05/2018",
+ TemperatureC = -13,
+ Summary = "Freezing",
+ TemperatureF = 9
+ },
+ new WeatherRow
+ {
+ DateFormatted = "09/05/2018",
+ TemperatureC = -16,
+ Summary = "Balmy",
+ TemperatureF = 4
+ },
+ new WeatherRow
+ {
+ DateFormatted = "10/05/2018",
+ TemperatureC = 2,
+ Summary = "Chilly",
+ TemperatureF = 29
+ }
+ };
+
+ [HttpGet("/components")]
+ public IActionResult Index()
+ {
+ return View();
+ }
+
+ [HttpGet("/WeatherData")]
+ [Produces("application/json")]
+ public IActionResult WeatherData()
+ {
+ return Ok(_weatherData);
+ }
+
+ private class WeatherRow
+ {
+ public string DateFormatted { get; internal set; }
+ public int TemperatureC { get; internal set; }
+ public string Summary { get; internal set; }
+ public int TemperatureF { get; internal set; }
+ }
+ }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContactApiController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContactApiController.cs
index c2d3400e1f..d333df973f 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContactApiController.cs
+++ b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContactApiController.cs
@@ -131,11 +131,6 @@ namespace BasicWebSite
public Task BindModelAsync(ModelBindingContext bindingContext)
{
var val = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);
- if (val == null)
- {
- return Task.CompletedTask;
- }
-
bindingContext.Result = ModelBindingResult.Success("From TestModelBinder: " + val);
return Task.CompletedTask;
}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor
new file mode 100644
index 0000000000..79f6d6937c
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor
@@ -0,0 +1,53 @@
+@using BasicWebSite.Services
+@inject WeatherForecastService ForecastService
+
+Weather forecast
+
+This component demonstrates fetching data from the server.
+
+@if (forecasts == null)
+{
+ Loading...
+}
+else
+{
+ Weather data for @(StartDate.ToString("MM/dd/yyyy"))
+
+
+
+ | Date |
+ Temp. (C) |
+ Temp. (F) |
+ Summary |
+
+
+
+ @foreach (var forecast in forecasts)
+ {
+
+ | @forecast.DateFormatted |
+ @forecast.TemperatureC |
+ @forecast.TemperatureF |
+ @forecast.Summary |
+
+ }
+
+
+}
+
+@functions {
+ [Parameter] DateTime StartDate { get; set; }
+
+ WeatherForecast[] forecasts;
+
+ protected override async Task OnParametersSetAsync()
+ {
+ // If no value was given in the URL for StartDate, apply a default
+ if (StartDate == default)
+ {
+ StartDate = DateTime.Now;
+ }
+
+ forecasts = await ForecastService.GetForecastAsync(StartDate);
+ }
+}
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Greetings.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Greetings.razor
new file mode 100644
index 0000000000..bd67e43af9
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/Greetings.razor
@@ -0,0 +1 @@
+Hello world!
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Services/WeatherForecastService.cs b/src/Mvc/test/WebSites/BasicWebSite/Services/WeatherForecastService.cs
new file mode 100644
index 0000000000..5491c579ec
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Services/WeatherForecastService.cs
@@ -0,0 +1,45 @@
+// 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.Net.Http;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace BasicWebSite.Services
+{
+ public class WeatherForecastService
+ {
+ private readonly HttpClient _httpClient;
+
+ public WeatherForecastService(HttpClient httpClient)
+ {
+ _httpClient = httpClient;
+ }
+
+ public async Task GetForecastAsync(DateTime startDate)
+ {
+ var result = await _httpClient.GetAsync("/WeatherData");
+ result.EnsureSuccessStatusCode();
+ var dataString = await result.Content.ReadAsStringAsync();
+ var weatherData = JsonConvert.DeserializeObject(
+ dataString, new JsonSerializerSettings
+ {
+ ContractResolver = new DefaultContractResolver
+ {
+ NamingStrategy = new CamelCaseNamingStrategy()
+ }
+ });
+ return weatherData;
+ }
+ }
+
+ public class WeatherForecast
+ {
+ public string DateFormatted { get; set; }
+ public int TemperatureC { get; set; }
+ public string Summary { get; set; }
+ public int TemperatureF { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Startup.cs b/src/Mvc/test/WebSites/BasicWebSite/Startup.cs
index 8147a6b774..978ce38fe7 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/BasicWebSite/Startup.cs
@@ -1,13 +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;
+using System.Net.Http;
+using BasicWebSite.Services;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Abstractions;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
namespace BasicWebSite
{
@@ -48,6 +53,22 @@ namespace BasicWebSite
services.AddTransient();
services.AddScoped();
services.AddSingleton();
+ services.TryAddSingleton(CreateWeatherForecastService);
+ }
+
+ // For manual debug only (running this test site with F5)
+ // This needs to be changed to match the site host
+ private WeatherForecastService CreateWeatherForecastService(IServiceProvider serviceProvider)
+ {
+ var contextAccessor = serviceProvider.GetRequiredService();
+ var httpContext = contextAccessor.HttpContext;
+ if (httpContext == null)
+ {
+ throw new InvalidOperationException("Needs a request context!");
+ }
+ var client = new HttpClient();
+ client.BaseAddress = new Uri($"{httpContext.Request.Scheme}://{httpContext.Request.Host}");
+ return new WeatherForecastService(client);
}
public void Configure(IApplicationBuilder app)
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/Components/Index.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Components/Index.cshtml
new file mode 100644
index 0000000000..6bff9af76f
--- /dev/null
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/Components/Index.cshtml
@@ -0,0 +1,9 @@
+@using BasicWebSite.RazorComponents;
+Razor components
+
+ @(await Html.RenderComponentAsync())
+
+
+
+ @(await Html.RenderComponentAsync(new { StartDate = new DateTime(2019, 01, 15) }))
+
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/UpdateableFileProviderController.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/UpdateableViewsController.cs
similarity index 79%
rename from src/Mvc/test/WebSites/RazorWebSite/Controllers/UpdateableFileProviderController.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/UpdateableViewsController.cs
index ed5a12a6f2..609e8ab7bf 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Controllers/UpdateableFileProviderController.cs
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/UpdateableViewsController.cs
@@ -3,11 +3,11 @@
using Microsoft.AspNetCore.Mvc;
-namespace RazorWebSite
+namespace RazorBuildWebSite
{
- public class UpdateableFileProviderController : Controller
+ public class UpdateableViewsController : Controller
{
- public IActionResult Index() => View("/Views/UpdateableIndex/Index.cshtml");
+ public IActionResult Index() => View();
[HttpPost]
public IActionResult Update([FromServices] UpdateableFileProvider fileProvider, string path, string content)
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
index f7fcee6d8a..76177e1789 100644
--- a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp3.0
@@ -10,6 +10,7 @@
+
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
index 3d4858bd55..5d5123ee9d 100644
--- a/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
@@ -13,7 +13,11 @@ namespace RazorBuildWebSite
{
public void ConfigureServices(IServiceCollection services)
{
+ var fileProvider = new UpdateableFileProvider();
+ services.AddSingleton(fileProvider);
+
services.AddMvc()
+ .AddRazorRuntimeCompilation(options => options.FileProviders.Add(fileProvider))
.SetCompatibilityVersion(CompatibilityVersion.Latest);
}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Services/UpdateableFileProvider.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/UpdateableFileProvider.cs
similarity index 92%
rename from src/Mvc/test/WebSites/RazorWebSite/Services/UpdateableFileProvider.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite/UpdateableFileProvider.cs
index 5613ffda9a..42968e9fa0 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Services/UpdateableFileProvider.cs
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/UpdateableFileProvider.cs
@@ -10,7 +10,7 @@ using System.Threading;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Primitives;
-namespace RazorWebSite
+namespace RazorBuildWebSite
{
public class UpdateableFileProvider : IFileProvider
{
@@ -19,15 +19,11 @@ namespace RazorWebSite
private readonly Dictionary _content = new Dictionary()
{
{
- "/Views/UpdateableIndex/_ViewImports.cshtml",
+ "/Views/UpdateableViews/_ViewImports.cshtml",
new TestFileInfo(string.Empty)
},
{
- "/Views/UpdateableIndex/Index.cshtml",
- new TestFileInfo(@"@Html.Partial(""../UpdateableShared/_Partial.cshtml"")")
- },
- {
- "/Views/UpdateableShared/_Partial.cshtml",
+ "/Views/UpdateableViews/Index.cshtml",
new TestFileInfo("Original content")
},
{
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/readme.md b/src/Mvc/test/WebSites/RazorBuildWebSite/readme.md
index 292a669614..07d41e6944 100644
--- a/src/Mvc/test/WebSites/RazorBuildWebSite/readme.md
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/readme.md
@@ -1,4 +1,4 @@
RazorBuildWebSite
===
-This web site tests how the Razor view engine interacts with pre-built Razor assemblies.
\ No newline at end of file
+This web site tests how the Razor view engine interacts with pre-built and runtime compiled Razor assemblies.
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Controllers/AuthorizedActionController.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Controllers/AuthorizedActionController.cs
new file mode 100644
index 0000000000..5967c595ec
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Controllers/AuthorizedActionController.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.
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace RazorPagesWebSite.Controllers
+{
+ [Route("[controller]/[action]")]
+ [Authorize]
+ public class AuthorizedActionController : Controller
+ {
+ public IActionResult Index() => Ok();
+ }
+}
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ModelWithAuthFilter.cs
similarity index 100%
rename from src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ModelWithAuthFilter.cs
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ModelWithAuthFilter.cshtml
similarity index 100%
rename from src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ModelWithAuthFilter.cshtml
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/StartupWithEndpointRouting.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/StartupWithEndpointRouting.cs
new file mode 100644
index 0000000000..3483ad0b0f
--- /dev/null
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/StartupWithEndpointRouting.cs
@@ -0,0 +1,36 @@
+// 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.Builder;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace RazorPagesWebSite
+{
+ public class StartupWithEndpointRouting
+ {
+ public void ConfigureServices(IServiceCollection services)
+ {
+ services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
+ .AddCookie(options => options.LoginPath = "/Login");
+
+ services.AddMvc()
+ .AddRazorPagesOptions(options =>
+ {
+ options.Conventions.AuthorizeFolder("/Admin");
+ })
+ .SetCompatibilityVersion(CompatibilityVersion.Latest);
+ }
+
+ public void Configure(IApplicationBuilder app)
+ {
+ app.UseRouting(routes =>
+ {
+ routes.MapApplication();
+ });
+
+ app.UseAuthorization();
+ }
+ }
+}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Controllers/EmbeddedViewsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/EmbeddedViewsController.cs
deleted file mode 100644
index d170e5cf57..0000000000
--- a/src/Mvc/test/WebSites/RazorWebSite/Controllers/EmbeddedViewsController.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.
-
-using Microsoft.AspNetCore.Mvc;
-
-namespace RazorWebSite.Controllers
-{
- public class EmbeddedViewsController : Controller
- {
- public IActionResult Index() => null;
-
- public IActionResult LookupByName() => View("Index");
-
- public IActionResult LookupByPath() => View("/Views/EmbeddedViews/Index.cshtml");
-
- public IActionResult RelativeNonPath() => View();
- }
-}
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Layout.cshtml
deleted file mode 100644
index e16c087dfd..0000000000
--- a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Layout.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-@RenderBody()
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Partial.cshtml
deleted file mode 100644
index b34fab2eec..0000000000
--- a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Partial.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-Hello from EmbeddedShared/_Partial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/EmbeddedPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/EmbeddedPartial.cshtml
deleted file mode 100644
index cebe57816a..0000000000
--- a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/EmbeddedPartial.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-Hello from EmbeddedHome\EmbeddedPartial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml
deleted file mode 100644
index 0084534e52..0000000000
--- a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@(await Html.PartialAsync("../EmbeddedShared/_Partial.cshtml"))
-@(await Html.PartialAsync("_EmbeddedPartial"))
-Tag Helper Link
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml
deleted file mode 100644
index 03303e5f91..0000000000
--- a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml
+++ /dev/null
@@ -1,2 +0,0 @@
-@{ Layout = "../EmbeddedShared/_Layout"; }
-@(await Html.PartialAsync("./EmbeddedPartial"))
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewImports.cshtml
deleted file mode 100644
index 9018c7897f..0000000000
--- a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewImports.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewStart.cshtml
deleted file mode 100644
index e4209d9008..0000000000
--- a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewStart.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-@{ Layout = "/Views/EmbeddedShared/_Layout.cshtml"; }
diff --git a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/Shared/_EmbeddedPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/Shared/_EmbeddedPartial.cshtml
deleted file mode 100644
index ef09462726..0000000000
--- a/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/Shared/_EmbeddedPartial.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-Hello from Shared/_EmbeddedPartial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
index 17402ce6bc..edf7a035d9 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
+++ b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
@@ -1,4 +1,4 @@
-
+