From 89f5cec832cba2012abd18cd74039bf1101cced0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 14 Nov 2019 17:00:21 +1100
Subject: [PATCH] Fixes System.ComponentModel.Annotations to keep working with
 aspnet framework

---
 src/Umbraco.Web.UI/web.Template.Debug.config | 7 +++++++
 src/Umbraco.Web.UI/web.Template.config       | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/src/Umbraco.Web.UI/web.Template.Debug.config b/src/Umbraco.Web.UI/web.Template.Debug.config
index ff42f098f7..ad76664924 100644
--- a/src/Umbraco.Web.UI/web.Template.Debug.config
+++ b/src/Umbraco.Web.UI/web.Template.Debug.config
@@ -91,6 +91,13 @@
                 <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
             </dependentAssembly>
 
+            <dependentAssembly xdt:Transform="Remove"
+                               xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='System.ComponentModel.Annotations']])"/>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" />
+                <bindingRedirect oldVersion="0.0.0.0-4.6.0.0" newVersion="4.0.0.0"/>
+            </dependentAssembly>
+
         </assemblyBinding>
     </runtime>
 
diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config
index 6d68ea845a..91faf2c8c7 100644
--- a/src/Umbraco.Web.UI/web.Template.config
+++ b/src/Umbraco.Web.UI/web.Template.config
@@ -257,6 +257,11 @@
                 <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35"/>
                 <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
             </dependentAssembly>
+            <!-- This needs to be here currently for aspnet framework to keep working -->
+            <dependentAssembly>
+                <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.6.0.0" newVersion="4.0.0.0"/>
+            </dependentAssembly>
         </assemblyBinding>
     </runtime>