Skip to content

Commit 2d2752e

Browse files
author
JanKallman
committed
Converted to VS2010. Added Enumerator to ExcelRange to enable Linq queries. New Linq sample. Worksheet copy will work between different packages. Copy method to ExcelRangeBase.
--HG-- extra : convert_revision : svn%3Ac031521d-7fdb-604e-9ef1-0138de3cd895/trunk%4045
1 parent bad33c2 commit 2d2752e

23 files changed

+691
-120
lines changed

‎EPPlus.sln

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 10.00
3-
# Visual Studio 2008
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlus", "ExcelPackage\EPPlus.csproj", "{7B288026-5502-4A39-BF41-77E086F3E4A3}"
5-
EndProject
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlusSamples", "SampleApp\EPPlusSamples.csproj", "{06BF3C68-E7D4-4579-90BE-E36DACE564EF}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlusTest", "ExcelPackageTest\EPPlusTest.csproj", "{E7BCEDE0-EADD-437B-86D5-49D192216948}"
9-
EndProject
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
104
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{84BB37E9-CE27-48E0-88F6-A741A46D5883}"
115
ProjectSection(SolutionItems) = preProject
126
ExcelPackage.vsmdi = ExcelPackage.vsmdi
137
LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
148
EndProjectSection
159
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlus", "ExcelPackage\EPPlus.csproj", "{7B288026-5502-4A39-BF41-77E086F3E4A3}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlusSamples", "SampleApp\EPPlusSamples.csproj", "{06BF3C68-E7D4-4579-90BE-E36DACE564EF}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlusTest", "ExcelPackageTest\EPPlusTest.csproj", "{E7BCEDE0-EADD-437B-86D5-49D192216948}"
15+
EndProject
1616
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlusWebSample", "EPPlusWebSample\EPPlusWebSample.csproj", "{1BF30A52-6149-432D-82F6-725250E5C662}"
1717
EndProject
1818
Global

‎EPPlusWebSample/EPPlusWebSample.csproj

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
23
<PropertyGroup>
34
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
45
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,8 +12,10 @@
1112
<RootNamespace>EPPlusWebSample</RootNamespace>
1213
<AssemblyName>EPPlusWebSample</AssemblyName>
1314
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
14-
<TargetFrameworkSubset>
15-
</TargetFrameworkSubset>
15+
<FileUpgradeFlags>
16+
</FileUpgradeFlags>
17+
<OldToolsVersion>3.5</OldToolsVersion>
18+
<UpgradeBackupLocation />
1619
</PropertyGroup>
1720
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1821
<DebugSymbols>true</DebugSymbols>
@@ -22,6 +25,7 @@
2225
<DefineConstants>DEBUG;TRACE</DefineConstants>
2326
<ErrorReport>prompt</ErrorReport>
2427
<WarningLevel>4</WarningLevel>
28+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
2529
</PropertyGroup>
2630
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2731
<DebugType>pdbonly</DebugType>
@@ -30,6 +34,7 @@
3034
<DefineConstants>TRACE</DefineConstants>
3135
<ErrorReport>prompt</ErrorReport>
3236
<WarningLevel>4</WarningLevel>
37+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
3338
</PropertyGroup>
3439
<ItemGroup>
3540
<Reference Include="System" />
@@ -74,7 +79,7 @@
7479
<Folder Include="App_Data\" />
7580
</ItemGroup>
7681
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
77-
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
82+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
7883
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7984
Other similar extension points exist, see Microsoft.Common.targets.
8085
<Target Name="BeforeBuild">
@@ -88,7 +93,7 @@
8893
<WebProjectProperties>
8994
<UseIIS>False</UseIIS>
9095
<AutoAssignPort>True</AutoAssignPort>
91-
<DevelopmentServerPort>2529</DevelopmentServerPort>
96+
<DevelopmentServerPort>1616</DevelopmentServerPort>
9297
<DevelopmentServerVPath>/</DevelopmentServerVPath>
9398
<IISUrl>
9499
</IISUrl>

