merge (#3)

merge 

Co-authored-by: Kahbazi <[email protected]>
Co-authored-by: Pranav K <[email protected]>
Co-authored-by: null <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Doug Bunting <[email protected]>
Co-authored-by: Justin Kotalik <[email protected]>
Co-authored-by: David Fowler <[email protected]>
Co-authored-by: Jeow Li Huan <[email protected]>
Co-authored-by: Andrew Stanton-Nurse <[email protected]>
Co-authored-by: Steve Sanderson <[email protected]>
Co-authored-by: Nate McMaster <[email protected]>
Co-authored-by: Smit Patel <[email protected]>

Author: 12 people

eng/ProjectReferences.props

@@ -8,7 +8,10 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.Specification.Tests" ProjectPath="$(RepoRoot)src\Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.Web.Xdt.Extensions" ProjectPath="$(RepoRoot)src\SiteExtensions\Microsoft.Web.Xdt.Extensions\src\Microsoft.Web.Xdt.Extensions.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" ProjectPath="$(RepoRoot)src\Tools\FirstRunCertGenerator\src\Microsoft.AspNetCore.DeveloperCertificates.XPlat.csproj"  />
+    <ProjectReferenceProvider Include="dotnet-getdocument" ProjectPath="$(RepoRoot)src\Mvc\dotnet-getdocument\src\dotnet-getdocument.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Client" ProjectPath="$(RepoRoot)src\Mvc\Extensions.ApiDescription.Client\src\Microsoft.Extensions.ApiDescription.Client.csproj"  />
+    <ProjectReferenceProvider Include="Microsoft.Extensions.ApiDescription.Server" ProjectPath="$(RepoRoot)src\Mvc\Extensions.ApiDescription.Server\src\Microsoft.Extensions.ApiDescription.Server.csproj"  />
+    <ProjectReferenceProvider Include="GetDocument.Insider" ProjectPath="$(RepoRoot)src\Mvc\GetDocumentInsider\src\GetDocumentInsider.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Specification.Tests" ProjectPath="$(RepoRoot)src\SignalR\server\Specification.Tests\src\Microsoft.AspNetCore.SignalR.Specification.Tests.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Build" ProjectPath="$(RepoRoot)src\Components\Blazor\Build\src\Microsoft.AspNetCore.Blazor.Build.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />

eng/Version.Details.xml

@@ -53,21 +53,6 @@
 
     <Copy SourceFiles="$(PackageJson)" DestinationFiles="$(_BackupPackageJson)" />
 
-    <ReadLinesFromFile File="$(PackageJson)" Condition="@(ReplacePackageContent->Count()) != 0 AND $([MSBuild]::IsOSPlatform('Windows'))">
-      <Output TaskParameter="Lines" ItemName="PackageJsonContent" />
-    </ReadLinesFromFile>
-
-    <PropertyGroup Condition="@(PackageJsonContent->Count()) > 0">
-      <_PackageJsonContent>@(PackageJsonContent->'%(Identity)', '%0a')</_PackageJsonContent>
-      <_PackageJsonContent>$(_PackageJsonContent.Replace('%(ReplacePackageContent.Identity)', '%(ReplacePackageContent.ReplaceWith)'))</_PackageJsonContent>
-    </PropertyGroup>
-
-    <WriteLinesToFile
-      File="$(PackageJson)"
-      Lines="$(_PackageJsonContent)"
-      Condition="@(ReplacePackageContent->Count()) != 0 AND $([MSBuild]::IsOSPlatform('Windows'))"
-      Overwrite="true" />
-
     <Yarn Command="version --no-git-tag-version --new-version $(PackageVersion)" />
     <Yarn Command="pack --filename $(PackageFileName)" />
 

eng/Versions.props

@@ -11,15 +11,11 @@
 
   <Target Name="SetTemplateJsonSymbolReplacements">
     <PropertyGroup>
-      <IncludeCustomRestoreSourcesValue>true</IncludeCustomRestoreSourcesValue>
-      <IncludeCustomRestoreSourcesValue Condition=" '$(IsFinalBuild)' == 'true' AND ('$(PreReleaseLabel)' == 'servicing' OR '$(PreReleaseLabel)' == 'rtm')">false</IncludeCustomRestoreSourcesValue>
-
       <!--
         Properties here will be injected into the template config *.json files
         during the build, replacing tokens of the form ${PropertyName}
       -->
       <GeneratedContentProperties>
-        IncludeCustomRestoreSources=$(IncludeCustomRestoreSourcesValue);
         TemplateBlazorVersion=$(PackageVersion);
         TemplateComponentsVersion=$(ComponentsPackageVersion);
         RepositoryCommit=$(SourceRevisionId);

eng/targets/Npm.Common.targets

@@ -71,12 +71,6 @@
       "type": "bind",
       "binding": "HostIdentifier"
     },
-    "IncludeCustomRestoreSourcesSymbol": {
-      "type": "parameter",
-      "datatype": "bool",
-      "description": "If set, includes restore sources for the Blazor MyGet feed.",
-      "defaultValue": "${IncludeCustomRestoreSources}"
-    },
     "TemplateBlazorVersionSymbol": {
       "type": "parameter",
       "datatype": "string",

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

@@ -1 +1,5 @@
-<Router AppAssembly="typeof(Program).Assembly" />
+<Router AppAssembly="typeof(Program).Assembly">
+    <NotFoundContent>
+        <p>Sorry, there's nothing at this address.</p>
+    </NotFoundContent>
+</Router>

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

@@ -3,10 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
-      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-      https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
-    </RestoreAdditionalProjectSources>
     <LangVersion>7.3</LangVersion>
     <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>

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

@@ -2,10 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
-      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
-      https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
-    </RestoreAdditionalProjectSources>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 

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

@@ -33,7 +33,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseBlazorDebugging();
             }
 
-            app.UseBlazorClientSideFiles<Client.Startup>();
+            app.UseClientSideBlazorFiles<Client.Startup>();
 
             app.UseRouting();