Skip to content

Commit 9b11e48

Browse files
isaacrlevinKahbazipranavkmdotnet-maestro[bot]dougbu
authored
merge (#3)
merge Co-authored-by: Kahbazi <a.kahbazi@gmail.com> Co-authored-by: Pranav K <prkrishn@hotmail.com> Co-authored-by: null <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com> Co-authored-by: Justin Kotalik <jukotali@microsoft.com> Co-authored-by: David Fowler <davidfowl@gmail.com> Co-authored-by: Jeow Li Huan <huan086@users.noreply.github.com> Co-authored-by: Andrew Stanton-Nurse <andrew@stanton-nurse.com> Co-authored-by: Steve Sanderson <SteveSandersonMS@users.noreply.github.com> Co-authored-by: Nate McMaster <natemcmaster@users.noreply.github.com> Co-authored-by: Smit Patel <smitpatel@users.noreply.github.com>
2 parents 241de23 + bb9ba12 commit 9b11e48

File tree

66 files changed

+7348
-12330
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+7348
-12330
lines changed

‎eng/ProjectReferences.props

+3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.Specification.Tests" ProjectPath="$(RepoRoot)src\Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
99
<ProjectReferenceProvider Include="Microsoft.Web.Xdt.Extensions" ProjectPath="$(RepoRoot)src\SiteExtensions\Microsoft.Web.Xdt.Extensions\src\Microsoft.Web.Xdt.Extensions.csproj" />
1010
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" ProjectPath="$(RepoRoot)src\Tools\FirstRunCertGenerator\src\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj" />
11+
<ProjectReferenceProvider Include="dotnet-getdocument" ProjectPath="$(RepoRoot)src\Mvc\dotnet-getdocument\src\dotnet-getdocument.csproj" />
1112
<ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Client" ProjectPath="$(RepoRoot)src\Mvc\Extensions.ApiDescription.Client\src\Microsoft.Extensions.ApiDescription.Client.csproj" />
13+
<ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Server" ProjectPath="$(RepoRoot)src\Mvc\Extensions.ApiDescription.Server\src\Microsoft.Extensions.ApiDescription.Server.csproj" />
14+
<ProjectReferenceProvider Include="GetDocument.Insider" ProjectPath="$(RepoRoot)src\Mvc\GetDocumentInsider\src\GetDocumentInsider.csproj" />
1215
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Specification.Tests" ProjectPath="$(RepoRoot)src\SignalR\server\Specification.Tests\src\Microsoft.AspNetCore.SignalR.Specification.Tests.csproj" />
1316
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Build" ProjectPath="$(RepoRoot)src\Components\Blazor\Build\src\Microsoft.AspNetCore.Blazor.Build.csproj" />
1417
<ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />

‎eng/Version.Details.xml

+144-144
Large diffs are not rendered by default.

‎eng/Versions.props

+72-72
Large diffs are not rendered by default.

‎eng/targets/Npm.Common.targets

-15
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,6 @@
5353

5454
<Copy SourceFiles="$(PackageJson)" DestinationFiles="$(_BackupPackageJson)" />
5555

56-
<ReadLinesFromFile File="$(PackageJson)" Condition="@(ReplacePackageContent->Count()) != 0 AND $([MSBuild]::IsOSPlatform('Windows'))">
57-
<Output TaskParameter="Lines" ItemName="PackageJsonContent" />
58-
</ReadLinesFromFile>
59-
60-
<PropertyGroup Condition="@(PackageJsonContent->Count()) > 0">
61-
<_PackageJsonContent>@(PackageJsonContent->'%(Identity)', '%0a')</_PackageJsonContent>
62-
<_PackageJsonContent>$(_PackageJsonContent.Replace('%(ReplacePackageContent.Identity)', '%(ReplacePackageContent.ReplaceWith)'))</_PackageJsonContent>
63-
</PropertyGroup>
64-
65-
<WriteLinesToFile
66-
File="$(PackageJson)"
67-
Lines="$(_PackageJsonContent)"
68-
Condition="@(ReplacePackageContent->Count()) != 0 AND $([MSBuild]::IsOSPlatform('Windows'))"
69-
Overwrite="true" />
70-
7156
<Yarn Command="version --no-git-tag-version --new-version $(PackageVersion)" />
7257
<Yarn Command="pack --filename $(PackageFileName)" />
7358

‎src/Components/Blazor/Templates/src/SetPackageProperties.targets

-4
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,11 @@
1111

1212
<Target Name="SetTemplateJsonSymbolReplacements">
1313
<PropertyGroup>
14-
<IncludeCustomRestoreSourcesValue>true</IncludeCustomRestoreSourcesValue>
15-
<IncludeCustomRestoreSourcesValue Condition=" '$(IsFinalBuild)' == 'true' AND ('$(PreReleaseLabel)' == 'servicing' OR '$(PreReleaseLabel)' == 'rtm')">false</IncludeCustomRestoreSourcesValue>
16-
1714
<!--
1815
Properties here will be injected into the template config *.json files
1916
during the build, replacing tokens of the form ${PropertyName}
2017
-->
2118
<GeneratedContentProperties>
22-
IncludeCustomRestoreSources=$(IncludeCustomRestoreSourcesValue);
2319
TemplateBlazorVersion=$(PackageVersion);
2420
TemplateComponentsVersion=$(ComponentsPackageVersion);
2521
RepositoryCommit=$(SourceRevisionId);

‎src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/.template.config.src/template.json

-6
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,6 @@
7171
"type": "bind",
7272
"binding": "HostIdentifier"
7373
},
74-
"IncludeCustomRestoreSourcesSymbol": {
75-
"type": "parameter",
76-
"datatype": "bool",
77-
"description": "If set, includes restore sources for the Blazor MyGet feed.",
78-
"defaultValue": "${IncludeCustomRestoreSources}"
79-
},
8074
"TemplateBlazorVersionSymbol": {
8175
"type": "parameter",
8276
"datatype": "string",

‎src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/App.razor

+5-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
<Router AppAssembly="typeof(Program).Assembly" />
1+
<Router AppAssembly="typeof(Program).Assembly">
2+
<NotFoundContent>
3+
<p>Sorry, there's nothing at this address.</p>
4+
</NotFoundContent>
5+
</Router>

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

-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<OutputType>Exe</OutputType>
6-
<RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
7-
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
8-
https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
9-
</RestoreAdditionalProjectSources>
106
<LangVersion>7.3</LangVersion>
117
<RazorLangVersion>3.0</RazorLangVersion>
128
</PropertyGroup>

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

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.0</TargetFramework>
5-
<RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
6-
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
7-
https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
8-
</RestoreAdditionalProjectSources>
95
<LangVersion>7.3</LangVersion>
106
</PropertyGroup>
117

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
3333
app.UseBlazorDebugging();
3434
}
3535

