Skip to content
This repository has been archived by the owner on Apr 26, 2020. It is now read-only.

Commit

Permalink
v2 alpha prep
Browse files Browse the repository at this point in the history
  • Loading branch information
jchannon committed Mar 7, 2016
1 parent 4a7dab4 commit 7effde3
Show file tree
Hide file tree
Showing 58 changed files with 228 additions and 218,574 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Expand Up @@ -15,4 +15,8 @@ build/
[Oo]bj/
[Rr]elease/
_[Rr]e[Ss]harper.*/
*.tss
*.tss
.vs/
packages/
project.lock.json
TestAssembly.dll
49 changes: 49 additions & 0 deletions Nancy.Serialization.JsonNet.Next.sln
@@ -0,0 +1,49 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Serialization.JsonNet", "src\Nancy.Serialization.JsonNet\Nancy.Serialization.JsonNet.xproj", "{8A8138A6-7E3D-41CC-A582-6664752F8D53}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy", "dependencies\Nancy\src\Nancy\Nancy.xproj", "{87C7C329-1824-4AC7-AF25-3D06068A01F6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{163C656D-B5BA-4979-AA0D-830A36079092}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
NuGet.config = NuGet.config
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1B1A132B-A5AF-4A16-9906-DAB0CC40366C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{96364ECA-D1E5-48D8-B4E7-BCC2F619BCA6}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Nancy.Serialization.JsonNet.Tests", "test\Nancy.Serialization.JsonNet.Tests\Nancy.Serialization.JsonNet.Tests.xproj", "{9EC1FBB1-F518-4949-96F0-2BC755F641B7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8A8138A6-7E3D-41CC-A582-6664752F8D53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8A8138A6-7E3D-41CC-A582-6664752F8D53}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A8138A6-7E3D-41CC-A582-6664752F8D53}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8A8138A6-7E3D-41CC-A582-6664752F8D53}.Release|Any CPU.Build.0 = Release|Any CPU
{87C7C329-1824-4AC7-AF25-3D06068A01F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{87C7C329-1824-4AC7-AF25-3D06068A01F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{87C7C329-1824-4AC7-AF25-3D06068A01F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{87C7C329-1824-4AC7-AF25-3D06068A01F6}.Release|Any CPU.Build.0 = Release|Any CPU
{9EC1FBB1-F518-4949-96F0-2BC755F641B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9EC1FBB1-F518-4949-96F0-2BC755F641B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9EC1FBB1-F518-4949-96F0-2BC755F641B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9EC1FBB1-F518-4949-96F0-2BC755F641B7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{8A8138A6-7E3D-41CC-A582-6664752F8D53} = {1B1A132B-A5AF-4A16-9906-DAB0CC40366C}
{87C7C329-1824-4AC7-AF25-3D06068A01F6} = {1B1A132B-A5AF-4A16-9906-DAB0CC40366C}
{9EC1FBB1-F518-4949-96F0-2BC755F641B7} = {96364ECA-D1E5-48D8-B4E7-BCC2F619BCA6}
EndGlobalSection
EndGlobal
@@ -1,19 +1,23 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Serialization.JsonNet", "Nancy.Serialization.JsonNet\Nancy.Serialization.JsonNet.csproj", "{F16A38F6-6C14-4511-84C1-3F7248C96A7F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Serialization.JsonNet", "src\Nancy.Serialization.JsonNet.MSBuild\Nancy.Serialization.JsonNet.csproj", "{F16A38F6-6C14-4511-84C1-3F7248C96A7F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy", "..\dependencies\Nancy\src\Nancy.MSBuild\Nancy.csproj", "{34576216-0DCA-4B0F-A0DC-9075E75A676F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy", "dependencies\Nancy\src\Nancy.MSBuild\Nancy.csproj", "{34576216-0DCA-4B0F-A0DC-9075E75A676F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Hosting.Aspnet", "..\dependencies\Nancy\src\Nancy.Hosting.Aspnet.MSBuild\Nancy.Hosting.Aspnet.csproj", "{15B7F794-0BB2-4B66-AD78-4A951F1209B2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Hosting.Aspnet", "dependencies\Nancy\src\Nancy.Hosting.Aspnet.MSBuild\Nancy.Hosting.Aspnet.csproj", "{15B7F794-0BB2-4B66-AD78-4A951F1209B2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Serialization.JsonNet.Tests", "Nancy.Serialization.JsonNet.Tests\Nancy.Serialization.JsonNet.Tests.csproj", "{FBB1B4A0-11F0-4C19-B268-ABE1412CD86E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Serialization.JsonNet.Tests", "test\Nancy.Serialization.JsonNet.Tests.MSBuild\Nancy.Serialization.JsonNet.Tests.csproj", "{FBB1B4A0-11F0-4C19-B268-ABE1412CD86E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Testing", "..\dependencies\Nancy\src\Nancy.Testing.MSBuild\Nancy.Testing.csproj", "{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Testing", "dependencies\Nancy\src\Nancy.Testing.MSBuild\Nancy.Testing.csproj", "{D79203C0-B672-4751-9C95-C3AB7D3FEFBE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Authentication.Forms", "..\dependencies\Nancy\src\Nancy.Authentication.Forms.MSBuild\Nancy.Authentication.Forms.csproj", "{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Authentication.Forms", "dependencies\Nancy\src\Nancy.Authentication.Forms.MSBuild\Nancy.Authentication.Forms.csproj", "{E8B18958-7C8A-4FBA-AF00-3041C34A20CE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6F305F2A-6F99-42D4-9A58-ADB2FEBB16B6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8808B96C-80EE-4FA0-A4BD-D0B6319427E7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -75,4 +79,12 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{F16A38F6-6C14-4511-84C1-3F7248C96A7F} = {6F305F2A-6F99-42D4-9A58-ADB2FEBB16B6}
{34576216-0DCA-4B0F-A0DC-9075E75A676F} = {6F305F2A-6F99-42D4-9A58-ADB2FEBB16B6}
{15B7F794-0BB2-4B66-AD78-4A951F1209B2} = {6F305F2A-6F99-42D4-9A58-ADB2FEBB16B6}
{FBB1B4A0-11F0-4C19-B268-ABE1412CD86E} = {8808B96C-80EE-4FA0-A4BD-D0B6319427E7}
{D79203C0-B672-4751-9C95-C3AB7D3FEFBE} = {8808B96C-80EE-4FA0-A4BD-D0B6319427E7}
{E8B18958-7C8A-4FBA-AF00-3041C34A20CE} = {6F305F2A-6F99-42D4-9A58-ADB2FEBB16B6}
EndGlobalSection
EndGlobal
7 changes: 7 additions & 0 deletions NuGet.config
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>

<configuration>
<packageSources>
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
6 changes: 6 additions & 0 deletions global.json
@@ -0,0 +1,6 @@
{
"projects": [ "src", "test", "dependencies/Nancy/src" ],
"sdk": {
"version": "1.0.0-rc1-update1"
}
}
12 changes: 3 additions & 9 deletions rakefile.rb
Expand Up @@ -9,7 +9,7 @@
CONFIGURATION = 'Release'
CONFIGURATIONMONO = 'MonoRelease'
SHARED_ASSEMBLY_INFO = 'dependencies/Nancy/SharedAssemblyInfo.cs'
SOLUTION_FILE = 'src/Nancy.Serialization.JsonNet.sln'
SOLUTION_FILE = 'Nancy.Serialization.JsonNet.sln'

Albacore.configure do |config|
config.log_level = :verbose
Expand All @@ -29,6 +29,7 @@
#Add the folders that should be cleaned as part of the clean task
CLEAN.include(OUTPUT)
CLEAN.include(FileList["src/**/#{CONFIGURATION}"])
CLEAN.include(FileList["test/**/#{CONFIGURATION}"])

desc "Update shared assemblyinfo file for the build"
assemblyinfo :version => [:clean] do |asm|
Expand Down Expand Up @@ -66,19 +67,12 @@

desc "Executes xUnit tests"
xunit :xunit => :compile do |xunit|
tests = FileList["src/**/#{CONFIGURATION}/*.Tests.dll"].exclude(/obj\//)
tests = FileList["test/**/#{CONFIGURATION}/*.Tests.dll"].exclude(/obj\//)

xunit.command = "dependencies/Nancy/tools/xunit/xunit.console.x86.exe"
xunit.assemblies = tests
end

desc "Executes xUnit tests using Mono"
xunit :xunitmono => [] do |xunit|
tests = FileList["src/**/#{CONFIGURATION}/*.Tests.dll"].exclude(/obj\//)
xunit.command = "dependencies/Nancy/tools/xunit/xunitmono.sh"
xunit.assemblies = tests
end

desc "Zips up the built binaries for easy distribution"
zip :package => [:publish] do |zip|
Dir.mkdir("#{OUTPUT}/packages")
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -34,7 +34,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand All @@ -49,9 +49,15 @@
<Compile Include="..\..\dependencies\Nancy\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Helpers.cs" />
<Compile Include="JsonNetBodyDeserializer.cs" />
<Compile Include="JsonNetSerializer.cs" />
<Compile Include="..\Nancy.Serialization.JsonNet\Helpers.cs">
<Link>Helpers.cs</Link>
</Compile>
<Compile Include="..\Nancy.Serialization.JsonNet\JsonNetBodyDeserializer.cs">
<Link>JsonNetBodyDeserializer.cs</Link>
</Compile>
<Compile Include="..\Nancy.Serialization.JsonNet\JsonNetSerializer.cs">
<Link>JsonNetSerializer.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\dependencies\Nancy\src\Nancy.MSBuild\Nancy.csproj">
Expand Down
5 changes: 0 additions & 5 deletions src/Nancy.Serialization.JsonNet.Tests/packages.config

This file was deleted.

19 changes: 19 additions & 0 deletions src/Nancy.Serialization.JsonNet/Nancy.Serialization.JsonNet.xproj
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>8a8138a6-7e3d-41cc-a582-6664752f8d53</ProjectGuid>
<RootNamespace>Nancy.Serialization.JsonNet</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
19 changes: 19 additions & 0 deletions src/Nancy.Serialization.JsonNet/project.json
@@ -0,0 +1,19 @@
{
"version": "2.0.0-*",

"description": "Provides JSON (de)serialization support using Newtonsoft.JsonNet.",
"authors": [ "Andreas Håkansson, Steven Robbins and contributors" ],
"tags": [ "Nancy", "Json", "JsonNet" ],
"projectUrl": "http://nancyfx.org",
"licenseUrl": "https://github.com/NancyFx/Nancy/blob/master/license.txt",
"iconUrl": "http://nancyfx.org/nancy-nuget.png",

"dependencies": {
"Nancy": { "target": "project" },
"Newtonsoft.Json": "7.0.1"
},

"frameworks": {
"net451": {}
}
}
Binary file removed src/packages/AngleSharp.0.9.4/AngleSharp.0.9.4.nupkg
Binary file not shown.
Binary file not shown.

0 comments on commit 7effde3

Please sign in to comment.