Ewl » Canonical The canonical version of EWL Read More
Clone URL:  
Pushed to 2 repositories · View In Graph Contained in tip and canonical

Updated all projects to .NET 4.6.2.

Changeset 65c2978f6d4c

Parent 7bbf29781d89

by Profile picture of William GrossWilliam Gross

Changes to 15 files · Browse files at 65c2978f6d4c Showing diff from parent 7bbf29781d89 Diff from another changeset...

Change 1 of 1 Show Entire File .hgignore Stacked
 
1
2
3
 
 
4
5
6
 
1
2
 
3
4
5
6
7
@@ -1,6 +1,7 @@
 syntax: glob   -.vs/Enterprise Web Library/v14/.suo +.vs/Enterprise Web Library/v15/.suo +.vs/Enterprise Web Library/v15/sqlite3/storage.ide  packages/  _ReSharper*  Enterprise Web Library.sln.DotSettings.user
Change 1 of 1 Show Entire File Core/​Core.csproj Stacked
 
23
24
25
26
 
27
28
29
 
23
24
25
 
26
27
28
29
@@ -23,7 +23,7 @@
  <OldToolsVersion>3.5</OldToolsVersion>   <UpgradeBackupLocation>   </UpgradeBackupLocation> - <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>   <TargetFrameworkProfile />   <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\Standard Library\</SolutionDir>   <RestorePackages>true</RestorePackages>
Change 1 of 1 Show Entire File Core/​app.config Stacked
 
1
 
2
3
4
5
6
7
8
9
10
 
 
 
 
 
 
 
 
 
 
 
11
 
 
 
1
2
 
 
 
 
 
 
 
 
3
4
5
6
7
8
9
10
11
12
13
14
 
@@ -1,11 +1,14 @@
-<?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="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /> - </dependentAssembly> - </assemblyBinding> - </runtime> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> + </startup> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime>  </configuration> \ No newline at end of file
 
9
10
11
12
 
13
14
15
 
9
10
11
 
12
13
14
15
@@ -9,7 +9,7 @@
  <AppDesignerFolder>Properties</AppDesignerFolder>   <RootNamespace>EnterpriseWebLibrary.DevelopmentUtility</RootNamespace>   <AssemblyName>EnterpriseWebLibrary.DevelopmentUtility</AssemblyName> - <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>   <TargetFrameworkProfile>   </TargetFrameworkProfile>   <FileAlignment>512</FileAlignment>
 
121
122
123
124
 
125
126
127
 
130
131
132
133
134
135
136
 
622
623
624
625
 
626
627
628
 
634
635
636
637
638
639
640
 
670
671
672
673
 
 
674
675
676
 
121
122
123
 
124
125
126
127
 
130
131
132
 
133
134
135
 
621
622
623
 
624
625
626
627
 
633
634
635
 
636
637
638
 
668
669
670
 
