Issue #226 fix - made inklecate and tests project depend on ink-runtime-engine

.travis.yml

@@ -7,4 +7,4 @@ before_script:
   - nuget restore ink.sln
 script:
   - xbuild ink.sln
-  - nunit-console tests/bin/Debug/tests.dll
+  - nunit-console tests/bin/Debug/ink-tests.dll

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
@@ -22,6 +22,6 @@ 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
+zip --junk-paths ReleaseBinary/inklecate_mac.zip ReleaseBinary/inklecate ink-engine-runtime/bin/Release/ink-engine-runtime.dll
 
 rm ReleaseBinary/inklecate

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("")]
+

ink-engine-dll/ink-engine-dll.csproj → ink-engine-runtime/ink-engine-runtime.csproj

@@ -7,11 +7,13 @@
     <ProjectGuid>{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ink_engine</RootNamespace>
-    <AssemblyName>ink-engine</AssemblyName>
+    <RootNamespace>Ink.Runtime</RootNamespace>
+    <AssemblyName>ink-engine-runtime</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <ProductVersion>12.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,7 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\ink-engine.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\ink-engine-runtime.xml</DocumentationFile>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -30,7 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\ink-engine.xml</DocumentationFile>
+    <DocumentationFile>bin\Release\ink-engine-runtime.xml</DocumentationFile>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
@@ -39,7 +41,34 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\ink-engine-runtime\ink-engine-runtime.projitems" Label="Shared" />
+  <ItemGroup>
+    <Compile Include="CallStack.cs" />
+    <Compile Include="Container.cs" />
+    <Compile Include="ControlCommand.cs" />
+    <Compile Include="DebugMetadata.cs" />
+    <Compile Include="Divert.cs" />
+    <Compile Include="Glue.cs" />
+    <Compile Include="INamedContent.cs" />
+    <Compile Include="NativeFunctionCall.cs" />
+    <Compile Include="Object.cs" />
+    <Compile Include="Path.cs" />
+    <Compile Include="Story.cs" />
+    <Compile Include="StoryException.cs" />
+    <Compile Include="StringJoinExtension.cs" />
+    <Compile Include="VariableAssignment.cs" />
+    <Compile Include="VariableReference.cs" />
+    <Compile Include="Void.cs" />
+    <Compile Include="VariablesState.cs" />
+    <Compile Include="PushPop.cs" />
+    <Compile Include="StoryState.cs" />
+    <Compile Include="JsonSerialisation.cs" />
+    <Compile Include="Value.cs" />
+    <Compile Include="ChoicePoint.cs" />
+    <Compile Include="Choice.cs" />
+    <Compile Include="SimpleJson.cs" />
+    <Compile Include="Tag.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

ink.sln

@@ -1,78 +1,87 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "inklecate", "inklecate\inklecate.csproj", "{D10ED1A8-CF83-4E58-B505-3714B3A16215}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests", "tests\tests.csproj", "{C48016BB-CF8B-4357-B052-E4DC63AED06B}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ink-engine-runtime", "ink-engine-runtime\ink-engine-runtime.shproj", "{DF1CA307-A546-48DF-8BDD-0BA6D8F38645}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ink-engine-dll", "ink-engine-dll\ink-engine-dll.csproj", "{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x86 = Release|x86
-		Test|Any CPU = Test|Any CPU
-		Test|x86 = Test|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Debug|x86.Build.0 = Debug|Any CPU
-		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Release|x86.ActiveCfg = Release|Any CPU
-		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Release|x86.Build.0 = Release|Any CPU
-		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Test|Any CPU.ActiveCfg = Release|Any CPU
-		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Test|Any CPU.Build.0 = Release|Any CPU
-		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Test|x86.ActiveCfg = Release|Any CPU
-		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Test|x86.Build.0 = Release|Any CPU
-		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Debug|Any CPU.Build.0 = Debug|x86
-		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Debug|x86.ActiveCfg = Debug|x86
-		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Debug|x86.Build.0 = Debug|x86
-		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Release|Any CPU.ActiveCfg = Release|x86
-		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Release|Any CPU.Build.0 = Release|x86
-		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Release|x86.ActiveCfg = Release|x86
-		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Release|x86.Build.0 = Release|x86
-		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Test|Any CPU.ActiveCfg = Test|x86
-		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Test|Any CPU.Build.0 = Test|x86
-		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Test|x86.ActiveCfg = Test|x86
-		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Test|x86.Build.0 = Test|x86
-		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Debug|x86.Build.0 = Debug|Any CPU
-		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Release|x86.ActiveCfg = Release|Any CPU
-		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Release|x86.Build.0 = Release|Any CPU
-		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Test|Any CPU.ActiveCfg = Release|Any CPU
-		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Test|x86.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		Policies = $0
-		$0.DotNetNamingPolicy = $1
-		$1.DirectoryNamespaceAssociation = None
-		$1.ResourceNamePolicy = FileFormatDefault
-		$0.TextStylePolicy = $2
-		$2.FileWidth = 120
-		$2.TabsToSpaces = False
-		$2.inheritsSet = VisualStudio
-		$2.inheritsScope = text/plain
-	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		ink-engine-runtime\ink-engine-runtime.projitems*{f68d0ee2-1831-4a06-8ffa-cbd0315efd0e}*SharedItemsImports = 4
-		ink-engine-runtime\ink-engine-runtime.projitems*{d10ed1a8-cf83-4e58-b505-3714b3a16215}*SharedItemsImports = 4
-		ink-engine-runtime\ink-engine-runtime.projitems*{df1ca307-a546-48df-8bdd-0ba6d8f38645}*SharedItemsImports = 13
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "inklecate", "inklecate\inklecate.csproj", "{D10ED1A8-CF83-4E58-B505-3714B3A16215}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ink-tests", "tests\tests.csproj", "{C48016BB-CF8B-4357-B052-E4DC63AED06B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ink-engine-runtime", "ink-engine-runtime\ink-engine-runtime.csproj", "{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
+		Test|Any CPU = Test|Any CPU
+		Test|x86 = Test|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Debug|x86.Build.0 = Debug|Any CPU
+		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Release|x86.ActiveCfg = Release|Any CPU
+		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Release|x86.Build.0 = Release|Any CPU
+		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Test|Any CPU.ActiveCfg = Release|Any CPU
+		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Test|Any CPU.Build.0 = Release|Any CPU
+		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Test|x86.ActiveCfg = Release|Any CPU
+		{C48016BB-CF8B-4357-B052-E4DC63AED06B}.Test|x86.Build.0 = Release|Any CPU
+		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Debug|Any CPU.Build.0 = Debug|x86
+		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Debug|x86.ActiveCfg = Debug|x86
+		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Debug|x86.Build.0 = Debug|x86
+		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Release|Any CPU.ActiveCfg = Release|x86
+		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Release|Any CPU.Build.0 = Release|x86
+		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Release|x86.ActiveCfg = Release|x86
+		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Release|x86.Build.0 = Release|x86
+		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Test|Any CPU.ActiveCfg = Test|x86
+		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Test|Any CPU.Build.0 = Test|x86
+		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Test|x86.ActiveCfg = Test|x86
+		{D10ED1A8-CF83-4E58-B505-3714B3A16215}.Test|x86.Build.0 = Test|x86
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Debug|x86.Build.0 = Debug|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Debug|x86.Build.0 = Debug|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Release|x86.Build.0 = Release|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Release|x86.Build.0 = Release|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Test|Any CPU.ActiveCfg = Debug|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Test|Any CPU.ActiveCfg = Release|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Test|Any CPU.Build.0 = Debug|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Test|x86.ActiveCfg = Debug|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Test|x86.ActiveCfg = Release|Any CPU
+		{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}.Test|x86.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = inklecate\inklecate.csproj
+		Policies = $0
+		$0.DotNetNamingPolicy = $1
+		$1.DirectoryNamespaceAssociation = None
+		$1.ResourceNamePolicy = FileFormatDefault
+		$0.TextStylePolicy = $2
+		$2.FileWidth = 120
+		$2.TabsToSpaces = False
+		$2.inheritsSet = VisualStudio
+		$2.inheritsScope = text/plain
+	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		ink-engine-runtime\ink-engine-runtime.projitems*{f68d0ee2-1831-4a06-8ffa-cbd0315efd0e}*SharedItemsImports = 4
+		ink-engine-runtime\ink-engine-runtime.projitems*{d10ed1a8-cf83-4e58-b505-3714b3a16215}*SharedItemsImports = 4
+		ink-engine-runtime\ink-engine-runtime.projitems*{df1ca307-a546-48df-8bdd-0ba6d8f38645}*SharedItemsImports = 13
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

inklecate/Properties/AssemblyInfo.cs

@@ -1,4 +1,5 @@
 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.
@@ -16,6 +17,8 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
+[assembly: InternalsVisibleTo("ink-tests")]
+
 [assembly: AssemblyVersion ("1.0.*")]
 
 // The following attributes are used to specify the signing key for the assembly,

inklecate/inklecate.csproj

@@ -42,6 +42,12 @@
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ink-engine-runtime\ink-engine-runtime.csproj">
+      <Project>{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}</Project>
+      <Name>ink-engine-runtime</Name>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="CommandLineTool.cs" />
@@ -103,7 +109,6 @@
     <Compile Include="CommandLinePlayer.cs" />
     <Compile Include="InkParser\InkParser_Tags.cs" />
   </ItemGroup>
-  <Import Project="..\ink-engine-runtime\ink-engine-runtime.projitems" Label="Shared" Condition="Exists('..\ink-engine-runtime\ink-engine-runtime.projitems')" />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <None Include="test.ink">
@@ -117,5 +122,4 @@
     </None>
     <None Include="Plugins\Readme.txt" />
   </ItemGroup>
-  <ItemGroup />
 </Project>

tests/tests.csproj

@@ -6,7 +6,7 @@
     <ProjectGuid>{C48016BB-CF8B-4357-B052-E4DC63AED06B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>tests</RootNamespace>
-    <AssemblyName>tests</AssemblyName>
+    <AssemblyName>ink-tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -31,6 +31,7 @@
     <Reference Include="System" />
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Package>nunit</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -53,6 +54,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\ink-engine-runtime\ink-engine-runtime.csproj">
+      <Project>{F68D0EE2-1831-4A06-8FFA-CBD0315EFD0E}</Project>
+      <Name>ink-engine-runtime</Name>
+    </ProjectReference>
     <ProjectReference Include="..\inklecate\inklecate.csproj">
       <Project>{D10ED1A8-CF83-4E58-B505-3714B3A16215}</Project>
       <Name>inklecate</Name>