diff --git a/src/NuGet.Clients/NuGet.CommandLine/Common/CommandLineResponseFile.cs b/src/NuGet.Clients/NuGet.CommandLine/Common/CommandLineResponseFile.cs
index a13bd67c15c..d0b02ac85fc 100644
--- a/src/NuGet.Clients/NuGet.CommandLine/Common/CommandLineResponseFile.cs
+++ b/src/NuGet.Clients/NuGet.CommandLine/Common/CommandLineResponseFile.cs
@@ -126,13 +126,13 @@ private static string[] SplitArgs(string unsplitArguments)
         {
             if (string.IsNullOrWhiteSpace(unsplitArguments))
             {
-                return new string[0];
+                return Array.Empty<string>();
             }
 
             var ptrToSplitArgs = CommandLineToArgvW(unsplitArguments, out int numberOfArgs);
             if (ptrToSplitArgs == IntPtr.Zero)
             {
-                return new string[0];
+                return Array.Empty<string>();
             }
 
             try
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/LegacyPackageReferenceProject.cs b/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/LegacyPackageReferenceProject.cs
index 30a3aed64b1..705b88eb1e6 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/LegacyPackageReferenceProject.cs
+++ b/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/LegacyPackageReferenceProject.cs
@@ -79,7 +79,7 @@ public override async Task<string> GetAssetsFilePathAsync()
         public override async Task<string> GetCacheFilePathAsync()
         {
             await _threadingService.JoinableTaskFactory.SwitchToMainThreadAsync();
-            return NoOpRestoreUtilities.GetProjectCacheFilePath(cacheRoot: GetBaseIntermediatePath(), projectPath: _projectFullPath);
+            return NoOpRestoreUtilities.GetProjectCacheFilePath(cacheRoot: GetMSBuildProjectExtensionsPath(), projectPath: _projectFullPath);
         }
 
         public override async Task<string> GetAssetsFilePathOrNullAsync()
@@ -91,14 +91,23 @@ private async Task<string> GetAssetsFilePathAsync(bool shouldThrow)
         {
             await _threadingService.JoinableTaskFactory.SwitchToMainThreadAsync();
 
-            var baseIntermediatePath = GetBaseIntermediatePath(shouldThrow);
+            var msbuildProjectExtensionsPath = GetMSBuildProjectExtensionsPath(shouldThrow);
 
-            if (baseIntermediatePath == null)
+            if (msbuildProjectExtensionsPath == null)
             {
                 return null;
             }
 
-            return Path.Combine(baseIntermediatePath, LockFileFormat.AssetsFileName);
+            return Path.Combine(msbuildProjectExtensionsPath, LockFileFormat.AssetsFileName);
+        }
+
+        private async Task<string> GetAssetsCacheFolderAsync(bool shouldThrow)
+        {
+            await _threadingService.JoinableTaskFactory.SwitchToMainThreadAsync();
+
+            var msbuildProjectExtensionsPath = GetMSBuildProjectExtensionsPath(shouldThrow);
+
+            return msbuildProjectExtensionsPath;
         }
 
         #endregion BuildIntegratedNuGetProject
@@ -164,25 +173,26 @@ public override async Task<bool> UninstallPackageAsync(
 
         #endregion
 
-        private string GetBaseIntermediatePath(bool shouldThrow = true)
+        private string GetMSBuildProjectExtensionsPath(bool shouldThrow = true)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
-            var baseIntermediatePath = _vsProjectAdapter.BaseIntermediateOutputPath;
+            var msbuildProjectExtensionsPath = _vsProjectAdapter.MSBuildProjectExtensionsPath;
 
-            if (string.IsNullOrEmpty(baseIntermediatePath))
+            if (string.IsNullOrEmpty(msbuildProjectExtensionsPath))
             {
                 if (shouldThrow)
                 {
                     throw new InvalidDataException(string.Format(
-                        Strings.BaseIntermediateOutputPathNotFound,
+                        Strings.MSBuildPropertyNotFound,
+                        ProjectBuildProperties.MSBuildProjectExtensionsPath,
                         _vsProjectAdapter.ProjectDirectory));
                 }
 
                 return null;
             }
 
-            return baseIntermediatePath;
+            return msbuildProjectExtensionsPath;
         }
 
         private string GetPackagesPath(ISettings settings)
@@ -337,7 +347,7 @@ private async Task<PackageSpec> GetPackageSpecAsync(ISettings settings)
                 RestoreMetadata = new ProjectRestoreMetadata
                 {
                     ProjectStyle = ProjectStyle.PackageReference,
-                    OutputPath = GetBaseIntermediatePath(),
+                    OutputPath = GetMSBuildProjectExtensionsPath(),
                     ProjectPath = _projectFullPath,
                     ProjectName = projectName,
                     ProjectUniqueName = _projectFullPath,
@@ -352,7 +362,7 @@ private async Task<PackageSpec> GetPackageSpecAsync(ISettings settings)
                         }
                     },
                     SkipContentFileWrite = true,
-                    CacheFilePath = await GetCacheFilePathAsync(),
+                    AssetsCacheFolder = await GetAssetsCacheFolderAsync(true),
                     PackagesPath = GetPackagesPath(settings),
                     Sources = GetSources(settings),
                     FallbackFolders = GetFallbackFolders(settings),
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/VsProjectAdapter.cs b/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/VsProjectAdapter.cs
index 94775ea035e..028dc6e53d2 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/VsProjectAdapter.cs
+++ b/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/VsProjectAdapter.cs
@@ -35,18 +35,18 @@ internal class VsProjectAdapter : IVsProjectAdapter
 
         #region Properties
 
-        public string BaseIntermediateOutputPath
+        public string MSBuildProjectExtensionsPath
         {
             get
             {
-                var baseIntermediateOutputPath = BuildProperties.GetPropertyValue(ProjectBuildProperties.BaseIntermediateOutputPath);
+                var msbuildProjectExtensionsPath = BuildProperties.GetPropertyValue(ProjectBuildProperties.MSBuildProjectExtensionsPath);
 
-                if (string.IsNullOrEmpty(baseIntermediateOutputPath))
+                if (string.IsNullOrEmpty(msbuildProjectExtensionsPath))
                 {
                     return null;
                 }
 
-                return Path.Combine(ProjectDirectory, baseIntermediateOutputPath);
+                return Path.Combine(ProjectDirectory, msbuildProjectExtensionsPath);
             }
         }
 
@@ -278,7 +278,7 @@ public async Task<string[]> GetProjectTypeGuidsAsync()
                     return new string[] { _projectTypeGuid };
                 }
 
-                return new string[0];
+                return Array.Empty<string>();
             }
         }
 
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/VsProjectJsonNuGetProject.cs b/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/VsProjectJsonNuGetProject.cs
index c0a6647d5df..be1d7910a45 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/VsProjectJsonNuGetProject.cs
+++ b/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Projects/VsProjectJsonNuGetProject.cs
@@ -39,23 +39,24 @@ public VsProjectJsonNuGetProject(
             ProjectServices = projectServices;
         }
 
