Skip to content

Commit bfd041e

Browse files
muratcakirmuratcakir
committed
Targeting .NET Framework 4.6.1 (work in progress)
1 parent 4951faf commit bfd041e

25 files changed

Lines changed: 413 additions & 404 deletions

‎src/Libraries/SmartStore.Core/SmartStore.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>SmartStore.Core</RootNamespace>
1212
<AssemblyName>SmartStore.Core</AssemblyName>
13-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>
1616
</SccProjectName>

‎src/Libraries/SmartStore.Core/app.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
6+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
7+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
10+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral"/>
11+
<bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>
15-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
15+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

‎src/Libraries/SmartStore.Data/ObjectContextBase.SaveChanges.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ namespace SmartStore.Data
1919
{
2020
public abstract partial class ObjectContextBase
2121
{
22-
private IDbHookHandler _dbHookHandler;
2322
private SaveChangesOperation _currentSaveOperation;
2423

2524
private readonly static ConcurrentDictionary<Type, bool> _hookableEntities = new ConcurrentDictionary<Type, bool>();

‎src/Libraries/SmartStore.Data/ObjectContextBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected ObjectContextBase(string nameOrConnectionString, string alias = null)
4343
if (DataSettings.DatabaseIsInstalled() && !DbSeedingMigrator<SmartObjectContext>.IsMigrating)
4444
{
4545
//// listen to 'ObjectMaterialized' for load hooking
46-
//((IObjectContextAdapter)this).ObjectContext.ObjectMaterialized += ObjectMaterialized;
46+
((IObjectContextAdapter)this).ObjectContext.ObjectMaterialized += ObjectMaterialized;
4747
}
4848
}
4949

‎src/Libraries/SmartStore.Data/SmartStore.Data.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>SmartStore.Data</RootNamespace>
1212
<AssemblyName>SmartStore.Data</AssemblyName>
13-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>
1616
</SccProjectName>

‎src/Libraries/SmartStore.Data/app.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
6+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral"/>
7+
<bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
10+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
11+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>
15-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
15+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

‎src/Libraries/SmartStore.Services/SmartStore.Services.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>SmartStore.Services</RootNamespace>
1212
<AssemblyName>SmartStore.Services</AssemblyName>
13-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SccProjectName>
1616
</SccProjectName>

‎src/Libraries/SmartStore.Services/app.config‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5-
<section name="SmartStore.Services.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
5+
<section name="SmartStore.Services.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
66
</sectionGroup>
77
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
8-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
8+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
99
</configSections>
1010
<applicationSettings>
1111
<SmartStore.Services.Properties.Settings>
@@ -20,23 +20,23 @@
2020
<runtime>
2121
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
2222
<dependentAssembly>
23-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
24-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
23+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
24+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
2525
</dependentAssembly>
2626
<dependentAssembly>
27-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
28-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
27+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
28+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
2929
</dependentAssembly>
3030
<dependentAssembly>
31-
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
32-
<bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
31+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral"/>
32+
<bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0"/>
3333
</dependentAssembly>
3434
</assemblyBinding>
3535
</runtime>
3636
<entityFramework>
37-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
37+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
3838
<providers>
39-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
39+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
4040
</providers>
4141
</entityFramework>
42-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
42+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

‎src/Plugins/SmartStore.DevTools/SmartStore.DevTools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<AppDesignerFolder>Properties</AppDesignerFolder>
2121
<RootNamespace>SmartStore.DevTools</RootNamespace>
2222
<AssemblyName>SmartStore.DevTools</AssemblyName>
23-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
23+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
2424
<FileAlignment>512</FileAlignment>
2525
<TargetFrameworkProfile />
2626
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>

‎src/Plugins/SmartStore.DevTools/Web.config‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,16 @@
55
<add key="webpages:Version" value="3.0.0.0" />
66
<add key="webpages:Enabled" value="false" />
77
</appSettings>
8+
<!--
9+
Eine Beschreibung der Änderungen von 'web.config' finden Sie unter 'http://go.microsoft.com/fwlink/?LinkId=235367'.
10+
11+
Die folgenden Attribute können für die <httpRuntime>-Kennung festgelegt werden.
12+
<system.Web>
13+
<httpRuntime targetFramework="4.6.1" />
14+
</system.Web>
15+
-->
816
<system.web>
9-
<compilation debug="true" targetFramework="4.5.2">
17+
<compilation debug="true" targetFramework="4.6.1">
1018
<assemblies>
1119
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1220
<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
@@ -133,8 +141,8 @@
133141
<system.codedom>
134142
<!-- Enables C# 6 features in plugin views -->
135143
<compilers>
136-
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
144+
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:latest /nowarn:1659;1699;1701" />
137145
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
138146
</compilers>
139147
</system.codedom>
140-
</configuration>
148+
</configuration>

0 commit comments

Comments
 (0)