diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 2dc800b910..098333666e 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -11,7 +11,6 @@ - @@ -130,5 +129,6 @@ + diff --git a/eng/SharedFramework.Local.props b/eng/SharedFramework.Local.props index 4907c5f433..4a27b6b0d5 100644 --- a/eng/SharedFramework.Local.props +++ b/eng/SharedFramework.Local.props @@ -73,6 +73,7 @@ + @@ -87,5 +88,6 @@ + diff --git a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs b/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs index cdb2d7aecd..3659af2888 100644 --- a/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs +++ b/src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.netstandard2.0.cs @@ -68,7 +68,7 @@ namespace Microsoft.AspNetCore.Blazor.Rendering } namespace Microsoft.AspNetCore.Blazor.Services { - public partial class WebAssemblyUriHelper : Microsoft.AspNetCore.Components.Services.UriHelperBase + public partial class WebAssemblyUriHelper : Microsoft.AspNetCore.Components.UriHelperBase { internal WebAssemblyUriHelper() { } public static readonly Microsoft.AspNetCore.Blazor.Services.WebAssemblyUriHelper Instance; diff --git a/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs b/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs index 690b2eaff7..8ba0d6947d 100644 --- a/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs +++ b/src/Components/Blazor/Blazor/src/Hosting/WebAssemblyHostBuilder.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Net.Http; using Microsoft.AspNetCore.Blazor.Services; -using Microsoft.AspNetCore.Components.Services; +using Microsoft.AspNetCore.Components; using Microsoft.Extensions.DependencyInjection; using Microsoft.JSInterop; diff --git a/src/Components/Blazor/Blazor/src/Services/WebAssemblyComponentContext.cs b/src/Components/Blazor/Blazor/src/Services/WebAssemblyComponentContext.cs index ff1d9882d8..0cc175dcde 100644 --- a/src/Components/Blazor/Blazor/src/Services/WebAssemblyComponentContext.cs +++ b/src/Components/Blazor/Blazor/src/Services/WebAssemblyComponentContext.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. -using Microsoft.AspNetCore.Components.Services; +using Microsoft.AspNetCore.Components; namespace Microsoft.AspNetCore.Blazor.Services { diff --git a/src/Components/Blazor/Blazor/src/Services/WebAssemblyUriHelper.cs b/src/Components/Blazor/Blazor/src/Services/WebAssemblyUriHelper.cs index ecbdf7a92d..046a161f05 100644 --- a/src/Components/Blazor/Blazor/src/Services/WebAssemblyUriHelper.cs +++ b/src/Components/Blazor/Blazor/src/Services/WebAssemblyUriHelper.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Components.Services; +using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; using Interop = Microsoft.AspNetCore.Components.Browser.BrowserUriHelperInterop; diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec index 4a217ffc24..71a47fcb6e 100644 --- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec +++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec @@ -21,6 +21,6 @@ - + diff --git a/src/Components/Blazor/Build/src/ReferenceFromSource.props b/src/Components/Blazor/Build/src/ReferenceFromSource.props index fdbe689421..145ee253f6 100644 --- a/src/Components/Blazor/Build/src/ReferenceFromSource.props +++ b/src/Components/Blazor/Build/src/ReferenceFromSource.props @@ -11,7 +11,7 @@ true - $(RepositoryRoot)src\Components\Browser.JS\src\dist\components.*.js + $(RepositoryRoot)src\Components\Browser.JS\src\dist\blazor.*.js diff --git a/src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.props b/src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.props index d15e156b1d..682dbeed28 100644 --- a/src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.props +++ b/src/Components/Blazor/Build/src/targets/Blazor.MonoRuntime.props @@ -1,7 +1,7 @@ - $(MSBuildThisFileDirectory)../tools/blazor/components.*.js + $(MSBuildThisFileDirectory)../tools/blazor/blazor.*.js @@ -19,4 +19,4 @@ $(BaseBlazorRuntimeOutputPath)$(BlazorBootJsonName) - \ No newline at end of file + diff --git a/src/Components/Blazor/Directory.Build.props b/src/Components/Blazor/Directory.Build.props index cb599cac75..d1e60bbeab 100644 --- a/src/Components/Blazor/Directory.Build.props +++ b/src/Components/Blazor/Directory.Build.props @@ -3,8 +3,5 @@ $(PackageVersion) - $(BlazorComponentsVersionPrefix) - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix) diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/index.html b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/index.html index bb64fbb139..b0e4ed8d94 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/index.html +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/index.html @@ -11,6 +11,6 @@ Loading... - + diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/.template.config.src/template.json b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/.template.config.src/template.json index 6bfbc79d63..2e4c21ece5 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/.template.config.src/template.json +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/.template.config.src/template.json @@ -7,7 +7,7 @@ ], "groupIdentity": "Microsoft.Web.Blazor.Standalone", "identity": "Microsoft.Web.Blazor.Standalone.CSharp", - "name": "Blazor (standalone)", + "name": "Blazor (client-side)", "preferNameDirectory": true, "primaryOutputs": [ { diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/.template.config.src/vs-2017.3.host.json b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/.template.config.src/vs-2017.3.host.json index c7489ae90f..09333b8052 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/.template.config.src/vs-2017.3.host.json +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/.template.config.src/vs-2017.3.host.json @@ -1,7 +1,7 @@ { "$schema": "http://json.schemastore.org/vs-2017.3.host", "name": { - "text": "Blazor", + "text": "Blazor (client-side)", "package": "{0CD94836-1526-4E85-87D3-FB5274C5AFC9}", "id": "1050" }, diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/wwwroot/index.html b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/wwwroot/index.html index 17ce31fd47..a64de8f3d1 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/wwwroot/index.html +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/wwwroot/index.html @@ -11,6 +11,6 @@ Loading... - + diff --git a/src/Components/Blazor/testassets/HostedInAspNet.Client/wwwroot/index.html b/src/Components/Blazor/testassets/HostedInAspNet.Client/wwwroot/index.html index 7defbfa816..a47b1ad84e 100644 --- a/src/Components/Blazor/testassets/HostedInAspNet.Client/wwwroot/index.html +++ b/src/Components/Blazor/testassets/HostedInAspNet.Client/wwwroot/index.html @@ -7,6 +7,6 @@ Loading... - + diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/wwwroot/blazor-frame.html b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/wwwroot/blazor-frame.html index e93b5f8d82..59a2dc0063 100644 --- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/wwwroot/blazor-frame.html +++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/wwwroot/blazor-frame.html @@ -19,6 +19,6 @@ Loading... - + diff --git a/src/Components/Blazor/testassets/StandaloneApp/wwwroot/index.html b/src/Components/Blazor/testassets/StandaloneApp/wwwroot/index.html index 663e9776c1..5da6ba26b3 100644 --- a/src/Components/Blazor/testassets/StandaloneApp/wwwroot/index.html +++ b/src/Components/Blazor/testassets/StandaloneApp/wwwroot/index.html @@ -11,6 +11,6 @@ Loading... - + diff --git a/src/Components/Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.npmproj b/src/Components/Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.npmproj index bb19ff4a0b..03ffbe8e7a 100644 --- a/src/Components/Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.npmproj +++ b/src/Components/Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.npmproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/Components/Browser.JS/src/webpack.config.js b/src/Components/Browser.JS/src/webpack.config.js index fd4256d368..8133972c5e 100644 --- a/src/Components/Browser.JS/src/webpack.config.js +++ b/src/Components/Browser.JS/src/webpack.config.js @@ -8,8 +8,8 @@ module.exports = (env, args) => ({ rules: [{ test: /\.ts?$/, loader: 'ts-loader' }] }, entry: { - 'components.webassembly': './Boot.WebAssembly.ts', - 'components.server': './Boot.Server.ts', + 'blazor.webassembly': './Boot.WebAssembly.ts', + 'blazor.server': './Boot.Server.ts', }, output: { path: path.join(__dirname, '/dist'), filename: '[name].js' } }); 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 a7a92c962b..1fbd52ef58 100644 --- a/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs +++ b/src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs @@ -311,6 +311,10 @@ namespace Microsoft.AspNetCore.Components void Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle); System.Threading.Tasks.Task SetParametersAsync(Microsoft.AspNetCore.Components.ParameterCollection parameters); } + public partial interface IComponentContext + { + bool IsConnected { get; } + } public partial interface IHandleAfterRender { System.Threading.Tasks.Task OnAfterRenderAsync(); @@ -324,6 +328,16 @@ namespace Microsoft.AspNetCore.Components { public InjectAttribute() { } } + public partial interface IUriHelper + { + event System.EventHandler OnLocationChanged; + string GetAbsoluteUri(); + string GetBaseUri(); + void NavigateTo(string uri); + void NavigateTo(string uri, bool forceLoad); + System.Uri ToAbsoluteUri(string href); + string ToBaseRelativePath(string baseUri, string locationAbsolute); + } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct MarkupString { @@ -545,6 +559,23 @@ namespace Microsoft.AspNetCore.Components public double DeltaY { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public double DeltaZ { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } } + public abstract partial class UriHelperBase : Microsoft.AspNetCore.Components.IUriHelper + { + protected UriHelperBase() { } + public event System.EventHandler OnLocationChanged { add { } remove { } } + protected virtual void EnsureInitialized() { } + public string GetAbsoluteUri() { throw null; } + public virtual string GetBaseUri() { throw null; } + public virtual void InitializeState(string uriAbsolute, string baseUriAbsolute) { } + public void NavigateTo(string uri) { } + public void NavigateTo(string uri, bool forceLoad) { } + protected abstract void NavigateToCore(string uri, bool forceLoad); + protected void SetAbsoluteBaseUri(string baseUri) { } + protected void SetAbsoluteUri(string uri) { } + public System.Uri ToAbsoluteUri(string href) { throw null; } + public string ToBaseRelativePath(string baseUri, string locationAbsolute) { throw null; } + protected void TriggerOnLocationChanged() { } + } } namespace Microsoft.AspNetCore.Components.Forms { @@ -780,37 +811,3 @@ namespace Microsoft.AspNetCore.Components.Routing Prefix = 0, } } -namespace Microsoft.AspNetCore.Components.Services -{ - public partial interface IComponentContext - { - bool IsConnected { get; } - } - public partial interface IUriHelper - { - event System.EventHandler OnLocationChanged; - string GetAbsoluteUri(); - string GetBaseUri(); - void NavigateTo(string uri); - void NavigateTo(string uri, bool forceLoad); - System.Uri ToAbsoluteUri(string href); - string ToBaseRelativePath(string baseUri, string locationAbsolute); - } - public abstract partial class UriHelperBase : Microsoft.AspNetCore.Components.Services.IUriHelper - { - protected UriHelperBase() { } - public event System.EventHandler OnLocationChanged { add { } remove { } } - protected virtual void EnsureInitialized() { } - public string GetAbsoluteUri() { throw null; } - public virtual string GetBaseUri() { throw null; } - public virtual void InitializeState(string uriAbsolute, string baseUriAbsolute) { } - public void NavigateTo(string uri) { } - public void NavigateTo(string uri, bool forceLoad) { } - protected abstract void NavigateToCore(string uri, bool forceLoad); - protected void SetAbsoluteBaseUri(string baseUri) { } - protected void SetAbsoluteUri(string uri) { } - public System.Uri ToAbsoluteUri(string href) { throw null; } - public string ToBaseRelativePath(string baseUri, string locationAbsolute) { throw null; } - protected void TriggerOnLocationChanged() { } - } -} diff --git a/src/Components/Components/src/Services/IComponentContext.cs b/src/Components/Components/src/IComponentContext.cs similarity index 94% rename from src/Components/Components/src/Services/IComponentContext.cs rename to src/Components/Components/src/IComponentContext.cs index fa851e9e54..879693eeb4 100644 --- a/src/Components/Components/src/Services/IComponentContext.cs +++ b/src/Components/Components/src/IComponentContext.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.Services +namespace Microsoft.AspNetCore.Components { /// /// Provides information about the environment in which components are executing. diff --git a/src/Components/Components/src/Services/IUriHelper.cs b/src/Components/Components/src/IUriHelper.cs similarity index 98% rename from src/Components/Components/src/Services/IUriHelper.cs rename to src/Components/Components/src/IUriHelper.cs index b228570ffc..3c9aa2040c 100644 --- a/src/Components/Components/src/Services/IUriHelper.cs +++ b/src/Components/Components/src/IUriHelper.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Components.Services +namespace Microsoft.AspNetCore.Components { /// /// Helpers for working with URIs and navigation state. diff --git a/src/Components/Components/src/Routing/NavLink.cs b/src/Components/Components/src/Routing/NavLink.cs index 280f423a2d..cf8603fe7e 100644 --- a/src/Components/Components/src/Routing/NavLink.cs +++ b/src/Components/Components/src/Routing/NavLink.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.RenderTree; -using Microsoft.AspNetCore.Components.Services; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Components/Components/src/Routing/Router.cs b/src/Components/Components/src/Routing/Router.cs index 55a77d71bd..f3e0fbf3f8 100644 --- a/src/Components/Components/src/Routing/Router.cs +++ b/src/Components/Components/src/Routing/Router.cs @@ -7,7 +7,6 @@ using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Components.Layouts; using Microsoft.AspNetCore.Components.RenderTree; -using Microsoft.AspNetCore.Components.Services; namespace Microsoft.AspNetCore.Components.Routing { diff --git a/src/Components/Components/src/Services/UriHelperBase.cs b/src/Components/Components/src/UriHelperBase.cs similarity index 99% rename from src/Components/Components/src/Services/UriHelperBase.cs rename to src/Components/Components/src/UriHelperBase.cs index 4c067404d4..7f702fe398 100644 --- a/src/Components/Components/src/Services/UriHelperBase.cs +++ b/src/Components/Components/src/UriHelperBase.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Components.Services +namespace Microsoft.AspNetCore.Components { /// /// A base class for implementations. diff --git a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj new file mode 100644 index 0000000000..8f51f6c12b --- /dev/null +++ b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp3.0 + + + + + + + + + + + + + diff --git a/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs new file mode 100644 index 0000000000..1d92f8a4d7 --- /dev/null +++ b/src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs @@ -0,0 +1,296 @@ +// 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 MessagePack +{ + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public partial struct ExtensionHeader + { + private int _dummyPrimitive; + public ExtensionHeader(sbyte typeCode, int length) { throw null; } + public ExtensionHeader(sbyte typeCode, uint length) { throw null; } + public uint Length { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public sbyte TypeCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public partial struct ExtensionResult + { + private object _dummy; + private int _dummyPrimitive; + public ExtensionResult(sbyte typeCode, System.Buffers.ReadOnlySequence data) { throw null; } + public ExtensionResult(sbyte typeCode, System.Memory data) { throw null; } + public System.Buffers.ReadOnlySequence Data { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public MessagePack.ExtensionHeader Header { get { throw null; } } + public sbyte TypeCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + } + public static partial class MessagePackCode + { + public const byte Array16 = (byte)220; + public const byte Array32 = (byte)221; + public const byte Bin16 = (byte)197; + public const byte Bin32 = (byte)198; + public const byte Bin8 = (byte)196; + public const byte Ext16 = (byte)200; + public const byte Ext32 = (byte)201; + public const byte Ext8 = (byte)199; + public const byte False = (byte)194; + public const byte FixExt1 = (byte)212; + public const byte FixExt16 = (byte)216; + public const byte FixExt2 = (byte)213; + public const byte FixExt4 = (byte)214; + public const byte FixExt8 = (byte)215; + public const byte Float32 = (byte)202; + public const byte Float64 = (byte)203; + public const byte Int16 = (byte)209; + public const byte Int32 = (byte)210; + public const byte Int64 = (byte)211; + public const byte Int8 = (byte)208; + public const byte Map16 = (byte)222; + public const byte Map32 = (byte)223; + public const byte MaxFixArray = (byte)159; + public const byte MaxFixInt = (byte)127; + public const byte MaxFixMap = (byte)143; + public const byte MaxFixStr = (byte)191; + public const byte MaxNegativeFixInt = (byte)255; + public const byte MinFixArray = (byte)144; + public const byte MinFixInt = (byte)0; + public const byte MinFixMap = (byte)128; + public const byte MinFixStr = (byte)160; + public const byte MinNegativeFixInt = (byte)224; + public const byte NeverUsed = (byte)193; + public const byte Nil = (byte)192; + public const byte Str16 = (byte)218; + public const byte Str32 = (byte)219; + public const byte Str8 = (byte)217; + public const byte True = (byte)195; + public const byte UInt16 = (byte)205; + public const byte UInt32 = (byte)206; + public const byte UInt64 = (byte)207; + public const byte UInt8 = (byte)204; + public static bool IsSignedInteger(byte code) { throw null; } + public static string ToFormatName(byte code) { throw null; } + public static MessagePack.MessagePackType ToMessagePackType(byte code) { throw null; } + } + public static partial class MessagePackRange + { + public const int MaxFixArrayCount = 15; + public const int MaxFixMapCount = 15; + public const int MaxFixNegativeInt = -1; + public const int MaxFixPositiveInt = 127; + public const int MaxFixStringLength = 31; + public const int MinFixNegativeInt = -32; + public const int MinFixStringLength = 0; + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public ref partial struct MessagePackReader + { + private object _dummy; + public MessagePackReader(System.Buffers.ReadOnlySequence readOnlySequence) { throw null; } + public MessagePackReader(System.ReadOnlyMemory memory) { throw null; } + public long Consumed { get { throw null; } } + public bool End { get { throw null; } } + public bool IsNil { get { throw null; } } + public byte NextCode { get { throw null; } } + public MessagePack.MessagePackType NextMessagePackType { get { throw null; } } + public System.SequencePosition Position { get { throw null; } } + public System.Buffers.ReadOnlySequence Sequence { get { throw null; } } + public MessagePack.MessagePackReader Clone(System.Buffers.ReadOnlySequence readOnlySequence) { throw null; } + public MessagePack.MessagePackReader CreatePeekReader() { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public int ReadArrayHeader() { throw null; } + public bool ReadBoolean() { throw null; } + public byte ReadByte() { throw null; } + public System.Buffers.ReadOnlySequence ReadBytes() { throw null; } + public char ReadChar() { throw null; } + public System.DateTime ReadDateTime() { throw null; } + public double ReadDouble() { throw null; } + public MessagePack.ExtensionResult ReadExtensionFormat() { throw null; } + public MessagePack.ExtensionHeader ReadExtensionFormatHeader() { throw null; } + public short ReadInt16() { throw null; } + public int ReadInt32() { throw null; } + public long ReadInt64() { throw null; } + public int ReadMapHeader() { throw null; } + public MessagePack.Nil ReadNil() { throw null; } + public System.Buffers.ReadOnlySequence ReadRaw(long length) { throw null; } + public sbyte ReadSByte() { throw null; } + public float ReadSingle() { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public string ReadString() { throw null; } + public System.Buffers.ReadOnlySequence ReadStringSegment() { throw null; } + public ushort ReadUInt16() { throw null; } + public uint ReadUInt32() { throw null; } + public ulong ReadUInt64() { throw null; } + public void Skip() { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public bool TryReadNil() { throw null; } + } + public enum MessagePackType : byte + { + Array = (byte)7, + Binary = (byte)6, + Boolean = (byte)3, + Extension = (byte)9, + Float = (byte)4, + Integer = (byte)1, + Map = (byte)8, + Nil = (byte)2, + String = (byte)5, + Unknown = (byte)0, + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public ref partial struct MessagePackWriter + { + private object _dummy; + private int _dummyPrimitive; + public MessagePackWriter(System.Buffers.IBufferWriter writer) { throw null; } + public bool OldSpec { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public MessagePack.MessagePackWriter Clone(System.Buffers.IBufferWriter writer) { throw null; } + public void Flush() { } + public void Write(bool value) { } + public void Write(System.Buffers.ReadOnlySequence src) { } + public void Write(byte value) { } + public void Write(char value) { } + public void Write(System.DateTime dateTime) { } + public void Write(double value) { } + public void Write(short value) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Write(int value) { } + public void Write(long value) { } + public void Write(System.ReadOnlySpan src) { } + public void Write(System.ReadOnlySpan value) { } + public void Write(sbyte value) { } + public void Write(float value) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Write(string value) { } + public void Write(ushort value) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void Write(uint value) { } + public void Write(ulong value) { } + public void WriteArrayHeader(int count) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public void WriteArrayHeader(uint count) { } + public void WriteExtensionFormat(MessagePack.ExtensionResult extensionData) { } + public void WriteExtensionFormatHeader(MessagePack.ExtensionHeader extensionHeader) { } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)][System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public void WriteFixedArrayHeaderUnsafe(uint count) { } + public void WriteInt16(short value) { } + public void WriteInt32(int value) { } + public void WriteInt64(long value) { } + public void WriteInt8(sbyte value) { } + public void WriteMapHeader(int count) { } + public void WriteMapHeader(uint count) { } + public void WriteNil() { } + public void WriteRaw(System.Buffers.ReadOnlySequence rawMessagePackBlock) { } + public void WriteRaw(System.ReadOnlySpan rawMessagePackBlock) { } + public void WriteString(System.Buffers.ReadOnlySequence utf8stringBytes) { } + public void WriteString(System.ReadOnlySpan utf8stringBytes) { } + public void WriteUInt16(ushort value) { } + public void WriteUInt32(uint value) { } + public void WriteUInt64(ulong value) { } + public void WriteUInt8(byte value) { } + } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential, Size=1)] + public partial struct Nil : System.IEquatable + { + public static readonly MessagePack.Nil Default; + public bool Equals(MessagePack.Nil other) { throw null; } + public override bool Equals(object obj) { throw null; } + public override int GetHashCode() { throw null; } + public override string ToString() { throw null; } + } + public static partial class ReservedMessagePackExtensionTypeCode + { + public const sbyte DateTime = (sbyte)-1; + } +} +namespace Microsoft.AspNetCore.Builder +{ + public static partial class ComponentEndpointConventionBuilderExtensions + { + public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder AddComponent(this Microsoft.AspNetCore.Builder.IEndpointConventionBuilder builder, System.Type componentType, string selector) { throw null; } + public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder AddComponent(this Microsoft.AspNetCore.Builder.IEndpointConventionBuilder builder, string selector) { throw null; } + } + public static partial class ComponentEndpointRouteBuilderExtensions + { + public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints) { throw null; } + public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, System.Type componentType, string selector, string path) { throw null; } + public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string selector) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; } + public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder MapBlazorHub(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string selector, string path) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; } + } +} +namespace Microsoft.AspNetCore.Components.Browser.Rendering +{ + public partial class RemoteRendererException : System.Exception + { + public RemoteRendererException(string message) { } + } +} +namespace Microsoft.AspNetCore.Components.Server +{ + public partial class CircuitOptions + { + public CircuitOptions() { } + public System.TimeSpan DisconnectedCircuitRetentionPeriod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public int MaxRetainedDisconnectedCircuits { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + public sealed partial class ComponentHub : Microsoft.AspNetCore.SignalR.Hub + { + public ComponentHub(System.IServiceProvider services, Microsoft.Extensions.Logging.ILogger logger) { } + public static Microsoft.AspNetCore.Http.PathString DefaultPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public void BeginInvokeDotNetFromJS(string callId, string assemblyName, string methodIdentifier, long dotNetObjectId, string argsJson) { } + [System.Diagnostics.DebuggerStepThroughAttribute] + public System.Threading.Tasks.Task ConnectCircuit(string circuitId) { throw null; } + public override System.Threading.Tasks.Task OnDisconnectedAsync(System.Exception exception) { throw null; } + public void OnRenderCompleted(long renderId, string errorMessageOrNull) { } + public string StartCircuit(string uriAbsolute, string baseUriAbsolute) { throw null; } + } + public partial class ComponentPrerenderingContext + { + public ComponentPrerenderingContext() { } + public System.Type ComponentType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Http.HttpContext Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public Microsoft.AspNetCore.Components.ParameterCollection Parameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + } + public sealed partial class ComponentPrerenderResult + { + internal ComponentPrerenderResult() { } + public void WriteTo(System.IO.TextWriter writer) { } + } + public partial interface IComponentPrerenderer + { + System.Threading.Tasks.Task PrerenderComponentAsync(Microsoft.AspNetCore.Components.Server.ComponentPrerenderingContext context); + } + public static partial class WasmMediaTypeNames + { + public static partial class Application + { + public const string Wasm = "application/wasm"; + } + } +} +namespace Microsoft.AspNetCore.Components.Server.Circuits +{ + public sealed partial class Circuit + { + internal Circuit() { } + public string Id { get { throw null; } } + } + public abstract partial class CircuitHandler + { + protected CircuitHandler() { } + public virtual int Order { get { throw null; } } + public virtual System.Threading.Tasks.Task OnCircuitClosedAsync(Microsoft.AspNetCore.Components.Server.Circuits.Circuit circuit, System.Threading.CancellationToken cancellationToken) { throw null; } + public virtual System.Threading.Tasks.Task OnCircuitOpenedAsync(Microsoft.AspNetCore.Components.Server.Circuits.Circuit circuit, System.Threading.CancellationToken cancellationToken) { throw null; } + public virtual System.Threading.Tasks.Task OnConnectionDownAsync(Microsoft.AspNetCore.Components.Server.Circuits.Circuit circuit, System.Threading.CancellationToken cancellationToken) { throw null; } + public virtual System.Threading.Tasks.Task OnConnectionUpAsync(Microsoft.AspNetCore.Components.Server.Circuits.Circuit circuit, System.Threading.CancellationToken cancellationToken) { throw null; } + } + public partial class RemoteUriHelper : Microsoft.AspNetCore.Components.UriHelperBase + { + public RemoteUriHelper(Microsoft.Extensions.Logging.ILogger logger) { } + public bool HasAttachedJSRuntime { get { throw null; } } + public override void InitializeState(string uriAbsolute, string baseUriAbsolute) { } + protected override void NavigateToCore(string uri, bool forceLoad) { } + [Microsoft.JSInterop.JSInvokableAttribute("NotifyLocationChanged")] + public static void NotifyLocationChanged(string uriAbsolute) { } + } +} +namespace Microsoft.Extensions.DependencyInjection +{ + public static partial class ComponentServiceCollectionExtensions + { + public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddServerSideBlazor(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) { throw null; } + } +} diff --git a/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs b/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs index fe871272d8..dc893a1c3b 100644 --- a/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs +++ b/src/Components/Server/src/Builder/ComponentEndpointRouteBuilderExtensions.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.Routing; @@ -13,12 +14,11 @@ namespace Microsoft.AspNetCore.Builder public static class ComponentEndpointRouteBuilderExtensions { /// - /// Maps the SignalR to the path and associates - /// the component to this hub instance as the given DOM . + /// Maps the SignalR to the path . /// /// The . /// The . - public static IEndpointConventionBuilder MapComponentHub(this IEndpointRouteBuilder endpoints) + public static IEndpointConventionBuilder MapBlazorHub(this IEndpointRouteBuilder endpoints) { if (endpoints == null) { @@ -29,16 +29,16 @@ namespace Microsoft.AspNetCore.Builder } /// - /// Maps the SignalR to the path and associates + /// Maps the SignalR to the path and associates /// the component to this hub instance as the given DOM . /// /// The first associated with this . /// The . /// The selector for the . /// The . - public static IEndpointConventionBuilder MapComponentHub( + public static IEndpointConventionBuilder MapBlazorHub( this IEndpointRouteBuilder endpoints, - string selector) + string selector) where TComponent: IComponent { if (endpoints == null) { @@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Builder throw new ArgumentNullException(nameof(selector)); } - return endpoints.MapComponentHub(typeof(TComponent), selector, ComponentHub.DefaultPath); + return endpoints.MapBlazorHub(typeof(TComponent), selector, ComponentHub.DefaultPath); } /// @@ -62,10 +62,10 @@ namespace Microsoft.AspNetCore.Builder /// The selector for the . /// The path to map to which the will be mapped. /// The . - public static IEndpointConventionBuilder MapComponentHub( + public static IEndpointConventionBuilder MapBlazorHub( this IEndpointRouteBuilder endpoints, string selector, - string path) + string path) where TComponent : IComponent { if (endpoints == null) { @@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Builder throw new ArgumentNullException(nameof(selector)); } - return endpoints.MapComponentHub(typeof(TComponent), selector, path); + return endpoints.MapBlazorHub(typeof(TComponent), selector, path); } /// @@ -94,7 +94,7 @@ namespace Microsoft.AspNetCore.Builder /// The selector for the . /// The path to map to which the will be mapped. /// The . - public static IEndpointConventionBuilder MapComponentHub( + public static IEndpointConventionBuilder MapBlazorHub( this IEndpointRouteBuilder endpoints, Type componentType, string selector, diff --git a/src/Components/Server/src/Circuits/CircuitHandler.cs b/src/Components/Server/src/Circuits/CircuitHandler.cs index 6c007ecb62..b4c1dc596e 100644 --- a/src/Components/Server/src/Circuits/CircuitHandler.cs +++ b/src/Components/Server/src/Circuits/CircuitHandler.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits /// has been established. /// /// - /// is invoked immediately after the completion of + /// is invoked immediately after the completion of /// . In addition, the method is invoked each time a connection is re-established /// with a client after it's been dropped. is invoked each time a connection /// is dropped. @@ -24,7 +24,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits /// Application users may use this event to save state for a client that can be later rehydrated. /// /// - ///
    ///
public abstract class CircuitHandler { diff --git a/src/Components/Server/src/Circuits/CircuitHost.cs b/src/Components/Server/src/Circuits/CircuitHost.cs index ca3497a36a..5039202bca 100644 --- a/src/Components/Server/src/Circuits/CircuitHost.cs +++ b/src/Components/Server/src/Circuits/CircuitHost.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Components.Browser; using Microsoft.AspNetCore.Components.Browser.Rendering; using Microsoft.AspNetCore.Components.Rendering; -using Microsoft.AspNetCore.Components.Services; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.JSInterop; diff --git a/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs b/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs index 8dbdf3b5ec..8b68083281 100644 --- a/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs +++ b/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs @@ -8,7 +8,6 @@ using System.Text.Encodings.Web; using Microsoft.AspNetCore.Components.Browser; using Microsoft.AspNetCore.Components.Browser.Rendering; using Microsoft.AspNetCore.Components.Rendering; -using Microsoft.AspNetCore.Components.Services; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.DependencyInjection; @@ -105,7 +104,7 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits { throw new InvalidOperationException( $"{nameof(ComponentHub)} doesn't have an associated endpoint. " + - "Use 'app.UseEndpoints(endpoints => endpoints.MapComponentHub(\"app\"))' to register your hub."); + "Use 'app.UseEndpoints(endpoints => endpoints.MapBlazorHub(\"app\"))' to register your hub."); } var componentsMetadata = endpoint.Metadata.OfType().ToList(); diff --git a/src/Components/Server/src/Circuits/RemoteComponentContext.cs b/src/Components/Server/src/Circuits/RemoteComponentContext.cs index ecca025e98..91a1b91710 100644 --- a/src/Components/Server/src/Circuits/RemoteComponentContext.cs +++ b/src/Components/Server/src/Circuits/RemoteComponentContext.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Components.Services; namespace Microsoft.AspNetCore.Components.Server.Circuits { diff --git a/src/Components/Server/src/Circuits/RemoteUriHelper.cs b/src/Components/Server/src/Circuits/RemoteUriHelper.cs index 2cf1d42831..ab8390316e 100644 --- a/src/Components/Server/src/Circuits/RemoteUriHelper.cs +++ b/src/Components/Server/src/Circuits/RemoteUriHelper.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Components.Services; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.JSInterop; @@ -18,11 +17,18 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits private IJSRuntime _jsRuntime; private readonly ILogger _logger; + /// + /// Creates a new instance. + /// + /// The . public RemoteUriHelper(ILogger logger) { _logger = logger; } + /// + /// Gets or sets whether the circuit has an attached . + /// public bool HasAttachedJSRuntime => _jsRuntime != null; /// @@ -30,7 +36,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits /// /// The absolute URI of the current page. /// The absolute base URI of the current page. - /// The to use for interoperability. public override void InitializeState(string uriAbsolute, string baseUriAbsolute) { base.InitializeState(uriAbsolute, baseUriAbsolute); @@ -40,8 +45,6 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits /// /// Initializes the . /// - /// The absolute URI of the current page. - /// The absolute base URI of the current page. /// The to use for interoperability. internal void AttachJsRuntime(IJSRuntime jsRuntime) { diff --git a/src/Components/Server/src/ComponentHub.cs b/src/Components/Server/src/ComponentHub.cs index 4c6d6d1a5e..0b41cfc2f7 100644 --- a/src/Components/Server/src/ComponentHub.cs +++ b/src/Components/Server/src/ComponentHub.cs @@ -4,7 +4,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Components.Server.Circuits; -using Microsoft.AspNetCore.Components.Services; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.SignalR; diff --git a/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs b/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs index 1d3cec0820..043b9819e6 100644 --- a/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs +++ b/src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.Components.Server.BlazorPack; using Microsoft.AspNetCore.Components.Server.Circuits; -using Microsoft.AspNetCore.Components.Services; using Microsoft.AspNetCore.SignalR.Protocol; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; @@ -23,7 +23,7 @@ namespace Microsoft.Extensions.DependencyInjection /// /// The . /// The . - public static IServiceCollection AddRazorComponents(this IServiceCollection services) + public static IServiceCollection AddServerSideBlazor(this IServiceCollection services) { services.AddSignalR() .AddHubOptions(options => diff --git a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj index 00697597dc..ce06ad6727 100644 --- a/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj +++ b/src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj @@ -3,9 +3,9 @@ netcoreapp3.0 Runtime server features for ASP.NET Core Components. - true + true true - false + true true @@ -14,7 +14,7 @@ false false - + @@ -61,7 +61,7 @@ - + diff --git a/src/Components/Server/test/Circuits/CircuitPrerendererTest.cs b/src/Components/Server/test/Circuits/CircuitPrerendererTest.cs index a18a0a010b..9f2c4ec66f 100644 --- a/src/Components/Server/test/Circuits/CircuitPrerendererTest.cs +++ b/src/Components/Server/test/Circuits/CircuitPrerendererTest.cs @@ -6,7 +6,6 @@ using System.IO; using System.Text.RegularExpressions; using System.Threading.Tasks; using Microsoft.AspNetCore.Components.Server.Circuits; -using Microsoft.AspNetCore.Components.Services; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor b/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor index 084061e401..8ac0815070 100644 --- a/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor @@ -1,5 +1,5 @@ @page "/prerendered-interop" -@using Microsoft.AspNetCore.Components.Services +@using Microsoft.AspNetCore.Components @using Microsoft.JSInterop @inject IComponentContext ComponentContext @inject IJSRuntime JSRuntime diff --git a/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor b/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor index 00fee3f53f..05be9c65e1 100644 --- a/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor +++ b/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor @@ -1,5 +1,5 @@ @page "/prerendered-transition" -@using Microsoft.AspNetCore.Components.Services +@using Microsoft.AspNetCore.Components @inject IComponentContext ComponentContext

Hello

diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor index 99ec690d78..b0c9e432f6 100644 --- a/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor +++ b/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor @@ -1,5 +1,5 @@ @using Microsoft.AspNetCore.Components.Routing -@inject Microsoft.AspNetCore.Components.Services.IUriHelper uriHelper +@inject Microsoft.AspNetCore.Components.IUriHelper uriHelper
  • Default (matches all)
    • diff --git a/src/Components/test/testassets/BasicTestApp/wwwroot/index.html b/src/Components/test/testassets/BasicTestApp/wwwroot/index.html index eb90752c41..4a489dd814 100644 --- a/src/Components/test/testassets/BasicTestApp/wwwroot/index.html +++ b/src/Components/test/testassets/BasicTestApp/wwwroot/index.html @@ -20,12 +20,12 @@ } (function () { - // Load either components.webassembly.js or components.server.js depending + // Load either blazor.webassembly.js or blazor.server.js depending // on the hash part of the URL. This is just to give a way for the // test runner to make the selection. var src = location.hash === '#server' - ? 'components.server.js' - : 'components.webassembly.js'; + ? 'blazor.server.js' + : 'blazor.webassembly.js'; document.write(' diff --git a/src/Components/test/testassets/ComponentsApp.Server/Pages/Index.cshtml b/src/Components/test/testassets/ComponentsApp.Server/Pages/Index.cshtml index 8525e0d3aa..e3bfe581aa 100644 --- a/src/Components/test/testassets/ComponentsApp.Server/Pages/Index.cshtml +++ b/src/Components/test/testassets/ComponentsApp.Server/Pages/Index.cshtml @@ -15,7 +15,7 @@ @(await Html.RenderComponentAsync(new { Name="Guest" })) - + + + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs index 6c995fe3ab..ae6a05a3bb 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Startup.cs @@ -21,7 +21,7 @@ namespace RazorComponentsWeb_CSharp public void ConfigureServices(IServiceCollection services) { services.AddRazorPages(); - services.AddRazorComponents(); + services.AddServerSideBlazor(); services.AddSingleton(); } @@ -50,7 +50,7 @@ namespace RazorComponentsWeb_CSharp app.UseEndpoints(endpoints => { - endpoints.MapComponentHub(); + endpoints.MapBlazorHub(); endpoints.MapFallbackToPage("/_Host"); }); } diff --git a/src/ProjectTemplates/test/RazorComponentsTemplateTest.cs b/src/ProjectTemplates/test/RazorComponentsTemplateTest.cs index 74edc2b944..33b42aed69 100644 --- a/src/ProjectTemplates/test/RazorComponentsTemplateTest.cs +++ b/src/ProjectTemplates/test/RazorComponentsTemplateTest.cs @@ -26,9 +26,9 @@ namespace Templates.Test [Fact] public async Task RazorComponentsTemplateWorks() { - Project = await ProjectFactory.GetOrCreateProject("razorcomponents", Output); + Project = await ProjectFactory.GetOrCreateProject("blazorserverside", Output); - var createResult = await Project.RunDotNetNewAsync("razorcomponents"); + var createResult = await Project.RunDotNetNewAsync("blazorserverside"); Assert.True(0 == createResult.ExitCode, ErrorMessages.GetFailedProcessMessage("create/restore", Project, createResult)); var publishResult = await Project.RunDotNetPublishAsync();