-        protected override async Task<string> GetBaseIntermediatePathAsync()
+        protected override async Task<string> GetBaseIntermediateOutputPathAsync()
         {
-            var baseIntermediatePath = await ProjectServices.BuildProperties.GetPropertyValueAsync(ProjectBuildProperties.BaseIntermediateOutputPath);
+            var baseIntermediateOutputPath = await ProjectServices.BuildProperties.GetPropertyValueAsync(ProjectBuildProperties.BaseIntermediateOutputPath);
 
-            if (string.IsNullOrEmpty(baseIntermediatePath))
+            if (string.IsNullOrEmpty(baseIntermediateOutputPath))
             {
                 throw new InvalidDataException(string.Format(
-                    Strings.BaseIntermediateOutputPathNotFound,
+                    Strings.MSBuildPropertyNotFound,
+                    ProjectBuildProperties.BaseIntermediateOutputPath,
                     MSBuildProjectPath));
             }
 
-            return UriUtility.GetAbsolutePathFromFile(MSBuildProjectPath, baseIntermediatePath);
+            return UriUtility.GetAbsolutePathFromFile(MSBuildProjectPath, baseIntermediateOutputPath);
         }
 
         public override async Task<string> GetCacheFilePathAsync()
         {
-            return NoOpRestoreUtilities.GetProjectCacheFilePath(await GetBaseIntermediatePathAsync(), MSBuildProjectPath);
+            return NoOpRestoreUtilities.GetProjectCacheFilePath(await GetBaseIntermediateOutputPathAsync(), MSBuildProjectPath);
         }
 
         protected override async Task UpdateInternalTargetFrameworkAsync()
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Strings.Designer.cs b/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Strings.Designer.cs
index 5efa9a98f17..1d11e6f1285 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Strings.Designer.cs
+++ b/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Strings.Designer.cs
@@ -114,15 +114,6 @@ public static string Argument_Must_Be_GreaterThanOrEqualTo {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to The BaseIntermediateOutputPath MSBuild property could not be found for project &apos;{0}&apos;..
-        /// </summary>
-        public static string BaseIntermediateOutputPathNotFound {
-            get {
-                return ResourceManager.GetString("BaseIntermediateOutputPathNotFound", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to NuGet operation failed.
         /// </summary>
@@ -339,6 +330,15 @@ public static string InstallingPackage {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The {0} MSBuild property could not be found for project &apos;{1}&apos;..
+        /// </summary>
+        public static string MSBuildPropertyNotFound {
+            get {
+                return ResourceManager.GetString("MSBuildPropertyNotFound", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Package stream should be seekable.
         /// </summary>
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Strings.resx b/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Strings.resx
index 297d41eb99e..88dd232cc57 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Strings.resx
+++ b/src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Strings.resx
@@ -200,9 +200,9 @@
   <data name="ProjectNotLoaded_RestoreFailed" xml:space="preserve">
     <value>The operation failed as details for project {0} could not be loaded.</value>
   </data>
-  <data name="BaseIntermediateOutputPathNotFound" xml:space="preserve">
-    <value>The BaseIntermediateOutputPath MSBuild property could not be found for project '{0}'.</value>
-    <comment>{0} is the full path to the project.</comment>
+  <data name="MSBuildPropertyNotFound" xml:space="preserve">
+    <value>The {0} MSBuild property could not be found for project '{1}'.</value>
+    <comment>{0} is the name of the property that was not set.  {1} is the full path to the project.</comment>
   </data>
   <data name="ProjectCouldNotBeCastedToBuildPropertyStorage" xml:space="preserve">
     <value>The project '{0}' could not be cast to a build property storage interface, which is required to get MSBuild properties inside Visual Studio.</value>
diff --git a/src/NuGet.Clients/NuGet.SolutionRestoreManager/VsSolutionRestoreService.cs b/src/NuGet.Clients/NuGet.SolutionRestoreManager/VsSolutionRestoreService.cs
index 3498f508966..44816ab786e 100644
--- a/src/NuGet.Clients/NuGet.SolutionRestoreManager/VsSolutionRestoreService.cs
+++ b/src/NuGet.Clients/NuGet.SolutionRestoreManager/VsSolutionRestoreService.cs
@@ -284,10 +284,11 @@ private static PackageSpec ToPackageSpec(ProjectNames projectNames, IVsProjectRe
                         treatWarningsAsErrors: GetNonEvaluatedPropertyOrNull(projectRestoreInfo.TargetFrameworks, TreatWarningsAsErrors, e => e),
                         warningsAsErrors: GetNonEvaluatedPropertyOrNull(projectRestoreInfo.TargetFrameworks, WarningsAsErrors, e => e),
                         noWarn: GetNonEvaluatedPropertyOrNull(projectRestoreInfo.TargetFrameworks, NoWarn, e => e)),
-                    CacheFilePath = NoOpRestoreUtilities.GetProjectCacheFilePath(cacheRoot: outputPath, projectPath: projectFullPath)
+                    AssetsCacheFolder = outputPath
                 },
                 RuntimeGraph = GetRuntimeGraph(projectRestoreInfo),
                 RestoreSettings = new ProjectRestoreSettings() { HideWarningsAndErrors = true }
+
             };
 
             return packageSpec;
diff --git a/src/NuGet.Clients/NuGet.VisualStudio.Common/IVsProjectAdapter.cs b/src/NuGet.Clients/NuGet.VisualStudio.Common/IVsProjectAdapter.cs
index e2dcc2cc173..5369f6dfea9 100644
--- a/src/NuGet.Clients/NuGet.VisualStudio.Common/IVsProjectAdapter.cs
+++ b/src/NuGet.Clients/NuGet.VisualStudio.Common/IVsProjectAdapter.cs
@@ -22,9 +22,9 @@ public interface IVsProjectAdapter
         string AssetTargetFallback { get; }
 
         /// <summary>
-        /// BaseIntermediateOutputPath project property (e.g. c:\projFoo\obj)
+        /// MSBuildProjectExtensionsPath project property (e.g. c:\projFoo\obj)
         /// </summary>
-        string BaseIntermediateOutputPath { get; }
+        string MSBuildProjectExtensionsPath { get; }
 
         IProjectBuildProperties BuildProperties { get; }
 
diff --git a/src/NuGet.Clients/NuGet.VisualStudio.Common/VsHierarchyUtility.cs b/src/NuGet.Clients/NuGet.VisualStudio.Common/VsHierarchyUtility.cs
index ad57979f2c0..c1333351c09 100644
--- a/src/NuGet.Clients/NuGet.VisualStudio.Common/VsHierarchyUtility.cs
+++ b/src/NuGet.Clients/NuGet.VisualStudio.Common/VsHierarchyUtility.cs
@@ -104,7 +104,7 @@ public static string[] GetProjectTypeGuids(IVsHierarchy hierarchy, string defaul
                 return new[] { defaultType };
             }
 
-            return new string[0];
+            return Array.Empty<string>();
         }
 
         /// <summary>
diff --git a/src/NuGet.Clients/NuGetConsole.Host.PowerShell/UnsupportedHost.cs b/src/NuGet.Clients/NuGetConsole.Host.PowerShell/UnsupportedHost.cs
index 5ef3dc627c4..a23200f1f45 100644
--- a/src/NuGet.Clients/NuGetConsole.Host.PowerShell/UnsupportedHost.cs
+++ b/src/NuGet.Clients/NuGetConsole.Host.PowerShell/UnsupportedHost.cs
@@ -46,7 +46,7 @@ public string ActivePackageSource
 
         public string[] GetPackageSources()
         {
-            return new string[0];
+            return Array.Empty<string>();
         }
 
         public string DefaultProject
@@ -60,7 +60,7 @@ public void SetDefaultProjectIndex(int index)
 
         public string[] GetAvailableProjects()
         {
-            return new string[0];
+            return Array.Empty<string>();
         }
 
         public void SetDefaultRunspace()
diff --git a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.targets b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.targets
index ddb19636eb6..b6414d1eebb 100644
--- a/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.targets
+++ b/src/NuGet.Core/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.targets
@@ -148,7 +148,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </PropertyGroup>
     <PropertyGroup>
       <PackageOutputPath Condition=" '$(PackageOutputPath)' == '' ">$(OutputPath)</PackageOutputPath>
-      <RestoreOutputPath Condition=" '$(RestoreOutputPath)' == '' " >$(BaseIntermediateOutputPath)</RestoreOutputPath>
+      <RestoreOutputPath Condition=" '$(RestoreOutputPath)' == '' " >$(MSBuildProjectExtensionsPath)</RestoreOutputPath>
     </PropertyGroup>
 
     <ConvertToAbsolutePath Paths="$(NuspecOutputPath)">
diff --git a/src/NuGet.Core/NuGet.Build.Tasks/GetRestoreSettingsTask.cs b/src/NuGet.Core/NuGet.Build.Tasks/GetRestoreSettingsTask.cs
index 0601f9f7170..1d3788bbfa0 100644
--- a/src/NuGet.Core/NuGet.Build.Tasks/GetRestoreSettingsTask.cs
+++ b/src/NuGet.Core/NuGet.Build.Tasks/GetRestoreSettingsTask.cs
@@ -131,7 +131,7 @@ public override bool Execute()
                 // Sources
                 var currentSources = RestoreSettingsUtils.GetValue(
                     () => RestoreSourcesOverride?.Select(MSBuildRestoreUtility.FixSourcePath).Select(e => GetGlobalAbsolutePath(e)).ToArray(),
-                    () => MSBuildRestoreUtility.ContainsClearKeyword(RestoreSources) ? new string[0] : null,
+                    () => MSBuildRestoreUtility.ContainsClearKeyword(RestoreSources) ? Array.Empty<string>() : null,
                     () => RestoreSources?.Select(MSBuildRestoreUtility.FixSourcePath).Select(e => UriUtility.GetAbsolutePathFromFile(ProjectUniqueName, e)).ToArray(),
                     () => (new PackageSourceProvider(settings)).LoadPackageSources().Where(e => e.IsEnabled).Select(e => e.Source).ToArray());
 
@@ -148,7 +148,7 @@ public override bool Execute()
                 // Fallback folders
                 var currentFallbackFolders = RestoreSettingsUtils.GetValue(
                     () => RestoreFallbackFoldersOverride?.Select(e => GetGlobalAbsolutePath(e)).ToArray(),
-                    () => MSBuildRestoreUtility.ContainsClearKeyword(RestoreFallbackFolders) ? new string[0] : null,
+                    () => MSBuildRestoreUtility.ContainsClearKeyword(RestoreFallbackFolders) ? Array.Empty<string>() : null,
                     () => RestoreFallbackFolders?.Select(e => UriUtility.GetAbsolutePathFromFile(ProjectUniqueName, e)).ToArray(),
                     () => SettingsUtility.GetFallbackPackageFolders(settings).ToArray());
 
diff --git a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets
index 2986d474774..ef892da8bbe 100644
--- a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets
+++ b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.targets
@@ -414,6 +414,25 @@ Copyright (c) .NET Foundation. All rights reserved.
     </PropertyGroup>
   </Target>
 
+  <!--
+    ============================================================
+    EnableIntermediateOutputPathMismatchWarning
+    If using PackageReference, enable an MSBuild warning if BaseIntermediateOutputPath is set to something different
+    than MSBuildProjectExtensionsPath, because it may be unexpected that the assets and related files wouldn't be written
+    to the BaseIntermediateOutputPath.
+    ============================================================
+  -->
+
+  <Target Name="EnableIntermediateOutputPathMismatchWarning" DependsOnTargets="_GetRestoreProjectStyle"
+          BeforeTargets="_CheckForInvalidConfigurationAndPlatform"
+          Condition="'$(RestoreProjectStyle)' == 'PackageReference'">
+    
+    <PropertyGroup Condition="'$(EnableBaseIntermediateOutputPathMismatchWarning)' == ''">
+      <EnableBaseIntermediateOutputPathMismatchWarning>true</EnableBaseIntermediateOutputPathMismatchWarning>
+    </PropertyGroup>
+  
+  </Target>
+  
   <!--
     ============================================================
     _GetRestoreTargetFrameworksOutput
@@ -569,13 +588,27 @@ Copyright (c) .NET Foundation. All rights reserved.
     Returns="@(_RestoreGraphEntry)">
 
     <!-- Determine the restore output path -->
-    <PropertyGroup Condition=" '$(PackageReferenceCompatibleProjectStyle)' == 'true' OR '$(RestoreProjectStyle)' == 'ProjectJson' ">
-      <RestoreOutputPath Condition=" '$(RestoreOutputPath)' == '' " >$(BaseIntermediateOutputPath)</RestoreOutputPath>
+    <PropertyGroup Condition=" '$(PackageReferenceCompatibleProjectStyle)' == 'true' ">
+      <!-- NuGet writes .props and .targets files to the RestoreOutputPath for PackageReference projects.  MSBuild common
+           targets import these via the MSBuildProjectExtensionsPath, so that's what the RestoreOutputPath should be. -->
+      <RestoreOutputPath Condition=" '$(RestoreOutputPath)' == '' " >$(MSBuildProjectExtensionsPath)</RestoreOutputPath>
     </PropertyGroup>
 
-    <ConvertToAbsolutePath Paths="$(RestoreOutputPath)" Condition=" '$(PackageReferenceCompatibleProjectStyle)' == 'true' OR '$(RestoreProjectStyle)' == 'ProjectJson'">
+    <ConvertToAbsolutePath Paths="$(RestoreOutputPath)" Condition=" '$(PackageReferenceCompatibleProjectStyle)' == 'true' ">
       <Output TaskParameter="AbsolutePaths" PropertyName="RestoreOutputAbsolutePath" />
     </ConvertToAbsolutePath>
+    
+    <PropertyGroup Condition=" '$(RestoreProjectStyle)' == 'ProjectJson' ">
+      <!-- For project.json projects, the restore output path is the project directory.  The assets file cache
+           goes in BaseIntermediateOutputPath. -->
+      <RestoreAssetsCacheFolder Condition=" '$(RestoreOutputPath)' == '' " >$(BaseIntermediateOutputPath)</RestoreAssetsCacheFolder>
+    </PropertyGroup>
+
+    <ConvertToAbsolutePath Paths="$(RestoreAssetsCacheFolder)" Condition=" '$(RestoreProjectStyle)' == 'ProjectJson'">
+      <Output TaskParameter="AbsolutePaths" PropertyName="RestoreAssetsCacheFolder" />
+    </ConvertToAbsolutePath>
+
+    
 
     <!--
       Determine project name for the assets file.
@@ -626,6 +659,7 @@ Copyright (c) .NET Foundation. All rights reserved.
         <PackagesPath>$(_OutputPackagesPath)</PackagesPath>
         <ProjectStyle>$(RestoreProjectStyle)</ProjectStyle>
         <OutputPath>$(RestoreOutputAbsolutePath)</OutputPath>
+        <AssetsCacheFolder>$(RestoreOutputAbsolutePath)</AssetsCacheFolder>
         <TargetFrameworks>@(_RestoreTargetFrameworksOutputFiltered)</TargetFrameworks>
         <RuntimeIdentifiers>$(RuntimeIdentifiers);$(RuntimeIdentifier)</RuntimeIdentifiers>
         <RuntimeSupports>$(RuntimeSupports)</RuntimeSupports>
@@ -648,7 +682,8 @@ Copyright (c) .NET Foundation. All rights reserved.
         <ProjectPath>$(MSBuildProjectFullPath)</ProjectPath>
         <ProjectName>$(_RestoreProjectName)</ProjectName>
         <Sources>$(_OutputSources)</Sources>
-        <OutputPath>$(RestoreOutputAbsolutePath)</OutputPath>
+        <OutputPath>$(MSBuildProjectDirectory)</OutputPath>
+        <AssetsCacheFolder>$(RestoreAssetsCacheFolder)</AssetsCacheFolder>
         <FallbackFolders>$(_OutputFallbackFolders)</FallbackFolders>
         <PackagesPath>$(_OutputPackagesPath)</PackagesPath>
         <ProjectJsonPath>$(_CurrentProjectJsonPath)</ProjectJsonPath>
diff --git a/src/NuGet.Core/NuGet.Build.Tasks/WarnForInvalidProjectsTask.cs b/src/NuGet.Core/NuGet.Build.Tasks/WarnForInvalidProjectsTask.cs
index be9ac2a92b7..6cb1ed5c68c 100644
--- a/src/NuGet.Core/NuGet.Build.Tasks/WarnForInvalidProjectsTask.cs
+++ b/src/NuGet.Core/NuGet.Build.Tasks/WarnForInvalidProjectsTask.cs
@@ -1,6 +1,7 @@
 // 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.
 
+using System;
 using System.Linq;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
@@ -28,8 +29,8 @@ public override bool Execute()
             var log = new MSBuildLogger(Log);
 
             // item -> string
-            var all = AllProjects?.Select(e => e.ItemSpec).ToArray() ?? new string[0];
-            var valid = ValidProjects?.Select(e => e.ItemSpec).ToArray() ?? new string[0];
+            var all = AllProjects?.Select(e => e.ItemSpec).ToArray() ?? Array.Empty<string>();
+            var valid = ValidProjects?.Select(e => e.ItemSpec).ToArray() ?? Array.Empty<string>();
 
             // log inputs
             BuildTasksUtility.LogInputParam(log, nameof(AllProjects), all);
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/RequestFactory/DependencyGraphSpecRequestProvider.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/RequestFactory/DependencyGraphSpecRequestProvider.cs
index e0fee4741cd..f6dc9dfc61f 100644
--- a/src/NuGet.Core/NuGet.Commands/RestoreCommand/RequestFactory/DependencyGraphSpecRequestProvider.cs
+++ b/src/NuGet.Core/NuGet.Commands/RestoreCommand/RequestFactory/DependencyGraphSpecRequestProvider.cs
@@ -151,12 +151,15 @@ private RestoreSummaryRequest Create(
             {
                 // Set properties from the restore metadata
                 ProjectStyle = project.PackageSpec.RestoreMetadata.ProjectStyle,
+                //  Project.json is special cased to put assets file and generated .props and targets in the project folder
                 RestoreOutputPath = project.PackageSpec.RestoreMetadata.ProjectStyle == ProjectStyle.ProjectJson ? rootPath : project.PackageSpec.RestoreMetadata.OutputPath,
                 DependencyGraphSpec = projectDgSpec,
-                BaseIntermediateOutputPath = projectPackageSpec.RestoreMetadata.OutputPath,
-                ParentId = restoreArgs.ParentId
+                ParentId = restoreArgs.ParentId,
             };
-            
+
+            request.AssetsCachePath = NoOpRestoreUtilities.GetCacheFilePath(request);
+
+
             var restoreLegacyPackagesDirectory = project.PackageSpec?.RestoreMetadata?.LegacyPackagesDirectory
                 ?? DefaultRestoreLegacyPackagesDirectory;
             request.IsLowercasePackagesDirectory = !restoreLegacyPackagesDirectory;
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/RequestFactory/RestoreArgs.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/RequestFactory/RestoreArgs.cs
index 7d18045150d..7978d2fcd8e 100644
--- a/src/NuGet.Core/NuGet.Commands/RestoreCommand/RequestFactory/RestoreArgs.cs
+++ b/src/NuGet.Core/NuGet.Commands/RestoreCommand/RequestFactory/RestoreArgs.cs
@@ -181,10 +181,6 @@ public void ApplyStandardProperties(RestoreRequest request)
                 request.LockFilePath = ProjectJsonPathUtilities.GetLockFilePath(request.Project.FilePath);
             }
 
-            if (request.Project.RestoreMetadata?.CacheFilePath == null) {
-                request.Project.RestoreMetadata.CacheFilePath = NoOpRestoreUtilities.GetCacheFilePath(request);
-            }
-
             request.MaxDegreeOfConcurrency =
                 DisableParallel ? 1 : RestoreRequest.DefaultDegreeOfConcurrency;
 
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreCommand.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreCommand.cs
index b05542481c5..542080b375e 100644
--- a/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreCommand.cs
+++ b/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreCommand.cs
@@ -103,7 +103,7 @@ public async Task<RestoreResult> ExecuteAsync(CancellationToken token)
                                 _request.ExistingLockFile,
                                 _request.ExistingLockFile.Path,
                                 cacheFile,
-                                _request.Project.RestoreMetadata.CacheFilePath,
+                                _request.AssetsCachePath,
                                 _request.ProjectStyle,
                                 restoreTime.Elapsed);
                         }
@@ -222,9 +222,9 @@ private KeyValuePair<CacheFile, bool> EvaluateCacheFile()
                 NoOpRestoreUtilities.UpdateRequestBestMatchingToolPathsIfAvailable(_request);
             }
 
-            if (_request.AllowNoOp && File.Exists(_request.Project.RestoreMetadata.CacheFilePath))
+            if (_request.AllowNoOp && File.Exists(_request.AssetsCachePath))
             {
-                cacheFile = FileUtility.SafeRead(_request.Project.RestoreMetadata.CacheFilePath, (stream, path) => CacheFileFormat.Read(stream, _logger, path));
+                cacheFile = FileUtility.SafeRead(_request.AssetsCachePath, (stream, path) => CacheFileFormat.Read(stream, _logger, path));
 
                 if (cacheFile.IsValid && StringComparer.Ordinal.Equals(cacheFile.DgSpecHash, newDgSpecHash))
                 {
@@ -254,7 +254,7 @@ private KeyValuePair<CacheFile, bool> EvaluateCacheFile()
                 {
                     // Clean up to preserve the pre no-op behavior. This should not be used, but we want to be cautious. 
                     _request.LockFilePath = null;
-                    _request.Project.RestoreMetadata.CacheFilePath = null;
+                    _request.AssetsCachePath = null;
                 }
             }
             return new KeyValuePair<CacheFile, bool>(cacheFile, noOp);
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreRequest.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreRequest.cs
index 45196fc819f..ffbbe9ea7e3 100644
--- a/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreRequest.cs
+++ b/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreRequest.cs
@@ -132,16 +132,15 @@ public RestoreRequest(
         public ProjectStyle ProjectStyle { get; set; } = ProjectStyle.Unknown;
 
         /// <summary>
-        /// Restore output path
+        /// RestoreOutputPath, which is where the restore output (assets file and generated props and targets) will go
         /// </summary>
         public string RestoreOutputPath { get; set; }
 
         /// <summary>
-        /// Base Intermediate output path
+        /// AssetsCachePath, which is where the no-op restore cache will go
         /// </summary>
-        public string BaseIntermediateOutputPath { get; set; }
+        public string AssetsCachePath { get; set; }
 
-        
         /// <summary>
         /// Compatibility options
         /// </summary>
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/MSBuildRestoreUtility.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/MSBuildRestoreUtility.cs
index 5e9de6c7f95..dc7d4d94ad5 100644
--- a/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/MSBuildRestoreUtility.cs
+++ b/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/MSBuildRestoreUtility.cs
@@ -219,6 +219,7 @@ public static PackageSpec GetPackageSpec(IEnumerable<IMSBuildItem> items)
                     result.RestoreMetadata.PackagesPath = specItem.GetProperty("PackagesPath");
 
                     result.RestoreMetadata.OutputPath = specItem.GetProperty("OutputPath");
+                    result.RestoreMetadata.AssetsCacheFolder = specItem.GetProperty("AssetsCacheFolder");
                 }
 
                 // Read package references for netcore, tools, and standalone
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/NoOpRestoreUtilities.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/NoOpRestoreUtilities.cs
index 207d19f2b8a..98e622a3aa9 100644
--- a/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/NoOpRestoreUtilities.cs
+++ b/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/NoOpRestoreUtilities.cs
@@ -26,7 +26,7 @@ internal static bool IsNoOpSupported(RestoreRequest request)
         }
 
         /// <summary>
-        /// The cache file path is $(BaseIntermediateOutputPath)\$(project).nuget.cache
+        /// The cache file path is $(project).nuget.cache in the AssetsCachePath folder
         /// </summary>
         private static string GetBuildIntegratedProjectCacheFilePath(RestoreRequest request)
         {
@@ -35,8 +35,9 @@ private static string GetBuildIntegratedProjectCacheFilePath(RestoreRequest requ
                 || request.ProjectStyle == ProjectStyle.PackageReference
                 || request.ProjectStyle == ProjectStyle.Standalone)
             {
-                var cacheRoot = request.BaseIntermediateOutputPath ?? request.RestoreOutputPath;
-                return request.Project.RestoreMetadata.CacheFilePath = GetProjectCacheFilePath(cacheRoot, request.Project.RestoreMetadata.ProjectPath);
+                var cacheRoot = request.Project.RestoreMetadata.AssetsCacheFolder;
+
+                return GetProjectCacheFilePath(cacheRoot, request.Project.RestoreMetadata.ProjectPath);
             }
 
             return null;
@@ -89,20 +90,17 @@ internal static string GetCacheFilePath(RestoreRequest request)
         /// </summary>
         internal static string GetCacheFilePath(RestoreRequest request, LockFile lockFile)
         {
-            var projectCacheFilePath = request.Project.RestoreMetadata?.CacheFilePath;
+            string projectCacheFilePath = null;
 
-            if (string.IsNullOrEmpty(projectCacheFilePath))
+            if (request.ProjectStyle == ProjectStyle.PackageReference
+                || request.ProjectStyle == ProjectStyle.Standalone
+                || request.ProjectStyle == ProjectStyle.ProjectJson)
             {
-                if (request.ProjectStyle == ProjectStyle.PackageReference
-                    || request.ProjectStyle == ProjectStyle.Standalone
-                    || request.ProjectStyle == ProjectStyle.ProjectJson)
-                {
-                    projectCacheFilePath = GetBuildIntegratedProjectCacheFilePath(request);
-                }
-                else if(request.ProjectStyle == ProjectStyle.DotnetCliTool)
-                {
-                    projectCacheFilePath = GetToolCacheFilePath(request, lockFile);
-                }
+                projectCacheFilePath = GetBuildIntegratedProjectCacheFilePath(request);
+            }
+            else if(request.ProjectStyle == ProjectStyle.DotnetCliTool)
+            {
+                projectCacheFilePath = GetToolCacheFilePath(request, lockFile);
             }
             return projectCacheFilePath != null ? Path.GetFullPath(projectCacheFilePath) : null;
         }
@@ -296,7 +294,7 @@ public static void UpdateRequestBestMatchingToolPathsIfAvailable(RestoreRequest
 
                 if (toolDirectory != null) // Only set the paths if a good enough match was found. 
                 {
-                    request.Project.RestoreMetadata.CacheFilePath = NoOpRestoreUtilities.GetToolCacheFilePath(toolDirectory, ToolRestoreUtility.GetToolIdOrNullFromSpec(request.Project));
+                    request.AssetsCachePath = NoOpRestoreUtilities.GetToolCacheFilePath(toolDirectory, ToolRestoreUtility.GetToolIdOrNullFromSpec(request.Project));
                     request.LockFilePath = toolPathResolver.GetLockFilePath(toolDirectory);
                 }
             }
diff --git a/src/NuGet.Core/NuGet.Common/Errors/NuGetLogCode.cs b/src/NuGet.Core/NuGet.Common/Errors/NuGetLogCode.cs
index e98c23f6733..562e65fecc7 100644
--- a/src/NuGet.Core/NuGet.Common/Errors/NuGetLogCode.cs
+++ b/src/NuGet.Core/NuGet.Common/Errors/NuGetLogCode.cs
@@ -4,7 +4,7 @@
 namespace NuGet.Common
 {
     /// <summary>
-    /// This enum is used to quantify NuGet error and wanring codes. 
+    /// This enum is used to quantify NuGet error and warning codes. 
     /// Format - NUxyzw where NU is the profix indicating NuGet and xyzw is a 4 digit code
     ///
     /// Numbers - xyzw
diff --git a/src/NuGet.Core/NuGet.Common/MsBuildStringUtility.cs b/src/NuGet.Core/NuGet.Common/MsBuildStringUtility.cs
index 49dae7d2f91..8a9c3eaf224 100644
--- a/src/NuGet.Core/NuGet.Common/MsBuildStringUtility.cs
+++ b/src/NuGet.Core/NuGet.Common/MsBuildStringUtility.cs
@@ -34,7 +34,7 @@ public static string[] Split(string s, params char[] chars)
                     .ToArray();
             }
 
-            return new string[0];
+            return Array.Empty<string>();
         }
 
         /// <summary>
@@ -59,7 +59,7 @@ public static string[] TrimAndExcludeNullOrEmpty(string[] strings)
         {
             if (strings == null)
             {
-                return new string[0];
+                return Array.Empty<string>();
             }
 
             return strings
diff --git a/src/NuGet.Core/NuGet.PackageManagement/Projects/ProjectBuildProperties.cs b/src/NuGet.Core/NuGet.PackageManagement/Projects/ProjectBuildProperties.cs
index e34793008f6..e25e1c3e208 100644
--- a/src/NuGet.Core/NuGet.PackageManagement/Projects/ProjectBuildProperties.cs
+++ b/src/NuGet.Core/NuGet.PackageManagement/Projects/ProjectBuildProperties.cs
@@ -9,6 +9,7 @@ namespace NuGet.ProjectManagement
     /// </summary>
     public static class ProjectBuildProperties
     {
+        public const string MSBuildProjectExtensionsPath = "MSBuildProjectExtensionsPath";
         public const string BaseIntermediateOutputPath = "BaseIntermediateOutputPath";
         public const string PackageTargetFallback = "PackageTargetFallback";
         public const string AssetTargetFallback = "AssetTargetFallback";
diff --git a/src/NuGet.Core/NuGet.PackageManagement/Projects/ProjectJsonNuGetProject.cs b/src/NuGet.Core/NuGet.PackageManagement/Projects/ProjectJsonNuGetProject.cs
index 2e0801105b7..0a6483fa52c 100644
--- a/src/NuGet.Core/NuGet.PackageManagement/Projects/ProjectJsonNuGetProject.cs
+++ b/src/NuGet.Core/NuGet.PackageManagement/Projects/ProjectJsonNuGetProject.cs
@@ -151,12 +151,13 @@ public override async Task<IEnumerable<PackageReference>> GetInstalledPackagesAs
             return packages;
         }
 
-        protected virtual Task<string> GetBaseIntermediatePathAsync()
+        protected virtual Task<string> GetBaseIntermediateOutputPathAsync()
         {
-            // Extending class will implement the functionality.
-            return Task.FromResult((string) null);
+            // Extending class will implement the functionality (but tests will use this implementation)
+            string baseIntermediateOutputPath = Path.Combine(Path.GetDirectoryName(MSBuildProjectPath), "obj");
+            return Task.FromResult((string)baseIntermediateOutputPath);
         }
-       
+
         public override async Task<IReadOnlyList<PackageSpec>> GetPackageSpecsAsync(DependencyGraphCacheContext context)
         {
             PackageSpec packageSpec = null;
@@ -172,12 +173,12 @@ public override async Task<IReadOnlyList<PackageSpec>> GetPackageSpecsAsync(Depe
                 packageSpec.RestoreMetadata = metadata;
 
                 metadata.ProjectStyle = ProjectStyle.ProjectJson;
-                metadata.OutputPath = await GetBaseIntermediatePathAsync();
+                metadata.OutputPath = Path.GetDirectoryName(MSBuildProjectPath);
                 metadata.ProjectPath = MSBuildProjectPath;
                 metadata.ProjectJsonPath = packageSpec.FilePath;
                 metadata.ProjectName = packageSpec.Name;
                 metadata.ProjectUniqueName = MSBuildProjectPath;
-                metadata.CacheFilePath = await GetCacheFilePathAsync();
+                metadata.AssetsCacheFolder = await GetBaseIntermediateOutputPathAsync();
 
                 // Reload the target framework from csproj and update the target framework in packageSpec for restore
                 await UpdateInternalTargetFrameworkAsync();
diff --git a/src/NuGet.Core/NuGet.Packaging/TopologicalSortUtility.cs b/src/NuGet.Core/NuGet.Packaging/TopologicalSortUtility.cs
index 8f00c35376c..b0c8cd4cb29 100644
--- a/src/NuGet.Core/NuGet.Packaging/TopologicalSortUtility.cs
+++ b/src/NuGet.Core/NuGet.Packaging/TopologicalSortUtility.cs
@@ -141,7 +141,7 @@ private static void CalculateRelationships(ItemDependencyInfo[] packages, Dictio
         {
             foreach (var package in packages)
             {
-                var dependencies = package.DependencyIds ?? new string[0];
+                var dependencies = package.DependencyIds ?? Array.Empty<string>();
 
                 foreach (var id in dependencies)
                 {
diff --git a/src/NuGet.Core/NuGet.ProjectModel/JsonPackageSpecReader.cs b/src/NuGet.Core/NuGet.ProjectModel/JsonPackageSpecReader.cs
index 0d6762818f9..366e74d15ae 100644
--- a/src/NuGet.Core/NuGet.ProjectModel/JsonPackageSpecReader.cs
+++ b/src/NuGet.Core/NuGet.ProjectModel/JsonPackageSpecReader.cs
@@ -346,8 +346,8 @@ private static PackOptions GetPackOptions(PackageSpec packageSpec, JObject rawPa
             }
             var owners = rawPackOptions["owners"];
             var tags = rawPackOptions["tags"];
-            packageSpec.Owners = owners == null ? new string[0] { } : owners.ValueAsArray<string>();
-            packageSpec.Tags = tags == null ? new string[0] { } : tags.ValueAsArray<string>();
+            packageSpec.Owners = owners == null ? Array.Empty<string>() : owners.ValueAsArray<string>();
+            packageSpec.Tags = tags == null ? Array.Empty<string>() : tags.ValueAsArray<string>();
             packageSpec.ProjectUrl = rawPackOptions.GetValue<string>("projectUrl");
             packageSpec.IconUrl = rawPackOptions.GetValue<string>("iconUrl");
             packageSpec.Summary = rawPackOptions.GetValue<string>("summary");
diff --git a/src/NuGet.Core/NuGet.ProjectModel/PackageSpec.cs b/src/NuGet.Core/NuGet.ProjectModel/PackageSpec.cs
index d60f3aff2b6..04f4d915c71 100644
--- a/src/NuGet.Core/NuGet.ProjectModel/PackageSpec.cs
+++ b/src/NuGet.Core/NuGet.ProjectModel/PackageSpec.cs
@@ -59,9 +59,9 @@ public NuGetVersion Version
 
         public string ReleaseNotes { get; set; }
 
-        public string[] Authors { get; set; } = new string[0];
+        public string[] Authors { get; set; } = Array.Empty<string>();
 
-        public string[] Owners { get; set; } = new string[0];
+        public string[] Owners { get; set; } = Array.Empty<string>();
 
         public string ProjectUrl { get; set; }
 
@@ -77,7 +77,7 @@ public NuGetVersion Version
 
         public BuildOptions BuildOptions { get; set; }
 
-        public string[] Tags { get; set; } = new string[0];
+        public string[] Tags { get; set; } = Array.Empty<string>();
 
         public IList<string> ContentFiles { get; set; } = new List<string>();
 
diff --git a/src/NuGet.Core/NuGet.ProjectModel/ProjectRestoreMetadata.cs b/src/NuGet.Core/NuGet.ProjectModel/ProjectRestoreMetadata.cs
index 77511d23ad6..3939cf83f71 100644
--- a/src/NuGet.Core/NuGet.ProjectModel/ProjectRestoreMetadata.cs
+++ b/src/NuGet.Core/NuGet.ProjectModel/ProjectRestoreMetadata.cs
@@ -29,7 +29,11 @@ public class ProjectRestoreMetadata : IEquatable<ProjectRestoreMetadata>
         public string ProjectJsonPath { get; set; }
 
         /// <summary>
-        /// Assets file output path.
+        /// Restore Output Path.
+        /// In NuGet.targets, this is set to MSBuildProjectExtensionsPath for PackageReference projects.
+        /// For PackageReference, this is where the assets file, generated .props and .targets files, and assets file cache will be stored.
+        /// For project.json projects, the assets file and generated .props and .targets will go into the project folder, and this
+        /// property will only affect where the assets cache is stored.
         /// </summary>
         public string OutputPath { get; set; }
 
@@ -54,9 +58,9 @@ public class ProjectRestoreMetadata : IEquatable<ProjectRestoreMetadata>
         public string PackagesPath { get; set; }
 
         /// <summary>
-        /// Cache file path
+        /// Cache file folder
         /// </summary>
-        public string CacheFilePath { get; set; }
+        public string AssetsCacheFolder { get; set; }
 
         /// <summary>
         /// Fallback folders.
@@ -185,7 +189,7 @@ public ProjectRestoreMetadata Clone()
             clonedObject.ProjectName = ProjectName;
             clonedObject.ProjectUniqueName = ProjectUniqueName;
             clonedObject.PackagesPath = PackagesPath;
-            clonedObject.CacheFilePath = CacheFilePath;
+            clonedObject.AssetsCacheFolder = AssetsCacheFolder;
             clonedObject.CrossTargeting = CrossTargeting;
             clonedObject.LegacyPackagesDirectory = LegacyPackagesDirectory;
             clonedObject.SkipContentFileWrite = SkipContentFileWrite;
diff --git a/src/NuGet.Core/NuGet.Protocol/LegacyFeed/V2FeedPackageInfo.cs b/src/NuGet.Core/NuGet.Protocol/LegacyFeed/V2FeedPackageInfo.cs
index 0849dd62f64..46c286ddaa4 100644
--- a/src/NuGet.Core/NuGet.Protocol/LegacyFeed/V2FeedPackageInfo.cs
+++ b/src/NuGet.Core/NuGet.Protocol/LegacyFeed/V2FeedPackageInfo.cs
@@ -48,8 +48,8 @@ public V2FeedPackageInfo(PackageIdentity identity, string title, string summary,
         {
             _summary = summary;
             _description = description;
-            _authors = authors == null ? new string[0] : authors.ToArray();
-            _owners = owners == null ? new string[0] : owners.ToArray();
+            _authors = authors == null ? Array.Empty<string>() : authors.ToArray();
+            _owners = owners == null ? Array.Empty<string>() : owners.ToArray();
             _iconUrl = iconUrl;
             _licenseUrl = licenseUrl;
             _projectUrl = projectUrl;
diff --git a/src/NuGet.Core/NuGet.Versioning/SemanticVersionFactory.cs b/src/NuGet.Core/NuGet.Versioning/SemanticVersionFactory.cs
index 3e57a3be045..8285ba4f03c 100644
--- a/src/NuGet.Core/NuGet.Versioning/SemanticVersionFactory.cs
+++ b/src/NuGet.Core/NuGet.Versioning/SemanticVersionFactory.cs
@@ -9,7 +9,7 @@ namespace NuGet.Versioning
     public partial class SemanticVersion
     {
         // Reusable set of empty release labels
-        internal static readonly string[] EmptyReleaseLabels = new string[0];
+        internal static readonly string[] EmptyReleaseLabels = Array.Empty<string>();
 
         /// <summary>
         /// Parses a SemVer string using strict SemVer rules.
diff --git a/test/NuGet.Clients.Tests/NuGet.PackageManagement.VisualStudio.Test/ProjectSystems/LegacyPackageReferenceProjectTests.cs b/test/NuGet.Clients.Tests/NuGet.PackageManagement.VisualStudio.Test/ProjectSystems/LegacyPackageReferenceProjectTests.cs
index 5df51ce216a..d66cc5aa4bd 100644
--- a/test/NuGet.Clients.Tests/NuGet.PackageManagement.VisualStudio.Test/ProjectSystems/LegacyPackageReferenceProjectTests.cs
+++ b/test/NuGet.Clients.Tests/NuGet.PackageManagement.VisualStudio.Test/ProjectSystems/LegacyPackageReferenceProjectTests.cs
@@ -43,17 +43,17 @@ public LegacyPackageReferenceProjectTests(DispatcherThreadFixture fixture)
         }
 
         [Fact]
-        public async Task GetAssetsFilePathAsync_WithValidBaseIntermediateOutputPath_Succeeds()
+        public async Task GetAssetsFilePathAsync_WithValidMSBuildProjectExtensionsPath_Succeeds()
         {
             // Arrange
             using (var testDirectory = TestDirectory.Create())
             {
-                var testBaseIntermediateOutputPath = Path.Combine(testDirectory, "obj");
-                Directory.CreateDirectory(testBaseIntermediateOutputPath);
+                var testMSBuildProjectExtensionsPath = Path.Combine(testDirectory, "obj");
+                Directory.CreateDirectory(testMSBuildProjectExtensionsPath);
                 var projectAdapter = Mock.Of<IVsProjectAdapter>();
                 Mock.Get(projectAdapter)
-                    .SetupGet(x => x.BaseIntermediateOutputPath)
-                    .Returns(testBaseIntermediateOutputPath);
+                    .SetupGet(x => x.MSBuildProjectExtensionsPath)
+                    .Returns(testMSBuildProjectExtensionsPath);
 
                 var testProject = new LegacyPackageReferenceProject(
                     projectAdapter,
@@ -67,16 +67,16 @@ public async Task GetAssetsFilePathAsync_WithValidBaseIntermediateOutputPath_Suc
                 var assetsPath = await testProject.GetAssetsFilePathAsync();
 
                 // Assert
-                Assert.Equal(Path.Combine(testBaseIntermediateOutputPath, "project.assets.json"), assetsPath);
+                Assert.Equal(Path.Combine(testMSBuildProjectExtensionsPath, "project.assets.json"), assetsPath);
 
                 // Verify
                 Mock.Get(projectAdapter)
-                    .VerifyGet(x => x.BaseIntermediateOutputPath, Times.AtLeastOnce);
+                    .VerifyGet(x => x.MSBuildProjectExtensionsPath, Times.AtLeastOnce);
             }
         }
 
         [Fact]
-        public async Task GetAssetsFilePathAsync_WithNoBaseIntermediateOutputPath_Throws()
+        public async Task GetAssetsFilePathAsync_WithNoMSBuildProjectExtensionsPath_Throws()
         {
             // Arrange
             using (TestDirectory.Create())
@@ -96,18 +96,18 @@ await Assert.ThrowsAsync<InvalidDataException>(
         }
 
         [Fact]
-        public async Task GetCacheFilePathAsync_WithValidBaseIntermediateOutputPath_Succeeds()
+        public async Task GetCacheFilePathAsync_WithValidMSBuildProjectExtensionsPath_Succeeds()
         {
             // Arrange
             using (var testDirectory = TestDirectory.Create())
             {
                 var testProj = "project.csproj";
-                var testBaseIntermediateOutputPath = Path.Combine(testDirectory, "obj");
-                Directory.CreateDirectory(testBaseIntermediateOutputPath);
+                var testMSBuildProjectExtensionsPath = Path.Combine(testDirectory, "obj");
+                Directory.CreateDirectory(testMSBuildProjectExtensionsPath);
                 var projectAdapter = Mock.Of<IVsProjectAdapter>();
                 Mock.Get(projectAdapter)
-                    .SetupGet(x => x.BaseIntermediateOutputPath)
-                    .Returns(testBaseIntermediateOutputPath);
+                    .SetupGet(x => x.MSBuildProjectExtensionsPath)
+                    .Returns(testMSBuildProjectExtensionsPath);
 
                 Mock.Get(projectAdapter)
                     .SetupGet(x => x.FullProjectPath)
@@ -125,16 +125,16 @@ public async Task GetCacheFilePathAsync_WithValidBaseIntermediateOutputPath_Succ
                 var cachePath = await testProject.GetCacheFilePathAsync();
 
                 // Assert
-                Assert.Equal(Path.Combine(testBaseIntermediateOutputPath, $"{testProj}.nuget.cache"), cachePath);
+                Assert.Equal(Path.Combine(testMSBuildProjectExtensionsPath, $"{testProj}.nuget.cache"), cachePath);
 
                 // Verify
                 Mock.Get(projectAdapter)
-                    .VerifyGet(x => x.BaseIntermediateOutputPath, Times.AtLeastOnce);
+                    .VerifyGet(x => x.MSBuildProjectExtensionsPath, Times.AtLeastOnce);
             }
         }
 
         [Fact]
-        public async Task GetCacheFilePathAsync_WithNoBaseIntermediateOutputPath_Throws()
+        public async Task GetCacheFilePathAsync_WithNoMSBuildProjectExtensionsPath_Throws()
         {
             // Arrange
             using (TestDirectory.Create())
@@ -160,12 +160,12 @@ public async Task GetCacheFilePathAsync_SwitchesToMainThread_Succeeds()
             using (var testDirectory = TestDirectory.Create())
             {
                 var testProj = "project.csproj";
-                var testBaseIntermediateOutputPath = Path.Combine(testDirectory, "obj");
-                Directory.CreateDirectory(testBaseIntermediateOutputPath);
+                var testMSBuildProjectExtensionsPath = Path.Combine(testDirectory, "obj");
+                Directory.CreateDirectory(testMSBuildProjectExtensionsPath);
                 var projectAdapter = Mock.Of<IVsProjectAdapter>();
                 Mock.Get(projectAdapter)
-                    .SetupGet(x => x.BaseIntermediateOutputPath)
-                    .Returns(testBaseIntermediateOutputPath);
+                    .SetupGet(x => x.MSBuildProjectExtensionsPath)
+                    .Returns(testMSBuildProjectExtensionsPath);
 
                 Mock.Get(projectAdapter)
                     .SetupGet(x => x.FullProjectPath)
@@ -181,11 +181,11 @@ public async Task GetCacheFilePathAsync_SwitchesToMainThread_Succeeds()
                 var assetsPath = await testProject.GetCacheFilePathAsync();
 
                 // Assert
-                Assert.Equal(Path.Combine(testBaseIntermediateOutputPath, $"{testProj}.nuget.cache"), assetsPath);
+                Assert.Equal(Path.Combine(testMSBuildProjectExtensionsPath, $"{testProj}.nuget.cache"), assetsPath);
 
                 // Verify
                 Mock.Get(projectAdapter)
-                    .VerifyGet(x => x.BaseIntermediateOutputPath, Times.AtLeastOnce);
+                    .VerifyGet(x => x.MSBuildProjectExtensionsPath, Times.AtLeastOnce);
             }
         }
 
@@ -776,11 +776,11 @@ private static IVsProjectAdapter CreateProjectAdapter(string fullPath)
                 .Setup(x => x.GetTargetFrameworkAsync())
                 .ReturnsAsync(NuGetFramework.Parse("netstandard13"));
 
-            var testBaseIntermediateOutputPath = Path.Combine(fullPath, "obj");
-            Directory.CreateDirectory(testBaseIntermediateOutputPath);
+            var testMSBuildProjectExtensionsPath = Path.Combine(fullPath, "obj");
+            Directory.CreateDirectory(testMSBuildProjectExtensionsPath);
             projectAdapter
-                .Setup(x => x.BaseIntermediateOutputPath)
-                .Returns(testBaseIntermediateOutputPath);
+                .Setup(x => x.MSBuildProjectExtensionsPath)
+                .Returns(testMSBuildProjectExtensionsPath);
 
             return projectAdapter.Object;
         }
diff --git a/test/NuGet.Clients.Tests/NuGet.SolutionRestoreManager.Test/VsSolutionRestoreServiceTests.cs b/test/NuGet.Clients.Tests/NuGet.SolutionRestoreManager.Test/VsSolutionRestoreServiceTests.cs
index d326df8c4b5..bc18be70765 100644
--- a/test/NuGet.Clients.Tests/NuGet.SolutionRestoreManager.Test/VsSolutionRestoreServiceTests.cs
+++ b/test/NuGet.Clients.Tests/NuGet.SolutionRestoreManager.Test/VsSolutionRestoreServiceTests.cs
@@ -474,7 +474,7 @@ public async Task NominateProjectAsync_CacheFilePathInPackageSpec_Succeeds()
 
             var actualProjectSpec = actualRestoreSpec.GetProjectSpec(projectFullPath);
             Assert.NotNull(actualProjectSpec);
-            Assert.Equal(Path.Combine(actualProjectSpec.RestoreMetadata.OutputPath,$"{Path.GetFileName(projectFullPath)}.nuget.cache"), actualProjectSpec.RestoreMetadata.CacheFilePath);
+            Assert.Equal(actualProjectSpec.RestoreMetadata.OutputPath, actualProjectSpec.RestoreMetadata.AssetsCacheFolder);
         }
 
         [Theory]
diff --git a/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/DotnetToolTests.cs b/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/DotnetToolTests.cs
index 74520b97a22..6b462b0b9aa 100644
--- a/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/DotnetToolTests.cs
+++ b/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/DotnetToolTests.cs
@@ -111,7 +111,7 @@ public void DotnetToolTests_BasicDotnetToolRestore_Succeeds(string tfm)
                 // Assert
                 Assert.True(result.Item1 == 0, result.AllOutput);
                 // Verify the assets file
-                var lockFile = LockFileUtilities.GetLockFile(Path.Combine(testDirectory, projectName, "project.assets.json"), NullLogger.Instance);
+                var lockFile = LockFileUtilities.GetLockFile(Path.Combine(testDirectory, projectName, "obj", "project.assets.json"), NullLogger.Instance);
                 Assert.NotNull(lockFile);
                 Assert.Equal(2, lockFile.Targets.Count);
                 var ridTargets = lockFile.Targets.Where(e => e.RuntimeIdentifier != null ? e.RuntimeIdentifier.Equals(rid, StringComparison.CurrentCultureIgnoreCase) : false);
@@ -195,7 +195,7 @@ public void DotnetToolTests_BasicDotnetToolRestore_WithJsonCompatibleAssets_Succ
                 // Assert
                 Assert.True(result.Item1 == 0, result.AllOutput);
                 // Verify the assets file
-                var lockFile = LockFileUtilities.GetLockFile(Path.Combine(testDirectory, projectName, "project.assets.json"), NullLogger.Instance);
+                var lockFile = LockFileUtilities.GetLockFile(Path.Combine(testDirectory, projectName, "obj", "project.assets.json"), NullLogger.Instance);
                 Assert.NotNull(lockFile);
                 Assert.Equal(2, lockFile.Targets.Count);
                 var ridTargets = lockFile.Targets.Where(e => e.RuntimeIdentifier != null ? e.RuntimeIdentifier.Equals(rid, StringComparison.CurrentCultureIgnoreCase) : false);
@@ -243,7 +243,7 @@ public void DotnetToolTests_PackageWithRuntimeJson_RuntimeIdentifierAny_Succeeds
                 // Assert
                 Assert.True(result.Item1 == 0, result.AllOutput);
                 // Verify the assets file
-                var lockFile = LockFileUtilities.GetLockFile(Path.Combine(testDirectory, projectName, "project.assets.json"), NullLogger.Instance);
+                var lockFile = LockFileUtilities.GetLockFile(Path.Combine(testDirectory, projectName, "obj", "project.assets.json"), NullLogger.Instance);
                 Assert.NotNull(lockFile);
                 Assert.Equal(2, lockFile.Targets.Count);
                 var ridTargets = lockFile.Targets.Where(e => e.RuntimeIdentifier != null ? e.RuntimeIdentifier.Equals(projectRID, StringComparison.CurrentCultureIgnoreCase) : false);
@@ -384,7 +384,7 @@ public void DotnetToolTests_ToolWithPlatformPackage_Succeeds(string tfm, string
 
                 // Assert
                 Assert.True(result.Item1 == 0, result.AllOutput);
-                var lockFile = LockFileUtilities.GetLockFile(Path.Combine(testDirectory, projectName, "project.assets.json"), NullLogger.Instance);
+                var lockFile = LockFileUtilities.GetLockFile(Path.Combine(testDirectory, projectName, "obj", "project.assets.json"), NullLogger.Instance);
                 Assert.NotNull(lockFile);
                 Assert.Equal(2, lockFile.Targets.Count);
                 var ridTargets = lockFile.Targets.Where(e => e.RuntimeIdentifier != null ? e.RuntimeIdentifier.Equals(projectRid, StringComparison.CurrentCultureIgnoreCase) : false);
@@ -504,7 +504,7 @@ public void DotnetToolTests_BasicDotnetToolRestoreWithNestedValues_Succeeds(stri
                 // Assert
                 Assert.True(result.Item1 == 0, result.AllOutput);
                 // Verify the assets file
-                var lockFile = LockFileUtilities.GetLockFile(Path.Combine(testDirectory, projectName, "project.assets.json"), NullLogger.Instance);
+                var lockFile = LockFileUtilities.GetLockFile(Path.Combine(testDirectory, projectName, "obj", "project.assets.json"), NullLogger.Instance);
                 Assert.NotNull(lockFile);
                 Assert.Equal(2, lockFile.Targets.Count);
                 var ridTargets = lockFile.Targets.Where(e => e.RuntimeIdentifier != null ? e.RuntimeIdentifier.Equals(rid, StringComparison.CurrentCultureIgnoreCase) : false);
diff --git a/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/MsbuilldIntegrationTestFixture.cs b/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/MsbuildIntegrationTestFixture.cs
similarity index 99%
rename from test/NuGet.Core.FuncTests/Dotnet.Integration.Test/MsbuilldIntegrationTestFixture.cs
rename to test/NuGet.Core.FuncTests/Dotnet.Integration.Test/MsbuildIntegrationTestFixture.cs
index c5aa04ed303..2e3b234ff71 100644
--- a/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/MsbuilldIntegrationTestFixture.cs
+++ b/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/MsbuildIntegrationTestFixture.cs
@@ -80,7 +80,6 @@ internal void CreateDotnetToolProject(string solutionRoot, string projectName, s
             var projectFileName = Path.Combine(workingDirectory, projectName + ".csproj");
 
             var restorePackagesPath = Path.Combine(workingDirectory, "tools", "packages");
-            var baseIntermediatepath = Path.Combine(workingDirectory);
             var restoreSolutionDirectory = workingDirectory;
             var packageReference = string.Empty;
             foreach (var package in packages) {
@@ -94,7 +93,6 @@ internal void CreateDotnetToolProject(string solutionRoot, string projectName, s
                 <RuntimeIdentifier>{rid} </RuntimeIdentifier> 
                 <!-- Things that do change-->
                 <RestorePackagesPath>{restorePackagesPath}</RestorePackagesPath>
-                <BaseIntermediateOutputPath>{baseIntermediatepath}</BaseIntermediateOutputPath>
                 <RestoreSolutionDirectory>{restoreSolutionDirectory}</RestoreSolutionDirectory>
     
                 <RestoreSources>{source}</RestoreSources>
diff --git a/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/PackTaskTests.cs b/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/PackTaskTests.cs
index 18f3be6c95e..c503e0f2e86 100644
--- a/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/PackTaskTests.cs
+++ b/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/PackTaskTests.cs
@@ -317,9 +317,9 @@ public void PackTask_MapsAllProperties()
             {
                 AssemblyName = "AssemblyName",
                 FrameworkAssemblyReferences = new ITaskItem[0],
-                Authors = new string[0],
-                AllowedOutputExtensionsInPackageBuildOutputFolder = new string[0],
-                AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder = new string[0],
+                Authors = Array.Empty<string>(),
+                AllowedOutputExtensionsInPackageBuildOutputFolder = Array.Empty<string>(),
+                AllowedOutputExtensionsInSymbolsPackageBuildOutputFolder = Array.Empty<string>(),
                 BuildOutputFolder = "BuildOutputFolder",
                 ContentTargetFolders = new string[] { "ContentTargetFolders" } ,
                 ContinuePackingAfterGeneratingNuspec = true,
@@ -335,13 +335,13 @@ public void PackTask_MapsAllProperties()
                 MinClientVersion = "MinClientVersion",
                 NoPackageAnalysis = true,
                 NuspecOutputPath = "NuspecOutputPath",
-                NuspecProperties = new string[0],
+                NuspecProperties = Array.Empty<string>(),
                 PackItem = null, // This is asserted by other tests. It does not serialize well.
                 PackageFiles = new ITaskItem[0],
                 PackageFilesToExclude = new ITaskItem[0],
                 PackageId = "PackageId",
                 PackageOutputPath = "PackageOutputPath",
-                PackageTypes = new string[0],
+                PackageTypes = Array.Empty<string>(),
                 PackageVersion = "PackageVersion",
                 ProjectReferencesWithVersions = new ITaskItem[0],
                 ProjectUrl = "ProjectUrl",
@@ -353,8 +353,8 @@ public void PackTask_MapsAllProperties()
                 RequireLicenseAcceptance = true,
                 Serviceable = true,
                 SourceFiles = new ITaskItem[0],
-                Tags = new string[0],
-                TargetFrameworks = new string[0],
+                Tags = Array.Empty<string>(),
+                TargetFrameworks = Array.Empty<string>(),
                 BuildOutputInPackage = new ITaskItem[0],
                 TargetPathsToSymbols = new ITaskItem[0]
             };
diff --git a/test/NuGet.Core.Tests/NuGet.Build.Tasks.Test/GetRestoreSettingTaskTests.cs b/test/NuGet.Core.Tests/NuGet.Build.Tasks.Test/GetRestoreSettingTaskTests.cs
index b9d05799854..1f00d5d290b 100644
--- a/test/NuGet.Core.Tests/NuGet.Build.Tasks.Test/GetRestoreSettingTaskTests.cs
+++ b/test/NuGet.Core.Tests/NuGet.Build.Tasks.Test/GetRestoreSettingTaskTests.cs
@@ -42,7 +42,7 @@ public void GetRestoreSettingsTask_GetValueGetLastValue()
             RestoreSettingsUtils.GetValue(
                 () => null,
                 () => null,
-                () => new string[0]).ShouldBeEquivalentTo(new string[0]);
+                () => Array.Empty<string>()).ShouldBeEquivalentTo(Array.Empty<string>());
         }
 
         [Fact]
diff --git a/test/NuGet.Core.Tests/NuGet.PackageManagement.Test/InstallationCompatibilityTests.cs b/test/NuGet.Core.Tests/NuGet.PackageManagement.Test/InstallationCompatibilityTests.cs
index cb2c27e30ab..69fadce5b51 100644
--- a/test/NuGet.Core.Tests/NuGet.PackageManagement.Test/InstallationCompatibilityTests.cs
+++ b/test/NuGet.Core.Tests/NuGet.PackageManagement.Test/InstallationCompatibilityTests.cs
@@ -361,7 +361,7 @@ public TestContext(string userPackageFolder = null)
                     .Returns(userPackageFolder);
                 NuGetPathContext
                     .Setup(x => x.FallbackPackageFolders)
-                    .Returns(new string[0]);
+                    .Returns(Array.Empty<string>());
 
                 NuspecReader
                     .Setup(p => p.GetIdentity())
diff --git a/test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/AttributeUtilityTests.cs b/test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/AttributeUtilityTests.cs
index 45f069113d7..23310c525f9 100644
--- a/test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/AttributeUtilityTests.cs
+++ b/test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/AttributeUtilityTests.cs
@@ -566,7 +566,7 @@ public void CreateNuGetPackageOwners_WhenPackageOwnersNull_Throws()
         public void CreateNuGetPackageOwners_WhenPackageOwnersEmpty_Throws()
         {
             var exception = Assert.Throws<ArgumentException>(
-                () => AttributeUtility.CreateNuGetPackageOwners(new string[0]));
+                () => AttributeUtility.CreateNuGetPackageOwners(Array.Empty<string>()));
 
             Assert.Equal("packageOwners", exception.ParamName);
             Assert.StartsWith("The argument cannot be null or empty.", exception.Message);
diff --git a/test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/NuGetPackageOwnersTests.cs b/test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/NuGetPackageOwnersTests.cs
index b49d83a93e7..f80ac20e2a2 100644
--- a/test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/NuGetPackageOwnersTests.cs
+++ b/test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/NuGetPackageOwnersTests.cs
@@ -25,7 +25,7 @@ public void Constructor_WhenPackageOwnersNull_Throws()
         public void Constructor_WhenPackageOwnersEmpty_Throws()
         {
             var exception = Assert.Throws<ArgumentException>(
-                () => new NuGetPackageOwners(new string[0]));
+                () => new NuGetPackageOwners(Array.Empty<string>()));
 
             Assert.Equal("packageOwners", exception.ParamName);
             Assert.StartsWith("The argument cannot be null or empty.", exception.Message);
diff --git a/test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/SigningUtilityTests.cs b/test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/SigningUtilityTests.cs
index 6de36f93214..c6200d6587d 100644
--- a/test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/SigningUtilityTests.cs
+++ b/test/NuGet.Core.Tests/NuGet.Packaging.Test/SigningTests/SigningUtilityTests.cs
@@ -267,7 +267,7 @@ public void CreateSignedAttributes_RepositorySignPackageRequest_WhenPackageOwner
         public void CreateSignedAttributes_RepositorySignPackageRequest_WhenPackageOwnersEmpty_ReturnsAttributes()
         {
             var v3ServiceIndexUrl = new Uri("https://test.test", UriKind.Absolute);
-            var packageOwners = new string[0];
+            var packageOwners = Array.Empty<string>();
 
             using (var certificate = _fixture.GetDefaultCertificate())
             using (var request = CreateRequestRepository(certificate, v3ServiceIndexUrl, packageOwners))
diff --git a/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/LockFileFormatTests.cs b/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/LockFileFormatTests.cs
index c16f81a1a0c..331dbf82aba 100644
--- a/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/LockFileFormatTests.cs
+++ b/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/LockFileFormatTests.cs
@@ -317,7 +317,7 @@ public void LockFileFormat_WritesLockFile()
             lockFile.ProjectFileDependencyGroups.Add(
                 new ProjectFileDependencyGroup("", new string[] { "System.Runtime [4.0.10-beta-*, )" }));
             lockFile.ProjectFileDependencyGroups.Add(
-                new ProjectFileDependencyGroup(FrameworkConstants.CommonFrameworks.DotNet.DotNetFrameworkName, new string[0]));
+                new ProjectFileDependencyGroup(FrameworkConstants.CommonFrameworks.DotNet.DotNetFrameworkName, Array.Empty<string>()));
 
             // Act
             var lockFileFormat = new LockFileFormat();
@@ -547,7 +547,7 @@ public void LockFileFormat_WritesMinimalErrorMessage()
             lockFile.ProjectFileDependencyGroups.Add(
                 new ProjectFileDependencyGroup("", new string[] { "System.Runtime [4.0.10-beta-*, )" }));
             lockFile.ProjectFileDependencyGroups.Add(
-                new ProjectFileDependencyGroup(FrameworkConstants.CommonFrameworks.DotNet.DotNetFrameworkName, new string[0]));
+                new ProjectFileDependencyGroup(FrameworkConstants.CommonFrameworks.DotNet.DotNetFrameworkName, Array.Empty<string>()));
 
             lockFile.LogMessages = new List<IAssetsLogMessage>
             {
@@ -658,7 +658,7 @@ public void LockFileFormat_WritesMultipleErrorMessages()
             lockFile.ProjectFileDependencyGroups.Add(
                 new ProjectFileDependencyGroup("", new string[] { "System.Runtime [4.0.10-beta-*, )" }));
             lockFile.ProjectFileDependencyGroups.Add(
-                new ProjectFileDependencyGroup(FrameworkConstants.CommonFrameworks.DotNet.DotNetFrameworkName, new string[0]));
+                new ProjectFileDependencyGroup(FrameworkConstants.CommonFrameworks.DotNet.DotNetFrameworkName, Array.Empty<string>()));
 
             lockFile.LogMessages = new List<IAssetsLogMessage>
             {
@@ -774,7 +774,7 @@ public void LockFileFormat_WritesFullErrorMessage()
             lockFile.ProjectFileDependencyGroups.Add(
                 new ProjectFileDependencyGroup("", new string[] { "System.Runtime [4.0.10-beta-*, )" }));
             lockFile.ProjectFileDependencyGroups.Add(
-                new ProjectFileDependencyGroup(FrameworkConstants.CommonFrameworks.DotNet.DotNetFrameworkName, new string[0]));
+                new ProjectFileDependencyGroup(FrameworkConstants.CommonFrameworks.DotNet.DotNetFrameworkName, Array.Empty<string>()));
 
             lockFile.LogMessages = new List<IAssetsLogMessage>
             {
@@ -893,7 +893,7 @@ public void LockFileFormat_WritesErrorMessageWithFilePathSameAsProjectPath()
             lockFile.ProjectFileDependencyGroups.Add(
                 new ProjectFileDependencyGroup("", new string[] { "System.Runtime [4.0.10-beta-*, )" }));
             lockFile.ProjectFileDependencyGroups.Add(
-                new ProjectFileDependencyGroup(FrameworkConstants.CommonFrameworks.DotNet.DotNetFrameworkName, new string[0]));
+                new ProjectFileDependencyGroup(FrameworkConstants.CommonFrameworks.DotNet.DotNetFrameworkName, Array.Empty<string>()));
             lockFile.PackageSpec = new PackageSpec(new List<TargetFrameworkInformation>())
             {
                 RestoreMetadata = new ProjectRestoreMetadata()
@@ -1006,7 +1006,7 @@ public void LockFileFormat_WritesMinimalWarningMessageWithWarningLevel()
             lockFile.ProjectFileDependencyGroups.Add(
                 new ProjectFileDependencyGroup("", new string[] { "System.Runtime [4.0.10-beta-*, )" }));
             lockFile.ProjectFileDependencyGroups.Add(
-                new ProjectFileDependencyGroup(FrameworkConstants.CommonFrameworks.DotNet.DotNetFrameworkName, new string[0]));
+                new ProjectFileDependencyGroup(FrameworkConstants.CommonFrameworks.DotNet.DotNetFrameworkName, Array.Empty<string>()));
 
             lockFile.LogMessages = new List<IAssetsLogMessage>
             {
diff --git a/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/PackageSpecCloningTests.cs b/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/PackageSpecCloningTests.cs
index c8eb4481a40..75eba731c6c 100644
--- a/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/PackageSpecCloningTests.cs
+++ b/test/NuGet.Core.Tests/NuGet.ProjectModel.Test/PackageSpecCloningTests.cs
@@ -362,7 +362,7 @@ private ProjectRestoreMetadata CreateProjectRestoreMetadata()
             originalProjectRestoreMetadata.ProjectName = "ProjectName";
             originalProjectRestoreMetadata.ProjectUniqueName = "ProjectUniqueName";
             originalProjectRestoreMetadata.PackagesPath = "PackagesPath";
-            originalProjectRestoreMetadata.CacheFilePath = "CacheFilePath";
+            originalProjectRestoreMetadata.AssetsCacheFolder = "AssetsCacheFolder";
             originalProjectRestoreMetadata.CrossTargeting = true;
             originalProjectRestoreMetadata.LegacyPackagesDirectory = true;
             originalProjectRestoreMetadata.ValidateRuntimeAssets = true;
diff --git a/test/NuGet.Core.Tests/NuGet.Versioning.Test/NuGetVersionTest.cs b/test/NuGet.Core.Tests/NuGet.Versioning.Test/NuGetVersionTest.cs
index 1543b37b87c..1222e936472 100644
--- a/test/NuGet.Core.Tests/NuGet.Versioning.Test/NuGetVersionTest.cs
+++ b/test/NuGet.Core.Tests/NuGet.Versioning.Test/NuGetVersionTest.cs
@@ -26,7 +26,7 @@ public void NuGetVersionConstructors()
             versions.Add(new NuGetVersion(4, 3, 0, string.Empty));
             versions.Add(new NuGetVersion(4, 3, 0, null));
             versions.Add(new NuGetVersion(4, 3, 0, 0));
-            versions.Add(new NuGetVersion(new Version(4, 3, 0), new string[0], string.Empty, "4.3"));
+            versions.Add(new NuGetVersion(new Version(4, 3, 0), Array.Empty<string>(), string.Empty, "4.3"));
 
             versions.Add(new SemanticVersion(4, 3, 0));
             versions.Add(new SemanticVersion(4, 3, 0, string.Empty));
diff --git a/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsFactAttribute.cs b/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsFactAttribute.cs
index e95fcceaf95..530794dedbf 100644
--- a/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsFactAttribute.cs
+++ b/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsFactAttribute.cs
@@ -55,7 +55,7 @@ public FileExistsFactAttribute(params string[] paths)
 
         private string[] GetPaths()
         {
-            var paths = new HashSet<string>(Paths ?? new string[0], StringComparer.OrdinalIgnoreCase)
+            var paths = new HashSet<string>(Paths ?? Array.Empty<string>(), StringComparer.OrdinalIgnoreCase)
             {
                 Path
             };
diff --git a/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsInNuGetRoamingFactAttribute.cs b/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsInNuGetRoamingFactAttribute.cs
index fa35b64eb3b..d2a73497f72 100644
--- a/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsInNuGetRoamingFactAttribute.cs
+++ b/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsInNuGetRoamingFactAttribute.cs
@@ -58,7 +58,7 @@ public FileExistsInNuGetRoamingFactAttribute(params string[] paths)
 
         private string[] GetPaths()
         {
-            var paths = new HashSet<string>(Paths ?? new string[0], StringComparer.OrdinalIgnoreCase)
+            var paths = new HashSet<string>(Paths ?? Array.Empty<string>(), StringComparer.OrdinalIgnoreCase)
             {
                 Path
             };
diff --git a/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsInNuGetRoamingTheoryAttribute.cs b/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsInNuGetRoamingTheoryAttribute.cs
index dbcca28862d..88679ff7c86 100644
--- a/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsInNuGetRoamingTheoryAttribute.cs
+++ b/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsInNuGetRoamingTheoryAttribute.cs
@@ -58,7 +58,7 @@ public FileExistsInNuGetRoamingTheoryAttribute(params string[] paths)
 
         private string[] GetPaths()
         {
-            var paths = new HashSet<string>(Paths ?? new string[0], StringComparer.OrdinalIgnoreCase)
+            var paths = new HashSet<string>(Paths ?? Array.Empty<string>(), StringComparer.OrdinalIgnoreCase)
             {
                 Path
             };
diff --git a/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsTheoryAttribute.cs b/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsTheoryAttribute.cs
index 10a85ae490e..ea671b375ba 100644
--- a/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsTheoryAttribute.cs
+++ b/test/TestUtilities/Test.Utility/PlatformXunitAttributes/FileExistsTheoryAttribute.cs
@@ -55,7 +55,7 @@ public FileExistsTheoryAttribute(params string[] paths)
 
         private string[] GetPaths()
         {
-            var paths = new HashSet<string>(Paths ?? new string[0], StringComparer.OrdinalIgnoreCase)
+            var paths = new HashSet<string>(Paths ?? Array.Empty<string>(), StringComparer.OrdinalIgnoreCase)
             {
                 Path
             };
diff --git a/test/TestUtilities/Test.Utility/PlatformXunitAttributes/PlatformFactAttribute.cs b/test/TestUtilities/Test.Utility/PlatformXunitAttributes/PlatformFactAttribute.cs
index b99744cddf8..fa618c66ba7 100644
--- a/test/TestUtilities/Test.Utility/PlatformXunitAttributes/PlatformFactAttribute.cs
+++ b/test/TestUtilities/Test.Utility/PlatformXunitAttributes/PlatformFactAttribute.cs
@@ -68,12 +68,12 @@ public PlatformFactAttribute(params string[] platforms)
 
         private string[] GetAllPlatforms()
         {
-            var platforms = new HashSet<string>(Platforms ?? new string[0], StringComparer.OrdinalIgnoreCase)
+            var platforms = new HashSet<string>(Platforms ?? Array.Empty<string>(), StringComparer.OrdinalIgnoreCase)
             {
                 Platform
             };
 
-            var skipPlatforms = new HashSet<string>(SkipPlatforms ?? new string[0], StringComparer.OrdinalIgnoreCase)
+            var skipPlatforms = new HashSet<string>(SkipPlatforms ?? Array.Empty<string>(), StringComparer.OrdinalIgnoreCase)
             {
                 SkipPlatform
             };
diff --git a/test/TestUtilities/Test.Utility/PlatformXunitAttributes/PlatformTheoryAttribute.cs b/test/TestUtilities/Test.Utility/PlatformXunitAttributes/PlatformTheoryAttribute.cs
index 281afa059cb..b3b2f122320 100644
--- a/test/TestUtilities/Test.Utility/PlatformXunitAttributes/PlatformTheoryAttribute.cs
+++ b/test/TestUtilities/Test.Utility/PlatformXunitAttributes/PlatformTheoryAttribute.cs
@@ -68,12 +68,12 @@ public PlatformTheoryAttribute(params string[] platforms)
 
         private string[] GetAllPlatforms()
         {
-            var platforms = new HashSet<string>(Platforms ?? new string[0], StringComparer.OrdinalIgnoreCase)
+            var platforms = new HashSet<string>(Platforms ?? Array.Empty<string>(), StringComparer.OrdinalIgnoreCase)
             {
                 Platform
             };
 
-            var skipPlatforms = new HashSet<string>(SkipPlatforms ?? new string[0], StringComparer.OrdinalIgnoreCase)
+            var skipPlatforms = new HashSet<string>(SkipPlatforms ?? Array.Empty<string>(), StringComparer.OrdinalIgnoreCase)
             {
                 SkipPlatform
             };
diff --git a/test/TestUtilities/Test.Utility/SimpleTestSetup/SimpleTestProjectContext.cs b/test/TestUtilities/Test.Utility/SimpleTestSetup/SimpleTestProjectContext.cs
index 05a1af743d3..e1dc5abc496 100644
--- a/test/TestUtilities/Test.Utility/SimpleTestSetup/SimpleTestProjectContext.cs
+++ b/test/TestUtilities/Test.Utility/SimpleTestSetup/SimpleTestProjectContext.cs
@@ -60,7 +60,7 @@ public SimpleTestProjectContext(string projectName, ProjectStyle type, string so
         public string ProjectPath { get; set; }
 
         /// <summary>
-        /// Base intermediate directory path
+        /// MSBuildProjectExtensionsPath
         /// </summary>
         public string OutputPath { get; set; }
 
@@ -396,7 +396,7 @@ public XDocument GetXML()
             ProjectFileUtils.AddProperties(xml, new Dictionary<string, string>()
             {
                 { "ProjectGuid", "{" + ProjectGuid.ToString() + "}" },
-                { "BaseIntermediateOutputPath", OutputPath },
+                { "MSBuildProjectExtensionsPath", OutputPath },
                 { "AssemblyName", ProjectName }
             });
 
diff --git a/test/TestUtilities/Test.Utility/TestPackages.cs b/test/TestUtilities/Test.Utility/TestPackages.cs
index ef2a106b0a6..2f5c947b5bd 100644
--- a/test/TestUtilities/Test.Utility/TestPackages.cs
+++ b/test/TestUtilities/Test.Utility/TestPackages.cs
@@ -238,7 +238,7 @@ public static FileInfo GetLegacySolutionLevelPackage(string path, string package
 
         public static FileInfo GetInvalidPackage(string path, string packageId, string packageVersion)
         {
-            return GeneratePackage(path, packageId, packageVersion, new string[0]);
+            return GeneratePackage(path, packageId, packageVersion, Array.Empty<string>());
         }
 
         public static FileInfo GetEmptyPackageWithDependencies(string path, string packageId, string packageVersion)