Skip to content
Browse files

finally fixing the unit tests so they can run in release mode, update…

…d Newtonsoft.Json
  • Loading branch information...
1 parent aec0c42 commit 36a27cbde0abe5c80afbeef3109a6d9c59cd39bb @jeremydmiller jeremydmiller committed Dec 9, 2011
Showing with 268 additions and 69 deletions.
  1. +1 −0 .gitignore
  2. +90 −0 samples/grammars_release.xml
  3. +10 −0 samples/math_release.xml
  4. +2 −3 src/SampleGenerator/SampleGenerator.csproj
  5. +1 −1 src/SampleGenerator/packages.config
  6. +4 −0 src/SampleGenerator/repositories.config
  7. +30 −3 src/StoryTeller.Testing/DataMother.cs
  8. +7 −5 src/StoryTeller.Testing/Engine/ObjectFinderTester.cs
  9. +1 −1 src/StoryTeller.Testing/Execution/ProjectTestRunnerIntegratedTester.cs
  10. +7 −9 src/StoryTeller.Testing/StoryTeller.Testing.csproj
  11. +1 −1 src/StoryTeller.Testing/Usages/UsageGraphIntegratedTester.cs
  12. +4 −4 src/StoryTeller.Testing/packages.config
  13. +4 −0 src/StoryTeller.Testing/repositories.config
  14. +1 −1 src/StoryTeller.UserInterface.Testing/Integration/TestEngineIntegrationTester.cs
  15. +7 −9 src/StoryTeller.UserInterface.Testing/StoryTeller.UserInterface.Testing.csproj
  16. +58 −8 src/StoryTeller.UserInterface.Testing/UI/Tests/TestStateManagerTester.cs
  17. +4 −4 src/StoryTeller.UserInterface.Testing/packages.config
  18. +4 −0 src/StoryTeller.UserInterface.Testing/repositories.config
  19. +4 −5 src/StoryTeller.UserInterface/StoryTeller.UserInterface.csproj
  20. +3 −3 src/StoryTeller.UserInterface/packages.config
  21. +4 −0 src/StoryTeller.UserInterface/repositories.config
  22. +6 −8 src/StoryTeller/StoryTeller.csproj
  23. +3 −3 src/StoryTeller/packages.config
  24. +4 −0 src/StoryTeller/repositories.config
  25. +3 −1 src/StoryTellerUI/StoryTellerUI.csproj
  26. +5 −0 src/StoryTellerUI/app.config
