Skip to content

Commit 736149c

Browse files
muratcakirmuratcakir
committed
* Updated some framework libraries to newest version
* Added ConnectionStrings.config for Azure & Redis connection settings
1 parent 75f197b commit 736149c

24 files changed

Lines changed: 809 additions & 773 deletions

File tree

‎src/Libraries/SmartStore.Core/IO/LocalFileSystem.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public IFile GetFile(string path)
108108
throw new ArgumentException("File " + path + " does not exist");
109109
}
110110

111-
return new FileSystemStorageFile(Fix(path), fileInfo);
111+
return new LocalFile(Fix(path), fileInfo);
112112
}
113113

114114
public IFolder GetFolder(string path)
@@ -120,7 +120,7 @@ public IFolder GetFolder(string path)
120120
throw new ArgumentException("Folder " + path + " does not exist");
121121
}
122122

123-
return new FileSystemStorageFolder(Fix(path), directoryInfo);
123+
return new LocalFolder(Fix(path), directoryInfo);
124124
}
125125

126126
public IFolder GetFolderForFile(string path)
@@ -139,7 +139,7 @@ public IFolder GetFolderForFile(string path)
139139
// get relative path of the folder
140140
var folderPath = Path.GetDirectoryName(path);
141141

142-
return new FileSystemStorageFolder(Fix(folderPath), fileInfo.Directory);
142+
return new LocalFolder(Fix(folderPath), fileInfo.Directory);
143143
}
144144

145145
public IEnumerable<string> SearchFiles(string path, string pattern)
@@ -163,7 +163,7 @@ public IEnumerable<IFile> ListFiles(string path)
163163
return directoryInfo
164164
.GetFiles()
165165
.Where(fi => !IsHidden(fi))
166-
.Select<FileInfo, IFile>(fi => new FileSystemStorageFile(Path.Combine(Fix(path), fi.Name), fi))
166+
.Select<FileInfo, IFile>(fi => new LocalFile(Path.Combine(Fix(path), fi.Name), fi))
167167
.ToList();
168168
}
169169

@@ -190,7 +190,7 @@ public IEnumerable<IFolder> ListFolders(string path)
190190
return directoryInfo
191191
.GetDirectories()
192192
.Where(di => !IsHidden(di))
193-
.Select<DirectoryInfo, IFolder>(di => new FileSystemStorageFolder(Path.Combine(Fix(path), di.Name), di))
193+
.Select<DirectoryInfo, IFolder>(di => new LocalFolder(Path.Combine(Fix(path), di.Name), di))
194194
.ToList();
195195
}
196196

@@ -258,7 +258,7 @@ public IFile CreateFile(string path)
258258

259259
File.WriteAllBytes(fileInfo.FullName, new byte[0]);
260260

261-
return new FileSystemStorageFile(Fix(path), fileInfo);
261+
return new LocalFile(Fix(path), fileInfo);
262262
}
263263

264264
public void DeleteFile(string path)
@@ -361,12 +361,12 @@ internal static string ValidatePath(string basePath, string mappedPath)
361361
}
362362

363363

364-
private class FileSystemStorageFile : IFile
364+
private class LocalFile : IFile
365365
{
366366
private readonly string _path;
367367
private readonly FileInfo _fileInfo;
368368

369-
public FileSystemStorageFile(string path, FileInfo fileInfo)
369+
public LocalFile(string path, FileInfo fileInfo)
370370
{
371371
_path = path;
372372
_fileInfo = fileInfo;
@@ -413,12 +413,12 @@ public Stream CreateFile()
413413
}
414414
}
415415

