Skip to content

Commit c98667c

Browse files
author
JanKallman
committed
Version 2.6.0.1
Added a new sample 7. Fixes and cleanup. --HG-- extra : convert_revision : svn%3Ac031521d-7fdb-604e-9ef1-0138de3cd895/trunk%4029
1 parent 8a6c73d commit c98667c

File tree

82 files changed

+411
-418
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+411
-418
lines changed

‎EPPlusWebSample/Default.aspx.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Linq;
43
using System.Web;
54
using System.Web.UI;
65
using System.Web.UI.WebControls;

‎EPPlusWebSample/EPPlusWebSample.csproj

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>EPPlusWebSample</RootNamespace>
1212
<AssemblyName>EPPlusWebSample</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
14+
<TargetFrameworkSubset>
15+
</TargetFrameworkSubset>
1416
</PropertyGroup>
1517
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1618
<DebugSymbols>true</DebugSymbols>
@@ -32,18 +34,6 @@
3234
<ItemGroup>
3335
<Reference Include="System" />
3436
<Reference Include="System.Data" />
35-
<Reference Include="System.Core">
36-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
37-
</Reference>
38-
<Reference Include="System.Data.DataSetExtensions">
39-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
40-
</Reference>
41-
<Reference Include="System.Web.Extensions">
42-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
43-
</Reference>
44-
<Reference Include="System.Xml.Linq">
45-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
46-
</Reference>
4737
<Reference Include="System.Drawing" />
4838
<Reference Include="System.Web" />
4939
<Reference Include="System.Xml" />

‎EPPlusWebSample/GetSample.aspx.cs

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
1-
using System;
1+
/*******************************************************************************
2+
* You may amend and distribute as you like, but don't remove this header!
3+
*
4+
* All rights reserved.
5+
*
6+
* EPPlus is an Open Source project provided under the
7+
* GNU General Public License (GPL) as published by the
8+
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
9+
*
10+
* See http://epplus.codeplex.com/ for details
11+
*
12+
* The GNU General Public License can be viewed at http://www.opensource.org/licenses/gpl-license.php
13+
* If you unfamiliar with this license or have questions about it, here is an http://www.gnu.org/licenses/gpl-faq.html
14+
*
15+
* The code for this project may be used and redistributed by any means PROVIDING it is
16+
* not sold for profit without the author's written consent, and providing that this notice
17+
* and the author's name and all copyright notices remain intact.
18+
*
19+
* All code and executables are provided "as is" with no warranty either express or implied.
20+
* The author accepts no liability for any damage or loss of business that this product may cause.
21+
*
22+
* Code change notes:
23+
*
24+
* Author Change Date
25+
*******************************************************************************
26+
* Jan Källman Added 23-MAR-2010
27+
*******************************************************************************/
28+
using System;
229
using System.Collections.Generic;
3-
using System.Linq;
430
using System.Web;
531
using System.Web.UI;
632
using System.Web.UI.WebControls;

