Skip to content

Commit

Permalink
merge commits
Browse files Browse the repository at this point in the history
  • Loading branch information
alirizaadiyahsi committed Feb 2, 2018
1 parent 99cdf58 commit 0e9cecc
Show file tree
Hide file tree
Showing 1,133 changed files with 92,391 additions and 204,045 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ TestResults
*.user
*.sln.docstates

# Visual Studio 2015/2017 cache/options directory
.vs/

# Build results
[Dd]ebug/
[Rr]elease/
Expand Down
170 changes: 44 additions & 126 deletions AbpEfConsoleApp/AbpEfConsoleApp/AbpEfConsoleApp.csproj

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions AbpEfConsoleApp/AbpEfConsoleApp/App.config
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>

<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
<connectionStrings>
<add name="Default" connectionString="Server=localhost;Database=AbpEfConsoleApp;Trusted_Connection=True;" providerName="System.Data.SqlClient" />
<add name="Default" connectionString="Server=localhost;Database=AbpEfConsoleApp;Trusted_Connection=True;" providerName="System.Data.SqlClient"/>
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
</providers>
</entityFramework>
</configuration>
55 changes: 13 additions & 42 deletions AbpEfConsoleApp/AbpEfConsoleApp/packages.config
Original file line number Diff line number Diff line change
@@ -1,46 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="3.4.0" targetFramework="net461" />
<package id="Abp.EntityFramework" version="3.4.0" targetFramework="net461" />
<package id="Abp.EntityFramework.Common" version="3.4.0" targetFramework="net461" />
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
<package id="Castle.Core-log4net" version="4.2.1" targetFramework="net461" />
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
<package id="Abp" version="0.10.0.1" targetFramework="net461" />
<package id="Abp.EntityFramework" version="0.10.0.2" targetFramework="net461" />
<package id="Abp.EntityFramework.Common" version="0.10.0.1" targetFramework="net461" />
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
<package id="Castle.Core-log4net" version="3.3.3" targetFramework="net451" />
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
<package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
<package id="Castle.Windsor-log4net" version="3.3.0" targetFramework="net451" />
<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
<package id="EntityFramework.DynamicFilters" version="3.0.1" targetFramework="net461" />
<package id="JetBrains.Annotations" version="11.1.0" targetFramework="net461" />
<package id="log4net" version="2.0.8" 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="2.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.Caching.Memory" version="2.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.Options" version="2.0.0" targetFramework="net461" />
<package id="Microsoft.Extensions.Primitives" version="2.0.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net461" />
<package id="Nito.AsyncEx.Context" version="1.1.0" targetFramework="net461" />
<package id="Nito.AsyncEx.Coordination" version="1.0.2" targetFramework="net461" />
<package id="Nito.AsyncEx.Tasks" version="1.1.0" targetFramework="net461" />
<package id="Nito.Collections.Deque" version="1.0.4" targetFramework="net461" />
<package id="Nito.Disposables" version="1.2.3" targetFramework="net461" />
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
<package id="System.ComponentModel.Annotations" version="4.4.1" targetFramework="net461" />
<package id="System.Configuration.ConfigurationManager" version="4.4.1" targetFramework="net461" />
<package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
<package id="System.Linq.Dynamic.Core" version="1.0.8.2" targetFramework="net461" />
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.4.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.Claims" version="4.3.0" targetFramework="net461" />
<package id="System.Threading" version="4.3.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="2.2.1" targetFramework="net461" />
<package id="EntityFramework" version="6.1.3" targetFramework="net451" />
<package id="EntityFramework.DynamicFilters" version="1.4.11" targetFramework="net461" />
<package id="log4net" version="1.2.10" targetFramework="net451" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />
<package id="System.Collections.Immutable" version="1.2.0" targetFramework="net461" />
</packages>
2 changes: 1 addition & 1 deletion AbpSwaggerDemo/.vs/config/applicationhost.config
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
</site>
<site name="AbpSwagger.Tests" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="D:\GitHub\aspnetboilerplate-samples\AbpSwaggerDemo\AbpSwagger.Tests" />
<virtualDirectory path="/" physicalPath="D:\Halil\GitHub\aspnetboilerplate-samples\AbpSwaggerDemo\AbpSwagger.Tests" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:8351:localhost" />
Expand Down
Loading

0 comments on commit 0e9cecc

Please sign in to comment.