Skip to content

Commit

Permalink
Moved to .NET 4.5.2. Upgraded all nuget packages.
Browse files Browse the repository at this point in the history
  • Loading branch information
hikalkan committed Dec 3, 2015
1 parent 24c82c5 commit 9301dc6
Show file tree
Hide file tree
Showing 24 changed files with 180 additions and 154 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
<AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -32,12 +33,12 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.5.0\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.AutoMapper, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.7.4.1\lib\net451\Abp.AutoMapper.dll</HintPath>
<Reference Include="Abp.AutoMapper, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.7.5.0\lib\net452\Abp.AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/AbpCompanyName.AbpProjectName.Application/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
4 changes: 2 additions & 2 deletions src/AbpCompanyName.AbpProjectName.Application/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
<package id="Abp.AutoMapper" version="0.7.4.1" targetFramework="net451" />
<package id="Abp" version="0.7.5.0" targetFramework="net452" />
<package id="Abp.AutoMapper" version="0.7.5.0" targetFramework="net452" />
<package id="AutoMapper" version="4.1.1" targetFramework="net451" />
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
<AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -32,8 +33,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.5.0\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
Expand Down
12 changes: 6 additions & 6 deletions src/AbpCompanyName.AbpProjectName.Core/app.config
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0" />
<assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
2 changes: 1 addition & 1 deletion src/AbpCompanyName.AbpProjectName.Core/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
<package id="Abp" version="0.7.5.0" targetFramework="net452" />
<package id="Castle.Core" 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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
<AssemblyName>AbpCompanyName.AbpProjectName.EntityFramework</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -32,12 +33,12 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.5.0\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.EntityFramework, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.EntityFramework.0.7.4.1\lib\net451\Abp.EntityFramework.dll</HintPath>
<Reference Include="Abp.EntityFramework, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.EntityFramework.0.7.5.0\lib\net452\Abp.EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
Expand All @@ -56,8 +57,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.4\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
<Reference Include="EntityFramework.DynamicFilters, Version=1.4.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.DynamicFilters.1.4.5\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
Expand Down
14 changes: 7 additions & 7 deletions src/AbpCompanyName.AbpProjectName.EntityFramework/App.config
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?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>
<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>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
<package id="Abp.EntityFramework" version="0.7.4.1" targetFramework="net451" />
<package id="Abp" version="0.7.5.0" targetFramework="net452" />
<package id="Abp.EntityFramework" version="0.7.5.0" targetFramework="net452" />
<package id="Castle.Core" 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="EntityFramework" version="6.1.3" targetFramework="net451" />
<package id="EntityFramework.DynamicFilters" version="1.4.4" targetFramework="net451" />
<package id="EntityFramework.DynamicFilters" version="1.4.5" targetFramework="net452" />
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net451" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
<AssemblyName>AbpCompanyName.AbpProjectName.NHibernate</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -32,16 +33,16 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.5.0\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.FluentMigrator, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.FluentMigrator.0.7.4.1\lib\net451\Abp.FluentMigrator.dll</HintPath>
<Reference Include="Abp.FluentMigrator, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.FluentMigrator.0.7.5.0\lib\net452\Abp.FluentMigrator.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.NHibernate, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.NHibernate.0.7.4.1\lib\net451\Abp.NHibernate.dll</HintPath>
<Reference Include="Abp.NHibernate, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.NHibernate.0.7.5.0\lib\net452\Abp.NHibernate.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/AbpCompanyName.AbpProjectName.NHibernate/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
6 changes: 3 additions & 3 deletions src/AbpCompanyName.AbpProjectName.NHibernate/packages.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
<package id="Abp.FluentMigrator" version="0.7.4.1" targetFramework="net451" />
<package id="Abp.NHibernate" version="0.7.4.1" targetFramework="net451" />
<package id="Abp" version="0.7.5.0" targetFramework="net452" />
<package id="Abp.FluentMigrator" version="0.7.5.0" targetFramework="net452" />
<package id="Abp.NHibernate" version="0.7.5.0" targetFramework="net452" />
<package id="Castle.Core" 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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
<AssemblyName>AbpCompanyName.AbpProjectName.WebApi</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -32,20 +33,20 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.5.0\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.AutoMapper, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.7.4.1\lib\net451\Abp.AutoMapper.dll</HintPath>
<Reference Include="Abp.AutoMapper, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.7.5.0\lib\net452\Abp.AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Web, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.0.7.4.1\lib\net451\Abp.Web.dll</HintPath>
<Reference Include="Abp.Web, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.0.7.5.0\lib\net452\Abp.Web.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Web.Api, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.Api.0.7.4.1\lib\net451\Abp.Web.Api.dll</HintPath>
<Reference Include="Abp.Web.Api, Version=0.7.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.Api.0.7.5.0\lib\net452\Abp.Web.Api.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/AbpCompanyName.AbpProjectName.WebApi/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
8 changes: 4 additions & 4 deletions src/AbpCompanyName.AbpProjectName.WebApi/packages.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="0.7.4.1" targetFramework="net451" />
<package id="Abp.AutoMapper" version="0.7.4.1" targetFramework="net451" />
<package id="Abp.Web" version="0.7.4.1" targetFramework="net451" />
<package id="Abp.Web.Api" version="0.7.4.1" targetFramework="net451" />
<package id="Abp" version="0.7.5.0" targetFramework="net452" />
<package id="Abp.AutoMapper" version="0.7.5.0" targetFramework="net452" />
<package id="Abp.Web" version="0.7.5.0" targetFramework="net452" />
<package id="Abp.Web.Api" version="0.7.5.0" targetFramework="net452" />
<package id="AutoMapper" version="4.1.1" targetFramework="net451" />
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
Expand Down
Loading

0 comments on commit 9301dc6

Please sign in to comment.