View
1 .gitignore
@@ -25,3 +25,4 @@ demo/*
source/StoryTeller/CommonAssemblyInfo.cs
src/packages
src/CommonAssemblyInfo.cs
+artifacts
View
90 samples/grammars_release.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<Project xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <Options>
+ <FileTemplate>using NUnit.Framework;
+using StoryTeller.Execution;
+
+namespace StoryTellerTestHarness
+{
+ [TestFixture, Explicit]
+ public class Template
+ {
+ private ProjectTestRunner runner;
+
+ [TestFixtureSetUp]
+ public void SetupRunner()
+ {
+ runner = new ProjectTestRunner(@"$PROJECT_FILE$");
+ }
+
+$METHODS$
+
+ [TestFixtureTearDown]
+ public void TeardownRunner()
+ {
+ runner.Dispose();
+ }
+ }
+}</FileTemplate>
+ <MethodTemplate> [Test]
+ public void $CLEAN_TEST_NAME$()
+ {
+ runner.RunAndAssertTest("$TEST_PATH$");
+ }</MethodTemplate>
+ <TargetFile>..\source\StoryTeller.Samples\StoryTellerDebug.cs</TargetFile>
+ </Options>
+ <Workspaces>
+ <WorkspaceFilter Name="Embedded">
+ <Actions />
+ <Filters>
+ <FixtureFilter Type="Fixture" Name="Embedded" />
+ <FixtureFilter Type="Fixture" Name="Another" />
+ <FixtureFilter Type="Fixture" Name="Math" />
+ </Filters>
+ </WorkspaceFilter>
+ <WorkspaceFilter Name="General">
+ <Actions />
+ <Filters>
+ <FixtureFilter Type="All" Name="ALL" />
+ </Filters>
+ </WorkspaceFilter>
+ <WorkspaceFilter Name="Paragraphs">
+ <Actions />
+ <Filters>
+ <FixtureFilter Type="Fixture" Name="Another" />
+ </Filters>
+ </WorkspaceFilter>
+ <WorkspaceFilter Name="Sentences">
+ <Actions />
+ <Filters>
+ <FixtureFilter Type="Fixture" Name="Sentence" />
+ <FixtureFilter Type="Fixture" Name="Math" />
+ <FixtureFilter Type="Fixture" Name="CurriedMath" />
+ </Filters>
+ </WorkspaceFilter>
+ <WorkspaceFilter Name="Sets">
+ <Actions />
+ <Filters>
+ <FixtureFilter Type="All" Name="ALL" />
+ </Filters>
+ </WorkspaceFilter>
+ <WorkspaceFilter Name="Tables">
+ <Actions />
+ <Filters>
+ <FixtureFilter Type="All" Name="ALL" />
+ </Filters>
+ </WorkspaceFilter>
+ <WorkspaceFilter Name="Parking">
+ <Actions />
+ <Filters>
+ <FixtureFilter Type="All" Name="ALL" />
+ </Filters>
+ </WorkspaceFilter>
+ </Workspaces>
+ <FixtureAssembly>Storyteller.Samples</FixtureAssembly>
+ <BinaryFolder>..\src\StoryTeller.Samples\bin\release</BinaryFolder>
+ <TestFolder>..\src\StoryTeller.Samples\Tests</TestFolder>
+ <FileName>..\..\..\..\samples\grammars.xml</FileName>
+ <TimeoutInSeconds>30</TimeoutInSeconds>
+ <Name>Grammars</Name>
+</Project>
View
10 samples/math_release.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <FileName>C:\code\StoryTeller\samples\math.xml</FileName>
+ <BinaryFolder>..\src\StoryTeller.Samples\bin\release</BinaryFolder>
+ <TestFolder>math</TestFolder>
+ <TimeoutInSeconds>30</TimeoutInSeconds>
+ <TestRunnerTypeName>StoryTeller.Samples.MathTestRunner, StoryTeller.Samples, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TestRunnerTypeName>
+ <Name>Math</Name>
+ <FixtureAssembly>Storyteller.Samples</FixtureAssembly>
+</Project>
View
5 src/SampleGenerator/SampleGenerator.csproj
@@ -35,9 +35,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="FubuCore, Version=0.9.2.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\FubuCore.0.9.2.84\lib\FubuCore.dll</HintPath>
+ <Reference Include="FubuCore">
+ <HintPath>..\packages\FubuCore.0.9.3.101\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
View
2 src/SampleGenerator/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="1.0" />
- <package id="FubuCore" version="0.9.2.84" />
+ <package id="FubuCore" version="0.9.3.101" />
</packages>
View
4 src/SampleGenerator/repositories.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+ <repository path="packages.config" />
+</repositories>
View
33 src/StoryTeller.Testing/DataMother.cs
@@ -1,10 +1,13 @@
using System;
using System.IO;
+using System.Xml;
using StoryTeller.Domain;
using StoryTeller.Engine;
using StoryTeller.Execution;
using StoryTeller.Model;
using StoryTeller.Workspace;
+using FubuCore;
+using FileSystem = FubuCore.FileSystem;
namespace StoryTeller.Testing
{
@@ -22,7 +25,31 @@ public static Project MathProject()
Directory.CreateDirectory(empty);
}
- return Project.LoadFromFile(THE_MATH_FILE);
+ return readProjectFile(THE_MATH_FILE);
+ }
+
+ private static Project readProjectFile(string projectFile)
+ {
+ if (AppDomain.CurrentDomain.BaseDirectory.ToLower().EndsWith("release"))
+ {
+ var newFile = Path.GetFileName(projectFile).Replace(".xml", "_release.xml");
+ var releaseFile = projectFile.ToFullPath().ParentDirectory().AppendPath(newFile);
+ new FileSystem().Copy(projectFile, releaseFile);
+
+ var document = new XmlDocument();
+ document.Load(releaseFile);
+
+ var element = document.DocumentElement.SelectSingleNode("//BinaryFolder");
+ element.InnerText = element.InnerText.Replace("debug", "release");
+
+ document.Save(releaseFile);
+
+ return Project.LoadFromFile(releaseFile);
+ }
+ else
+ {
+ return Project.LoadFromFile(projectFile);
+ }
}
public static string MathProjectFile()
@@ -146,12 +173,12 @@ public static Test[] TestArray(int count)
public static ProjectTestRunner MathProjectRunner()
{
- return new ProjectTestRunner(THE_MATH_FILE);
+ return new ProjectTestRunner(readProjectFile(THE_MATH_FILE));
}
public static ProjectTestRunner GrammarsProjectRunner()
{
- return new ProjectTestRunner(THE_GRAMMAR_FILE);
+ return new ProjectTestRunner(readProjectFile(THE_GRAMMAR_FILE));
}
}
}
View
12 src/StoryTeller.Testing/Engine/ObjectFinderTester.cs
@@ -53,6 +53,8 @@ public void SetUp()
#endregion
+ public class CrazyService{}
+
private ObjectFinder finder;
[Test]
@@ -66,7 +68,7 @@ public void a_guid()
[Test]
public void array_of_non_simple_type_that_does_not_have_a_finder_cannot_be_parsed()
{
- finder.CanBeParsed(typeof (Service[])).ShouldBeFalse();
+ finder.CanBeParsed(typeof(CrazyService[])).ShouldBeFalse();
}
[Test]
@@ -80,14 +82,14 @@ public void array_of_non_simple_type_that_has_a_finder_can_be_parsed()
[Test]
public void enumerable_of_non_simple_type_that_does_not_have_a_finder_cannot_be_parsed()
{
- finder.CanBeParsed(typeof (IEnumerable<Service>)).ShouldBeFalse();
+ finder.CanBeParsed(typeof (IEnumerable<CrazyService>)).ShouldBeFalse();
}
[Test]
public void enumerable_of_non_simple_type_that_has_a_finder_can_be_parsed()
{
- finder.RegisterFinder(x => new Service(x));
- finder.CanBeParsed(typeof (IEnumerable<Service>)).ShouldBeTrue();
+ finder.RegisterFinder(x => new CrazyService());
+ finder.CanBeParsed(typeof (IEnumerable<CrazyService>)).ShouldBeTrue();
}
[Test]
@@ -199,7 +201,7 @@ public void get_string_array()
[Test]
public void non_simple_type_that_does_not_have_a_finder_cannot_be_parsed()
{
- finder.CanBeParsed(typeof (Service)).ShouldBeFalse();
+ finder.CanBeParsed(typeof (CrazyService)).ShouldBeFalse();
}
[Test]
View
2 src/StoryTeller.Testing/Execution/ProjectTestRunnerIntegratedTester.cs
@@ -11,7 +11,7 @@ public class ProjectTestRunnerIntegratedTester
[SetUp]
public void SetUp()
{
- runner = new ProjectTestRunner(DataMother.MathProjectFile());
+ runner = DataMother.MathProjectRunner();
}
[TearDown]
View
16 src/StoryTeller.Testing/StoryTeller.Testing.csproj
@@ -53,22 +53,20 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="FubuCore, Version=0.9.2.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\FubuCore.0.9.2.71\lib\FubuCore.dll</HintPath>
+ <Reference Include="FubuCore">
+ <HintPath>..\packages\FubuCore.0.9.3.101\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="FubuTestingSupport">
- <HintPath>..\packages\FubuTestingSupport.0.9.2.71\lib\FubuTestingSupport.dll</HintPath>
+ <HintPath>..\packages\FubuTestingSupport.0.9.3.101\lib\FubuTestingSupport.dll</HintPath>
</Reference>
- <Reference Include="HtmlTags, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
+ <Reference Include="HtmlTags">
+ <HintPath>..\packages\HtmlTags.1.0.0.52\lib\4.0\HtmlTags.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=4.0.3.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
View
2 src/StoryTeller.Testing/Usages/UsageGraphIntegratedTester.cs
@@ -15,7 +15,7 @@ public class UsageGraphIntegratedTester
[SetUp]
public void SetUp()
{
- runner = new ProjectTestRunner(DataMother.THE_GRAMMAR_FILE);
+ runner = DataMother.GrammarsProjectRunner();
usages = new UsageGraph(runner.GetLibary(), new ConsoleUsageGraphListener());
usages.Rebuild(runner.Hierarchy);
}
View
8 src/StoryTeller.Testing/packages.config
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="1.0" />
- <package id="FubuCore" version="0.9.2.71" />
+ <package id="FubuCore" version="0.9.3.101" />
+ <package id="FubuTestingSupport" version="0.9.3.101" />
+ <package id="HtmlTags" version="1.0.0.52" />
+ <package id="Newtonsoft.Json" version="4.0.4" />
<package id="NUnit" version="2.5.10.11092" />
<package id="RhinoMocks" version="3.6" />
<package id="structuremap" version="2.6.3" />
<package id="structuremap.automocking" version="2.6.3" />
- <package id="FubuTestingSupport" version="0.9.2.71" />
- <package id="HtmlTags" version="1.0.0.23" />
- <package id="Newtonsoft.Json" version="4.0.3" />
</packages>
View
4 src/StoryTeller.Testing/repositories.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+ <repository path="packages.config" />
+</repositories>
View
2 src/StoryTeller.UserInterface.Testing/Integration/TestEngineIntegrationTester.cs
@@ -30,7 +30,7 @@ public void SetUp()
project = StoryTeller.Testing.DataMother.MathProject();
- project.GetBinaryFolder().ShouldEqual(Path.GetFullPath(@"..\..\..\StoryTeller.Samples\bin\debug"));
+ //project.GetBinaryFolder().ShouldEqual(Path.GetFullPath(@"..\..\..\StoryTeller.Samples\bin\debug"));
hierarchy = project.LoadTests();
View
16 src/StoryTeller.UserInterface.Testing/StoryTeller.UserInterface.Testing.csproj
@@ -31,22 +31,20 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="FubuCore, Version=0.9.2.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\FubuCore.0.9.2.71\lib\FubuCore.dll</HintPath>
+ <Reference Include="FubuCore">
+ <HintPath>..\packages\FubuCore.0.9.3.101\lib\FubuCore.dll</HintPath>
</Reference>
<Reference Include="FubuTestingSupport">
- <HintPath>..\packages\FubuTestingSupport.0.9.2.71\lib\FubuTestingSupport.dll</HintPath>
+ <HintPath>..\packages\FubuTestingSupport.0.9.3.101\lib\FubuTestingSupport.dll</HintPath>
</Reference>
- <Reference Include="HtmlTags, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
+ <Reference Include="HtmlTags">
+ <HintPath>..\packages\HtmlTags.1.0.0.52\lib\4.0\HtmlTags.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=4.0.3.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
View
66 src/StoryTeller.UserInterface.Testing/UI/Tests/TestStateManagerTester.cs
@@ -1,6 +1,9 @@
+using System;
+using System.Xml;
using NUnit.Framework;
using Rhino.Mocks;
using StoryTeller.Domain;
+using StoryTeller.Model;
using StoryTeller.Persistence;
using StoryTeller.Testing;
using StoryTeller.UserInterface.Tests;
@@ -143,6 +146,51 @@ public void the_test_is_no_longer_dirty()
}
}
+ public class FakeConverter : ITestConverter
+ {
+ public Test Clone(Test test)
+ {
+ throw new NotImplementedException();
+ }
+
+ public Test TestFromXml(string xml)
+ {
+ throw new NotImplementedException();
+ }
+
+ public string ToXml(Test test)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void ApplyXmlChanges(Test test, XmlDocument xml)
+ {
+ throw new NotImplementedException();
+ }
+
+ public string ToPreview(FixtureLibrary library, Test test)
+ {
+ throw new NotImplementedException();
+ }
+
+ public string TheJson;
+
+ public string ToJson(Test test)
+ {
+ return TheJson;
+ }
+
+ public void ApplyJsonChanges(Test test, string json)
+ {
+
+ }
+
+ public void ApplyXmlChanges(Test test, string xml)
+ {
+ throw new NotImplementedException();
+ }
+ }
+
[TestFixture]
public class when_reverting_the_test
{
@@ -152,29 +200,31 @@ public class when_reverting_the_test
public void SetUp()
{
test = new Test("my test");
- service = MockRepository.GenerateMock<ITestConverter>();
+
listener1 = MockRepository.GenerateMock<ITestStateListener>();
listener2 = MockRepository.GenerateMock<ITestStateListener>();
listener3 = MockRepository.GenerateMock<ITestStateListener>();
- manager = new TestStateManager(service, test);
+ theOriginalJson = "{old: 'json'}";
+ theNewJson = "{new: 'json'}";
+
+ theConverter = new FakeConverter() { TheJson = theOriginalJson };
+ manager = new TestStateManager(theConverter, test);
manager.RegisterListener(listener1);
manager.RegisterListener(listener2);
manager.RegisterListener(listener3);
- theOriginalJson = "{old: 'json'}";
- theNewJson = "{new: 'json'}";
- service.Expect(x => x.ToJson(test)).Return(theOriginalJson);
- service.Expect(x => x.ToJson(test)).Return(theNewJson);
+
- manager = new TestStateManager(service, test);
+ manager = new TestStateManager(theConverter, test);
// setting the pre-condition here
manager.CurrentJson.ShouldEqual(theOriginalJson);
+ theConverter.TheJson = theNewJson;
manager.Version(null);
// second version of the JSON
manager.CurrentJson.ShouldEqual(theNewJson);
@@ -193,7 +243,7 @@ public void SetUp()
#endregion
private Test test;
- private ITestConverter service;
+ private FakeConverter theConverter;
private TestStateManager manager;
private ITestStateListener listener1;
private ITestStateListener listener2;
View
8 src/StoryTeller.UserInterface.Testing/packages.config
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="HtmlTags" version="1.0.0.23" />
<package id="CommonServiceLocator" version="1.0" />
- <package id="FubuCore" version="0.9.2.71" />
+ <package id="FubuCore" version="0.9.3.101" />
+ <package id="FubuTestingSupport" version="0.9.3.101" />
+ <package id="HtmlTags" version="1.0.0.52" />
+ <package id="Newtonsoft.Json" version="4.0.4" />
<package id="NUnit" version="2.5.10.11092" />
<package id="RhinoMocks" version="3.6" />
<package id="structuremap" version="2.6.3" />
<package id="structuremap.automocking" version="2.6.3" />
- <package id="FubuTestingSupport" version="0.9.2.71" />
- <package id="Newtonsoft.Json" version="4.0.3" />
</packages>
View
4 src/StoryTeller.UserInterface.Testing/repositories.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+ <repository path="packages.config" />
+</repositories>
View
9 src/StoryTeller.UserInterface/StoryTeller.UserInterface.csproj
@@ -55,12 +55,11 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Accessibility" />
- <Reference Include="FubuCore, Version=0.9.2.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\FubuCore.0.9.2.71\lib\FubuCore.dll</HintPath>
+ <Reference Include="FubuCore">
+ <HintPath>..\packages\FubuCore.0.9.3.101\lib\FubuCore.dll</HintPath>
</Reference>
- <Reference Include="HtmlTags, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
+ <Reference Include="HtmlTags">
+ <HintPath>..\packages\HtmlTags.1.0.0.52\lib\4.0\HtmlTags.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
View
6 src/StoryTeller.UserInterface/packages.config
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="structuremap" version="2.6.3" />
<package id="CommonServiceLocator" version="1.0" />
- <package id="FubuCore" version="0.9.2.71" />
- <package id="HtmlTags" version="1.0.0.23" />
+ <package id="FubuCore" version="0.9.3.101" />
+ <package id="HtmlTags" version="1.0.0.52" />
+ <package id="structuremap" version="2.6.3" />
</packages>
View
4 src/StoryTeller.UserInterface/repositories.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+ <repository path="packages.config" />
+</repositories>
View
14 src/StoryTeller/StoryTeller.csproj
@@ -53,19 +53,17 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="FubuCore, Version=0.9.2.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\FubuCore.0.9.2.71\lib\FubuCore.dll</HintPath>
+ <Reference Include="FubuCore">
+ <HintPath>..\packages\FubuCore.0.9.3.101\lib\FubuCore.dll</HintPath>
</Reference>
- <Reference Include="HtmlTags, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\HtmlTags.1.0.0.23\lib\4.0\HtmlTags.dll</HintPath>
+ <Reference Include="HtmlTags">
+ <HintPath>..\packages\HtmlTags.1.0.0.52\lib\4.0\HtmlTags.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=4.0.3.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\Newtonsoft.Json.4.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\packages\Newtonsoft.Json.4.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="StructureMap, Version=2.6.3.0, Culture=neutral, PublicKeyToken=e60ad81abae3c223, processorArchitecture=MSIL">
<HintPath>..\packages\structuremap.2.6.3\lib\StructureMap.dll</HintPath>
View
6 src/StoryTeller/packages.config
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="1.0" />
- <package id="FubuCore" version="0.9.2.71" />
- <package id="HtmlTags" version="1.0.0.23" />
- <package id="Newtonsoft.Json" version="4.0.3" />
+ <package id="FubuCore" version="0.9.3.101" />
+ <package id="HtmlTags" version="1.0.0.52" />
+ <package id="Newtonsoft.Json" version="4.0.4" />
<package id="structuremap" version="2.6.3" />
</packages>
View
4 src/StoryTeller/repositories.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+ <repository path="packages.config" />
+</repositories>
View
4 src/StoryTellerUI/StoryTellerUI.csproj
@@ -117,7 +117,9 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- <None Include="app.config" />
+ <None Include="app.config">
+ <SubType>Designer</SubType>
+ </None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
View
5 src/StoryTellerUI/app.config
@@ -1,3 +1,8 @@
<?xml version="1.0"?>
<configuration>
+
+
+
+
+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

0 comments on commit 36a27cb

Please sign in to comment.
Something went wrong with that request. Please try again.