Skip to content

Commit

Permalink
Don't ignore packages folder since it's required when building from c…
Browse files Browse the repository at this point in the history
…ommand line, and we don't have an automated way of grabbing the dependencies from NuGet. Also, updated to latest version of NUnit
  • Loading branch information
joethephish committed Oct 27, 2015
1 parent 0d8707f commit bf2d726
Show file tree
Hide file tree
Showing 8 changed files with 11,012 additions and 6 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
#build
[Oo]bj/
[Bb]in/
packages/
TestResults/

# Don't ignore packages, since they're needed when running from command line without having run Xamarin
# packages/


# globs
Makefile.in
*.DS_Store
Expand Down
Binary file added packages/NUnit.2.6.4/NUnit.2.6.4.nupkg
Binary file not shown.
Binary file added packages/NUnit.2.6.4/lib/nunit.framework.dll
Binary file not shown.
10,984 changes: 10,984 additions & 0 deletions packages/NUnit.2.6.4/lib/nunit.framework.xml

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions packages/NUnit.2.6.4/license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Copyright � 2002-2014 Charlie Poole
Copyright � 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
Copyright � 2000-2002 Philip A. Craig

This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.

Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment (see the following) in the product documentation is required.

Portions Copyright � 2002-2014 Charlie Poole or Copyright � 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright � 2000-2002 Philip A. Craig

2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.

3. This notice may not be removed or altered from any source distribution.
4 changes: 4 additions & 0 deletions packages/repositories.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="../tests/packages.config" />
</repositories>
2 changes: 1 addition & 1 deletion tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="2.6.3" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
</packages>
8 changes: 4 additions & 4 deletions tests/tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,18 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\inklewriter-engine-runtime\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Tests.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<None Include="packages.config" />
<None Include="test_included_file.ink">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand All @@ -54,6 +53,7 @@
<None Include="test_included_file4.ink">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\inklecate\inklecate.csproj">
Expand Down

0 comments on commit bf2d726

Please sign in to comment.