Merge branch 'v8/8.11' into v8/dev

umbraco · Jan 28, 2021 · febb154 · febb154
2 parents 3028159 + e62cef6
commit febb154
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 44 deletions.
diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -43,7 +43,7 @@
                 <dependency id="Serilog.Sinks.Map" version="[1.0.0,1.999999)" />
                 <dependency id="Serilog.Sinks.Async" version="[1.3.0,1.999999)" />
                 <dependency id="Umbraco.SqlServerCE" version="[4.0.0.1,4.999999)" />
-                <dependency id="NPoco" version="[4.0.3,4.999999)" />
+                <dependency id="NPoco" version="[3.9.4,3.999999)" />
             </group>
 
         </dependencies>

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.11.0")]
-[assembly: AssemblyInformationalVersion("8.11.0")]
+[assembly: AssemblyFileVersion("8.11.1")]
+[assembly: AssemblyInformationalVersion("8.11.1")]
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -91,7 +91,7 @@
     </PackageReference>
     <PackageReference Include="MiniProfiler" Version="4.0.138" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="NPoco" Version="4.0.3" />
+    <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="Semver" Version="2.0.4" />
     <PackageReference Include="Serilog">
       <Version>2.8.0</Version>

diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -56,7 +56,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="NPoco" Version="4.0.3" />
+    <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="SecurityCodeScan">
       <Version>3.3.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/src/Umbraco.Tests/Testing/TestDatabase.cs b/src/Umbraco.Tests/Testing/TestDatabase.cs
@@ -266,26 +266,6 @@ public void InsertBatch<T>(IEnumerable<T> pocos, BatchOptions options = null)
             throw new NotImplementedException();
         }
 
-        public Task<int> InsertBatchAsync<T>(IEnumerable<T> pocos, BatchOptions options = null)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<int> UpdateBatchAsync<T>(IEnumerable<UpdateBatch<T>> pocos, BatchOptions options = null)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IAsyncUpdateQueryProvider<T> UpdateManyAsync<T>()
-        {
-            throw new NotImplementedException();
-        }
-
-        public int UpdateBatch<T>(IEnumerable<UpdateBatch<T>> pocos, BatchOptions options = null)
-        {
-            throw new NotImplementedException();
-        }
-
         public int Update(string tableName, string primaryKeyName, object poco, object primaryKeyValue)
         {
             throw new NotImplementedException();
@@ -381,11 +361,6 @@ public IDeleteQueryProvider<T> DeleteMany<T>()
             throw new NotImplementedException();
         }
 
-        public IAsyncDeleteQueryProvider<T> DeleteManyAsync<T>()
-        {
-            throw new NotImplementedException();
-        }
-
         public void Save<T>(T poco)
         {
             throw new NotImplementedException();
@@ -773,17 +748,8 @@ public Task<List<T>> SkipTakeAsync<T>(long skip, long take, Sql sql)
         #endregion
 
         #region Stuff
-        public void BuildPageQueries<T>(long skip, long take, string sql, ref object[] args, out string sqlCount, out string sqlPage)
-        {
-            throw new NotImplementedException();
-        }
 
-        public IAsyncQueryProviderWithIncludes<T> QueryAsync<T>()
-        {
-            throw new NotImplementedException();
-        }
-
-        int IDatabase.InsertBatch<T>(IEnumerable<T> pocos, BatchOptions options)
+        public void BuildPageQueries<T>(long skip, long take, string sql, ref object[] args, out string sqlCount, out string sqlPage)
         {
             throw new NotImplementedException();
         }

diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -101,7 +101,7 @@
     <PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
     <PackageReference Include="MiniProfiler" Version="4.0.138" />
     <PackageReference Include="Moq" Version="4.10.1" />
-    <PackageReference Include="NPoco" Version="4.0.3" />
+    <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -347,9 +347,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8110</DevelopmentServerPort>
+          <DevelopmentServerPort>8111</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8110</IISUrl>
+          <IISUrl>http://localhost:8111</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -91,7 +91,7 @@
     </PackageReference>
     <PackageReference Include="MiniProfiler" Version="4.0.138" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="NPoco" Version="4.0.3" />
+    <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="SecurityCodeScan">
       <Version>3.3.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>