Merge branch 'release/3.1' => 'master' (#13527)

2019-09-19 15:33:55 -07:00 · 2019-09-19 15:33:55 -07:00 · 29ad3f2b8a
parent b759d3d7c3 5bf88699bf
commit 29ad3f2b8a
21 changed files with 52 additions and 345 deletions
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -313,10 +313,6 @@
      <Uri>https://github.com/dotnet/corefx</Uri>
      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
    </Dependency>
-    <Dependency Name="System.Data.SqlClient" Version="4.7.0-preview6.19264.9" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64" Pinned="true">
-      <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>a28176b5ec68b6da1472934fe9493790d1665cae</Sha>
-    </Dependency>
    <Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-alpha1.19462.7" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
      <Uri>https://github.com/dotnet/corefx</Uri>
      <Sha>be3d4bad4576eecda116d3e9a368cd6959ecf5ce</Sha>
@ -416,17 +412,17 @@
      <Uri>https://github.com/aspnet/Extensions</Uri>
      <Sha>d15c5687db29e4e1f31a302fe243226b0a3a17e3</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19411.1">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19425.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a11024c8c22cc762011addafc30c653c938048f4</Sha>
+      <Sha>2de3acc671fc624191672a45564f9ef130af5cd4</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19411.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19425.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a11024c8c22cc762011addafc30c653c938048f4</Sha>
+      <Sha>2de3acc671fc624191672a45564f9ef130af5cd4</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19411.1">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19425.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a11024c8c22cc762011addafc30c653c938048f4</Sha>
+      <Sha>2de3acc671fc624191672a45564f9ef130af5cd4</Sha>
    </Dependency>
    <Dependency Name="Microsoft.AspNetCore.Testing" Version="5.0.0-alpha1.19467.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
      <Uri>https://github.com/aspnet/Extensions</Uri>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -50,7 +50,7 @@
  -->
  <PropertyGroup Label="Automated">
    <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19411.1</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19425.1</MicrosoftDotNetGenAPIPackageVersion>
    <!-- Packages from dotnet/roslyn -->
    <MicrosoftNetCompilersToolsetPackageVersion>3.4.0-beta1-19456-03</MicrosoftNetCompilersToolsetPackageVersion>
    <!-- Packages from dotnet/core-setup -->
@ -64,7 +64,6 @@
    <MicrosoftWin32RegistryPackageVersion>5.0.0-alpha1.19462.7</MicrosoftWin32RegistryPackageVersion>
    <MicrosoftWin32SystemEventsPackageVersion>5.0.0-alpha1.19462.7</MicrosoftWin32SystemEventsPackageVersion>
    <SystemComponentModelAnnotationsPackageVersion>5.0.0-alpha1.19462.7</SystemComponentModelAnnotationsPackageVersion>
-    <SystemDataSqlClientPackageVersion>4.7.0-preview6.19264.9</SystemDataSqlClientPackageVersion>
    <SystemDiagnosticsEventLogPackageVersion>5.0.0-alpha1.19462.7</SystemDiagnosticsEventLogPackageVersion>
    <SystemDrawingCommonPackageVersion>5.0.0-alpha1.19462.7</SystemDrawingCommonPackageVersion>
    <SystemIOPipelinesPackageVersion>5.0.0-alpha1.19462.7</SystemIOPipelinesPackageVersion>
@ -223,7 +222,7 @@
    <CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
    <FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
    <GoogleProtobufPackageVersion>3.8.0</GoogleProtobufPackageVersion>
-    <GrpcAspNetCorePackageVersion>0.1.22-pre3</GrpcAspNetCorePackageVersion>
+    <GrpcAspNetCorePackageVersion>0.2.23-pre1</GrpcAspNetCorePackageVersion>
    <IdentityServer4AspNetIdentityPackageVersion>3.0.0-preview7.33</IdentityServer4AspNetIdentityPackageVersion>
    <IdentityServer4EntityFrameworkPackageVersion>3.0.0-preview7.33</IdentityServer4EntityFrameworkPackageVersion>
    <IdentityServer4PackageVersion>3.0.0-preview7.33</IdentityServer4PackageVersion>
@ -234,6 +233,7 @@
    <MonoCecilPackageVersion>0.10.1</MonoCecilPackageVersion>
    <NewtonsoftJsonBsonPackageVersion>1.0.2</NewtonsoftJsonBsonPackageVersion>
    <NewtonsoftJsonPackageVersion>12.0.1</NewtonsoftJsonPackageVersion>
+    <NSwagApiDescriptionClientPackageVersion>13.0.4</NSwagApiDescriptionClientPackageVersion>
    <SeleniumSupportPackageVersion>3.12.1</SeleniumSupportPackageVersion>
    <SeleniumWebDriverMicrosoftDriverPackageVersion>17.17134.0</SeleniumWebDriverMicrosoftDriverPackageVersion>
    <SeleniumWebDriverChromeDriverPackageVersion>2.43.0</SeleniumWebDriverChromeDriverPackageVersion>
--- a/eng/common/performance/perfhelixpublish.proj
+++ b/eng/common/performance/perfhelixpublish.proj
@ -83,8 +83,8 @@
  <ItemGroup Condition="$(TargetCsproj.Contains('MicroBenchmarks.csproj'))">
    <HelixWorkItem Include="@(Partition)">
      <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
-      <PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</PreCommands>
-      <Command>$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</Command>
+      <PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --artifacts $(BaselineArtifactsDirectory) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</PreCommands>
+      <Command>$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</Command>
      <PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults);$(FinalCommand)</PostCommands>
      <Timeout>4:00</Timeout>
    </HelixWorkItem>
