diff --git a/.gitignore b/.gitignore
index 2613a46..474234a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,9 @@ bld/
[Bb]in/
[Oo]bj/
+# KDiff3
+*.orig
+
# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
@@ -170,6 +173,7 @@ publish/
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets
+tools/
# Microsoft Azure Build Output
csx/
diff --git a/DotNetCore.NPOI.sln b/DotNetCore.NPOI.sln
index d1a763f..30a03bb 100644
--- a/DotNetCore.NPOI.sln
+++ b/DotNetCore.NPOI.sln
@@ -84,8 +84,8 @@ Global
{4D994508-5489-4342-9EE8-6FDDB0763E66}.Release|Any CPU.Build.0 = Release|Any CPU
{F5A6FF78-2C51-44E8-9E31-CD1B3EF784E9}..net 2 Release|Any CPU.ActiveCfg = Release|Any CPU
{F5A6FF78-2C51-44E8-9E31-CD1B3EF784E9}..net 2 Release|Any CPU.Build.0 = Release|Any CPU
- {F5A6FF78-2C51-44E8-9E31-CD1B3EF784E9}..net 4 Release|Any CPU.ActiveCfg = .net 4 Release|Any CPU
- {F5A6FF78-2C51-44E8-9E31-CD1B3EF784E9}..net 4 Release|Any CPU.Build.0 = .net 4 Release|Any CPU
+ {F5A6FF78-2C51-44E8-9E31-CD1B3EF784E9}..net 4 Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F5A6FF78-2C51-44E8-9E31-CD1B3EF784E9}..net 4 Release|Any CPU.Build.0 = Release|Any CPU
{F5A6FF78-2C51-44E8-9E31-CD1B3EF784E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5A6FF78-2C51-44E8-9E31-CD1B3EF784E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5A6FF78-2C51-44E8-9E31-CD1B3EF784E9}.NPOI.Tools|Any CPU.ActiveCfg = Release|Any CPU
@@ -98,14 +98,14 @@ Global
{A920C2BA-8BFD-4F54-8401-7D1C0730F1F0}..net 4 Release|Any CPU.Build.0 = Release|Any CPU
{A920C2BA-8BFD-4F54-8401-7D1C0730F1F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A920C2BA-8BFD-4F54-8401-7D1C0730F1F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A920C2BA-8BFD-4F54-8401-7D1C0730F1F0}.NPOI.Tools|Any CPU.ActiveCfg = NPOI.Tools|Any CPU
- {A920C2BA-8BFD-4F54-8401-7D1C0730F1F0}.NPOI.Tools|Any CPU.Build.0 = NPOI.Tools|Any CPU
+ {A920C2BA-8BFD-4F54-8401-7D1C0730F1F0}.NPOI.Tools|Any CPU.ActiveCfg = Debug|Any CPU
+ {A920C2BA-8BFD-4F54-8401-7D1C0730F1F0}.NPOI.Tools|Any CPU.Build.0 = Debug|Any CPU
{A920C2BA-8BFD-4F54-8401-7D1C0730F1F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A920C2BA-8BFD-4F54-8401-7D1C0730F1F0}.Release|Any CPU.Build.0 = Release|Any CPU
{0BF8C464-8779-43CF-AD7A-B1109A86EAAE}..net 2 Release|Any CPU.ActiveCfg = Release|Any CPU
{0BF8C464-8779-43CF-AD7A-B1109A86EAAE}..net 2 Release|Any CPU.Build.0 = Release|Any CPU
- {0BF8C464-8779-43CF-AD7A-B1109A86EAAE}..net 4 Release|Any CPU.ActiveCfg = .net 4 Release|Any CPU
- {0BF8C464-8779-43CF-AD7A-B1109A86EAAE}..net 4 Release|Any CPU.Build.0 = .net 4 Release|Any CPU
+ {0BF8C464-8779-43CF-AD7A-B1109A86EAAE}..net 4 Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0BF8C464-8779-43CF-AD7A-B1109A86EAAE}..net 4 Release|Any CPU.Build.0 = Release|Any CPU
{0BF8C464-8779-43CF-AD7A-B1109A86EAAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0BF8C464-8779-43CF-AD7A-B1109A86EAAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0BF8C464-8779-43CF-AD7A-B1109A86EAAE}.NPOI.Tools|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/test/NPOI.OpenXml4Net/App.config b/test/NPOI.OpenXml4Net/App.config
deleted file mode 100644
index 34538d8..0000000
--- a/test/NPOI.OpenXml4Net/App.config
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/NPOI.OpenXml4Net/ConfigurationManager.cs b/test/NPOI.OpenXml4Net/ConfigurationManager.cs
new file mode 100644
index 0000000..4a5e213
--- /dev/null
+++ b/test/NPOI.OpenXml4Net/ConfigurationManager.cs
@@ -0,0 +1,26 @@
+using Microsoft.Extensions.Configuration;
+using System.Collections.Specialized;
+using System.Linq;
+
+namespace System.Configuration
+{
+ // TODO: Replace this shim with actual Options class
+ public static class ConfigurationManager
+ {
+ public static NameValueCollection AppSettings { get; }
+
+ static ConfigurationManager()
+ {
+ AppSettings = new ConfigurationBuilder()
+ .AddJsonFile("appsettings.json", false)
+ .Build()
+ .GetSection("AppSettings")
+ .GetChildren()
+ .Aggregate(new NameValueCollection(), (acc, cur) =>
+ {
+ acc.Add(cur.Key, cur.Value);
+ return acc;
+ });
+ }
+ }
+}
diff --git a/test/NPOI.OpenXml4Net/NPOI.OOXML4Net.Testcases.csproj b/test/NPOI.OpenXml4Net/NPOI.OOXML4Net.Testcases.csproj
index 76349ec..46634da 100644
--- a/test/NPOI.OpenXml4Net/NPOI.OOXML4Net.Testcases.csproj
+++ b/test/NPOI.OpenXml4Net/NPOI.OOXML4Net.Testcases.csproj
@@ -1,137 +1,28 @@
-
-
-
+
+
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {F5A6FF78-2C51-44E8-9E31-CD1B3EF784E9}
- Library
- Properties
+ netcoreapp2.0;net461
OOXML4Net.Testcases
OOXML4Net.Testcases
- v4.6.1
- 512
- {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
-
-
- 3.5
-
- publish\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.0.0.%2a
- false
- false
- true
-
-
+ false
-
- true
- full
- false
- ..\..\solution\Lib\.net4\
- DEBUG;TRACE
- prompt
- 4
- AllRules.ruleset
- false
- false
-
-
- pdbonly
- true
- ..\..\solution\Lib\.net4\
- TRACE
- prompt
- 4
- AllRules.ruleset
- false
-
-
- ..\..\solution\Lib\.net4\
- TRACE
- true
- pdbonly
- AnyCPU
- prompt
- AllRules.ruleset
- false
-
-
-
- ..\..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
- Designer
+
+ PreserveNewest
+
-
+
+
+
+
+
+
-
- {4d994508-5489-4342-9ee8-6fddb0763e66}
- NPOI.OOXML
-
-
- {b6aae93b-44b0-41a0-b478-0d72c115a40c}
- NPOI.OpenXml4Net
-
-
- {6452e3fd-ef04-4136-a04c-896b7c96d1cd}
- NPOI.OpenXmlFormats
-
-
- {2fb384cb-1041-47b5-9c0d-d6e9e5b4d4c0}
- NPOI
-
+
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
\ No newline at end of file
+
+
diff --git a/test/NPOI.OpenXml4Net/POIDataSamples.cs b/test/NPOI.OpenXml4Net/POIDataSamples.cs
index 5384b97..ed5e340 100644
--- a/test/NPOI.OpenXml4Net/POIDataSamples.cs
+++ b/test/NPOI.OpenXml4Net/POIDataSamples.cs
@@ -113,7 +113,7 @@ namespace TestCases
private void Initialise()
{
- String dataDirName = System.Configuration.ConfigurationSettings.AppSettings[TEST_PROPERTY];
+ String dataDirName = System.Configuration.ConfigurationManager.AppSettings[TEST_PROPERTY];
if (dataDirName == null)
throw new Exception("Must set system property '"
diff --git a/test/NPOI.OpenXml4Net/appsettings.json b/test/NPOI.OpenXml4Net/appsettings.json
new file mode 100644
index 0000000..59eca89
--- /dev/null
+++ b/test/NPOI.OpenXml4Net/appsettings.json
@@ -0,0 +1,6 @@
+{
+ "AppSettings": {
+ "POI.testdata.path": "..\\..\\..\\..\\test-data",
+ "ClientSettingsProvider.ServiceUri": ""
+ }
+}
\ No newline at end of file
diff --git a/test/NPOI.OpenXml4Net/packages.config b/test/NPOI.OpenXml4Net/packages.config
deleted file mode 100644
index ebeb58f..0000000
--- a/test/NPOI.OpenXml4Net/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/test/NPOI.OpenXmlFormats/App.config b/test/NPOI.OpenXmlFormats/App.config
index 80bf945..b393ad0 100644
--- a/test/NPOI.OpenXmlFormats/App.config
+++ b/test/NPOI.OpenXmlFormats/App.config
@@ -1,40 +1,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ..\..\..\..\test-data
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/NPOI.OpenXmlFormats/NPOI.OOXML.TestCases.csproj b/test/NPOI.OpenXmlFormats/NPOI.OOXML.TestCases.csproj
index 65f26de..8948b69 100644
--- a/test/NPOI.OpenXmlFormats/NPOI.OOXML.TestCases.csproj
+++ b/test/NPOI.OpenXmlFormats/NPOI.OOXML.TestCases.csproj
@@ -1,232 +1,46 @@
-
-
-
+
+
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {0BF8C464-8779-43CF-AD7A-B1109A86EAAE}
- Library
- Properties
+ netcoreapp2.0;net461
NPOI.OOXML.Testcases
NPOI.OOXML.Testcases
- v4.6.1
- 512
- {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 3.5
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.0.0.%2a
- false
- false
- true
- false
- true
- true
-
-
-
-
- true
- full
- false
- ..\..\solution\Lib\.net4\
- DEBUG;TRACE;HIDE_UNREACHABLE_CODE
- prompt
- 4
- AllRules.ruleset
- false
- false
-
-
- pdbonly
- true
- ..\..\solution\Lib\.net4\
- TRACE;HIDE_UNREACHABLE_CODE
- prompt
- 4
- AllRules.ruleset
- false
-
-
- ..\..\solution\Lib\.net4\
- TRACE;HIDE_UNREACHABLE_CODE
- true
- pdbonly
- AnyCPU
- prompt
- AllRules.ruleset
- false
+ false
+
-
- ..\..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll
-
-
-
-
-
- ..\..\packages\System.Drawing.Common.4.5.0\lib\net461\System.Drawing.Common.dll
-
-
+
+
+
+
+
+
+
+
+
+ PreserveNewest
+
+
-
- True
- True
- Settings.settings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
- Designer
-
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
+
+
+
+
-
- {4d994508-5489-4342-9ee8-6fddb0763e66}
- NPOI.OOXML
-
-
- {b6aae93b-44b0-41a0-b478-0d72c115a40c}
- NPOI.OpenXml4Net
-
-
- {6452e3fd-ef04-4136-a04c-896b7c96d1cd}
- NPOI.OpenXmlFormats
-
-
- {2fb384cb-1041-47b5-9c0d-d6e9e5b4d4c0}
- NPOI
-
-
- {a920c2ba-8bfd-4f54-8401-7d1c0730f1f0}
- NPOI.TestCases
-
+
+
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
\ No newline at end of file
+
+
diff --git a/test/NPOI.OpenXmlFormats/Properties/Settings.Designer.cs b/test/NPOI.OpenXmlFormats/Properties/Settings.Designer.cs
deleted file mode 100644
index 59db2ef..0000000
--- a/test/NPOI.OpenXmlFormats/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace NPOI.OOXML.Testcases.Properties {
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default {
- get {
- return defaultInstance;
- }
- }
-
- [global::System.Configuration.UserScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("..\\..\\..\\test-data")]
- public string TEST_PROPERTY {
- get {
- return ((string)(this["TEST_PROPERTY"]));
- }
- set {
- this["TEST_PROPERTY"] = value;
- }
- }
- }
-}
diff --git a/test/NPOI.OpenXmlFormats/Properties/Settings.settings b/test/NPOI.OpenXmlFormats/Properties/Settings.settings
deleted file mode 100644
index 2e3cbab..0000000
--- a/test/NPOI.OpenXmlFormats/Properties/Settings.settings
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- ..\..\..\test-data
-
-
-
\ No newline at end of file
diff --git a/test/NPOI.OpenXmlFormats/appsettings.json b/test/NPOI.OpenXmlFormats/appsettings.json
new file mode 100644
index 0000000..59eca89
--- /dev/null
+++ b/test/NPOI.OpenXmlFormats/appsettings.json
@@ -0,0 +1,6 @@
+{
+ "AppSettings": {
+ "POI.testdata.path": "..\\..\\..\\..\\test-data",
+ "ClientSettingsProvider.ServiceUri": ""
+ }
+}
\ No newline at end of file
diff --git a/test/NPOI.OpenXmlFormats/packages.config b/test/NPOI.OpenXmlFormats/packages.config
deleted file mode 100644
index 7749186..0000000
--- a/test/NPOI.OpenXmlFormats/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/test/NPOI.TestCases/App.config b/test/NPOI.TestCases/App.config
deleted file mode 100644
index 48bc001..0000000
--- a/test/NPOI.TestCases/App.config
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ..\..\..\test-data
-
-
-
-
diff --git a/test/NPOI.TestCases/ConfigurationManager.cs b/test/NPOI.TestCases/ConfigurationManager.cs
new file mode 100644
index 0000000..4a5e213
--- /dev/null
+++ b/test/NPOI.TestCases/ConfigurationManager.cs
@@ -0,0 +1,26 @@
+using Microsoft.Extensions.Configuration;
+using System.Collections.Specialized;
+using System.Linq;
+
+namespace System.Configuration
+{
+ // TODO: Replace this shim with actual Options class
+ public static class ConfigurationManager
+ {
+ public static NameValueCollection AppSettings { get; }
+
+ static ConfigurationManager()
+ {
+ AppSettings = new ConfigurationBuilder()
+ .AddJsonFile("appsettings.json", false)
+ .Build()
+ .GetSection("AppSettings")
+ .GetChildren()
+ .Aggregate(new NameValueCollection(), (acc, cur) =>
+ {
+ acc.Add(cur.Key, cur.Value);
+ return acc;
+ });
+ }
+ }
+}
diff --git a/test/NPOI.TestCases/NPOI.TestCases.csproj b/test/NPOI.TestCases/NPOI.TestCases.csproj
index 90387e1..dc2a87e 100644
--- a/test/NPOI.TestCases/NPOI.TestCases.csproj
+++ b/test/NPOI.TestCases/NPOI.TestCases.csproj
@@ -1,630 +1,60 @@
-
-
-
+
+
- Debug
- AnyCPU
- 9.0.30729
- 2.0
- {A920C2BA-8BFD-4F54-8401-7D1C0730F1F0}
- Library
- Properties
+ netcoreapp2.0;net461
TestCases
- NPOI.TestCases
- v4.6.1
- 512
- {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- false
- 3.5
-
- publish\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.0.0.%2a
- false
- false
- true
-
-
+ false
+ $(DefineConstants);HIDE_UNREACHABLE_CODE
-
- true
- full
- false
- ..\..\solution\Lib\.net4\
- DEBUG;TRACE;HIDE_UNREACHABLE_CODE
- prompt
- 4
- MinimumRecommendedRules.ruleset
- false
-
-
- pdbonly
- true
- ..\..\solution\Lib\.net4\
- TRACE;HIDE_UNREACHABLE_CODE
- prompt
- 4
- AllRules.ruleset
- false
-
-
- bin\NPOI.Tools\
- AllRules.ruleset
- false
-
-
-
- ..\..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll
-
-
-
-
-
- ..\..\packages\System.Configuration.ConfigurationManager.4.4.0\lib\net461\System.Configuration.ConfigurationManager.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Designer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PreserveNewest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {2fb384cb-1041-47b5-9c0d-d6e9e5b4d4c0}
- NPOI
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/NPOI.TestCases/Properties/AssemblyInfo.cs b/test/NPOI.TestCases/Properties/AssemblyInfo.cs
deleted file mode 100644
index 61e399c..0000000
--- a/test/NPOI.TestCases/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("NPOI.TestCases")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("NPOI team")]
-[assembly: AssemblyProduct("NPOI.TestCases")]
-[assembly: AssemblyCopyright("Apache 2.0")]
-[assembly: AssemblyTrademark("NPOI")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM componenets. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("d2a277c6-e48e-4e70-af22-2827e19b799a")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.5.0")]
-[assembly: AssemblyFileVersion("1.2.5.0")]
diff --git a/test/NPOI.TestCases/Properties/Settings.Designer.cs b/test/NPOI.TestCases/Properties/Settings.Designer.cs
deleted file mode 100644
index 61bfeb7..0000000
--- a/test/NPOI.TestCases/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.261
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace TestCases.Properties {
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default {
- get {
- return defaultInstance;
- }
- }
-
- [global::System.Configuration.UserScopedSettingAttribute()]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("..\\..\\..\\test-data")]
- public string TEST_PROPERTY {
- get {
- return ((string)(this["TEST_PROPERTY"]));
- }
- set {
- this["TEST_PROPERTY"] = value;
- }
- }
- }
-}
diff --git a/test/NPOI.TestCases/Properties/Settings.settings b/test/NPOI.TestCases/Properties/Settings.settings
deleted file mode 100644
index 09eb0fa..0000000
--- a/test/NPOI.TestCases/Properties/Settings.settings
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- ..\..\..\test-data
-
-
-
\ No newline at end of file
diff --git a/test/NPOI.TestCases/SS/Util/NumberComparingSpreadsheetGenerator.cs b/test/NPOI.TestCases/SS/Util/NumberComparingSpreadsheetGenerator.cs
index c1ebb55..54c94c9 100644
--- a/test/NPOI.TestCases/SS/Util/NumberComparingSpreadsheetGenerator.cs
+++ b/test/NPOI.TestCases/SS/Util/NumberComparingSpreadsheetGenerator.cs
@@ -21,6 +21,8 @@ using System.Text;
using NPOI.Util;
using NPOI.HSSF.UserModel;
using System.IO;
+using NUnit.Framework;
+
namespace TestCases.SS.Util
{
@@ -132,7 +134,8 @@ namespace TestCases.SS.Util
return sb.ToString();
}
- public static void Main(String[] args)
+ //[Test]
+ public void Test()
{
IWorkbook wb = new HSSFWorkbook();
diff --git a/test/NPOI.TestCases/SS/Util/NumberRenderingSpreadsheetGenerator.cs b/test/NPOI.TestCases/SS/Util/NumberRenderingSpreadsheetGenerator.cs
index 0e27484..ee2db31 100644
--- a/test/NPOI.TestCases/SS/Util/NumberRenderingSpreadsheetGenerator.cs
+++ b/test/NPOI.TestCases/SS/Util/NumberRenderingSpreadsheetGenerator.cs
@@ -22,6 +22,7 @@ using NPOI.Util;
using NPOI.SS.UserModel;
using System.Text;
using System.IO;
+using NUnit.Framework;
namespace TestCases.SS.Util
{
@@ -140,7 +141,8 @@ namespace TestCases.SS.Util
return sb.ToString();
}
- public static void Main(String[] args)
+ //[Test]
+ public void Test()
{
WriteJavaDoc();
diff --git a/test/NPOI.TestCases/appsettings.json b/test/NPOI.TestCases/appsettings.json
new file mode 100644
index 0000000..5057051
--- /dev/null
+++ b/test/NPOI.TestCases/appsettings.json
@@ -0,0 +1,12 @@
+{
+ "AppSettings": {
+ "loggername": "test.Util.DummyPOILogger,NPOI.test",
+ "HSSF.testdata.path": "..\\..\\..\\..\\test-data\\hssf",
+ "POIFS.testdata.path": "..\\..\\..\\..\\test-data\\poifs",
+ "POI.testdata.path": "..\\..\\..\\..\\test-data",
+ "java.io.tmpdir": "..\\..\\..\\..\\test-data\\",
+ "poi.keep.tmp.files": "..\\..\\..\\..\\test-data\\",
+ "font.metrics.filename": "..\\..\\..\\..\\test-data\\font_metrics.properties",
+ "escher.data.path": "..\\..\\..\\..\\test-data\\ddf\\"
+ }
+}
\ No newline at end of file
diff --git a/test/NPOI.TestCases/packages.config b/test/NPOI.TestCases/packages.config
deleted file mode 100644
index ebeb58f..0000000
--- a/test/NPOI.TestCases/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file