Skip to content

Commit

Permalink
Merge pull request #185 from aspnetboilerplate/feat/abp6.0
Browse files Browse the repository at this point in the history 
Upgraded to ABP 6.0
  • Loading branch information
@ismcagdas
ismcagdas committed Nov 20, 2020
2 parents 442ba2f + f411d94 commit 108addb
Show file tree
Hide file tree
Showing 32 changed files with 1,223 additions and 972 deletions.
117 changes: 59 additions & 58 deletions ...bpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/AbpCompanyName.AbpProjectName.Application/app.config
View file
Expand Up @@ -216,7 +216,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="AutoMapper" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
Expand Down Expand Up @@ -260,7 +260,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
Expand Down
64 changes: 32 additions & 32 deletions src/AbpCompanyName.AbpProjectName.Application/packages.config
View file
@@ -1,57 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="5.13.0" targetFramework="net461" />
<package id="Abp.AutoMapper" version="5.13.0" targetFramework="net461" />
<package id="Abp.Zero" version="5.13.0" targetFramework="net461" />
<package id="Abp.Zero.Common" version="5.13.0" targetFramework="net461" />
<package id="AutoMapper" version="10.0.0" targetFramework="net461" />
<package id="Abp" version="6.0.0" targetFramework="net461" />
<package id="Abp.AutoMapper" version="6.0.0" targetFramework="net461" />
<package id="Abp.Zero" version="6.0.0" targetFramework="net461" />
<package id="Abp.Zero.Common" version="6.0.0" targetFramework="net461" />
<package id="AutoMapper" version="10.1.1" targetFramework="net461" />
<package id="AutoMapper.Collection" version="7.0.0" targetFramework="net461" />
<package id="Castle.Core" version="4.4.1" targetFramework="net461" />
<package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
<package id="Castle.LoggingFacility" version="5.0.1" targetFramework="net461" />
<package id="Castle.Windsor" version="5.0.1" targetFramework="net461" />
<package id="JetBrains.Annotations" version="2020.1.0" targetFramework="net461" />
<package id="Castle.LoggingFacility" version="5.1.0-beta001" targetFramework="net461" />
<package id="Castle.Windsor" version="5.1.0-beta001" targetFramework="net461" />
<package id="JetBrains.Annotations" version="2020.2.0-eap" targetFramework="net461" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.3" targetFramework="net461" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
<package id="Microsoft.Extensions.Caching.Abstractions" version="3.1.5" targetFramework="net461" />
<package id="Microsoft.Extensions.Caching.Memory" version="3.1.5" targetFramework="net461" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.5" targetFramework="net461" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="3.1.5" targetFramework="net461" />
<package id="Microsoft.Extensions.Options" version="3.1.5" targetFramework="net461" />
<package id="Microsoft.Extensions.Primitives" version="3.1.5" targetFramework="net461" />
<package id="Microsoft.Extensions.Caching.Abstractions" version="5.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.Caching.Memory" version="5.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="5.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.Options" version="5.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
<package id="Nito.AsyncEx" version="5.0.0" targetFramework="net461" />
<package id="Nito.AsyncEx.Context" version="5.0.0" targetFramework="net461" />
<package id="Nito.AsyncEx.Coordination" version="5.0.0" targetFramework="net461" />
<package id="Nito.AsyncEx.Interop.WaitHandles" version="5.0.0" targetFramework="net461" />
<package id="Nito.AsyncEx.Oop" version="5.0.0" targetFramework="net461" />
<package id="Nito.AsyncEx.Tasks" version="5.0.0" targetFramework="net461" />
<package id="Nito.Cancellation" version="1.0.5" targetFramework="net461" />
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
<package id="Nito.Disposables" version="2.0.1" targetFramework="net461" />
<package id="Nito.AsyncEx" version="5.1.0" targetFramework="net461" />
<package id="Nito.AsyncEx.Context" version="5.1.0" targetFramework="net461" />
<package id="Nito.AsyncEx.Coordination" version="5.1.0" targetFramework="net461" />
<package id="Nito.AsyncEx.Interop.WaitHandles" version="5.1.0" targetFramework="net461" />
<package id="Nito.AsyncEx.Oop" version="5.1.0" targetFramework="net461" />
<package id="Nito.AsyncEx.Tasks" version="5.1.0" targetFramework="net461" />
<package id="Nito.Cancellation" version="1.1.0" targetFramework="net461" />
<package id="Nito.Collections.Deque" version="1.1.0" targetFramework="net461" />
<package id="Nito.Disposables" version="2.2.0" targetFramework="net461" />
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
<package id="System.Collections.Immutable" version="1.7.1" targetFramework="net461" />
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net461" />
<package id="System.Configuration.ConfigurationManager" version="4.7.0" targetFramework="net461" />
<package id="System.Collections.Immutable" version="5.0.0" targetFramework="net461" />
<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="net461" />
<package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net461" />
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
<package id="System.Linq.Dynamic.Core" version="1.1.5" targetFramework="net461" />
<package id="System.Linq.Dynamic.Core" version="1.2.5" targetFramework="net461" />
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net461" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net461" />
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net461" />
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
<package id="System.Security.AccessControl" version="4.7.0" targetFramework="net461" />
<package id="System.Security.AccessControl" version="5.0.0" targetFramework="net461" />
<package id="System.Security.Claims" version="4.3.0" targetFramework="net461" />
<package id="System.Security.Permissions" version="4.7.0" targetFramework="net461" />
<package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net461" />
<package id="System.Security.Permissions" version="5.0.0" targetFramework="net461" />
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net461" />
<package id="System.Threading" version="4.3.0" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
<package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net461" />
<package id="TimeZoneConverter" version="3.2.0" targetFramework="net461" />
<package id="TimeZoneConverter" version="3.3.0" targetFramework="net461" />
</packages>

0 comments on commit 108addb

Please sign in to comment.