36-
app.UseBlazorClientSideFiles<Client.Startup>();
36+
app.UseClientSideBlazorFiles<Client.Startup>();
3737

3838
app.UseRouting();
3939

‎src/Components/Blazor/Templates/src/content/BlazorLibrary-CSharp/.template.config.src/template.json

-6
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@
4343
"type": "bind",
4444
"binding": "HostIdentifier"
4545
},
46-
"IncludeCustomRestoreSourcesSymbol": {
47-
"type": "parameter",
48-
"datatype": "bool",
49-
"description": "If set, includes restore sources for the Blazor MyGet feed.",
50-
"defaultValue": "${IncludeCustomRestoreSources}"
51-
},
5246
"TemplateBlazorVersionSymbol": {
5347
"type": "parameter",
5448
"datatype": "string",

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

-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<IsPackable>true</IsPackable>
6-
<RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
7-
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
8-
https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
9-
</RestoreAdditionalProjectSources>
106
<LangVersion>7.3</LangVersion>
117
<RazorLangVersion>3.0</RazorLangVersion>
128
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>

‎src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/.template.config.src/template.json

-6
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@
4444
"type": "bind",
4545
"binding": "HostIdentifier"
4646
},
47-
"IncludeCustomRestoreSourcesSymbol": {
48-
"type": "parameter",
49-
"datatype": "bool",
50-
"description": "If set, includes restore sources for the Blazor MyGet feed.",
51-
"defaultValue": "${IncludeCustomRestoreSources}"
52-
},
5347
"TemplateBlazorVersionSymbol": {
5448
"type": "parameter",
5549
"datatype": "string",

‎src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/App.razor

+5-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
<Router AppAssembly="typeof(Program).Assembly" />
1+
<Router AppAssembly="typeof(Program).Assembly">
2+
<NotFoundContent>
3+
<p>Sorry, there's nothing at this address.</p>
4+
</NotFoundContent>
5+
</Router>

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

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
6-
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
7-
https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
8-
</RestoreAdditionalProjectSources>
95
<LangVersion>7.3</LangVersion>
106
<RazorLangVersion>3.0</RazorLangVersion>
117
</PropertyGroup>

‎src/Components/Blazor/Templates/src/content/Directory.Build.props

-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,4 @@
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>
95
</Project>

‎src/Components/Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.npmproj

+14-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,23 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<ProjectReference Include="..\..\SignalR\clients\ts\signalr-protocol-msgpack\signalr-protocol-msgpack.npmproj" />
10+
<WebpackInputs Include="src\**\*.ts" />
11+
<WebPackOutputs Include="dist\Debug\blazor.webassembly.js" />
12+
<WebPackOutputs Include="dist\Release\blazor.webassembly.js" />
13+
<WebPackOutputs Include="dist\Debug\blazor.server.js" />
14+
<WebPackOutputs Include="dist\Release\blazor.server.js" />
1115
</ItemGroup>
1216

1317
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
1418

15-
<Target Name="Restore" />
19+
<!-- Override the default 'Build' target from eng/targets/Npm.Common.targets. -->
20+
<Target Name="Build"
21+
Inputs="@(WebpackInputs)"
22+
Outputs="@(WebPackOutputs)">
23+
<RemoveDir Directories="dist" />
24+
25+
<Yarn Command="run build:debug" />
26+
<Yarn Command="run build:production" />
27+
</Target>
1628

1729
</Project>

‎src/Components/Browser.JS/dist/.gitattributes

-2
This file was deleted.

0 commit comments

Comments
 (0)