Cleanup and revert some unneeded fixes

Author: John Luo

.azure/pipelines/jobs/default-build.yml

@@ -58,7 +58,7 @@ parameters:
   installTar: true
   installNodeJs: true
   installJdk: true
-  timeoutInMinutes: 300
+  timeoutInMinutes: 180
 
   # We need longer than the default amount of 5 minutes to upload our logs/artifacts. (We currently take around 5 mins in the best case).
   # This makes sure we have time to upload everything in the case of a build timeout - really important for investigating a build

eng/targets/ReferenceAssembly.targets

@@ -63,7 +63,7 @@
     <PropertyGroup>
       <_GenAPICommand Condition="'$(MSBuildRuntimeType)' == 'core'">"$(DotNetTool)" --roll-forward-on-no-candidate-fx 2 "$(_GenAPIPath)"</_GenAPICommand>
       <_GenAPICmd>$(_GenAPICommand)</_GenAPICmd>
-      <_GenAPICmd>$(_GenAPICmd) "$(TargetPath)" $(AdditionalGenApiCmdOptions)</_GenAPICmd>
+      <_GenAPICmd>$(_GenAPICmd) "$(TargetPath)"</_GenAPICmd>
       <_GenAPICmd>$(_GenAPICmd) --lib-path "@(_ReferencePathDirectories)"</_GenAPICmd>
       <_GenAPICmd>$(_GenAPICmd) --out "$(_RefSourceFileOutputPath)"</_GenAPICmd>
       <_GenAPICmd>$(_GenAPICmd) --header-file "$(RepoRoot)/eng/LicenseHeader.txt"</_GenAPICmd>

eng/targets/ResolveReferences.targets

@@ -160,7 +160,7 @@
     </ItemGroup>
 
     <!-- Substitute references to Extensions packages with with ref assemblies -->
-    <ItemGroup Condition="'$(ReferenceReferenceAssemblies)' == 'true' AND '$(TargetFramework)' == 'netcoreapp3.0' AND '$(DisableExtensionsRefAssembliesSwap)' != 'true' ">
+    <ItemGroup Condition="'$(ReferenceReferenceAssemblies)' == 'true' AND '$(TargetFramework)' == 'netcoreapp3.0' ">
       <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Abstractions" />
       <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.Memory" />
       <_ExtensionInternalRefAssemblies Include="Microsoft.Extensions.Caching.SqlServer" />

src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj

@@ -18,9 +18,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <PackageType>DotnetPlatform</PackageType>
     <RefAssemblyPackagePath>ref/$(TargetFramework)/</RefAssemblyPackagePath>
 
-    <!-- Do not substitute references to Extensions ref assemblies -->
-    <DisableExtensionsRefAssembliesSwap>true</DisableExtensionsRefAssembliesSwap>
-
     <!-- There are no symbols for reference assemblies. -->
     <IncludeSymbols>false</IncludeSymbols>
 
@@ -40,7 +37,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <!-- Reference implementation assemblies in addition to ref assemblies to get xml docs -->
     <ReferenceImplementationAssemblies>true</ReferenceImplementationAssemblies>
     <!-- We are ignoring MSB3243 warnings since implemenation and reference assemblies are versioned differently. We need both to compose the targeting pack with reference assemblies and xml docs. -->
-    <MSBuildWarningsAsMessages>MSB3243</MSBuildWarningsAsMessages >
+    <MSBuildWarningsAsMessages>MSB3243</MSBuildWarningsAsMessages>
+    <!-- We are ignoring NU5131 and NU5128 warnings since the dependency group should be kept empty. -->
+    <NoWarn>$(NoWarn);NU5131;NU5128</NoWarn>
 
     <!-- Platform manifest data -->
     <FrameworkListFileName>FrameworkList.xml</FrameworkListFileName>

src/ProjectTemplates/test/Infrastructure/Directory.Build.props.in

@@ -1,5 +1,3 @@
 <Project>
 <!-- This file gets copied above the template test projects so that we disconnect the templates from the rest of the repository -->
-
-  <Import Project="${IndirectReferences}" />
 </Project>

src/ProjectTemplates/test/ProjectTemplates.Tests.csproj

@@ -128,7 +128,7 @@
 
     <GenerateFileFromTemplate
       TemplateFile="$(MSBuildThisFileDirectory)Infrastructure\Directory.Build.props.in"
-      Properties="IndirectReferences=$(RepoRoot)eng\IndirectReferences.props"
+      Properties=""
       OutputPath="$(TestTemplateCreationFolder)Directory.Build.props" />
 
     <!-- Workaround https://github.com/dotnet/core-setup/issues/6420 - there is no MSBuild setting for rollforward yet -->