‎EPPlusWebSample/Web.config

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
<?xml version="1.0"?>
22
<configuration>
3-
<configSections>
4-
<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
5-
<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
6-
<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
7-
<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
8-
<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
9-
<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
10-
<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
11-
<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
12-
</sectionGroup>
13-
</sectionGroup>
14-
</sectionGroup>
15-
</configSections>
163
<appSettings/>
174
<connectionStrings/>
185
<system.web>
@@ -23,12 +10,6 @@
2310
during development.
2411
-->
2512
<compilation debug="true">
26-
<assemblies>
27-
<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
28-
<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
29-
<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
30-
<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
31-
</assemblies>
3213
</compilation>
3314
<!--
3415
The <authentication> section enables configuration
@@ -48,60 +29,13 @@
4829
<error statusCode="404" redirect="FileNotFound.htm" />
4930
</customErrors>
5031
-->
51-
<pages>
52-
<controls>
53-
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
54-
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
55-
</controls>
56-
</pages>
57-
<httpHandlers>
58-
<remove verb="*" path="*.asmx"/>
59-
<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
60-
<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
61-
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>
62-
</httpHandlers>
63-
<httpModules>
64-
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
65-
</httpModules>
6632
</system.web>
6733
<system.codedom>
68-
<compilers>
69-
<compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
70-
<providerOption name="CompilerVersion" value="v3.5"/>
71-
<providerOption name="WarnAsError" value="false"/>
72-
</compiler>
73-
</compilers>
7434
</system.codedom>
7535
<!--
7636
The system.webServer section is required for running ASP.NET AJAX under Internet
7737
Information Services 7.0. It is not necessary for previous version of IIS.
7838
-->
7939
<system.webServer>
80-
<validation validateIntegratedModeConfiguration="false"/>
81-
<modules>
82-
<remove name="ScriptModule"/>
83-
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
84-
</modules>
85-
<handlers>
86-
<remove name="WebServiceHandlerFactory-Integrated"/>
87-
<remove name="ScriptHandlerFactory"/>
88-
<remove name="ScriptHandlerFactoryAppServices"/>
89-
<remove name="ScriptResource"/>
90-
<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
91-
<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
92-
<add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
93-
</handlers>
9440
</system.webServer>
95-
<runtime>
96-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
97-
<dependentAssembly>
98-
<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
99-
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
100-
</dependentAssembly>
101-
<dependentAssembly>
102-
<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
103-
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
104-
</dependentAssembly>
105-
</assemblyBinding>
106-
</runtime>
10741
</configuration>

‎ExcelPackage/Drawing/Chart/ExcelBarChart.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* You may amend and distribute as you like, but don't remove this header!
33
*
44
* EPPlus provides server-side generation of Excel 2007 spreadsheets.
5-
* EPPlus is a fork of the ExcelPackage project
5+
*
66
* See http://www.codeplex.com/EPPlus for details.
77
*
88
* All rights reserved.

‎ExcelPackage/Drawing/Chart/ExcelChart.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* You may amend and distribute as you like, but don't remove this header!
33
*
44
* EPPlus provides server-side generation of Excel 2007 spreadsheets.
5-
* EPPlus is a fork of the ExcelPackage project
5+
*
66
* See http://www.codeplex.com/EPPlus for details.
77
*
88
* All rights reserved.

‎ExcelPackage/Drawing/Chart/ExcelChartAxis.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* You may amend and distribute as you like, but don't remove this header!
33
*
44
* EPPlus provides server-side generation of Excel 2007 spreadsheets.
5-
* EPPlus is a fork of the ExcelPackage project
5+
*
66
* See http://www.codeplex.com/EPPlus for details.
77
*
88
* All rights reserved.

‎ExcelPackage/Drawing/Chart/ExcelChartDataLabel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* You may amend and distribute as you like, but don't remove this header!
33
*
44
* EPPlus provides server-side generation of Excel 2007 spreadsheets.
5-
* EPPlus is a fork of the ExcelPackage project
5+
*
66
* See http://www.codeplex.com/EPPlus for details.
77
*
88
* All rights reserved.

‎ExcelPackage/Drawing/Chart/ExcelChartLegend.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* You may amend and distribute as you like, but don't remove this header!
33
*
44
* EPPlus provides server-side generation of Excel 2007 spreadsheets.
5-
* EPPlus is a fork of the ExcelPackage project
5+
*
66
* See http://www.codeplex.com/EPPlus for details.
77
*
88
* All rights reserved.

‎ExcelPackage/Drawing/Chart/ExcelChartPlotArea.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* You may amend and distribute as you like, but don't remove this header!
33
*
44
* EPPlus provides server-side generation of Excel 2007 spreadsheets.
5-
* EPPlus is a fork of the ExcelPackage project
5+
*
66
* See http://www.codeplex.com/EPPlus for details.
77
*
88
* All rights reserved.

0 commit comments

Comments
 (0)