diff --git a/.travis.yml b/.travis.yml
index 0abf1747..6c567243 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,4 +7,4 @@ before_script:
- nuget restore ink.sln
script:
- xbuild ink.sln
- - nunit-console tests/bin/Debug/tests.dll
\ No newline at end of file
+ - nunit-console tests/bin/Debug/ink-tests.dll
\ No newline at end of file
diff --git a/build_for_inky.command b/build_for_inky.command
index 0364c0c5..5eef1e40 100755
--- a/build_for_inky.command
+++ b/build_for_inky.command
@@ -18,7 +18,7 @@ export CC="cc -arch i386 -framework CoreFoundation -lobjc -liconv"
# "Bundles in addition support a –static flag. The –static flag causes mkbundle to generate a static executable that statically links the Mono runtime. Be advised that this option will trigger the LGPL requirement that you still distribute the independent pieces to your user so he can manually upgrade his Mono runtime if he chooses to do so. Alternatively, you can obtain a proprietary license of Mono by contacting Xamarin."
# http://www.mono-project.com/archived/guiderunning_mono_applications/
cd ./inklecate/bin/Debug/
-mkbundle --static --deps inklecate.exe -o inklecate_mac
+mkbundle --static --deps inklecate.exe ink-engine-runtime.dll -o inklecate_mac
# TODO: See if you can whittle down the dependencies a bit instead of using the --deps option above?
# It mentions all of the dependencies below, but I'm not convinced they're all necessary?
diff --git a/build_release.command b/build_release.command
index fd25f79e..7aca23c9 100755
--- a/build_release.command
+++ b/build_release.command
@@ -11,7 +11,7 @@ mkdir -p ReleaseBinary
# Windows: Simply zip up inklecate.exe and the runtime together
# We rely on a compatible version of .NET being installed on Windows
-zip --junk-paths ReleaseBinary/inklecate_windows_and_linux.zip inklecate/bin/Release/inklecate.exe ink-engine-dll/bin/Release/ink-engine.dll ink-engine-dll/bin/Release/ink-engine.xml
+zip --junk-paths ReleaseBinary/inklecate_windows_and_linux.zip inklecate/bin/Release/inklecate.exe ink-engine-runtime/bin/Release/ink-engine-runtime.dll ink-engine-runtime/bin/Release/ink-engine-runtime.xml
# Mac: Make a native binary that includes the mono runtime
# Prepare to bundle up compiled binary
@@ -21,7 +21,7 @@ export CC="cc -arch i386 -framework CoreFoundation -lobjc -liconv"
# "Bundles in addition support a –static flag. The –static flag causes mkbundle to generate a static executable that statically links the Mono runtime. Be advised that this option will trigger the LGPL requirement that you still distribute the independent pieces to your user so he can manually upgrade his Mono runtime if he chooses to do so. Alternatively, you can obtain a proprietary license of Mono by contacting Xamarin."
# http://www.mono-project.com/archived/guiderunning_mono_applications/
-mkbundle ./inklecate/bin/Release/inklecate.exe --deps --static -o ./ReleaseBinary/inklecate
-zip --junk-paths ReleaseBinary/inklecate_mac.zip ReleaseBinary/inklecate ink-engine-dll/bin/Release/ink-engine.dll
+mkbundle ./inklecate/bin/Release/inklecate.exe ./inklecate/bin/Release/ink-engine-runtime.dll --deps --static -o ./ReleaseBinary/inklecate
+zip --junk-paths ReleaseBinary/inklecate_mac.zip ReleaseBinary/inklecate ink-engine-runtime/bin/Release/ink-engine-runtime.dll
-rm ReleaseBinary/inklecate
\ No newline at end of file
+rm ReleaseBinary/inklecate
diff --git a/ink-engine-runtime/Properties/AssemblyInfo.cs b/ink-engine-runtime/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..41cae856
--- /dev/null
+++ b/ink-engine-runtime/Properties/AssemblyInfo.cs
@@ -0,0 +1,31 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle ("ink-engine-runtime")]
+[assembly: AssemblyDescription ("")]
+[assembly: AssemblyConfiguration ("")]
+[assembly: AssemblyCompany ("inkle Ltd")]
+[assembly: AssemblyProduct ("")]
+[assembly: AssemblyCopyright ("inkle Ltd")]
+[assembly: AssemblyTrademark ("")]
+[assembly: AssemblyCulture ("")]
+
+// Required to allow access of inernal types to 'inklecate' and the 'tests' project
+[assembly: InternalsVisibleTo ("inklecate")]
+[assembly: InternalsVisibleTo ("ink-tests")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion ("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly,
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+
diff --git a/ink-engine-dll/ink-engine-dll.csproj b/ink-engine-runtime/ink-engine-runtime.csproj
similarity index 58%
rename from ink-engine-dll/ink-engine-dll.csproj
rename to ink-engine-runtime/ink-engine-runtime.csproj
index 7cc2a460..030bdbd3 100644
--- a/ink-engine-dll/ink-engine-dll.csproj
+++ b/ink-engine-runtime/ink-engine-runtime.csproj
@@ -7,11 +7,13 @@
{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}
Library
Properties
- ink_engine
- ink-engine
+ Ink.Runtime
+ ink-engine-runtime
v3.5
512
+ 12.0.0
+ 2.0
true
@@ -21,7 +23,7 @@
DEBUG;TRACE
prompt
4
- bin\Debug\ink-engine.xml
+ bin\Debug\ink-engine-runtime.xml
AnyCPU
@@ -30,7 +32,7 @@
TRACE
prompt
4
- bin\Release\ink-engine.xml
+ bin\Release\ink-engine-runtime.xml
AnyCPU
@@ -39,7 +41,34 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+