From de67bdc2a2dc847118b757e80335176ef490220f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 3 Jul 2020 14:50:21 +1000
Subject: [PATCH] Fixing build/tests

---
 src/Umbraco.Tests/App.config                  | 104 +++++++++---------
 src/Umbraco.Tests/Umbraco.Tests.csproj        |   7 +-
 .../NuCache/DataSource/ContentNestedData.cs   |   6 +-
 .../NuCache/DataSource/CultureVariation.cs    |   8 +-
 .../NuCache/DataSource/PropertyData.cs        |   6 +-
 5 files changed, 68 insertions(+), 63 deletions(-)

diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index 91047ba6a2..4af04827e3 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-  </configSections>
+    <configSections>
+    </configSections>
 
-  <appSettings>
-    <add key="Umbraco.Core.ConfigurationStatus" value="6.0.0"/>
-    <add key="Umbraco.Core.ReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,~/.well-known" />
-    <add key="Umbraco.Core.ReservedPaths" value="~/install/"/>
-    <add key="Umbraco.Core.Path" value="~/umbraco"/>
-    <add key="Umbraco.Core.HideTopLevelNodeFromPath" value="true"/>
-    <add key="Umbraco.Core.TimeOutInMinutes" value="20"/>
-    <add key="Umbraco.Core.DefaultUILanguage" value="en"/>
-    <add key="Umbraco.Core.UseHttps" value="false"/>
-    <add key="dataAnnotations:dataTypeAttribute:disableRegEx" value="false"/>
-  </appSettings>
+    <appSettings>
+        <add key="Umbraco.Core.ConfigurationStatus" value="6.0.0"/>
+        <add key="Umbraco.Core.ReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd,~/.well-known" />
+        <add key="Umbraco.Core.ReservedPaths" value="~/install/"/>
+        <add key="Umbraco.Core.Path" value="~/umbraco"/>
+        <add key="Umbraco.Core.HideTopLevelNodeFromPath" value="true"/>
+        <add key="Umbraco.Core.TimeOutInMinutes" value="20"/>
+        <add key="Umbraco.Core.DefaultUILanguage" value="en"/>
+        <add key="Umbraco.Core.UseHttps" value="false"/>
+        <add key="dataAnnotations:dataTypeAttribute:disableRegEx" value="false"/>
+    </appSettings>
 
-  <connectionStrings>
-      <add name="umbracoDbDSN" connectionString="Datasource=|DataDirectory|UmbracoNPocoTests.sdf;Flush Interval=1;" providerName="System.Data.SqlServerCe.4.0"/>
-  </connectionStrings>
+    <connectionStrings>
+        <add name="umbracoDbDSN" connectionString="Datasource=|DataDirectory|UmbracoNPocoTests.sdf;Flush Interval=1;" providerName="System.Data.SqlServerCe.4.0"/>
+    </connectionStrings>
 
-  <system.data>
-    <DbProviderFactories>
-      <remove invariant="System.Data.SqlServerCe.4.0"/>
-      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
-    </DbProviderFactories>
-  </system.data>
+    <system.data>
+        <DbProviderFactories>
+            <remove invariant="System.Data.SqlServerCe.4.0"/>
+            <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
+        </DbProviderFactories>
+    </system.data>
 
-  <system.web>
-    <httpRuntime targetFramework="4.5"/>
-    <compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.0"></compilation>
-    <machineKey validationKey="5E7B955FCE36F5F2A867C2A0D85DC61E7FEA9E15F1561E8386F78BFE9EE23FF18B21E6A44AA17300B3B9D5DBEB37AA61A2C73884A5BBEDA6D3B14BA408A7A8CD" decryptionKey="116B853D031219E404E088FCA0986D6CF2DFA77E1957B59FCC9404B8CA3909A1" validation="SHA1" decryption="AES"/>
-    <!--<trust level="Medium" originUrl=".*"/>-->
-    <!-- Sitemap provider-->
-    <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
-      <providers>
-        <clear/>
-        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true"/>
-      </providers>
-    </siteMap>
-    <!-- Membership Provider -->
-    <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
-        <providers>
-            <clear/>
-            <add name="UmbracoMembershipProvider" type="Umbraco.Web.Security.Providers.MembersMembershipProvider, Umbraco.Web" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="4" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Member" passwordFormat="Hashed"/>
-            <add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, Umbraco.Web" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="4" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" allowManuallyChangingPassword="false"/>
-        </providers>
-    </membership>
-  </system.web>
+    <system.web>
+        <httpRuntime targetFramework="4.5"/>
+        <compilation defaultLanguage="c#" debug="true" batch="false" targetFramework="4.0"></compilation>
+        <machineKey validationKey="5E7B955FCE36F5F2A867C2A0D85DC61E7FEA9E15F1561E8386F78BFE9EE23FF18B21E6A44AA17300B3B9D5DBEB37AA61A2C73884A5BBEDA6D3B14BA408A7A8CD" decryptionKey="116B853D031219E404E088FCA0986D6CF2DFA77E1957B59FCC9404B8CA3909A1" validation="SHA1" decryption="AES"/>
+        <!--<trust level="Medium" originUrl=".*"/>-->
+        <!-- Sitemap provider-->
+        <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
+            <providers>
+                <clear/>
+                <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true"/>
+            </providers>
+        </siteMap>
+        <!-- Membership Provider -->
+        <membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
+            <providers>
+                <clear/>
+                <add name="UmbracoMembershipProvider" type="Umbraco.Web.Security.Providers.MembersMembershipProvider, Umbraco.Web" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="4" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Member" passwordFormat="Hashed"/>
+                <add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, Umbraco.Web" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="4" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" allowManuallyChangingPassword="false"/>
+            </providers>
+        </membership>
+    </system.web>
 
