Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated to v0.8.0

  • Loading branch information...
commit d78b7586f4da6120c131ceb19dcfd16e30cc1f2a 1 parent 7c99873
@grumpydev grumpydev authored
View
1  .gitignore
@@ -7,6 +7,7 @@
*.orig
*.pidb
*.userprefs
+*.tss
AssemblyInfo.cs
.DS_Store
deploy/
2  dependencies/Nancy
@@ -1 +1 @@
-Subproject commit 276431234426990e13e705bcb8b4b891aae07b59
+Subproject commit dfc2af2fb7635c821ee68cdf952632d2f8977627
View
2  rakefile.rb
@@ -4,7 +4,7 @@
require 'rake/clean'
require 'rexml/document'
-NANCY_VERSION = "0.7.1"
+NANCY_VERSION = "0.8.0"
OUTPUT = "build"
CONFIGURATION = 'Release'
SHARED_ASSEMBLY_INFO = 'src/SharedAssemblyInfo.cs'
View
5 src/Nancy.Serialization.ProtoBuf.Demo/Nancy.Serialization.ProtoBuf.Demo.csproj
@@ -13,6 +13,7 @@
<RootNamespace>Nancy.Serialization.ProtoBuf.Demo</RootNamespace>
<AssemblyName>Nancy.Serialization.ProtoBuf.Demo</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <UseIISExpress>false</UseIISExpress>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -60,9 +61,11 @@
</Content>
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\dependencies\Nancy\src\SharedAssemblyInfo.cs">
+ <Link>Properties\SharedAssemblyInfo.cs</Link>
+ </Compile>
<Compile Include="MainModule.cs" />
<Compile Include="Model\User.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\dependencies\Nancy\src\Nancy.Hosting.Aspnet\Nancy.Hosting.Aspnet.csproj">
View
4 src/Nancy.Serialization.ProtoBuf.Tests/Nancy.Serialization.ProtoBuf.Tests.csproj
@@ -50,7 +50,9 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="..\..\dependencies\Nancy\src\SharedAssemblyInfo.cs">
+ <Link>Properties\SharedAssemblyInfo.cs</Link>
+ </Compile>
<Compile Include="ProtoBufNancySerializationFixture.cs" />
</ItemGroup>
<ItemGroup>
View
7 src/Nancy.Serialization.ProtoBuf/Nancy.Serialization.ProtoBuf.csproj
@@ -44,14 +44,15 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\dependencies\Nancy\src\SharedAssemblyInfo.cs">
+ <Link>Properties\SharedAssemblyInfo.cs</Link>
+ </Compile>
<Compile Include="BodyDeserializers\ProtobufNetBodyDeserializer.cs" />
<Compile Include="Constants.cs" />
<Compile Include="FormatterExtensions.cs" />
<Compile Include="ProtoBufResponse.cs" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="Properties\" />
- </ItemGroup>
+ <ItemGroup />
<ItemGroup>
<ProjectReference Include="..\..\dependencies\Nancy\src\Nancy\Nancy.csproj">
<Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
View
9 src/SharedAssemblyInfo.cs
@@ -1,9 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-[assembly: AssemblyTitle("Nancy.Serialization.ProtoBuf")]
-[assembly: AssemblyDescription("A ProtoBuf Serializer for the Nancy web framework")]
-[assembly: AssemblyCompany("Nancy")]
-[assembly: AssemblyProduct("Nancy.Serialization.ProtoBuf")]
-[assembly: AssemblyCopyright("Copyright (C) Andreas Hakansson, Steven Robbins and contributors")]
-[assembly: AssemblyVersion("0.7.1")]
-
Please sign in to comment.
Something went wrong with that request. Please try again.