671
672
673
674
675
@@ -121,7 +121,7 @@
  }     private void copyInEwlFiles( DevelopmentInstallation installation ) { - if( installation.DevelopmentInstallationLogic.SystemIsEwl ) { + if( installation.DevelopmentInstallationLogic.SystemIsEwl )   foreach( var fileName in GlobalStatics.ConfigurationXsdFileNames ) {   IoMethods.CopyFile(   EwlStatics.CombinePaths( installation.GeneralLogic.Path, AppStatics.CoreProjectName, "Configuration", fileName + FileExtensions.Xsd ), @@ -130,7 +130,6 @@
  InstallationFileStatics.FilesFolderName,   fileName + FileExtensions.Xsd ) );   } - }   else {   var recognizedInstallation = installation as RecognizedDevelopmentInstallation;   if( recognizedInstallation == null || !recognizedInstallation.SystemIsEwlCacheCoordinator ) @@ -622,7 +621,7 @@
    private void generateXmlSchemaLogic( string projectPath, string schemaPathInProject, string nameSpace, string codeFileName, bool useSvcUtil ) {   var projectGeneratedCodeFolderPath = EwlStatics.CombinePaths( projectPath, "Generated Code" ); - if( useSvcUtil ) { + if( useSvcUtil )   try {   EwlStatics.RunProgram(   EwlStatics.CombinePaths( AppStatics.DotNetToolsFolderPath, "SvcUtil" ), @@ -634,7 +633,6 @@
  catch( Exception e ) {   throw new UserCorrectableException( "Failed to generate XML schema logic using SvcUtil.", e );   } - }   else {   Directory.CreateDirectory( projectGeneratedCodeFolderPath );   try { @@ -670,7 +668,8 @@
  writer.WriteLine( regionBegin );   writer.WriteLine( "syntax: glob" );   writer.WriteLine(); - writer.WriteLine( ".vs/{0}/v14/.suo".FormatWith( installation.ExistingInstallationLogic.RuntimeConfiguration.SystemName ) ); + writer.WriteLine( ".vs/{0}/v15/.suo".FormatWith( installation.ExistingInstallationLogic.RuntimeConfiguration.SystemName ) ); + writer.WriteLine( ".vs/{0}/v15/sqlite3/storage.ide".FormatWith( installation.ExistingInstallationLogic.RuntimeConfiguration.SystemName ) );   writer.WriteLine( "packages/" );   writer.WriteLine( installation.ExistingInstallationLogic.RuntimeConfiguration.SystemName + ".sln.DotSettings.user" );   writer.WriteLine( "Error Log.txt" );
 
1
 
2
3
4
5
6
7
8
9
10
11
12
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
 
 
 
 
 
 
 
 
 
 
3
4
5
6
7
8
9
10
11
12
13
14
 
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?>  <configuration> -<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" /></startup> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> + </startup> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime> +</configuration> \ No newline at end of file
 
4
5
6
7
 
8
9
10
 
4
5
6
 
7
8
9
10
@@ -4,7 +4,7 @@
  <add key="ChartImageHandler" value="storage=memory;deleteAfterServicing=true;" />   </appSettings>   <system.web> - <compilation debug="true" targetFramework="4.5.1" /> + <compilation debug="true" targetFramework="4.6.2" />   <customErrors mode="RemoteOnly" />   <httpRuntime executionTimeout="900" maxRequestLength="131072" requestPathInvalidCharacters="" requestValidationMode="2.0" targetFramework="4.5.1" />   <pages clientIDMode="AutoID" enableEventValidation="false" enableViewStateMac="false" validateRequest="false">
 
23
24
25
26
 
27
28
29
 
23
24
25
 
26
27
28
29
@@ -23,7 +23,7 @@
  <OldToolsVersion>3.5</OldToolsVersion>   <UpgradeBackupLocation>   </UpgradeBackupLocation> - <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>   <TargetFrameworkProfile />   <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\Standard Library\</SolutionDir>   <RestorePackages>true</RestorePackages>
 
1
 
2
3
4
5
6
7
8
9
10
 
 
 
 
 
 
 
 
 
 
 
11
 
 
 
1
2
 
 
 
 
 
 
 
 
3
4
5
6
7
8
9
10
11
12
13
14
 
@@ -1,11 +1,14 @@
-<?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="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /> - </dependentAssembly> - </assemblyBinding> - </runtime> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> + </startup> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime>  </configuration> \ No newline at end of file
 
23
24
25
26
 
27
28
29
 
23
24
25
 
26
27
28
29
@@ -23,7 +23,7 @@
  <OldToolsVersion>3.5</OldToolsVersion>   <UpgradeBackupLocation>   </UpgradeBackupLocation> - <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>   <TargetFrameworkProfile />   <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\Standard Library\</SolutionDir>   <RestorePackages>true</RestorePackages>
 
1
2
3
 
 
 
 
 
 
1
2
 
3
4
5
6
 
@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>  <configuration> -<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/></startup></configuration> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> + </startup> +</configuration> \ No newline at end of file
 
9
10
11
12
 
13
 
14
15
16
 
9
10
11
 
12
13
14
15
16
17
@@ -9,8 +9,9 @@
  <AppDesignerFolder>Properties</AppDesignerFolder>   <RootNamespace>EnterpriseWebLibrary.Tests</RootNamespace>   <AssemblyName>EnterpriseWebLibrary.Tests</AssemblyName> - <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>   <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile />   </PropertyGroup>   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">   <DebugSymbols>true</DebugSymbols>
Change 1 of 1 Show Entire File Tests/​app.config Stacked
 
1
 
2
3
4
5
6
7
8
9
10
 
 
 
 
 
 
 
 
 
 
 
11
 
 
 
1
2
 
 
 
 
 
 
 
 
3
4
5
6
7
8
9
10
11
12
13
14
 
@@ -1,11 +1,14 @@
-<?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="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /> - </dependentAssembly> - </assemblyBinding> - </runtime> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /> + </startup> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime>  </configuration> \ No newline at end of file
 
23
24
25
26
 
27
28
29
 
23
24
25
 
26
27
28
29
@@ -23,7 +23,7 @@
  <FileUpgradeFlags>   </FileUpgradeFlags>   <OldToolsVersion>4.0</OldToolsVersion> - <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>   <TargetFrameworkProfile />   <UseIISExpress>true</UseIISExpress>   <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\Standard Library\</SolutionDir>
 
4
5
6
7
 
8
9
10
 
4
5
6
 
7
8
9
10
@@ -4,7 +4,7 @@
  <add key="ChartImageHandler" value="storage=memory;deleteAfterServicing=true;" />   </appSettings>   <system.web> - <compilation debug="true" targetFramework="4.5.1" /> + <compilation debug="true" targetFramework="4.6.2" />   <customErrors mode="RemoteOnly" />   <httpRuntime executionTimeout="900" maxRequestLength="131072" requestPathInvalidCharacters="" requestValidationMode="2.0" targetFramework="4.5.1" />   <pages clientIDMode="AutoID" enableEventValidation="false" enableViewStateMac="false" validateRequest="false">