Update patches

patches/aspnet-extensions/0003-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch → patches/aspnet-extensions/0002-Build-MS.Internal.Ext.Refs-for-AspNetCore.patch

@@ -1,7 +1,7 @@
-From 9d97837d014e982f99d4d4a60c96f2f443f88914 Mon Sep 17 00:00:00 2001
+From ecf43b244977a72144d1cc9ef00fdff6552417f9 Mon Sep 17 00:00:00 2001
 From: adaggarwal <aditya.aggarwal@microsoft.com>
 Date: Wed, 13 Nov 2019 22:59:38 +0000
-Subject: [PATCH 2/2] Build MS.Internal.Ext.Refs for AspNetCore
+Subject: [PATCH 2/4] Build MS.Internal.Ext.Refs for AspNetCore
 
 ---
  .../ref/Microsoft.Internal.Extensions.Refs.csproj                   | 6 +++---
@@ -35,5 +35,5 @@ index c89ec06..952d69e 100644
 
    <!-- Override the default MSBuild targets so that nothing is returned from the project since it represents a collection of assemblies. -->
 -- 
-1.8.3.1
+2.7.4
 

patches/aspnet-extensions/0003-Don-t-warn-for-package-upgrades.patch

@@ -1,14 +1,14 @@
-From dbfe192c7005cba605a99753a15dc65bc86c1512 Mon Sep 17 00:00:00 2001
+From d7d674d61c76bce7824d0353c5642266236a83aa Mon Sep 17 00:00:00 2001
 From: Chris Rummel <crummel@microsoft.com>
 Date: Thu, 14 Nov 2019 20:50:56 -0600
-Subject: [PATCH 3/3] Don't warn for package upgrades
+Subject: [PATCH 3/4] Don't warn for package upgrades
 
 ---
  Directory.Build.props | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/Directory.Build.props b/Directory.Build.props
-index ae8a1733c..db1fa96de 100644
+index b9ac69e..365f4ea 100644
 --- a/Directory.Build.props
 +++ b/Directory.Build.props
 @@ -19,6 +19,7 @@
@@ -20,5 +20,5 @@ index ae8a1733c..db1fa96de 100644
 
    <Import Project="eng\FlakyTests.BeforeArcade.props" />
 -- 
-2.18.0
+2.7.4
 

patches/aspnet-extensions/0004-Don-t-call-dotnet-without-a-path.patch

@@ -1,17 +1,17 @@
-From b5498725a373eb203f75673687884393af8257fc Mon Sep 17 00:00:00 2001
+From 44308d18ac36deeb40b109a520a997a998b20929 Mon Sep 17 00:00:00 2001
 From: Chris Rummel <crummel@microsoft.com>
 Date: Wed, 23 Oct 2019 18:56:04 -0500
-Subject: [PATCH 2/2] Don't call dotnet without a path
+Subject: [PATCH 4/4] Don't call dotnet without a path
 
 ---
  eng/common/tools.sh | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/eng/common/tools.sh b/eng/common/tools.sh
-index 757d5b9ea..5a4cfeb1f 100755
+index 94965a8..8e14f8b 100755
 --- a/eng/common/tools.sh
 +++ b/eng/common/tools.sh