@ -93,8 +93,8 @@
  <ItemGroup Condition="!$(TargetCsproj.Contains('MicroBenchmarks.csproj'))">
    <HelixWorkItem Include="$(BuildConfig).WorkItem">
      <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
-      <PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument)"</PreCommands>
-      <Command>$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)"</Command>
+      <PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --artifacts $(ArtifactsDirectory)"</PreCommands>
+      <Command>$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory)"</Command>
      <PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults)</PostCommands>
      <Timeout>4:00</Timeout>
    </HelixWorkItem>
--- a/eng/common/sdl/run-sdl.ps1
+++ b/eng/common/sdl/run-sdl.ps1
@ -32,16 +32,16 @@ foreach ($tool in $ToolsList) {
  Write-Host $tool
  # We have to manually configure tools that run on source to look at the source directory only
  if ($tool -eq "credscan") {
-    Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory < $TargetDirectory `" `" OutputType < pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})"
-    & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory < $TargetDirectory " "OutputType < pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})
+    Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" TargetDirectory : $TargetDirectory `" `" OutputType : pre `" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})"
+    & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " TargetDirectory : $TargetDirectory " "OutputType : pre" $(If ($CrScanAdditionalRunConfigParams) {$CrScanAdditionalRunConfigParams})
    if ($LASTEXITCODE -ne 0) {
      Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE."
      exit $LASTEXITCODE
    }
  }
  if ($tool -eq "policheck") {
-    Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target < $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})"
-    & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target < $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})
+    Write-Host "$GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args `" Target : $TargetDirectory `" $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})"
+    & $GuardianCliLocation configure --working-directory $WorkingDirectory --tool $tool --output-path $gdnConfigFile --logger-level $GuardianLoggerLevel --noninteractive --force --args " Target : $TargetDirectory " $(If ($PoliCheckAdditionalRunConfigParams) {$PoliCheckAdditionalRunConfigParams})
    if ($LASTEXITCODE -ne 0) {
      Write-Host "Guardian configure for $tool failed with exit code $LASTEXITCODE."
      exit $LASTEXITCODE
@ -56,4 +56,4 @@ Write-Host "$GuardianCliLocation run --working-directory $WorkingDirectory --bas
 if ($LASTEXITCODE -ne 0) {
  Write-Host "Guardian run for $ToolsList using $configParam failed with exit code $LASTEXITCODE."
  exit $LASTEXITCODE
-}
+}
--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@ -49,6 +49,6 @@ variables:

  # Default locations for Installers and checksums
  - name: ChecksumsBlobFeedUrl
-    value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json
-  - name: InstallersBlobFeedUrl
    value: https://dotnetcli.blob.core.windows.net/dotnet/index.json
+  - name: InstallersBlobFeedUrl
+    value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json
--- a/global.json
+++ b/global.json
@ -24,7 +24,7 @@
  },
  "msbuild-sdks": {
    "Yarn.MSBuild": "1.15.2",
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19411.1",
-    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19411.1"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19425.1",
+    "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19425.1"
  }
 }
--- a/src/Components/Web.JS/dist/Release/blazor.server.js
+++ b/src/Components/Web.JS/dist/Release/blazor.server.js
--- a/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.csproj
+++ b/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.csproj
@ -1,18 +0,0 @@
-<!-- This file is automatically generated. -->
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp5.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'">
-    <Compile Include="Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp.cs" />
-    <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions"  />
-    <Reference Include="Microsoft.AspNetCore.Testing"  />
-    <Reference Include="Microsoft.Extensions.FileProviders.Embedded"  />
-    <Reference Include="Microsoft.Extensions.Logging"  />
-    <Reference Include="Microsoft.Extensions.Logging.Console"  />
-    <Reference Include="Microsoft.Extensions.Logging.Testing"  />
-    <Reference Include="Microsoft.NETCore.Windows.ApiSets"  />
-    <Reference Include="Serilog.Extensions.Logging"  />
-    <Reference Include="Serilog.Sinks.File"  />
-  </ItemGroup>
-</Project>
--- a/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp.cs
+++ b/src/Hosting/Server.IntegrationTesting/ref/Microsoft.AspNetCore.Server.IntegrationTesting.netcoreapp.cs
@ -1,276 +0,0 @@
-// 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.Hosting
-{
-    public static partial class IWebHostExtensions
-    {
-        public static string GetAddress(this Microsoft.AspNetCore.Hosting.IWebHost host) { throw null; }
-    }
-}
-namespace Microsoft.AspNetCore.Server.IntegrationTesting
-{
-    public abstract partial class ApplicationDeployer : System.IDisposable
-    {
-        public static readonly string DotnetCommandName;
-        public ApplicationDeployer(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { }
-        protected Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters DeploymentParameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        protected Microsoft.Extensions.Logging.ILogger Logger { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        protected Microsoft.Extensions.Logging.ILoggerFactory LoggerFactory { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        protected void AddEnvironmentVariablesToProcess(System.Diagnostics.ProcessStartInfo startInfo, System.Collections.Generic.IDictionary<string, string> environmentVariables) { }
-        protected void CleanPublishedOutput() { }
-        public abstract System.Threading.Tasks.Task<Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentResult> DeployAsync();
-        public abstract void Dispose();
-        protected void DotnetPublish(string publishRoot = null) { }
-        protected string GetDotNetExeForArchitecture() { throw null; }
-        protected void InvokeUserApplicationCleanup() { }
-        protected void ShutDownIfAnyHostProcess(System.Diagnostics.Process hostProcess) { }
-        protected void StartTimer() { }
-        protected void StopTimer() { }
-        protected void TriggerHostShutdown(System.Threading.CancellationTokenSource hostShutdownSource) { }
-    }
-    public partial class ApplicationDeployerFactory
-    {
-        public ApplicationDeployerFactory() { }
-        public static Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationDeployer Create(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { throw null; }
-    }
-    public partial class ApplicationPublisher
-    {
-        public static readonly string DotnetCommandName;
-        public ApplicationPublisher(string applicationPath) { }
-        public string ApplicationPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        protected static System.IO.DirectoryInfo CreateTempDirectory() { throw null; }
-        public virtual System.Threading.Tasks.Task<Microsoft.AspNetCore.Server.IntegrationTesting.PublishedApplication> Publish(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILogger logger) { throw null; }
-    }
-    public enum ApplicationType
-    {
-        Portable = 0,
-        Standalone = 1,
-    }
-    public partial class CachingApplicationPublisher : Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationPublisher, System.IDisposable
-    {
-        public CachingApplicationPublisher(string applicationPath) : base (default(string)) { }
-        public static void CopyFiles(System.IO.DirectoryInfo source, System.IO.DirectoryInfo target, Microsoft.Extensions.Logging.ILogger logger) { }
-        public void Dispose() { }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        public override System.Threading.Tasks.Task<Microsoft.AspNetCore.Server.IntegrationTesting.PublishedApplication> Publish(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILogger logger) { throw null; }
-    }
-    public partial class DeploymentParameters
-    {
-        public DeploymentParameters() { }
-        public DeploymentParameters(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters parameters) { }
-        public DeploymentParameters(Microsoft.AspNetCore.Server.IntegrationTesting.TestVariant variant) { }
-        public DeploymentParameters(string applicationPath, Microsoft.AspNetCore.Server.IntegrationTesting.ServerType serverType, Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeFlavor runtimeFlavor, Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture runtimeArchitecture) { }
-        public string AdditionalPublishParameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string ApplicationBaseUriHint { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string ApplicationName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string ApplicationPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationPublisher ApplicationPublisher { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationType ApplicationType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Configuration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string EnvironmentName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public System.Collections.Generic.IDictionary<string, string> EnvironmentVariables { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.HostingModel HostingModel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool PreservePublishedApplicationForDebugging { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool PublishApplicationBeforeDeployment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string PublishedApplicationRootPath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public System.Collections.Generic.IDictionary<string, string> PublishEnvironmentVariables { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture RuntimeArchitecture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeFlavor RuntimeFlavor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Scheme { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string ServerConfigLocation { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string ServerConfigTemplateContent { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.ServerType ServerType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string SiteName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool StatusMessagesEnabled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string TargetFramework { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public System.Action<Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters> UserAdditionalCleanup { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public override string ToString() { throw null; }
-    }
-    public partial class DeploymentResult
-    {
-        public DeploymentResult(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, string applicationBaseUri) { }
-        public DeploymentResult(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, string applicationBaseUri, string contentRoot, System.Threading.CancellationToken hostShutdownToken) { }
-        public string ApplicationBaseUri { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string ContentRoot { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters DeploymentParameters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public System.Threading.CancellationToken HostShutdownToken { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public System.Net.Http.HttpClient HttpClient { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public System.Net.Http.HttpClient CreateHttpClient(System.Net.Http.HttpMessageHandler baseHandler) { throw null; }
-    }
-    public static partial class DotNetCommands
-    {
-        public static string GetDotNetExecutable(Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture arch) { throw null; }
-        public static string GetDotNetHome() { throw null; }
-        public static string GetDotNetInstallDir(Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture arch) { throw null; }
-        public static bool IsRunningX86OnX64(Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture arch) { throw null; }
-    }
-    public enum HostingModel
-    {
-        InProcess = 2,
-        None = 0,
-        OutOfProcess = 1,
-    }
-    public partial class IISExpressAncmSchema
-    {
-        public IISExpressAncmSchema() { }
-        public static string SkipReason { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public static bool SupportsInProcessHosting { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
-    public partial class NginxDeployer : Microsoft.AspNetCore.Server.IntegrationTesting.SelfHostDeployer
-    {
-        public NginxDeployer(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) : base (default(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters), default(Microsoft.Extensions.Logging.ILoggerFactory)) { }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        public override System.Threading.Tasks.Task<Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentResult> DeployAsync() { throw null; }
-        public override void Dispose() { }
-    }
-    public partial class PublishedApplication : System.IDisposable
-    {
-        public PublishedApplication(string path, Microsoft.Extensions.Logging.ILogger logger) { }
-        public string Path { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public void Dispose() { }
-    }
-    public partial class RemoteWindowsDeployer : Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationDeployer
-    {
-        public RemoteWindowsDeployer(Microsoft.AspNetCore.Server.IntegrationTesting.RemoteWindowsDeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) : base (default(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters), default(Microsoft.Extensions.Logging.ILoggerFactory)) { }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        public override System.Threading.Tasks.Task<Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentResult> DeployAsync() { throw null; }
-        public override void Dispose() { }
-    }
-    public partial class RemoteWindowsDeploymentParameters : Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters
-    {
-        public RemoteWindowsDeploymentParameters(string applicationPath, string dotnetRuntimePath, Microsoft.AspNetCore.Server.IntegrationTesting.ServerType serverType, Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeFlavor runtimeFlavor, Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture runtimeArchitecture, string remoteServerFileSharePath, string remoteServerName, string remoteServerAccountName, string remoteServerAccountPassword) { }
-        public string DotnetRuntimePath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string RemoteServerFileSharePath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string ServerAccountName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string ServerAccountPassword { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        public string ServerName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-    }
-    public partial class RetryHelper
-    {
-        public RetryHelper() { }
-        public static void RetryOperation(System.Action retryBlock, System.Action<System.Exception> exceptionBlock, int retryCount = 3, int retryDelayMilliseconds = 0) { }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        public static System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage> RetryRequest(System.Func<System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage>> retryBlock, Microsoft.Extensions.Logging.ILogger logger, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken), int retryCount = 60) { throw null; }
-    }
-    public enum RuntimeArchitecture
-    {
-        x64 = 0,
-        x86 = 1,
-    }
-    public enum RuntimeFlavor
-    {
-        Clr = 2,
-        CoreClr = 1,
-        None = 0,
-    }
-    public partial class SelfHostDeployer : Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationDeployer
-    {
-        public SelfHostDeployer(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters deploymentParameters, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) : base (default(Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentParameters), default(Microsoft.Extensions.Logging.ILoggerFactory)) { }
-        public System.Diagnostics.Process HostProcess { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        public override System.Threading.Tasks.Task<Microsoft.AspNetCore.Server.IntegrationTesting.DeploymentResult> DeployAsync() { throw null; }
-        public override void Dispose() { }
-        [System.Diagnostics.DebuggerStepThroughAttribute]
-        protected System.Threading.Tasks.Task<System.ValueTuple<System.Uri, System.Threading.CancellationToken>> StartSelfHostAsync(System.Uri hintUrl) { throw null; }
-    }
-    public enum ServerType
-    {
-        HttpSys = 3,
-        IIS = 2,
-        IISExpress = 1,
-        Kestrel = 4,
-        Nginx = 5,
-        None = 0,
-    }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=true)]
-    public partial class SkipIfEnvironmentVariableNotEnabledAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
-    {
-        public SkipIfEnvironmentVariableNotEnabledAttribute(string environmentVariableName) { }
-        public string AdditionalInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public bool IsMet { get { throw null; } }
-        public string SkipReason { get { throw null; } }
-    }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Assembly | System.AttributeTargets.Class | System.AttributeTargets.Method)]
-    public sealed partial class SkipIfIISExpressSchemaMissingInProcessAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
-    {
-        public SkipIfIISExpressSchemaMissingInProcessAttribute() { }
-        public bool IsMet { get { throw null; } }
-        public string SkipReason { get { throw null; } }
-    }
-    [System.AttributeUsageAttribute(System.AttributeTargets.Method, AllowMultiple=false)]
-    public partial class SkipOn32BitOSAttribute : System.Attribute, Microsoft.AspNetCore.Testing.ITestCondition
-    {
-        public SkipOn32BitOSAttribute() { }
-        public bool IsMet { get { throw null; } }
-        public string SkipReason { get { throw null; } }
-    }
-    public partial class TestMatrix : System.Collections.Generic.IEnumerable<object[]>, System.Collections.IEnumerable
-    {
-        public TestMatrix() { }
-        public System.Collections.Generic.IList<Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationType> ApplicationTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public System.Collections.Generic.IList<Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture> Architectures { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public System.Collections.Generic.IList<Microsoft.AspNetCore.Server.IntegrationTesting.HostingModel> HostingModels { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public System.Collections.Generic.IList<Microsoft.AspNetCore.Server.IntegrationTesting.ServerType> Servers { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public System.Collections.Generic.IList<string> Tfms { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public static Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix ForServers(params Microsoft.AspNetCore.Server.IntegrationTesting.ServerType[] types) { throw null; }
-        public System.Collections.Generic.IEnumerator<object[]> GetEnumerator() { throw null; }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix Skip(string message, System.Func<Microsoft.AspNetCore.Server.IntegrationTesting.TestVariant, bool> check) { throw null; }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithAllApplicationTypes() { throw null; }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithAllArchitectures() { throw null; }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithAllHostingModels() { throw null; }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithAncmV2InProcess() { throw null; }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithApplicationTypes(params Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationType[] types) { throw null; }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithArchitectures(params Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture[] archs) { throw null; }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithHostingModels(params Microsoft.AspNetCore.Server.IntegrationTesting.HostingModel[] models) { throw null; }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.TestMatrix WithTfms(params string[] tfms) { throw null; }
-    }
-    public partial class TestVariant : Xunit.Abstractions.IXunitSerializable
-    {
-        public TestVariant() { }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.ApplicationType ApplicationType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.RuntimeArchitecture Architecture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.HostingModel HostingModel { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public Microsoft.AspNetCore.Server.IntegrationTesting.ServerType Server { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Skip { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public string Tfm { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
-        public void Deserialize(Xunit.Abstractions.IXunitSerializationInfo info) { }
-        public void Serialize(Xunit.Abstractions.IXunitSerializationInfo info) { }
-        public override string ToString() { throw null; }
-    }
-    public static partial class Tfm
-    {
-        public const string Net461 = "net461";
-        public const string NetCoreApp20 = "netcoreapp2.0";
-        public const string NetCoreApp21 = "netcoreapp2.1";
-        public const string NetCoreApp22 = "netcoreapp2.2";
-        public const string NetCoreApp30 = "netcoreapp3.0";
-        public const string NetCoreApp50 = "netcoreapp5.0";
-        public static bool Matches(string tfm1, string tfm2) { throw null; }
-    }
-}
-namespace Microsoft.AspNetCore.Server.IntegrationTesting.Common
-{
-    public static partial class TestPortHelper
-    {
-        public static int GetNextPort() { throw null; }
-        public static int GetNextSSLPort() { throw null; }
-    }
-    public static partial class TestUriHelper
-    {
-        public static System.Uri BuildTestUri(Microsoft.AspNetCore.Server.IntegrationTesting.ServerType serverType) { throw null; }
-        public static System.Uri BuildTestUri(Microsoft.AspNetCore.Server.IntegrationTesting.ServerType serverType, string hint) { throw null; }
-    }
-    public static partial class TestUrlHelper
-    {
-        public static string GetTestUrl(Microsoft.AspNetCore.Server.IntegrationTesting.ServerType serverType) { throw null; }
-    }
-}
-namespace System.Diagnostics
-{
-    public static partial class ProcessLoggingExtensions
-    {
-        public static void StartAndCaptureOutAndErrToLogger(this System.Diagnostics.Process process, string prefix, Microsoft.Extensions.Logging.ILogger logger) { }
-    }
-}
--- a/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
+++ b/src/Identity/EntityFrameworkCore/ref/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
@ -1,9 +1,14 @@
 <!-- This file is automatically generated. -->
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
  </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+    <Compile Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore.netstandard2.1.cs" />
+    <Reference Include="Microsoft.Extensions.Identity.Stores"  />
+    <Reference Include="Microsoft.EntityFrameworkCore.Relational"  />
+  </ItemGroup>
+<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
    <Compile Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore.netcoreapp.cs" />
    <Reference Include="Microsoft.Extensions.Identity.Stores"  />
    <Reference Include="Microsoft.EntityFrameworkCore.Relational"  />
--- a/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
+++ b/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <Description>ASP.NET Core Identity provider that uses Entity Framework Core.</Description>
-    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <TargetFrameworks>netstandard2.1;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
    <PackageTags>aspnetcore;entityframeworkcore;identity;membership</PackageTags>
    <IsShippingPackage>true</IsShippingPackage>
--- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
+++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
@ -53,7 +53,7 @@
  <ItemGroup>
    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
      <_Parameter1>DotNetEfFullPath</_Parameter1>
-      <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp5.0/any/dotnet-ef.dll</_Parameter2>
+      <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/$(DefaultNetCoreTargetFramework)/any/dotnet-ef.dll</_Parameter2>
    </AssemblyAttribute>
    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
      <_Parameter1>TestPackageRestorePath</_Parameter1>
--- a/src/Tools/GetDocumentInsider/src/GetDocumentInsider.csproj
+++ b/src/Tools/GetDocumentInsider/src/GetDocumentInsider.csproj
@ -7,7 +7,7 @@
    <OutputType>Exe</OutputType>
    <RootNamespace>Microsoft.Extensions.ApiDescription.Tool</RootNamespace>
    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
-    <VersionPrefix>$(ExperimentalVersionPrefix)</VersionPrefix>
+    <IsShippingPackage>false</IsShippingPackage>
  </PropertyGroup>

  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
--- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddFileTests.cs
@ -134,7 +134,7 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
            Assert.Single(openApiRefs);
        }

-        [Fact]
+        [Fact (Skip = "https://github.com/aspnet/AspNetCore/pull/13571/#issuecomment-531466801")]
        public async Task OpenApi_Add_NSwagTypeScript()
        {
            var project = CreateBasicProject(withOpenApi: true);
@ -168,7 +168,7 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
            Assert.False(runProc.HasExited, $"Run failed with: {runProc.Output}");
        }

-        [Fact]
+        [Fact (Skip = "https://github.com/aspnet/AspNetCore/pull/13571/#issuecomment-531466801")]
        public async Task OpenApi_Add_FromJson()
        {
            var project = CreateBasicProject(withOpenApi: true);
--- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddProjectTests.cs
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddProjectTests.cs
@ -25,13 +25,13 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
            {
                var project1 = refProj1.WithCSharpProject("refProj");
                project1
-                    .WithTargetFrameworks("netcoreapp3.0")
+                    .WithTargetFrameworks(TestTFM)
                    .Dir()
                    .Create();

                var project2 = refProj2.WithCSharpProject("refProj2");
                project2
-                    .WithTargetFrameworks("netcoreapp3.0")
+                    .WithTargetFrameworks(TestTFM)
                    .Dir()
                    .Create();

@ -64,7 +64,7 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
                var refProjName = "refProj";
                var csproj = refProj.WithCSharpProject(refProjName);
                csproj
-                    .WithTargetFrameworks("netcoreapp3.0")
+                    .WithTargetFrameworks(TestTFM)
                    .Dir()
                    .Create();

@ -98,7 +98,7 @@ namespace Microsoft.DotNet.OpenApi.Add.Tests
                var refProjName = "refProj";
                refProj
                    .WithCSharpProject(refProjName)
-                    .WithTargetFrameworks("netcoreapp3.0")
+                    .WithTargetFrameworks(TestTFM)
                    .Dir()
                    .Create();

--- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiRemoveTests.cs
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiRemoveTests.cs
@ -20,7 +20,7 @@ namespace Microsoft.DotNet.OpenApi.Remove.Tests
            var nswagJsonFile = "openapi.json";
            _tempDir
                .WithCSharpProject("testproj")
-                .WithTargetFrameworks("netcoreapp3.0")
+                .WithTargetFrameworks(TestTFM)
                .Dir()
                .WithContentFile(nswagJsonFile)
                .WithContentFile("Startup.cs")
@ -66,7 +66,7 @@ namespace Microsoft.DotNet.OpenApi.Remove.Tests
        {
            _tempDir
                .WithCSharpProject("testproj")
-                .WithTargetFrameworks("netcoreapp3.0")
+                .WithTargetFrameworks(TestTFM)
                .Dir()
                .WithContentFile("Startup.cs")
                .Create();
@ -108,7 +108,7 @@ namespace Microsoft.DotNet.OpenApi.Remove.Tests
        {
            _tempDir
               .WithCSharpProject("testproj")
-               .WithTargetFrameworks("netcoreapp3.0")
+               .WithTargetFrameworks(TestTFM)
               .Dir()
               .WithContentFile("Startup.cs")
               .Create();
@ -117,7 +117,7 @@ namespace Microsoft.DotNet.OpenApi.Remove.Tests
            var refProjName = "refProj";
            refProj
                .WithCSharpProject(refProjName)
-                .WithTargetFrameworks("netcoreapp3.0")
+                .WithTargetFrameworks(TestTFM)
                .Dir()
                .Create();

@ -160,7 +160,7 @@ namespace Microsoft.DotNet.OpenApi.Remove.Tests
            var swagFile2 = "swag2.json";
            _tempDir
                .WithCSharpProject("testproj")
-                .WithTargetFrameworks("netcoreapp3.0")
+                .WithTargetFrameworks(TestTFM)
                .Dir()
                .WithContentFile(nswagJsonFile)
                .WithFile(swagFile2)
--- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs
+++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs
@ -21,6 +21,7 @@ namespace Microsoft.DotNet.OpenApi.Tests
        protected readonly TextWriter _output = new StringWriter();
        protected readonly TextWriter _error = new StringWriter();
        protected readonly ITestOutputHelper _outputHelper;
+        protected const string TestTFM = "netcoreapp5.0";

        protected const string Content = @"{""x-generator"": ""NSwag""}";
        protected const string ActualUrl = "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/examples/v3.0/api-with-examples.yaml";
@ -61,7 +62,7 @@ namespace Microsoft.DotNet.OpenApi.Tests
            var nswagJsonFile = "openapi.json";
            var project = _tempDir
                .WithCSharpProject("testproj", sdk: "Microsoft.NET.Sdk.Web")
-                .WithTargetFrameworks("netcoreapp3.0");
+                .WithTargetFrameworks(TestTFM);
            var tmp = project.Dir();

            if (withOpenApi)
--- a/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
+++ b/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
@ -8,7 +8,7 @@
    <RootNamespace>Microsoft.Extensions.ApiDescription.Tool</RootNamespace>
    <TargetFramework>netcoreapp2.1</TargetFramework>
    <UseAppHost>false</UseAppHost>
-    <VersionPrefix>$(ExperimentalVersionPrefix)</VersionPrefix>
+    <IsShippingPackage>false</IsShippingPackage>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Tools/dotnet-user-secrets/src/Internal/InitCommand.cs
+++ b/src/Tools/dotnet-user-secrets/src/Internal/InitCommand.cs
@ -91,7 +91,7 @@ namespace Microsoft.Extensions.SecretManager.Tools.Internal
            var existingUserSecretsId = projectDocument.XPathSelectElements("//UserSecretsId").FirstOrDefault();

            // Check if a UserSecretsId is already set
-            if (existingUserSecretsId != null)
+            if (existingUserSecretsId is object)
            {
                // Only set the UserSecretsId if the user specified an explicit value
                if (string.IsNullOrWhiteSpace(OverrideId))
--- a/src/Tools/dotnet-watch/src/Internal/ProcessRunner.cs
+++ b/src/Tools/dotnet-watch/src/Internal/ProcessRunner.cs
@ -120,7 +120,7 @@ namespace Microsoft.DotNet.Watcher.Internal
                        // this code used Process.Exited, which could result in us missing some output due to the ordering of
                        // events.
                        //
-                        // See the remarks here: https://docs.microsoft.com/dotnet/api/system.diagnostics.process.waitforexit?view=netcore-2.2#System_Diagnostics_Process_WaitForExit_System_Int32_
+                        // See the remarks here: https://docs.microsoft.com/en-us/dotnet/api/system.diagnostics.process.waitforexit#System_Diagnostics_Process_WaitForExit_System_Int32_
                        if (!_process.WaitForExit(Int32.MaxValue))
                        {
                            throw new TimeoutException();
--- a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj
+++ b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj
@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <!-- This needs to be hard-coded, since these test projects choose not to import Directory.Build.Props from the root of the repo -->
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
    <AssemblyName>Microsoft.DotNet.Watcher.Tools.Tests</AssemblyName>
    <DefaultItemExcludes>$(DefaultItemExcludes);TestProjects\**\*</DefaultItemExcludes>
    <TestGroupName>DotNetWatcherToolsTests</TestGroupName>