diff --git a/System.Unicode.snk b/System.Unicode.snk
new file mode 100644
index 0000000..dc404c6
Binary files /dev/null and b/System.Unicode.snk differ
diff --git a/UnicodeCharacterInspector.sln b/UnicodeCharacterInspector.sln
index e7be7ef..f116374 100644
--- a/UnicodeCharacterInspector.sln
+++ b/UnicodeCharacterInspector.sln
@@ -9,6 +9,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnicodeInformation", "Unico
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnicodeInformation.Tests", "UnicodeInformation.Tests\UnicodeInformation.Tests.csproj", "{50337426-E884-4394-9E1A-F6F7A555F5D9}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnicodeInformation.Builder", "UnicodeInformation.Builder\UnicodeInformation.Builder.csproj", "{8DFDEE6C-4F0D-4DE1-B346-574CB56D2B8B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{73097DF3-04B7-4C5F-B4EA-0EB800E40702}"
+ ProjectSection(SolutionItems) = preProject
+ System.Unicode.snk = System.Unicode.snk
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -27,6 +34,10 @@ Global
{50337426-E884-4394-9E1A-F6F7A555F5D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{50337426-E884-4394-9E1A-F6F7A555F5D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{50337426-E884-4394-9E1A-F6F7A555F5D9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8DFDEE6C-4F0D-4DE1-B346-574CB56D2B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8DFDEE6C-4F0D-4DE1-B346-574CB56D2B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8DFDEE6C-4F0D-4DE1-B346-574CB56D2B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8DFDEE6C-4F0D-4DE1-B346-574CB56D2B8B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/UnicodeCharacterInspector/CharacterInspectorViewModel.cs b/UnicodeCharacterInspector/CharacterInspectorViewModel.cs
index c45f26a..78dd3cf 100644
--- a/UnicodeCharacterInspector/CharacterInspectorViewModel.cs
+++ b/UnicodeCharacterInspector/CharacterInspectorViewModel.cs
@@ -6,7 +6,7 @@ using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using UnicodeInformation;
+using System.Unicode;
namespace UnicodeCharacterInspector
{
diff --git a/UnicodeInformation.Builder/App.config b/UnicodeInformation.Builder/App.config
new file mode 100644
index 0000000..8e15646
--- /dev/null
+++ b/UnicodeInformation.Builder/App.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/UnicodeInformation.Tests/FileUcdSource.cs b/UnicodeInformation.Builder/FileUcdSource.cs
similarity index 81%
rename from UnicodeInformation.Tests/FileUcdSource.cs
rename to UnicodeInformation.Builder/FileUcdSource.cs
index 2fe34d0..aaa4e9c 100644
--- a/UnicodeInformation.Tests/FileUcdSource.cs
+++ b/UnicodeInformation.Builder/FileUcdSource.cs
@@ -4,10 +4,11 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using System.Unicode;
-namespace UnicodeInformation.Tests
+namespace System.Unicode.Builder
{
- internal sealed class FileUcdSource : IUcdSource
+ public sealed class FileUcdSource : IUcdSource
{
private readonly string baseDirectory;
diff --git a/UnicodeInformation/HttpUcdSource.cs b/UnicodeInformation.Builder/HttpUcdSource.cs
similarity index 95%
rename from UnicodeInformation/HttpUcdSource.cs
rename to UnicodeInformation.Builder/HttpUcdSource.cs
index 1662675..1c1a171 100644
--- a/UnicodeInformation/HttpUcdSource.cs
+++ b/UnicodeInformation.Builder/HttpUcdSource.cs
@@ -6,7 +6,7 @@ using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
-namespace UnicodeInformation
+namespace System.Unicode.Builder
{
public class HttpUcdSource : IUcdSource
{
diff --git a/UnicodeInformation/IUcdSource.cs b/UnicodeInformation.Builder/IUcdSource.cs
similarity index 87%
rename from UnicodeInformation/IUcdSource.cs
rename to UnicodeInformation.Builder/IUcdSource.cs
index 197085e..63e350d 100644
--- a/UnicodeInformation/IUcdSource.cs
+++ b/UnicodeInformation.Builder/IUcdSource.cs
@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace UnicodeInformation
+namespace System.Unicode.Builder
{
public interface IUcdSource
{
diff --git a/UnicodeInformation.Builder/Program.cs b/UnicodeInformation.Builder/Program.cs
new file mode 100644
index 0000000..ecf3e38
--- /dev/null
+++ b/UnicodeInformation.Builder/Program.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace System.Unicode.Builder
+{
+ class Program
+ {
+ static void Main(string[] args)
+ {
+ }
+ }
+}
diff --git a/UnicodeInformation.Builder/Properties/AssemblyInfo.cs b/UnicodeInformation.Builder/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..fcc4038
--- /dev/null
+++ b/UnicodeInformation.Builder/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+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("UnicodeInformation.Builder")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("UnicodeInformation.Builder")]
+[assembly: AssemblyCopyright("Copyright © 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. 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("8dfdee6c-4f0d-4de1-b346-574cb56d2b8b")]
+
+// 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 Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/UnicodeInformation/UnicodeCharacterDataBuilder.cs b/UnicodeInformation.Builder/UnicodeCharacterDataBuilder.cs
similarity index 99%
rename from UnicodeInformation/UnicodeCharacterDataBuilder.cs
rename to UnicodeInformation.Builder/UnicodeCharacterDataBuilder.cs
index aa8627c..5ac5f3c 100644
--- a/UnicodeInformation/UnicodeCharacterDataBuilder.cs
+++ b/UnicodeInformation.Builder/UnicodeCharacterDataBuilder.cs
@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace UnicodeInformation
+namespace System.Unicode.Builder
{
public sealed class UnicodeCharacterDataBuilder
{
diff --git a/UnicodeInformation/UnicodeDataBuilder.cs b/UnicodeInformation.Builder/UnicodeDataBuilder.cs
similarity index 99%
rename from UnicodeInformation/UnicodeDataBuilder.cs
rename to UnicodeInformation.Builder/UnicodeDataBuilder.cs
index 98d0560..336b183 100644
--- a/UnicodeInformation/UnicodeDataBuilder.cs
+++ b/UnicodeInformation.Builder/UnicodeDataBuilder.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace UnicodeInformation
+namespace System.Unicode.Builder
{
public class UnicodeDataBuilder
{
diff --git a/UnicodeInformation/UnicodeDataFileReader.cs b/UnicodeInformation.Builder/UnicodeDataFileReader.cs
similarity index 99%
rename from UnicodeInformation/UnicodeDataFileReader.cs
rename to UnicodeInformation.Builder/UnicodeDataFileReader.cs
index bd8cea3..174b47e 100644
--- a/UnicodeInformation/UnicodeDataFileReader.cs
+++ b/UnicodeInformation.Builder/UnicodeDataFileReader.cs
@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace UnicodeInformation
+namespace System.Unicode.Builder
{
public class UnicodeDataFileReader : IDisposable
{
diff --git a/UnicodeInformation/UnicodeDataManager.cs b/UnicodeInformation.Builder/UnicodeDataManager.cs
similarity index 99%
rename from UnicodeInformation/UnicodeDataManager.cs
rename to UnicodeInformation.Builder/UnicodeDataManager.cs
index e331d9d..4efb6f5 100644
--- a/UnicodeInformation/UnicodeDataManager.cs
+++ b/UnicodeInformation.Builder/UnicodeDataManager.cs
@@ -6,7 +6,7 @@ using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
-namespace UnicodeInformation
+namespace System.Unicode.Builder
{
public class UnicodeDataManager
{
diff --git a/UnicodeInformation.Builder/UnicodeInformation.Builder.csproj b/UnicodeInformation.Builder/UnicodeInformation.Builder.csproj
new file mode 100644
index 0000000..c918bc8
--- /dev/null
+++ b/UnicodeInformation.Builder/UnicodeInformation.Builder.csproj
@@ -0,0 +1,81 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {8DFDEE6C-4F0D-4DE1-B346-574CB56D2B8B}
+ Exe
+ Properties
+ System.Unicode.Builder
+ UnicodeInformation.Builder
+ v4.5
+ 512
+
+
+ AnyCPU
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+ true
+
+
+ ..\System.Unicode.snk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ System.Unicode.snk
+
+
+
+
+
+ {cb722958-a1c4-4121-804b-7d5a671491b1}
+ UnicodeInformation
+
+
+
+
+
\ No newline at end of file
diff --git a/UnicodeInformation.Tests/UnicodeDataManagerTests.cs b/UnicodeInformation.Tests/UnicodeDataManagerTests.cs
index f2a9654..0b234e9 100644
--- a/UnicodeInformation.Tests/UnicodeDataManagerTests.cs
+++ b/UnicodeInformation.Tests/UnicodeDataManagerTests.cs
@@ -4,8 +4,9 @@ using System.Threading.Tasks;
using System.Net;
using System.IO;
using System.IO.Compression;
+using System.Unicode.Builder;
-namespace UnicodeInformation.Tests
+namespace System.Unicode.Tests
{
[TestClass]
public class UnicodeDataManagerTests
@@ -36,7 +37,9 @@ namespace UnicodeInformation.Tests
{
var source = new FileUcdSource(UcdDirectoryName);
- await UnicodeDataManager.DownloadAndBuildDataAsync(source);
+ var data = await UnicodeDataManager.DownloadAndBuildDataAsync(source);
+
+ Assert.AreEqual((int)'\t', data.GetUnicodeData('\t').CodePointRange.FirstCodePoint);
}
}
}
diff --git a/UnicodeInformation.Tests/UnicodeInformation.Tests.csproj b/UnicodeInformation.Tests/UnicodeInformation.Tests.csproj
index ce75d6d..4faadbb 100644
--- a/UnicodeInformation.Tests/UnicodeInformation.Tests.csproj
+++ b/UnicodeInformation.Tests/UnicodeInformation.Tests.csproj
@@ -39,12 +39,6 @@
-
- ..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll
-
-
- ..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll
-
@@ -60,19 +54,19 @@
-
+
+ {8dfdee6c-4f0d-4de1-b346-574cb56d2b8b}
+ UnicodeInformation.Builder
+
{cb722958-a1c4-4121-804b-7d5a671491b1}
UnicodeInformation
-
-
-
@@ -93,13 +87,6 @@
-
-
-
- This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+ System.Unicode.snk
+
-
@@ -52,37 +60,18 @@
-
-
-
-
-
-
-
-
- ..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8\System.Net.Http.Extensions.dll
-
-
- ..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8\System.Net.Http.Primitives.dll
-
-
-
-
-
-
-