From cda7c8cad1bae53589dcbca3132fa4f13d347262 Mon Sep 17 00:00:00 2001
From: 0xd4d <de4dot@gmail.com>
Date: Sat, 29 Aug 2020 23:40:09 +0200
Subject: [PATCH] net48

---
 DnSpyCommon.props               |  2 +-
 build.ps1                       |  2 +-
 dnSpy/dnSpy/MainApp/App.xaml.cs | 14 --------------
 dnSpy/dnSpy/app.config          |  2 --
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/DnSpyCommon.props b/DnSpyCommon.props
index 90af488ba9..f69ae4b62b 100644
--- a/DnSpyCommon.props
+++ b/DnSpyCommon.props
@@ -6,7 +6,7 @@
         - .github/workflows/build.yml
         - dnSpy/dnSpy/app.config (supportedRuntime, .NET Framework only)
     NOTE: Update the ABOVE files when TargetFrameworks is updated -->
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
     <IsDotNetFramework>false</IsDotNetFramework>
     <IsDotNetCore>false</IsDotNetCore>
     <IsSelfContainedDotNetCore>false</IsSelfContainedDotNetCore>
diff --git a/build.ps1 b/build.ps1
index e94fd2a74b..11a846c6b6 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,7 +1,7 @@
 param([string]$buildtfm = 'all', [switch]$NoMsbuild)
 $ErrorActionPreference = 'Stop'
 
-$net_tfm = 'net472'
+$net_tfm = 'net48'
 $netcore_tfm = 'netcoreapp3.1'
 $configuration = 'Release'
 $net_baseoutput = "dnSpy\dnSpy\bin\$configuration"
diff --git a/dnSpy/dnSpy/MainApp/App.xaml.cs b/dnSpy/dnSpy/MainApp/App.xaml.cs
index 0cab15d429..d872144433 100644
--- a/dnSpy/dnSpy/MainApp/App.xaml.cs
+++ b/dnSpy/dnSpy/MainApp/App.xaml.cs
@@ -118,20 +118,6 @@ void AddAppContextFixes() {
 			// This prevents a thin line between the tab item and its content when dpi is eg. 144.
 			// It's hard to miss if you check the Options dialog box.
 			AppContext.SetSwitch("Switch.MS.Internal.DoNotApplyLayoutRoundingToMarginsAndBorderThickness", true);
-
-#if NETFRAMEWORK
-			// Workaround for a bug
-			//		Switch.System.Windows.Controls.Grid.StarDefinitionsCanExceedAvailableSpace=true
-			//		https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/runtime/4.7-4.7.1#resizing-a-grid-can-hang
-			// Repro: DPI=120%, .NET Framework 4.7.1, open the File, View, or Window menus
-			//		https://github.com/0xd4d/dnSpy/issues/734
-			//		https://github.com/0xd4d/dnSpy/issues/735
-			// This has been fixed in .NET Core 3.0 and .NET Framework 4.8
-#if NET48
-#error Remove this now
-#endif
-			AppContext.SetSwitch("Switch.System.Windows.Controls.Grid.StarDefinitionsCanExceedAvailableSpace", true);
-#endif
 		}
 
 		ExportProvider InitializeMEF(bool readSettings, bool useCache) {
diff --git a/dnSpy/dnSpy/app.config b/dnSpy/dnSpy/app.config
index 36a8caf91f..f4fd2fad9b 100644
--- a/dnSpy/dnSpy/app.config
+++ b/dnSpy/dnSpy/app.config
@@ -166,7 +166,5 @@
 		<legacyCorruptedStateExceptionsPolicy enabled="true"/>
 		<gcServer enabled="true"/>
 		<gcConcurrent enabled="true"/>
-		<!-- TODO: Switch.System.Windows.DoNotUsePresentationDpiCapabilityTier2OrGreater,Switch.System.Windows.DoNotScaleForDpiChanges can be removed when we target .NET Framework 4.8 or later -->
-		<AppContextSwitchOverrides value="Switch.System.Windows.DoNotUsePresentationDpiCapabilityTier2OrGreater=false;Switch.System.Windows.DoNotScaleForDpiChanges=false"/>
 	</runtime>
 </configuration>