‎ExcelPackage.vsmdi

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2006">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
33
<TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
44
<RunConfiguration id="dde59f2c-80d4-48ea-b6ff-2cf6055f3162" name="Local Test Run" storage="localtestrun.testrunconfig" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, PublicKeyToken=b03f5f7f11d50a3a" />
55
</TestList>

‎ExcelPackage/EPPlus.csproj

+37-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
23
<PropertyGroup>
34
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
45
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -23,10 +24,23 @@
2324
</FileUpgradeFlags>
2425
<UpgradeBackupLocation>
2526
</UpgradeBackupLocation>
26-
<OldToolsVersion>2.0</OldToolsVersion>
27+
<OldToolsVersion>3.5</OldToolsVersion>
2728
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
28-
<TargetFrameworkSubset>
29-
</TargetFrameworkSubset>
29+
<PublishUrl>publish\</PublishUrl>
30+
<Install>true</Install>
31+
<InstallFrom>Disk</InstallFrom>
32+
<UpdateEnabled>false</UpdateEnabled>
33+
<UpdateMode>Foreground</UpdateMode>
34+
<UpdateInterval>7</UpdateInterval>
35+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
36+
<UpdatePeriodically>false</UpdatePeriodically>
37+
<UpdateRequired>false</UpdateRequired>
38+
<MapFileExtensions>true</MapFileExtensions>
39+
<ApplicationRevision>0</ApplicationRevision>
40+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
41+
<IsWebBootstrapper>false</IsWebBootstrapper>
42+
<UseApplicationTrust>false</UseApplicationTrust>
43+
<BootstrapperEnabled>true</BootstrapperEnabled>
3044
</PropertyGroup>
3145
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3246
<DebugSymbols>true</DebugSymbols>
@@ -37,6 +51,7 @@
3751
<ErrorReport>prompt</ErrorReport>
3852
<WarningLevel>4</WarningLevel>
3953
<DocumentationFile>bin\Debug\ExcelPackageXmlDocumentationFile.xml</DocumentationFile>
54+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
4055
</PropertyGroup>
4156
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4257
<DebugType>pdbonly</DebugType>
@@ -46,6 +61,7 @@
4661
<ErrorReport>prompt</ErrorReport>
4762
<WarningLevel>4</WarningLevel>
4863
<DocumentationFile>bin\Release\EPPlusXmlDocumentationFile.xml</DocumentationFile>
64+
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
4965
</PropertyGroup>
5066
<ItemGroup>
5167
<Reference Include="System" />
@@ -146,6 +162,23 @@
146162
<ItemGroup>
147163
<None Include="OpenOfficeXml.snk" />
148164
</ItemGroup>
165+
<ItemGroup>
166+
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
167+
<Visible>False</Visible>
168+
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
169+
<Install>false</Install>
170+
</BootstrapperPackage>
171+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
172+
<Visible>False</Visible>
173+
<ProductName>.NET Framework 3.5 SP1</ProductName>
174+
<Install>true</Install>
175+
</BootstrapperPackage>
176+
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
177+
<Visible>False</Visible>
178+
<ProductName>Windows Installer 3.1</ProductName>
179+
<Install>true</Install>
180+
</BootstrapperPackage>
181+
</ItemGroup>
149182
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
150183
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
151184
Other similar extension points exist, see Microsoft.Common.targets.

‎ExcelPackage/ExcelCell.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ internal ulong CellID
9494
/// <summary>
9595
/// Read-only reference to the cell's column number
9696
/// </summary>
97-
public int Column { get { return _col; } internal set { _row = value; } }
97+
public int Column { get { return _col; } internal set { _col = value; } }
9898
/// <summary>
9999
/// Returns the current cell address in the standard Excel format (e.g. 'E5')
100100
/// </summary>

‎ExcelPackage/ExcelPackage.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public sealed class ExcelPackage : IDisposable
8585

8686
private ExcelWorkbook _workbook;
8787
public const int MaxColumns = 16384;
88-
public const int MaxRows = 16777216;
88+
public const int MaxRows = 1048576;
8989
#endregion
9090

9191
#region ExcelPackage Constructors

0 commit comments

Comments
 (0)