-@@ -340,9 +340,9 @@ function MSBuild {
+@@ -362,9 +362,9 @@ function MSBuild {
 
      # Work around issues with Azure Artifacts credential provider
      # https://github.com/dotnet/arcade/issues/3932
@@ -25,5 +25,5 @@ index 757d5b9ea..5a4cfeb1f 100755
      local toolset_dir="${_InitializeToolset%/*}"
      local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll"
 -- 
-2.18.0
+2.7.4
 

patches/aspnetcore-tooling/0001-Don-t-build-fullfx.patch

@@ -1,15 +1,15 @@
-From 722a6b2ceced53bb6e536856a813672c421fd273 Mon Sep 17 00:00:00 2001
+From 1a5a1cd558339f753323b59c86681a6d83d1ebf6 Mon Sep 17 00:00:00 2001
 From: Chris Rummel <crummel@microsoft.com>
 Date: Sun, 20 Oct 2019 15:51:49 -0500
-Subject: [PATCH 1/5] Don't build fullfx
+Subject: [PATCH 1/4] Don't build fullfx
 
 ---
  .../src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj | 10 +++++-----
- .../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets      |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ .../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets      |  4 ++--
+ 2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
-index dd3272a..ac0b233 100644
+index ba32df8..4f8ecce 100644
 --- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
 +++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
 @@ -1,7 +1,7 @@
@@ -46,18 +46,20 @@ index dd3272a..ac0b233 100644
 
      <Copy SourceFiles="@(ProjectOutput)" DestinationFiles="$(SdkOutputPath)tasks\%(RecursiveDir)%(FileName)%(Extension)" SkipUnchangedFiles="true">
 diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
-index 84d7bb7..b0a7c5e 100644
+index e5e8d92..b0a7c5e 100644
 --- a/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
 +++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
-@@ -31,7 +31,7 @@ Copyright (c) .NET Foundation. All rights reserved.
+@@ -30,8 +30,8 @@ Copyright (c) .NET Foundation. All rights reserved.
+     <!-- Paths to tools, tasks, and extensions are calculated relative to the RazorSdkDirectoryRoot. This can be modified to test a local build. -->
      <RazorSdkDirectoryRoot Condition="'$(RazorSdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\..\</RazorSdkDirectoryRoot>
      <RazorSdkBuildTasksDirectoryRoot Condition="'$(RazorSdkBuildTasksDirectoryRoot)'==''">$(RazorSdkDirectoryRoot)tasks\</RazorSdkBuildTasksDirectoryRoot>
-     <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(DefaultNetCoreTargetFramework)</_RazorSdkTasksTFM>
+-    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1</_RazorSdkTasksTFM>
 -    <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46</_RazorSdkTasksTFM>
++    <_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">$(DefaultNetCoreTargetFramework)</_RazorSdkTasksTFM>
 +    <_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net472</_RazorSdkTasksTFM>
      <RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
    </PropertyGroup>
 
 -- 
-1.8.3.1
+2.7.4
 

patches/aspnetcore-tooling/0002-dont-call-dotnet-without-path.patch

@@ -1,17 +1,17 @@
-From 33b9cd78c75736fc56695d10d80a7337aa999390 Mon Sep 17 00:00:00 2001
+From 0c8defec29ee1144a70f20870b3e46c31509cc13 Mon Sep 17 00:00:00 2001
 From: adaggarwal <aditya.aggarwal@microsoft.com>
 Date: Wed, 30 Oct 2019 19:41:56 +0000
-Subject: [PATCH 2/5] dont call dotnet without path
+Subject: [PATCH 2/4] dont call dotnet without path
 
 ---
  eng/common/tools.sh | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/eng/common/tools.sh b/eng/common/tools.sh
-index 757d5b9..5a4cfeb 100755
+index 94965a8..8e14f8b 100755
 --- a/eng/common/tools.sh
 +++ b/eng/common/tools.sh
-@@ -340,9 +340,9 @@ function MSBuild {
+@@ -362,9 +362,9 @@ function MSBuild {
 
      # Work around issues with Azure Artifacts credential provider
      # https://github.com/dotnet/arcade/issues/3932
@@ -25,5 +25,5 @@ index 757d5b9..5a4cfeb 100755
      local toolset_dir="${_InitializeToolset%/*}"
      local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll"
 -- 
-1.8.3.1
+2.7.4
 

patches/aspnetcore-tooling/0003-Import-PackageVersions.props.patch

@@ -1,17 +1,17 @@
-From 4056ed9ce4115fb5db22c5fc088bda17e8d2d3ee Mon Sep 17 00:00:00 2001
+From 0ba59aca7eb538cacfc603ccf3f0e0c283603e32 Mon Sep 17 00:00:00 2001
 From: adaggarwal <aditya.aggarwal@microsoft.com>
 Date: Wed, 13 Nov 2019 16:31:47 +0000
-Subject: [PATCH 3/5] Import PackageVersions.props
+Subject: [PATCH 3/4] Import PackageVersions.props
 
 ---
  eng/Versions.props | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/eng/Versions.props b/eng/Versions.props
-index a3a95fb..eee5f55 100644
+index dd53e83..7355673 100644
 --- a/eng/Versions.props
 +++ b/eng/Versions.props
-@@ -139,4 +139,7 @@
+@@ -141,4 +141,7 @@
      <XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
      <XunitVersion>2.4.1</XunitVersion>
    </PropertyGroup>
@@ -20,5 +20,5 @@ index a3a95fb..eee5f55 100644
 +
  </Project>
 -- 
-1.8.3.1
+2.7.4
 

patches/aspnetcore-tooling/0004-Pin-MSBuild-version-to-reference-versions.patch

@@ -1,15 +1,15 @@
-From 17ae709240a62b098d864acbe6d4c828fabd60cb Mon Sep 17 00:00:00 2001
+From 7aaf76c72b2b5bb9781eca190ae59920e8def8b8 Mon Sep 17 00:00:00 2001
 From: adaggarwal <aditya.aggarwal@microsoft.com>
 Date: Wed, 13 Nov 2019 16:35:48 +0000
-Subject: [PATCH 4/5] Pin MSBuild version to reference versions
+Subject: [PATCH 4/4] Pin MSBuild version to reference versions
 
 ---
  src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj  | 4 ++--
  .../Microsoft.VisualStudio.LanguageServices.Razor.csproj              | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
-index ac0b233..3ccc243 100644
+index 4f8ecce..5a433ed 100644
 --- a/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
 +++ b/src/Razor/src/Microsoft.NET.Sdk.Razor/Microsoft.NET.Sdk.Razor.csproj
 @@ -16,8 +16,8 @@
@@ -39,5 +39,5 @@ index 128866b..5abcc32 100644
      <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="$(VSIX_MicrosoftCodeAnalysisAnalyzersPackageVersion)" NoWarn="NU1608" />
      <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(VSIX_MicrosoftCodeAnalysisCommonPackageVersion)" />
 -- 
-1.8.3.1
+2.7.4
 

patches/aspnetcore/0001-Don-t-call-dotnet-without-path.patch

@@ -1,17 +1,17 @@
-From c9ceade354813f98ca291757e7d1657d0959ee4e Mon Sep 17 00:00:00 2001
+From a1fe4eb3f66c953fe8509b462a4d1adc86aa4f78 Mon Sep 17 00:00:00 2001
 From: Chris Rummel <crummel@microsoft.com>
 Date: Wed, 23 Oct 2019 20:04:55 -0500
-Subject: [PATCH 01/13] Don't call dotnet without path
+Subject: [PATCH 01/12] Don't call dotnet without path
 
 ---
  eng/common/tools.sh | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/eng/common/tools.sh b/eng/common/tools.sh
-index 757d5b9ea4..5a4cfeb1f0 100755
+index 6221830..d3635b8 100755
 --- a/eng/common/tools.sh
 +++ b/eng/common/tools.sh
-@@ -340,9 +340,9 @@ function MSBuild {
+@@ -370,9 +370,9 @@ function MSBuild {
 
      # Work around issues with Azure Artifacts credential provider
      # https://github.com/dotnet/arcade/issues/3932
@@ -25,5 +25,5 @@ index 757d5b9ea4..5a4cfeb1f0 100755
      local toolset_dir="${_InitializeToolset%/*}"
      local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll"
 -- 
-2.18.0
+2.7.4
 

patches/aspnetcore/0002-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch

@@ -1,18 +1,18 @@
-From 528f9457371651668d1923b27cdd5b761f8f2441 Mon Sep 17 00:00:00 2001
+From b8e0bcb052f711dd57e559ab9f78a4e56e322918 Mon Sep 17 00:00:00 2001
 From: dseefeld <dseefeld@microsoft.com>
 Date: Tue, 29 Oct 2019 18:19:03 +0000
-Subject: [PATCH 02/13] Use non-portable NETCoreAppRuntime for crossgen
+Subject: [PATCH 02/12] Use non-portable NETCoreAppRuntime for crossgen
 
 ---
  eng/Dependencies.props                                    | 1 +
  src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj | 6 ++++--
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/eng/Dependencies.props b/eng/Dependencies.props
-index 2e11857b1b..b49aee2a5c 100644
+index 8e7bb0e..fca75d9 100644
 --- a/eng/Dependencies.props
 +++ b/eng/Dependencies.props
-@@ -110,6 +110,7 @@ and are generated based on the last package release.
+@@ -113,6 +113,7 @@ and are generated based on the last package release.
      <LatestPackageReference Include="microsoft.netcore.app.runtime.linux-arm64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
      <LatestPackageReference Include="microsoft.netcore.app.runtime.linux-musl-x64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
      <LatestPackageReference Include="microsoft.netcore.app.runtime.linux-musl-arm64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
@@ -21,10 +21,10 @@ index 2e11857b1b..b49aee2a5c 100644
 
    <ItemGroup Label=".NET team dependencies (Non-source-build)" Condition="'$(DotNetBuildFromSource)' != 'true'">
 diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
-index 4c4298a92d..edad46be14 100644
+index 4a7b1c9..b63c15c 100644
 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
 +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
-@@ -100,7 +100,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
+@@ -107,7 +107,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
      <CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'linux-arm64' OR '$(TargetRuntimeIdentifier)' == 'linux-musl-arm64' ">x64_arm64\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
      <CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'win-arm' ">x86_arm\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
 
@@ -35,7 +35,7 @@ index 4c4298a92d..edad46be14 100644
      <RuntimePackageRoot>$([MSBuild]::EnsureTrailingSlash('$(RuntimePackageRoot)'))</RuntimePackageRoot>
      <CrossgenToolPath>$([System.IO.Path]::Combine('$(RuntimePackageRoot)', 'tools', '$(CrossgenToolPackagePath)'))</CrossgenToolPath>
      <AssetTargetFallback>$(AssetTargetFallback);native,Version=0.0</AssetTargetFallback>
-@@ -115,7 +117,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
+@@ -122,7 +124,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
        <IncludeAssets>Runtime;Native</IncludeAssets>
      </Reference>
 
@@ -45,5 +45,5 @@ index 4c4298a92d..edad46be14 100644
      <ProjectReference Condition="'$(BuildIisNativeProjects)' == 'true' AND '$(BuildNative)' != 'false' AND '$(VCTargetsPath)' != ''" Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj">
        <SetPlatform>Platform=$(TargetArchitecture)</SetPlatform>
 -- 
-2.18.0
+2.7.4
 

patches/aspnetcore/0003-Conditionally-set-PackAsToolShimRID.patch

@@ -1,17 +1,17 @@
-From 87371172f24562810552567b15890eefc9d57249 Mon Sep 17 00:00:00 2001
+From 36db65e3e4a7e141fc11875d06705ca1c4f79031 Mon Sep 17 00:00:00 2001
 From: dseefeld <dseefeld@microsoft.com>
 Date: Thu, 31 Oct 2019 20:38:26 +0000
-Subject: [PATCH 03/13] Conditionally set PackAsToolShimRID
+Subject: [PATCH 03/12] Conditionally set PackAsToolShimRID
 
 ---
  Directory.Build.targets | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Directory.Build.targets b/Directory.Build.targets
-index db3cea59f1..518b5e6246 100644
+index 0e0db95..854c5ea 100644
 --- a/Directory.Build.targets
 +++ b/Directory.Build.targets
-@@ -46,7 +46,7 @@
+@@ -45,7 +45,7 @@
      <SuppressDependenciesWhenPacking Condition="'$(SuppressDependenciesWhenPacking)' == '' AND '$(IsAnalyzersProject)' == 'true'">true</SuppressDependenciesWhenPacking>
    </PropertyGroup>
 
@@ -21,5 +21,5 @@ index db3cea59f1..518b5e6246 100644
      <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
    </PropertyGroup>
 -- 
-2.18.0
+2.7.4
 

patches/aspnetcore/0004-Exclude-analyzer-for-source-build.patch

@@ -1,17 +1,17 @@
-From bbd6cbebda9e08a49725b66d9130f76469479413 Mon Sep 17 00:00:00 2001
+From 3922c27dd9a37558926020815fce616da358aa4c Mon Sep 17 00:00:00 2001
 From: adaggarwal <aditya.aggarwal@microsoft.com>
 Date: Thu, 14 Nov 2019 16:52:25 +0000
-Subject: [PATCH 04/13] Exclude analyzer for source-build
+Subject: [PATCH 04/12] Exclude analyzer for source-build
 
 ---
  Directory.Build.props | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Directory.Build.props b/Directory.Build.props
-index 2fe19bde83..0bc8b25ecc 100644
+index 27c4622..563894e 100644
 --- a/Directory.Build.props
 +++ b/Directory.Build.props
-@@ -95,7 +95,7 @@
+@@ -101,7 +101,7 @@
      <InternalInstallerBaseName>$(RuntimeInstallerBaseName)-internal</InternalInstallerBaseName>
    </PropertyGroup>
 
@@ -21,5 +21,5 @@ index 2fe19bde83..0bc8b25ecc 100644
    </ItemGroup>
 
 -- 
-2.18.0
+2.7.4
 

patches/aspnetcore/0005-Import-PackageVersions.props.patch

@@ -1,17 +1,17 @@
-From 2812263dd785904cf8edd68f258d78d82c3cea59 Mon Sep 17 00:00:00 2001
+From 9c7735674a8dadd29dae456297e543f1216f37fd Mon Sep 17 00:00:00 2001
 From: adaggarwal <aditya.aggarwal@microsoft.com>
 Date: Thu, 14 Nov 2019 16:55:29 +0000
-Subject: [PATCH 05/13] Import PackageVersions.props
+Subject: [PATCH 05/12] Import PackageVersions.props
 
 ---
  eng/Versions.props | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/eng/Versions.props b/eng/Versions.props
-index a3e611aa4b..37797a5219 100644
+index f0b625f..b5af9f9 100644
 --- a/eng/Versions.props
 +++ b/eng/Versions.props
-@@ -267,6 +267,9 @@
+@@ -265,6 +265,9 @@
      <XunitExtensibilityExecutionPackageVersion>$(XunitVersion)</XunitExtensibilityExecutionPackageVersion>
      <MicrosoftDataSqlClientPackageVersion>1.0.19249.1</MicrosoftDataSqlClientPackageVersion>
    </PropertyGroup>
@@ -22,5 +22,5 @@ index a3e611aa4b..37797a5219 100644
    <PropertyGroup Label="Restore feeds">
      <!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
 -- 
-2.18.0
+2.7.4
 

patches/aspnetcore/0006-Exclude-some-projects-from-source-build.patch

@@ -1,14 +1,14 @@
-From 494311a11525c9ca8ce44cff9d6de39802d1dbc6 Mon Sep 17 00:00:00 2001
+From 3e3d7b29d859bfcbc66478e9cfbfc8ee81e02406 Mon Sep 17 00:00:00 2001
 From: adaggarwal <aditya.aggarwal@microsoft.com>
 Date: Thu, 14 Nov 2019 16:57:39 +0000
-Subject: [PATCH 06/13] Exclude some projects from source-build
+Subject: [PATCH 06/12] Exclude some projects from source-build
 
 ---
  Directory.Build.props | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/Directory.Build.props b/Directory.Build.props
-index 0bc8b25ecc..88411a30b2 100644
+index 563894e..38e2f77 100644
 --- a/Directory.Build.props
 +++ b/Directory.Build.props
 @@ -18,9 +18,11 @@
@@ -24,5 +24,5 @@ index 0bc8b25ecc..88411a30b2 100644
      <!--
        Following logic mimics core-setup approach as well as
 -- 
-2.18.0
+2.7.4