-  <startup>
-      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
-  </startup>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+    </startup>
 
-  <runtime>
-      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
@@ -94,7 +94,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>
-      </assemblyBinding>
-  </runtime>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
 
 </configuration>
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 5518fb5678..cd0868532c 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -78,7 +78,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="4.3.1" />
+    <PackageReference Include="Castle.Core" Version="4.4.1" />
     <PackageReference Include="Examine" Version="1.0.2" />
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.14</Version>
@@ -100,7 +100,9 @@
     <PackageReference Include="Microsoft.Owin.Testing" Version="4.0.1" />
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
     <PackageReference Include="MiniProfiler" Version="4.0.138" />
-    <PackageReference Include="Moq" Version="4.14.5" />
+    <PackageReference Include="Moq">
+      <Version>4.14.5</Version>
+    </PackageReference>
     <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
@@ -109,7 +111,6 @@
     <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
     <PackageReference Include="Semver" Version="2.0.4" />
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Cache\DistributedCacheBinderTests.cs" />
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
index 0ff24980fe..1a49aaaf62 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/ContentNestedData.cs
@@ -29,17 +29,17 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         public string UrlSegment { get; set; }
 
         //Legacy properties used to deserialize existing nucache db entries
-        [DataMember(Order = 3)]
+        [IgnoreDataMember]
         [JsonProperty("properties")]
         [JsonConverter(typeof(CaseInsensitiveDictionaryConverter<PropertyData[]>))]
         private Dictionary<string, PropertyData[]> LegacyPropertyData { set { PropertyData = value; } }
 
-        [DataMember(Order = 4)]
+        [IgnoreDataMember]
         [JsonProperty("cultureData")]
         [JsonConverter(typeof(CaseInsensitiveDictionaryConverter<CultureVariation>))]
         private Dictionary<string, CultureVariation> LegacyCultureData { set { CultureData = value; } }
 
-        [DataMember(Order = 5)]
+        [IgnoreDataMember]
         [JsonProperty("urlSegment")]
         private string LegacyUrlSegment { set { UrlSegment = value; } }
     }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
index dd3323fa0c..daf60b66ec 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/CultureVariation.cs
@@ -27,19 +27,19 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         public bool IsDraft { get; set; }
 
         //Legacy properties used to deserialize existing nucache db entries
-        [DataMember(Order = 4)]
+        [IgnoreDataMember]
         [JsonProperty("name")]
         private string LegacyName { set { Name = value; } }
 
-        [DataMember(Order = 5)]
+        [IgnoreDataMember]
         [JsonProperty("urlSegment")]
         private string LegacyUrlSegment { set { UrlSegment = value; } }
 
-        [DataMember(Order = 6)]
+        [IgnoreDataMember]
         [JsonProperty("date")]
         private DateTime LegacyDate { set { Date = value; } }
 
-        [DataMember(Order = 7)]
+        [IgnoreDataMember]
         [JsonProperty("isDraft")]
         private bool LegacyIsDraft { set { IsDraft = value; } }
     }
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
index b49a781e0c..7a3cb67d50 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/DataSource/PropertyData.cs
@@ -38,21 +38,21 @@ namespace Umbraco.Web.PublishedCache.NuCache.DataSource
         public object Value { get; set; }
 
         //Legacy properties used to deserialize existing nucache db entries
-        [DataMember(Order = 3)]
+        [IgnoreDataMember]
         [JsonProperty("culture")]
         private string LegacyCulture
         {
             set => Culture = value;
         }
 
-        [DataMember(Order = 4)]
+        [IgnoreDataMember]
         [JsonProperty("seg")]
         private string LegacySegment
         {
             set => Segment = value;
         }
 
-        [DataMember(Order = 5)]
+        [IgnoreDataMember]
         [JsonProperty("val")]
         private object LegacyValue
         {