Skip to content

Commit

Permalink
Fixed some issues, and started on example project
Browse files Browse the repository at this point in the history
  • Loading branch information
Jake Ginnivan committed Jul 17, 2012
1 parent 3853a62 commit e56609a
Show file tree
Hide file tree
Showing 65 changed files with 29,327 additions and 119 deletions.
124 changes: 102 additions & 22 deletions .gitignore
@@ -1,27 +1,107 @@
[Oo]bj/
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
[Bb]in/
[Oo]bj/

# mstest test results
TestResults

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
/TestResults
*.sln.docstates

# Build results
[Dd]ebug/
[Rr]elease/
x64/
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.vspscc
*.vssscc
deploy
deploy/*
*.suo
*.cache
packages/
msbuild.log
artifacts/log
artifacts/
post-build*
_ReSharper.*
deploy-to-ec2*
publish/
Build/
*.received.txt
TestResults/
Src/UpgradeLog*.XML
Src/_UpgradeReport_Files/
.builds

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf

# Visual Studio profiler
*.psess
*.vsp

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*

# NCrunch
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish

# Publish Web Output
*.Publish.xml

# Others
[Bb]in
[Oo]bj
sql
TestResults
[Tt]est[Rr]esult*
*.Cache
ClientBin
[Ss]tyle[Cc]op.*
~$*
*.dbmdl
*.orig
*LAND ISLANDS.png
Thumbs.db
Documentation/_site
Generated_Code #added for RIA/Silverlight projects

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML

# NuGet temporary packages folder
packages

# any logs
*.log

# our output folder for build artifacts
artifacts

WebApi.Hal*.nupkg
@@ -1,6 +1,6 @@
namespace WebApi.Hal.Tests.Representations
{
public class OrganisationRepresentation : HalResource
public class OrganisationRepresentation : Resource
{
public OrganisationRepresentation()
{
Expand Down
2 changes: 1 addition & 1 deletion WebApi.Hal.Tests/ResourceLinkerTests.cs
Expand Up @@ -19,7 +19,7 @@ public void throws_meaningful_exception_when_cannot_find_linker()
// act
try
{
resourceLinker.CreateLinks(new List<HalResource>());
resourceLinker.CreateLinks(new List<Resource>());
}
catch (ArgumentException ex)
{
Expand Down
8 changes: 6 additions & 2 deletions WebApi.Hal.Tests/WebApi.Hal.Tests.csproj
Expand Up @@ -11,6 +11,8 @@
<AssemblyName>WebApi.Hal.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -45,8 +47,9 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="xunit">
<HintPath>..\packages\xunit.1.9.0.1566\lib\xunit.dll</HintPath>
<Reference Include="xunit, Version=1.9.1.1600, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\xunit.1.9.1\lib\net20\xunit.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -70,6 +73,7 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.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.
<Target Name="BeforeBuild">
Expand Down
2 changes: 1 addition & 1 deletion WebApi.Hal.Tests/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ApprovalTests" version="1.9" />
<package id="xunit" version="1.9.0.1566" />
<package id="xunit" version="1.9.1" targetFramework="net40" />
</packages>

0 comments on commit e56609a

Please sign in to comment.