From 4a419f10ce21f0dbd95c63516c7b2117f1953c2a Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Sat, 6 Jul 2019 18:41:30 -0700 Subject: [PATCH 1/4] Update dependencies from 5 repositories * Update dependencies from build '20190706.1' of 'https://github.com/dotnet/arcade' - 'Microsoft.DotNet.Arcade.Sdk': '1.0.0-beta.19351.4' => '1.0.0-beta.19356.1' - 'Microsoft.DotNet.GenAPI': '1.0.0-beta.19351.4' => '1.0.0-beta.19356.1' - 'Microsoft.DotNet.Helix.Sdk': '2.0.0-beta.19351.4' => '2.0.0-beta.19356.1' * Update dependencies from build '20190706.2' of 'https://github.com/dotnet/roslyn' - 'Microsoft.Net.Compilers.Toolset': '3.3.0-beta1-19351-01' => '3.3.0-beta2-19356-02' * Update dependencies from build '20190706.5' of aspnet/AspNetCore-Tooling - 'Microsoft.AspNetCore.Mvc.Razor.Extensions': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19356.5' - 'Microsoft.AspNetCore.Razor.Language': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19356.5' - 'Microsoft.CodeAnalysis.Razor': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19356.5' - 'Microsoft.NET.Sdk.Razor': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19356.5' * Update dependencies from build '20190705.1' of 'https://github.com/aspnet/Blazor' - 'Microsoft.AspNetCore.Blazor.Mono': '0.10.0-preview8.19351.2' => '0.10.0-preview8.19355.1' * Update dependencies from from build '20190704.5' of 'https://github.com/aspnet/EntityFrameworkCore' - 'Microsoft.EntityFrameworkCore.Tools': '3.0.0-preview8.19353.14' => '3.0.0-preview8.19354.5' - 'Microsoft.EntityFrameworkCore.SqlServer': '3.0.0-preview8.19353.14' => '3.0.0-preview8.19354.5' - 'dotnet-ef': '3.0.0-preview8.19353.14' => '3.0.0-preview8.19354.5' - 'Microsoft.EntityFrameworkCore': '3.0.0-preview8.19353.14' => '3.0.0-preview8.19354.5' - 'Microsoft.EntityFrameworkCore.InMemory': '3.0.0-preview8.19353.14' => '3.0.0-preview8.19354.5' - 'Microsoft.EntityFrameworkCore.Relational': '3.0.0-preview8.19353.14' => '3.0.0-preview8.19354.5' - 'Microsoft.EntityFrameworkCore.Sqlite': '3.0.0-preview8.19353.14' => '3.0.0-preview8.19354.5' Coherency updates... - 'Microsoft.AspNetCore.Analyzer.Testing': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.AspNetCore.BenchmarkRunner.Sources': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.ActivatorUtilities.Sources': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Caching.Abstractions': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Caching.Memory': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Caching.SqlServer': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Caching.StackExchangeRedis': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.CommandLineUtils.Sources': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Configuration.Abstractions': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Configuration.AzureKeyVault': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Configuration.Binder': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Configuration.CommandLine': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Configuration.EnvironmentVariables': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Configuration.FileExtensions': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Configuration.Ini': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Configuration.Json': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Configuration.KeyPerFile': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Configuration.UserSecrets': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Configuration.Xml': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Configuration': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.DependencyInjection.Abstractions': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.DependencyInjection': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.DiagnosticAdapter': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Diagnostics.HealthChecks': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.FileProviders.Abstractions': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.FileProviders.Composite': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.FileProviders.Embedded': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.FileProviders.Physical': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.FileSystemGlobbing': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.HashCodeCombiner.Sources': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Hosting.Abstractions': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Hosting': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.HostFactoryResolver.Sources': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Http': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Localization.Abstractions': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Localization': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Logging.Abstractions': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Logging.AzureAppServices': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Logging.Configuration': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Logging.Console': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Logging.Debug': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Logging.EventSource': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Logging.EventLog': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Logging.TraceSource': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Logging.Testing': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.ObjectPool': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Options.ConfigurationExtensions': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Options.DataAnnotations': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Options': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.ParameterDefaultValue.Sources': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.Primitives': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.TypeNameHelper.Sources': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.ValueStopwatch.Sources': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.WebEncoders': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Internal.Extensions.Refs': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.JSInterop': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Mono.WebAssembly.Interop': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Internal.AspNetCore.Analyzers': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.AspNetCore.Testing': '3.0.0-preview8.19353.10' => '3.0.0-preview8.19354.4' - 'Microsoft.Extensions.DependencyModel': '3.0.0-preview8-27903-07' => '3.0.0-preview8-27904-06' - 'Microsoft.NETCore.App.Ref': '3.0.0-preview8-27903-07' => '3.0.0-preview8-27904-06' - 'Microsoft.NETCore.App.Runtime.win-x64': '3.0.0-preview8-27903-07' => '3.0.0-preview8-27904-06' - 'NETStandard.Library.Ref': '2.1.0-preview8-27903-07' => '2.1.0-preview8-27904-06' - 'Microsoft.Bcl.AsyncInterfaces': '1.0.0-preview8.19353.3' => '1.0.0-preview8.19354.4' - 'Microsoft.CSharp': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'Microsoft.NETCore.Platforms': '3.0.0-preview8.19353.3' => '3.0.0-preview8.19354.4' - 'Microsoft.Win32.Registry': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.ComponentModel.Annotations': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.Diagnostics.EventLog': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.IO.Pipelines': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.Net.Http.WinHttpHandler': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.Net.WebSockets.WebSocketProtocol': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.Reflection.Metadata': '1.7.0-preview8.19353.3' => '1.7.0-preview8.19354.4' - 'System.Runtime.CompilerServices.Unsafe': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.Security.Cryptography.Cng': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.Security.Cryptography.Pkcs': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.Security.Cryptography.Xml': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.Security.Permissions': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.Security.Principal.Windows': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.ServiceProcess.ServiceController': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.Text.Encodings.Web': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.Text.Json': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' - 'System.Threading.Channels': '4.6.0-preview8.19353.3' => '4.6.0-preview8.19354.4' --- eng/Version.Details.xml | 404 +++++++++++------------ eng/Versions.props | 198 +++++------ eng/common/sdl/execute-all-sdl-tools.ps1 | 8 +- eng/common/sdl/run-sdl.ps1 | 12 +- global.json | 4 +- 5 files changed, 315 insertions(+), 311 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6705606834ec..33fdc14b40f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,420 +9,420 @@ --> - + https://github.com/aspnet/Blazor - cce6ca292fc3cb1dbbf02e149756318ad40628dc + 7e2a0091dd81c0cb17ceb7bdc4d67aed67dbec66 - + https://github.com/aspnet/AspNetCore-Tooling - d6713a4f4ec7c67dd78e88c8451c9693563ad61a + ef191a23474d4ca8fe1396a17dc58ced20f671cd - + https://github.com/aspnet/AspNetCore-Tooling - d6713a4f4ec7c67dd78e88c8451c9693563ad61a + ef191a23474d4ca8fe1396a17dc58ced20f671cd - + https://github.com/aspnet/AspNetCore-Tooling - d6713a4f4ec7c67dd78e88c8451c9693563ad61a + ef191a23474d4ca8fe1396a17dc58ced20f671cd - + https://github.com/aspnet/AspNetCore-Tooling - d6713a4f4ec7c67dd78e88c8451c9693563ad61a + ef191a23474d4ca8fe1396a17dc58ced20f671cd - + https://github.com/aspnet/EntityFrameworkCore - 423cebfe911d4bc41c48871ea031acbd82d138fc + dcb203f0c7c8e59e0bd9eccc813680505d1df1d8 - + https://github.com/aspnet/EntityFrameworkCore - 423cebfe911d4bc41c48871ea031acbd82d138fc + dcb203f0c7c8e59e0bd9eccc813680505d1df1d8 - + https://github.com/aspnet/EntityFrameworkCore - 423cebfe911d4bc41c48871ea031acbd82d138fc + dcb203f0c7c8e59e0bd9eccc813680505d1df1d8 - + https://github.com/aspnet/EntityFrameworkCore - 423cebfe911d4bc41c48871ea031acbd82d138fc + dcb203f0c7c8e59e0bd9eccc813680505d1df1d8 - + https://github.com/aspnet/EntityFrameworkCore - 423cebfe911d4bc41c48871ea031acbd82d138fc + dcb203f0c7c8e59e0bd9eccc813680505d1df1d8 - + https://github.com/aspnet/EntityFrameworkCore - 423cebfe911d4bc41c48871ea031acbd82d138fc + dcb203f0c7c8e59e0bd9eccc813680505d1df1d8 - + https://github.com/aspnet/EntityFrameworkCore - 423cebfe911d4bc41c48871ea031acbd82d138fc + dcb203f0c7c8e59e0bd9eccc813680505d1df1d8 - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 https://github.com/dotnet/corefx a28176b5ec68b6da1472934fe9493790d1665cae - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/dotnet/core-setup - 574f3af7793a341fdbaf038a3230e25b519eb537 + 545b5d0f5a026015a8e41d676c9d98f23cf8b291 - + https://github.com/dotnet/core-setup - 574f3af7793a341fdbaf038a3230e25b519eb537 + 545b5d0f5a026015a8e41d676c9d98f23cf8b291 - + https://github.com/dotnet/core-setup - 574f3af7793a341fdbaf038a3230e25b519eb537 + 545b5d0f5a026015a8e41d676c9d98f23cf8b291 - + https://github.com/dotnet/core-setup - 574f3af7793a341fdbaf038a3230e25b519eb537 + 545b5d0f5a026015a8e41d676c9d98f23cf8b291 - + https://github.com/dotnet/corefx - a9594f72540034902e2bcb2a5187fcdba584cf36 + 477abf147d8860fae35f975fddafb2711ee42bd4 - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/dotnet/arcade - 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 + a65d0966dc28861394ce78cfdcb9d5dff370957c - + https://github.com/dotnet/arcade - 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 + a65d0966dc28861394ce78cfdcb9d5dff370957c - + https://github.com/dotnet/arcade - 1fb1e240c889cd7f6e10cb1eacd129efa3ddb4b4 + a65d0966dc28861394ce78cfdcb9d5dff370957c - + https://github.com/aspnet/Extensions - 0538d10f82468dd7539d9abdb7b60c378989e0a6 + 72ae6be0024651d8c3472fce3704a866d1aaa8ea - + https://github.com/dotnet/roslyn - c91adff42c488aef2c2c532a7b053fb55e0c16ea + d93153ce58958911d1d891d78d715a65401d9960 diff --git a/eng/Versions.props b/eng/Versions.props index 0823e886533c..ae19510cf627 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,114 +50,114 @@ --> - 1.0.0-beta.19351.4 + 1.0.0-beta.19356.1 - 3.3.0-beta1-19351-01 + 3.3.0-beta2-19356-02 - 3.0.0-preview8-27903-07 - 3.0.0-preview8-27903-07 - 3.0.0-preview8-27903-07 - 2.1.0-preview8-27903-07 + 3.0.0-preview8-27904-06 + 3.0.0-preview8-27904-06 + 3.0.0-preview8-27904-06 + 2.1.0-preview8-27904-06 - 1.0.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 + 1.0.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 4.7.0-preview6.19264.9 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 1.7.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 - 4.6.0-preview8.19353.3 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 1.7.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 - 3.0.0-preview8.19353.3 + 3.0.0-preview8.19354.4 - 0.10.0-preview8.19351.2 + 0.10.0-preview8.19355.1 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 + 3.0.0-preview8.19354.4 - 3.0.0-preview8.19353.14 - 3.0.0-preview8.19353.14 - 3.0.0-preview8.19353.14 - 3.0.0-preview8.19353.14 - 3.0.0-preview8.19353.14 - 3.0.0-preview8.19353.14 - 3.0.0-preview8.19353.14 + 3.0.0-preview8.19354.5 + 3.0.0-preview8.19354.5 + 3.0.0-preview8.19354.5 + 3.0.0-preview8.19354.5 + 3.0.0-preview8.19354.5 + 3.0.0-preview8.19354.5 + 3.0.0-preview8.19354.5 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 - 3.0.0-preview8.19353.10 + 3.0.0-preview8.19356.5 + 3.0.0-preview8.19356.5 + 3.0.0-preview8.19356.5 + 3.0.0-preview8.19356.5 + <_TransitiveExternalAspNetCoreAppReference Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" /> + <_TransitiveExternalAspNetCoreAppReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" /> + <_TransitiveExternalAspNetCoreAppReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonPackageVersion)" /> <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" /> <_TransitiveExternalAspNetCoreAppReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" /> - <_TransitiveExternalAspNetCoreAppReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" /> + <_TransitiveExternalAspNetCoreAppReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" /> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33fdc14b40f6..83d087e1c35b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -305,6 +305,10 @@ https://github.com/dotnet/corefx 477abf147d8860fae35f975fddafb2711ee42bd4 + + https://github.com/dotnet/corefx + 477abf147d8860fae35f975fddafb2711ee42bd4 + https://github.com/dotnet/corefx 477abf147d8860fae35f975fddafb2711ee42bd4 @@ -317,6 +321,10 @@ https://github.com/dotnet/corefx 477abf147d8860fae35f975fddafb2711ee42bd4 + + https://github.com/dotnet/corefx + 477abf147d8860fae35f975fddafb2711ee42bd4 + https://github.com/dotnet/corefx 477abf147d8860fae35f975fddafb2711ee42bd4 @@ -373,6 +381,10 @@ https://github.com/dotnet/corefx 477abf147d8860fae35f975fddafb2711ee42bd4 + + https://github.com/dotnet/corefx + 477abf147d8860fae35f975fddafb2711ee42bd4 + https://github.com/dotnet/core-setup 545b5d0f5a026015a8e41d676c9d98f23cf8b291 diff --git a/eng/Versions.props b/eng/Versions.props index ae19510cf627..e5991ebecf31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,11 @@ 1.0.0-preview8.19354.4 4.6.0-preview8.19354.4 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 4.6.0-preview8.19354.4 4.7.0-preview6.19264.9 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 4.6.0-preview8.19354.4 4.6.0-preview8.19354.4 4.6.0-preview8.19354.4 @@ -79,6 +81,7 @@ 4.6.0-preview8.19354.4 4.6.0-preview8.19354.4 4.6.0-preview8.19354.4 + 4.6.0-preview8.19354.4 3.0.0-preview8.19354.4 @@ -252,7 +255,6 @@ https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json; https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json; https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json; - https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev; From 7ae74871dd3da5bf6de4f5a334a3050636d627ac Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Mon, 8 Jul 2019 11:28:07 -0700 Subject: [PATCH 3/4] Remove `.Layouts` namespace from Blazor --- .../test/DirectiveRazorIntegrationTest.cs | 1 - .../BlazorHosted-CSharp.Client/_Imports.razor | 1 - .../BlazorStandalone-CSharp/_Imports.razor | 1 - .../_Imports.razor | 1 - .../testassets/StandaloneApp/_Imports.razor | 1 - ...ft.AspNetCore.Components.netstandard2.0.cs | 27 +++++++++---------- .../src/{Layouts => }/LayoutAttribute.cs | 2 +- .../src/{Layouts => }/LayoutComponentBase.cs | 2 +- .../src/{Layouts => }/PageDisplay.cs | 1 - .../Components/src/Routing/Router.cs | 2 +- .../Components/test/PageDisplayTest.cs | 1 - .../ComponentsApp.App/_Imports.razor | 1 - .../RazorComponentsWeb-CSharp/_Imports.razor | 1 - 13 files changed, 15 insertions(+), 27 deletions(-) rename src/Components/Components/src/{Layouts => }/LayoutAttribute.cs (97%) rename src/Components/Components/src/{Layouts => }/LayoutComponentBase.cs (93%) rename src/Components/Components/src/{Layouts => }/PageDisplay.cs (99%) diff --git a/src/Components/Blazor/Build/test/DirectiveRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/DirectiveRazorIntegrationTest.cs index a82da4b7556a..5d5fccef0d51 100644 --- a/src/Components/Blazor/Build/test/DirectiveRazorIntegrationTest.cs +++ b/src/Components/Blazor/Build/test/DirectiveRazorIntegrationTest.cs @@ -6,7 +6,6 @@ using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.Layouts; using Microsoft.AspNetCore.Components.Test.Helpers; using Xunit; using Xunit.Abstractions; diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/_Imports.razor b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/_Imports.razor index 087fc85bad2f..7c10ded3524c 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/_Imports.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/_Imports.razor @@ -1,6 +1,5 @@ @using System.Net.Http @using Microsoft.AspNetCore.Components.Forms -@using Microsoft.AspNetCore.Components.Layouts @using Microsoft.AspNetCore.Components.Routing @using Microsoft.JSInterop @using BlazorHosted_CSharp.Client diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/_Imports.razor b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/_Imports.razor index c01cdd4ec4fe..1d737e4ab7a4 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/_Imports.razor +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/_Imports.razor @@ -1,6 +1,5 @@ @using System.Net.Http @using Microsoft.AspNetCore.Components.Forms -@using Microsoft.AspNetCore.Components.Layouts @using Microsoft.AspNetCore.Components.Routing @using Microsoft.JSInterop @using BlazorStandalone_CSharp diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/_Imports.razor b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/_Imports.razor index aaba22f6240f..54219b6cbf2d 100644 --- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/_Imports.razor +++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/_Imports.razor @@ -1,5 +1,4 @@ @using System.Net.Http -@using Microsoft.AspNetCore.Components.Layouts @using Microsoft.AspNetCore.Components.Routing @using Microsoft.JSInterop @using Microsoft.AspNetCore.Blazor.E2EPerformance diff --git a/src/Components/Blazor/testassets/StandaloneApp/_Imports.razor b/src/Components/Blazor/testassets/StandaloneApp/_Imports.razor index 632972be4bd3..b4ffe1209457 100644 --- a/src/Components/Blazor/testassets/StandaloneApp/_Imports.razor +++ b/src/Components/Blazor/testassets/StandaloneApp/_Imports.razor @@ -1,5 +1,4 @@ @using System.Net.Http -@using Microsoft.AspNetCore.Components.Layouts @using Microsoft.AspNetCore.Components.Routing @using StandaloneApp @using StandaloneApp.Shared diff --git a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs index 65a1782fd452..7376cf6b8702 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs @@ -325,6 +325,18 @@ public partial interface IUriHelper System.Uri ToAbsoluteUri(string href); string ToBaseRelativePath(string baseUri, string locationAbsolute); } + [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)] + public sealed partial class LayoutAttribute : System.Attribute + { + public LayoutAttribute(System.Type layoutType) { } + public System.Type LayoutType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public abstract partial class LayoutComponentBase : Microsoft.AspNetCore.Components.ComponentBase + { + protected LayoutComponentBase() { } + [Microsoft.AspNetCore.Components.ParameterAttribute] + protected Microsoft.AspNetCore.Components.RenderFragment Body { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct MarkupString { @@ -616,21 +628,6 @@ public sealed partial class ValidationStateChangedEventArgs internal ValidationStateChangedEventArgs() { } } } -namespace Microsoft.AspNetCore.Components.Layouts -{ - [System.AttributeUsageAttribute(System.AttributeTargets.Class, AllowMultiple=false, Inherited=true)] - public sealed partial class LayoutAttribute : System.Attribute - { - public LayoutAttribute(System.Type layoutType) { } - public System.Type LayoutType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - public abstract partial class LayoutComponentBase : Microsoft.AspNetCore.Components.ComponentBase - { - protected LayoutComponentBase() { } - [Microsoft.AspNetCore.Components.ParameterAttribute] - protected Microsoft.AspNetCore.Components.RenderFragment Body { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } -} namespace Microsoft.AspNetCore.Components.Rendering { [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] diff --git a/src/Components/Components/src/Layouts/LayoutAttribute.cs b/src/Components/Components/src/LayoutAttribute.cs similarity index 97% rename from src/Components/Components/src/Layouts/LayoutAttribute.cs rename to src/Components/Components/src/LayoutAttribute.cs index ff722849cd62..8e4fa7892274 100644 --- a/src/Components/Components/src/Layouts/LayoutAttribute.cs +++ b/src/Components/Components/src/LayoutAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Components.Layouts +namespace Microsoft.AspNetCore.Components { /// /// Indicates that the associated component type uses a specified layout. diff --git a/src/Components/Components/src/Layouts/LayoutComponentBase.cs b/src/Components/Components/src/LayoutComponentBase.cs similarity index 93% rename from src/Components/Components/src/Layouts/LayoutComponentBase.cs rename to src/Components/Components/src/LayoutComponentBase.cs index 97caa00d73cb..b9c8672d86dd 100644 --- a/src/Components/Components/src/Layouts/LayoutComponentBase.cs +++ b/src/Components/Components/src/LayoutComponentBase.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNetCore.Components.Layouts +namespace Microsoft.AspNetCore.Components { /// /// Optional base class for components that represent a layout. diff --git a/src/Components/Components/src/Layouts/PageDisplay.cs b/src/Components/Components/src/PageDisplay.cs similarity index 99% rename from src/Components/Components/src/Layouts/PageDisplay.cs rename to src/Components/Components/src/PageDisplay.cs index a73a7ee6e24f..d109f5155748 100644 --- a/src/Components/Components/src/Layouts/PageDisplay.cs +++ b/src/Components/Components/src/PageDisplay.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Components.Auth; -using Microsoft.AspNetCore.Components.Layouts; using Microsoft.AspNetCore.Components.RenderTree; namespace Microsoft.AspNetCore.Components diff --git a/src/Components/Components/src/Routing/Router.cs b/src/Components/Components/src/Routing/Router.cs index 45fb9c5c8596..87a66a692a8d 100644 --- a/src/Components/Components/src/Routing/Router.cs +++ b/src/Components/Components/src/Routing/Router.cs @@ -38,7 +38,7 @@ public class Router : IComponent, IHandleAfterRender, IDisposable /// assemblies, for components matching the URI. /// [Parameter] public Assembly AppAssembly { get; private set; } - + /// /// Gets or sets the type of the component that should be used as a fallback when no match is found for the requested route. /// diff --git a/src/Components/Components/test/PageDisplayTest.cs b/src/Components/Components/test/PageDisplayTest.cs index cc3b86490a93..28a4d22b4a4b 100644 --- a/src/Components/Components/test/PageDisplayTest.cs +++ b/src/Components/Components/test/PageDisplayTest.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.Layouts; using Microsoft.AspNetCore.Components.RenderTree; using Microsoft.AspNetCore.Components.Test.Helpers; using System.Collections.Generic; diff --git a/src/Components/test/testassets/ComponentsApp.App/_Imports.razor b/src/Components/test/testassets/ComponentsApp.App/_Imports.razor index ba45d525339b..7fd67c69321a 100644 --- a/src/Components/test/testassets/ComponentsApp.App/_Imports.razor +++ b/src/Components/test/testassets/ComponentsApp.App/_Imports.razor @@ -1,5 +1,4 @@ @using System.Net.Http -@using Microsoft.AspNetCore.Components.Layouts @using Microsoft.AspNetCore.Components.Routing @using ComponentsApp.App @using ComponentsApp.App.Shared diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/_Imports.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/_Imports.razor index c62947785aad..e0adde7e9094 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/_Imports.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/_Imports.razor @@ -1,7 +1,6 @@ @using System.Net.Http @using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Components.Forms -@using Microsoft.AspNetCore.Components.Layouts @using Microsoft.AspNetCore.Components.Routing @using Microsoft.JSInterop @using RazorComponentsWeb_CSharp From e20a96f59d2aab0ce2010349f153cf6e4ba4efcb Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Mon, 8 Jul 2019 13:05:39 -0700 Subject: [PATCH 4/4] fix one more straggler --- src/Mvc/samples/MvcSandbox/Components/Shared/MainLayout.razor | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Mvc/samples/MvcSandbox/Components/Shared/MainLayout.razor b/src/Mvc/samples/MvcSandbox/Components/Shared/MainLayout.razor index 50a044f56d1a..97e764d353ac 100644 --- a/src/Mvc/samples/MvcSandbox/Components/Shared/MainLayout.razor +++ b/src/Mvc/samples/MvcSandbox/Components/Shared/MainLayout.razor @@ -1,5 +1,4 @@ -@using Microsoft.AspNetCore.Components.Layouts -@inherits LayoutComponentBase +@inherits LayoutComponentBase