From 7b6654d164037368a2d6b2bede3d6d52f22bc893 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Fri, 2 Aug 2019 21:54:21 -0700
Subject: [PATCH] Remove workarounds no longer needed after migrating to
 preview 7 SDK (#12812)

---
 eng/Workarounds.props   |  5 +++++
 eng/Workarounds.targets | 26 --------------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/eng/Workarounds.props b/eng/Workarounds.props
index e2ad3d58a8..0fa6edaeab 100644
--- a/eng/Workarounds.props
+++ b/eng/Workarounds.props
@@ -43,4 +43,9 @@
     This one sets UseSharedCompilation to false by default. -->
     <UseSharedCompilation>true</UseSharedCompilation>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Ignore warning about calling the Pack target on Web SDK projects. Our build scripts call /t:pack on everything in this repo. -->
+    <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
+  </PropertyGroup>
 </Project>
diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index f2162e9e86..ed0324f744 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -15,11 +15,6 @@
     <BundledNETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
   </PropertyGroup>
 
-  <!-- Workaround https://github.com/dotnet/sdk/issues/2976 -->
-  <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.Platforms" PrivateAssets="All" />
-  </ItemGroup>
-
   <!-- Workaround https://github.com/aspnet/AspNetCore/issues/7503. This chains GenerateSourceLinkFile before razor component targets run. -->
   <!-- Workaround https://github.com/dotnet/source-build/issues/1112. Source link is currently disabled in source build so do not apply this worksaround. -->
   <Target Condition="'$(DotNetBuildFromSource)' != 'true'"
@@ -30,12 +25,6 @@
   <!-- Workaround https://github.com/dotnet/source-build/issues/1112. Source link is currently disabled in source build so define this dummy target which is required for pack. -->
   <Import Condition="'$(DotNetBuildFromSource)' == 'true'" Project="WorkaroundsImported.targets" />
 
-  <!-- Workaround https://github.com/aspnet/websdk/pull/646. If merged, once we update to a websdk with this fix, we can move the setting below to Directory.Build.props. -->
-  <PropertyGroup>
-    <!-- Ignore warning about calling the Pack target on Web SDK projects. Our build scripts call /t:pack on everything in this repo. -->
-    <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
-  </PropertyGroup>
-
   <!-- Workaround for https://github.com/dotnet/arcade/issues/204 -->
   <ItemGroup>
     <PackageReference Include="Internal.AspNetCore.BuildTasks" PrivateAssets="All" Version="$(InternalAspNetCoreBuildTasksPackageVersion)" IsImplicitlyDefined="true" />
@@ -54,21 +43,6 @@
     </KnownFrameworkReference>
   </ItemGroup>
 
-  <!-- Workaround until we can build our repo with a 3.0 Preview 7 SDK which has https://github.com/dotnet/core-sdk/pull/2401. -->
-  <ItemGroup Condition="'$(PreReleasePreviewNumber)' == '7' ">
-    <KnownFrameworkReference Update="Microsoft.NETCore.App">
-      <!--
-        Temporary until we can update to build with the Preview7 SDK .
-        Using PreReleasePreviewNumber to time-bomb this so we can remove this before RTM.
-
-        This workaround was also applied to src\ProjectTemplates\test\Infrastructure\TemplateTests.props.in.
-      -->
-      <RuntimePackNamePatterns>Microsoft.NETCore.App.Runtime.**RID**</RuntimePackNamePatterns>
-      <AppHostPackNamePattern />
-      <AppHostRuntimeIdentifiers />
-    </KnownFrameworkReference>
-  </ItemGroup>
-
   <!-- Work around https://github.com/dotnet/cli/issues/11378. -->
   <Target Name="_WorkaroundNetStandard" AfterTargets="ResolvePackageAssets">
     <ItemGroup>