Skip to content

Commit 864f76b

Browse files
SteveSandersonMSSteveSandersonMS
authored
Update Razor Components and Blazor templates (#6682)
1 parent f072523 commit 864f76b

File tree

30 files changed

+42
-78
lines changed

30 files changed

+42
-78
lines changed

‎src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
7-
https://dotnet.myget.org/f/blazor-dev/api/v3/index.json;
7+
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
8+
https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
89
</RestoreAdditionalProjectSources>
910
<LangVersion>7.3</LangVersion>
1011
</PropertyGroup>
1112

1213
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="$(TemplateBlazorPackageVersion)" />
14-
<PackageReference Include="Microsoft.AspNetCore.Components.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
14+
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="$(TemplateBlazorPackageVersion)" />
15+
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
16+
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
1517
</ItemGroup>
1618

1719
<ItemGroup>

‎src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.AspNetCore.Components.Hosting;
1+
using Microsoft.AspNetCore.Blazor.Hosting;
22

33
namespace BlazorHosted_CSharp.Client
44
{

‎src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55
<RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
6-
https://dotnet.myget.org/f/blazor-dev/api/v3/index.json;
6+
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
7+
https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
78
</RestoreAdditionalProjectSources>
89
<LangVersion>7.3</LangVersion>
910
</PropertyGroup>
1011

1112
<ItemGroup>
12-
<PackageReference Include="Microsoft.AspNetCore.App" />
13-
<PackageReference Include="Microsoft.AspNetCore.Components.Server" Version="$(TemplateBlazorPackageVersion)" />
14-
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="$(TemplateRazorDesignPackageVersion)" />
13+
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="$(TemplateBlazorPackageVersion)" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.Server" Version="$(TemplateComponentsPackageVersion)" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/Startup.cs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
using Microsoft.AspNetCore.Components.Server;
21
using Microsoft.AspNetCore.Builder;
32
using Microsoft.AspNetCore.Hosting;
43
using Microsoft.AspNetCore.ResponseCompression;
54
using Microsoft.Extensions.DependencyInjection;
65
using Newtonsoft.Json.Serialization;
76
using System.Linq;
8-
using System.Net.Mime;
97

108
namespace BlazorHosted_CSharp.Server
119
{
@@ -16,15 +14,7 @@ public class Startup
1614
public void ConfigureServices(IServiceCollection services)
1715
{
1816
services.AddMvc();
19-
20-
services.AddResponseCompression(options =>
21-
{
22-
options.MimeTypes = ResponseCompressionDefaults.MimeTypes.Concat(new[]
23-
{
24-
MediaTypeNames.Application.Octet,
25-
WasmMediaTypeNames.Application.Wasm,
26-
});
27-
});
17+
services.AddResponseCompression();
2818
}
2919

3020
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -43,6 +33,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
4333
});
4434

4535
app.UseBlazor<Client.Startup>();
36+
app.UseBlazorDebugging();
4637
}
4738
}
4839
}

‎src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<OutputType>Library</OutputType>
65
<IsPackable>true</IsPackable>
7-
<BlazorLinkOnBuild>false</BlazorLinkOnBuild>
86
<RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
9-
https://dotnet.myget.org/f/blazor-dev/api/v3/index.json;
7+
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
8+
https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
109
</RestoreAdditionalProjectSources>
1110
<LangVersion>7.3</LangVersion>
1211
</PropertyGroup>
@@ -19,8 +18,8 @@
1918
</ItemGroup>
2019

2120
<ItemGroup>
22-
<PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="$(TemplateBlazorPackageVersion)" />
23-
<PackageReference Include="Microsoft.AspNetCore.Components.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
21+
<PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="$(TemplateComponentsPackageVersion)" />
22+
<PackageReference Include="Microsoft.AspNetCore.Components.Build" Version="$(TemplateComponentsPackageVersion)" PrivateAssets="all" />
2423
</ItemGroup>
2524

2625
</Project>

‎src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
<RunCommand>dotnet</RunCommand>
66
<RunArguments>blazor serve</RunArguments>
77
<RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
8-
https://dotnet.myget.org/f/blazor-dev/api/v3/index.json;
8+
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
9+
https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
910
</RestoreAdditionalProjectSources>
1011
<LangVersion>7.3</LangVersion>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="$(TemplateBlazorPackageVersion)" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
15+
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="$(TemplateBlazorPackageVersion)" />
16+
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
17+
<PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
1618

1719
<DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="$(TemplateBlazorPackageVersion)" />
1820
</ItemGroup>

‎src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.AspNetCore.Components.Hosting;
1+
using Microsoft.AspNetCore.Blazor.Hosting;
22

33
namespace BlazorStandalone_CSharp
44
{

‎src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Directory.Build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@
22
<Project>
33
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\build\dependencies.props" />
44
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\build\sources.props" />
5+
6+
<PropertyGroup>
7+
<IncludeCustomRestoreSourcesSymbol>true</IncludeCustomRestoreSourcesSymbol>
8+
</PropertyGroup>
59
</Project>

‎src/Components/build/dependencies.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
<MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>
1313
<MicrosoftAspNetCoreRazorDesignPackageVersion>3.0.0-alpha1-10605</MicrosoftAspNetCoreRazorDesignPackageVersion>
1414
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-alpha1-10605</MicrosoftExtensionsDependencyInjectionPackageVersion>
15+
<MicrosoftNETSdkRazorPackageVersion>3.0.0-preview-19057-06</MicrosoftNETSdkRazorPackageVersion>
1516
<MonoCecilPackageVersion>0.10.1</MonoCecilPackageVersion>
1617
<SignalRPackageVersion>3.0.0-alpha1-10605</SignalRPackageVersion>
17-
<TemplateBlazorPackageVersion>0.8.0-preview1-20181122.3</TemplateBlazorPackageVersion>
18+
<TemplateBlazorPackageVersion>0.8.0-preview-19064-0339</TemplateBlazorPackageVersion>
19+
<TemplateComponentsPackageVersion>3.0.0-preview-19064-0339</TemplateComponentsPackageVersion>
1820
<TemplateRazorDesignPackageVersion>2.1.2</TemplateRazorDesignPackageVersion>
19-
<RazorPackageVersion>3.0.0-alpha1-10605</RazorPackageVersion>
2021
<MicrosoftAspNetCoreBlazorMonoPackageVersion>0.8.0-preview1-20181126.1</MicrosoftAspNetCoreBlazorMonoPackageVersion>
2122

2223
<!-- When updating this, ensure you also update Browser.JS/package.json to reference the corresponding version of @dotnet/jsinterop -->
23-
<JSInteropPackageVersion>0.8.0-preview1-20181126.1</JSInteropPackageVersion>
24+
<JSInteropPackageVersion>0.8.0-preview1-20181126.4</JSInteropPackageVersion>
2425
</PropertyGroup>
2526
</Project>

‎src/Components/build/sources.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
99
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
1010
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
11-
https://dotnet.myget.org/f/blazor-dev/api/v3/index.json;
1211
</RestoreSources>
1312
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
1413
$(RestoreSources);

0 commit comments

Comments
 (0)