From 1c812d09d2451bc590e6b5609bf685ea19dceadc Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Thu, 1 Aug 2019 11:46:28 -0700
Subject: [PATCH 1/7] Remove workarounds

---
 eng/Workarounds.targets | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index f2162e9e86ff..52e1c7525c20 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'"
@@ -54,21 +49,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>

From 75e26a2c34c53a276e8e6fc26f88233cd11c9d79 Mon Sep 17 00:00:00 2001
From: = <johluo@microsoft.com>
Date: Thu, 1 Aug 2019 18:43:10 -0700
Subject: [PATCH 2/7] fb

---
 eng/Workarounds.targets | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index 52e1c7525c20..215a638ca035 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -48,11 +48,4 @@
       <RuntimeFrameworkName>NETStandard.Library</RuntimeFrameworkName>
     </KnownFrameworkReference>
   </ItemGroup>
-
-  <!-- Work around https://github.com/dotnet/cli/issues/11378. -->
-  <Target Name="_WorkaroundNetStandard" AfterTargets="ResolvePackageAssets">
-    <ItemGroup>
-      <TransitiveFrameworkReference Remove="NETStandard.Library" />
-    </ItemGroup>
-  </Target>
 </Project>

From ea3844bb7ff4a554c91cd45def78bc1170e32110 Mon Sep 17 00:00:00 2001
From: = <johluo@microsoft.com>
Date: Thu, 1 Aug 2019 18:46:54 -0700
Subject: [PATCH 3/7] Try removing site extensions workarounds

---
 src/SiteExtensions/build.cmd | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/SiteExtensions/build.cmd b/src/SiteExtensions/build.cmd
index af51ba3dd68b..def485a1ce35 100644
--- a/src/SiteExtensions/build.cmd
+++ b/src/SiteExtensions/build.cmd
@@ -10,9 +10,8 @@ IF %ERRORLEVEL% NEQ 0 (
 )
 
 ECHO Building LoggingBranch
-REM Remove /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true which workarounds dotnet store and publish behaviour changes in preview 6
-CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %*
-CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %*
+CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %*
+CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %*
 
 IF %ERRORLEVEL% NEQ 0 (
    EXIT /b %ErrorLevel%

From 6466990dcac852f1a78394ae106169580eed653a Mon Sep 17 00:00:00 2001
From: = <johluo@microsoft.com>
Date: Thu, 1 Aug 2019 19:35:18 -0700
Subject: [PATCH 4/7] Maybe we still need it on windows

---
 eng/Workarounds.targets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index 215a638ca035..52e1c7525c20 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -48,4 +48,11 @@
       <RuntimeFrameworkName>NETStandard.Library</RuntimeFrameworkName>
     </KnownFrameworkReference>
   </ItemGroup>
+
+  <!-- Work around https://github.com/dotnet/cli/issues/11378. -->
+  <Target Name="_WorkaroundNetStandard" AfterTargets="ResolvePackageAssets">
+    <ItemGroup>
+      <TransitiveFrameworkReference Remove="NETStandard.Library" />
+    </ItemGroup>
+  </Target>
 </Project>

From 1072fadd87a7c2fb27428013e94418cbe6ef2e41 Mon Sep 17 00:00:00 2001
From: = <johluo@microsoft.com>
Date: Thu, 1 Aug 2019 19:42:41 -0700
Subject: [PATCH 5/7] One more workaround that shouldn't be needed

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

diff --git a/eng/Workarounds.props b/eng/Workarounds.props
index e2ad3d58a8c1..0fa6edaeab58 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 52e1c7525c20..ed0324f74451 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -25,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" />

From 63a8445b63c785e4d456c2dec3f0cc5ffb8b3bf9 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Fri, 2 Aug 2019 10:53:26 -0700
Subject: [PATCH 6/7] Wip

---
 eng/Workarounds.targets      | 7 -------
 src/SiteExtensions/build.cmd | 5 +++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index ed0324f74451..b64e4c614d72 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -42,11 +42,4 @@
       <RuntimeFrameworkName>NETStandard.Library</RuntimeFrameworkName>
     </KnownFrameworkReference>
   </ItemGroup>
-
-  <!-- Work around https://github.com/dotnet/cli/issues/11378. -->
-  <Target Name="_WorkaroundNetStandard" AfterTargets="ResolvePackageAssets">
-    <ItemGroup>
-      <TransitiveFrameworkReference Remove="NETStandard.Library" />
-    </ItemGroup>
-  </Target>
 </Project>
diff --git a/src/SiteExtensions/build.cmd b/src/SiteExtensions/build.cmd
index def485a1ce35..af51ba3dd68b 100644
--- a/src/SiteExtensions/build.cmd
+++ b/src/SiteExtensions/build.cmd
@@ -10,8 +10,9 @@ IF %ERRORLEVEL% NEQ 0 (
 )
 
 ECHO Building LoggingBranch
-CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %*
-CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %*
+REM Remove /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true which workarounds dotnet store and publish behaviour changes in preview 6
+CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %*
+CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %*
 
 IF %ERRORLEVEL% NEQ 0 (
    EXIT /b %ErrorLevel%

From 893278cd16323df29761d38808bbed37421360e4 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Fri, 2 Aug 2019 17:17:01 -0700
Subject: [PATCH 7/7] wip

---
 eng/Workarounds.targets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eng/Workarounds.targets b/eng/Workarounds.targets
index b64e4c614d72..ed0324f74451 100644
--- a/eng/Workarounds.targets
+++ b/eng/Workarounds.targets
@@ -42,4 +42,11 @@
       <RuntimeFrameworkName>NETStandard.Library</RuntimeFrameworkName>
     </KnownFrameworkReference>
   </ItemGroup>
+
+  <!-- Work around https://github.com/dotnet/cli/issues/11378. -->
+  <Target Name="_WorkaroundNetStandard" AfterTargets="ResolvePackageAssets">
+    <ItemGroup>
+      <TransitiveFrameworkReference Remove="NETStandard.Library" />
+    </ItemGroup>
+  </Target>
 </Project>