yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v8/dev' into v8/contrib

Browse Source
This commit is contained in:
Sebastiaan Janssen
2021-01-28 16:10:52 +01:00
parent 7297bd5838 febb15445a
commit 820b04faec
8 changed files with 10 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/NuSpecs/UmbracoCms.Core.nuspec
View File

@@ -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>

4
src/SolutionInfo.cs
View File

@@ -18,5 +18,5 @@ using System.Resources;
[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")]

2
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -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>

2
src/Umbraco.Examine/Umbraco.Examine.csproj
View File

@@ -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>

36
src/Umbraco.Tests/Testing/TestDatabase.cs
View File

@@ -266,26 +266,6 @@ namespace Umbraco.Tests.Testing
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 @@ namespace Umbraco.Tests.Testing
throw new NotImplementedException();
}
public IAsyncDeleteQueryProvider<T> DeleteManyAsync<T>()
{
throw new NotImplementedException();
}
public void Save<T>(T poco)
{
throw new NotImplementedException();
@@ -773,21 +748,12 @@ namespace Umbraco.Tests.Testing
#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)
{
throw new NotImplementedException();
}
#endregion
}
}

2
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -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" />

4
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -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>

2
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -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>