diff --git a/Directory.Packages.props b/Directory.Packages.props
index e66e4b6c2..4c5a296c5 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -11,6 +11,7 @@
     <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorPackageVersion)" />
     <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
     <PackageVersion Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildRuntimePackageVersion)" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCorePackageVersion)" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Razor.Language" Version="$(MicrosoftAspNetCoreRazorLanguagePackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisVersion)" />
diff --git a/eng/Versions.props b/eng/Versions.props
index 5d0347948..9f716d2db 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -77,7 +77,8 @@
     <!-- Microsoft.AspNetCore.Razor.Language -->
     <MicrosoftAspNetCoreRazorLanguagePackageVersion>6.0.24</MicrosoftAspNetCoreRazorLanguagePackageVersion>
     <!-- Microsoft.Build-->
-    <MicrosoftBuildPackageVersion>17.11.4 </MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.11.31</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildTasksCorePackageVersion>17.14.8</MicrosoftBuildTasksCorePackageVersion>
     <!-- Microsoft.Build.Utilities-->
     <MicrosoftBuildUtilitiesCorePackageVersion>17.14.8</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildLocatorPackageVersion>1.9.1</MicrosoftBuildLocatorPackageVersion>
diff --git a/es-metadata.yml b/es-metadata.yml
new file mode 100644
index 000000000..613ad4484
--- /dev/null
+++ b/es-metadata.yml
@@ -0,0 +1,8 @@
+schemaVersion: 0.0.1
+isProduction: true
+accountableOwners:
+  service: 225159cd-5cda-4eaf-9b48-9bc4ff385b23
+routing:
+  defaultAreaPath:
+    org: devdiv
+    path: DevDiv\NET Tools\Web Tools\Web\Scaffolding
\ No newline at end of file
diff --git a/src/dotnet-scaffolding/Directory.Packages.props b/src/dotnet-scaffolding/Directory.Packages.props
index ffd37a06d..f57875857 100644
--- a/src/dotnet-scaffolding/Directory.Packages.props
+++ b/src/dotnet-scaffolding/Directory.Packages.props
@@ -10,6 +10,8 @@
     <PackageVersion Include="Microsoft.ApplicationInsights.WorkerService" Version="$(MicrosoftApplicationInsightsWorkerServicePackageVersion)" />
     <PackageVersion Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorPackageVersion)" />
     <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
+    <!-- pinning this directly here, as this version needs to be different -->
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.11.31" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisPreviewVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisPreviewVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisPreviewVersion)" />
diff --git a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Microsoft.DotNet.Scaffolding.Roslyn.csproj b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Microsoft.DotNet.Scaffolding.Roslyn.csproj
index bdc4f7021..eb950c3d2 100644
--- a/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Microsoft.DotNet.Scaffolding.Roslyn.csproj
+++ b/src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Microsoft.DotNet.Scaffolding.Roslyn.csproj
@@ -9,6 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Locator" />
     <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.CodeAnalysis.Common" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" />
diff --git a/test/Scaffolding/VS.Web.CG.MSBuild.Test/VS.Web.CG.MSBuild.Tests.csproj b/test/Scaffolding/VS.Web.CG.MSBuild.Test/VS.Web.CG.MSBuild.Tests.csproj
index ef44fe60d..2081d9113 100644
--- a/test/Scaffolding/VS.Web.CG.MSBuild.Test/VS.Web.CG.MSBuild.Tests.csproj
+++ b/test/Scaffolding/VS.Web.CG.MSBuild.Test/VS.Web.CG.MSBuild.Tests.csproj
@@ -28,6 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Runtime" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
     <PackageReference Include="NuGet.Packaging" />
   </ItemGroup>
diff --git a/test/Scaffolding/VS.Web.CG.Sources.Test/VS.Web.CG.Sources.Tests.csproj b/test/Scaffolding/VS.Web.CG.Sources.Test/VS.Web.CG.Sources.Tests.csproj
index b25341e77..7cca281f5 100644
--- a/test/Scaffolding/VS.Web.CG.Sources.Test/VS.Web.CG.Sources.Tests.csproj
+++ b/test/Scaffolding/VS.Web.CG.Sources.Test/VS.Web.CG.Sources.Tests.csproj
@@ -24,6 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Runtime" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
   </ItemGroup>