416-
private class FileSystemStorageFolder : IFolder
416+
private class LocalFolder : IFolder
417417
{
418418
private readonly string _path;
419419
private readonly DirectoryInfo _directoryInfo;
420420

421-
public FileSystemStorageFolder(string path, DirectoryInfo directoryInfo)
421+
public LocalFolder(string path, DirectoryInfo directoryInfo)
422422
{
423423
_path = path;
424424
_directoryInfo = directoryInfo;
@@ -450,7 +450,7 @@ public IFolder Parent
450450
{
451451
if (_directoryInfo.Parent != null)
452452
{
453-
return new FileSystemStorageFolder(System.IO.Path.GetDirectoryName(_path), _directoryInfo.Parent);
453+
return new LocalFolder(System.IO.Path.GetDirectoryName(_path), _directoryInfo.Parent);
454454
}
455455
throw new ArgumentException("Directory " + _directoryInfo.Name + " does not have a parent directory");
456456
}

‎src/Plugins/SmartStore.AmazonPay/web.config‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,131 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<appSettings>
4-
<add key="webpages:Version" value="3.0.0.0"/>
5-
<add key="webpages:Enabled" value="false"/>
4+
<add key="webpages:Version" value="3.0.0.0" />
5+
<add key="webpages:Enabled" value="false" />
66
</appSettings>
77
<system.web>
88
<compilation debug="true" targetFramework="4.5.1">
99
<assemblies>
10-
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
11-
<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
12-
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
13-
<add assembly="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
14-
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
10+
<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
11+
<add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
12+
<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
13+
<add assembly="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
14+
<add assembly="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
1515
</assemblies>
1616
</compilation>
1717
<pages>
1818
<namespaces>
19-
<add namespace="System.Collections.Generic"/>
20-
<add namespace="System.Linq"/>
21-
<add namespace="System.Web.Helpers"/>
22-
<add namespace="System.Web.Mvc"/>
23-
<add namespace="System.Web.Mvc.Ajax"/>
24-
<add namespace="System.Web.Mvc.Html"/>
25-
<add namespace="System.Web.Routing"/>
26-
<add namespace="System.Web.WebPages"/>
27-
<add namespace="System.Web.Optimization"/>
28-
<add namespace="Telerik.Web.Mvc.UI"/>
19+
<add namespace="System.Collections.Generic" />
20+
<add namespace="System.Linq" />
21+
<add namespace="System.Web.Helpers" />
22+
<add namespace="System.Web.Mvc" />
23+
<add namespace="System.Web.Mvc.Ajax" />
24+
<add namespace="System.Web.Mvc.Html" />
25+
<add namespace="System.Web.Routing" />
26+
<add namespace="System.Web.WebPages" />
27+
<add namespace="System.Web.Optimization" />
28+
<add namespace="Telerik.Web.Mvc.UI" />
2929
</namespaces>
3030
</pages>
3131
</system.web>
3232
<runtime>
3333
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
3434
<dependentAssembly>
35-
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
36-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
35+
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31BF3856AD364E35" culture="neutral" />
36+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
3737
</dependentAssembly>
3838
<dependentAssembly>
39-
<assemblyIdentity name="Autofac" publicKeyToken="17863AF14B0044DA" culture="neutral"/>
40-
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
39+
<assemblyIdentity name="Autofac" publicKeyToken="17863AF14B0044DA" culture="neutral" />
40+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
4141
</dependentAssembly>
4242
<dependentAssembly>
43-
<assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
44-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
43+
<assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31BF3856AD364E35" culture="neutral" />
44+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
4545
</dependentAssembly>
4646
<dependentAssembly>
47-
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
48-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
47+
<assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31BF3856AD364E35" culture="neutral" />
48+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
4949
</dependentAssembly>
5050
<dependentAssembly>
51-
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
52-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
51+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31BF3856AD364E35" culture="neutral" />
52+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
5353
</dependentAssembly>
5454
<dependentAssembly>
55-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
56-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
55+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral" />
56+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
5757
</dependentAssembly>
5858
<dependentAssembly>
59-
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
60-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
59+
<assemblyIdentity name="System.Web.Razor" publicKeyToken="31BF3856AD364E35" culture="neutral" />
60+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
6161
</dependentAssembly>
6262
<dependentAssembly>
63-
<assemblyIdentity name="System.Web.Http" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
64-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
63+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31BF3856AD364E35" culture="neutral" />
64+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
6565
</dependentAssembly>
6666
<dependentAssembly>
67-
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
68-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
67+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
68+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
6969
</dependentAssembly>
7070
<dependentAssembly>
71-
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral"/>
72-
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
71+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
72+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
7373
</dependentAssembly>
7474
<dependentAssembly>
75-
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
76-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
75+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
76+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
7777
</dependentAssembly>
7878
<dependentAssembly>
79-
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral"/>
80-
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0"/>
79+
<assemblyIdentity name="JavaScriptEngineSwitcher.Core" publicKeyToken="c608b2a8cc9e4472" culture="neutral" />
80+
<bindingRedirect oldVersion="0.0.0.0-1.2.4.0" newVersion="1.2.4.0" />
8181
</dependentAssembly>
8282
<dependentAssembly>
83-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
84-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
83+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
84+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
8585
</dependentAssembly>
8686
<dependentAssembly>
87-
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
88-
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0"/>
87+
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
88+
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
8989
</dependentAssembly>
9090
<dependentAssembly>
91-
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
92-
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0"/>
91+
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
92+
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
9393
</dependentAssembly>
9494
<dependentAssembly>
95-
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
96-
<bindingRedirect oldVersion="0.0.0.0-5.6.1.0" newVersion="5.6.1.0"/>
95+
<assemblyIdentity name="System.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
96+
<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
9797
</dependentAssembly>
9898
<dependentAssembly>
99-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
100-
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
99+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
100+
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
101101
</dependentAssembly>
102102
<dependentAssembly>
103-
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/>
104-
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
103+
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
104+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
105105
</dependentAssembly>
106106
<dependentAssembly>
107-
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
108-
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0"/>
107+
<assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31bf3856ad364e35" culture="neutral" />
108+
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
109109
</dependentAssembly>
110110
<dependentAssembly>
111-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
112-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
111+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
112+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
113113
</dependentAssembly>
114114
<dependentAssembly>
115-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
116-
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
115+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
116+
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
117117
</dependentAssembly>
118118
<dependentAssembly>
119-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
120-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
119+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
120+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
121121
</dependentAssembly>
122122
<dependentAssembly>
123-
<assemblyIdentity name="AjaxMin" publicKeyToken="21ef50ce11b5d80f" culture="neutral"/>
124-
<bindingRedirect oldVersion="0.0.0.0-5.14.5506.26196" newVersion="5.14.5506.26196"/>
123+
<assemblyIdentity name="AjaxMin" publicKeyToken="21ef50ce11b5d80f" culture="neutral" />
124+
<bindingRedirect oldVersion="0.0.0.0-5.14.5506.26196" newVersion="5.14.5506.26196" />
125125
</dependentAssembly>
126126
<dependentAssembly>
127-
<assemblyIdentity name="MsieJavaScriptEngine" publicKeyToken="a3a2846a37ac0d3e" culture="neutral"/>
128-
<bindingRedirect oldVersion="0.0.0.0-1.5.6.0" newVersion="1.5.6.0"/>
127+
<assemblyIdentity name="MsieJavaScriptEngine" publicKeyToken="a3a2846a37ac0d3e" culture="neutral" />
128+
<bindingRedirect oldVersion="0.0.0.0-1.5.6.0" newVersion="1.5.6.0" />
129129
</dependentAssembly>
130130
</assemblyBinding>
131131
</runtime>

0 commit comments

Comments
 (0)