Skip to content
This repository has been archived by the owner on Jan 24, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1650 from VQComms/patch-1
Browse files Browse the repository at this point in the history
renamed metadata module project and nuspec
  • Loading branch information
khellang committed Sep 8, 2014
2 parents ab24dac + e718331 commit 060fa49
Show file tree
Hide file tree
Showing 23 changed files with 69 additions and 79 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace Nancy.Demo.Hosting.Aspnet.Metadata
{
using Nancy.Metadata.Module;
using Nancy.Metadata.Modules;

public class MainMetadataModule : MetadataModule<MyUberRouteMetadata>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@
<Project>{15B7F794-0BB2-4B66-AD78-4A951F1209B2}</Project>
<Name>Nancy.Hosting.Aspnet</Name>
</ProjectReference>
<ProjectReference Include="..\Nancy.Metadata.Module\Nancy.Metadata.Module.csproj">
<ProjectReference Include="..\Nancy.Metadata.Modules\Nancy.Metadata.Modules.csproj">
<Project>{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}</Project>
<Name>Nancy.Metadata.Module</Name>
<Name>Nancy.Metadata.Modules</Name>
</ProjectReference>
<ProjectReference Include="..\Nancy.ViewEngines.DotLiquid\Nancy.ViewEngines.DotLiquid.csproj">
<Project>{B795886D-9D70-45B1-BFB5-AD54CBC9A447}</Project>
Expand Down
8 changes: 0 additions & 8 deletions src/Nancy.Metadata.Module.Tests/FakeNancyMetadataModule.cs

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
namespace Nancy.Metadata.Module.Tests
namespace Nancy.Metadata.Modules.Tests
{
using System.Linq;

using Nancy.Tests;

using System.Linq;
using Xunit;

public class DefaultMetadataModuleConventionsFixture
Expand Down
8 changes: 8 additions & 0 deletions src/Nancy.Metadata.Modules.Tests/FakeNancyMetadataModule.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Nancy.Metadata.Modules.Tests
{
using Nancy.Metadata.Modules;

public class FakeNancyMetadataModule : MetadataModule<string>
{
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Nancy.Metadata.Module.Tests
namespace Nancy.Metadata.Modules.Tests
{
using System;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Nancy.Metadata.Modules.Tests.Metadata
{
using Nancy.Metadata.Modules;

public class FakeNancyMetadataModule : MetadataModule<string>
{
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
namespace Nancy.Metadata.Module.Tests
namespace Nancy.Metadata.Modules.Tests
{
using Nancy.Routing;
using Nancy.Tests;

using Xunit;

public class MetadataModuleFixture
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
namespace Nancy.Metadata.Module.Tests
namespace Nancy.Metadata.Modules.Tests
{
using FakeItEasy;

using Nancy.Routing;
using Nancy.Tests;

using Xunit;

public class MetadataModuleRouteMetadataProviderFixture
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Nancy.Metadata.Module.Tests.Modules
namespace Nancy.Metadata.Modules.Tests.Modules
{
public class FakeNancyModule : NancyModule
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<ProjectGuid>{508A3A68-2012-4E62-925F-2F3083A013FC}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Nancy.Metadata.Module.Tests</RootNamespace>
<AssemblyName>Nancy.Metadata.Module.Tests</AssemblyName>
<RootNamespace>Nancy.Metadata.Modules.Tests</RootNamespace>
<AssemblyName>Nancy.Metadata.Modules.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
Expand Down Expand Up @@ -86,9 +86,9 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Nancy.Metadata.Module\Nancy.Metadata.Module.csproj">
<ProjectReference Include="..\Nancy.Metadata.Modules\Nancy.Metadata.Modules.csproj">
<Project>{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}</Project>
<Name>Nancy.Metadata.Module</Name>
<Name>Nancy.Metadata.Modules</Name>
</ProjectReference>
<ProjectReference Include="..\Nancy\Nancy.csproj">
<Project>{34576216-0DCA-4B0F-A0DC-9075E75A676F}</Project>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
namespace Nancy.Metadata.Module
namespace Nancy.Metadata.Modules
{
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

using Nancy.Routing;

/// <summary>
/// This is a wrapper around the type
/// 'IEnumerable<Func<INancyModule, IEnumerable<IMetadataModule>, IMetadataModule>>' and its
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
namespace Nancy.Metadata.Module
namespace Nancy.Metadata.Modules
{
using System;
using System.Collections.Generic;
using System.Linq;

using Nancy.Routing;

/// <summary>
/// Default implementation on how metadata modules are resolved by Nancy.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Nancy.Metadata.Module
namespace Nancy.Metadata.Modules
{
using System;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
namespace Nancy.Metadata.Module
namespace Nancy.Metadata.Modules
{
using Nancy.Routing;

/// <summary>
/// Defines the functionality for resolving the metadata module for a given <see cref="INancyModule"/>.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Nancy.Metadata.Module
namespace Nancy.Metadata.Modules
{
using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
namespace Nancy.Metadata.Module
namespace Nancy.Metadata.Modules
{
using Nancy.Bootstrapper;
using Nancy.Routing;

/// <summary>
/// Performs application registations for metadata modules.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Nancy.Metadata.Module
namespace Nancy.Metadata.Modules
{
using System;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<ProjectGuid>{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Nancy.Metadata.Module</RootNamespace>
<AssemblyName>Nancy.Metadata.Module</AssemblyName>
<RootNamespace>Nancy.Metadata.Modules</RootNamespace>
<AssemblyName>Nancy.Metadata.Modules</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
Expand All @@ -21,7 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\Nancy.Metadata.Module.XML</DocumentationFile>
<DocumentationFile>bin\Debug\Nancy.Metadata.Modules.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -30,7 +30,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Nancy.Metadata.Module.XML</DocumentationFile>
<DocumentationFile>bin\Release\Nancy.Metadata.Modules.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -40,7 +40,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\MonoDebug\Nancy.Metadata.Module.XML</DocumentationFile>
<DocumentationFile>bin\MonoDebug\Nancy.Metadata.Modules.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
<OutputPath>bin\MonoRelease\</OutputPath>
Expand All @@ -50,7 +50,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\MonoRelease\Nancy.Metadata.Module.XML</DocumentationFile>
<DocumentationFile>bin\MonoRelease\Nancy.Metadata.Modules.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Nancy.MetaData</id>
<id>Nancy.Metadata.Modules</id>
<version>0.0.0</version> <!-- The real version will be added by rake -->
<authors>Andreas Håkansson, Steven Robbins and contributors</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand Down
50 changes: 26 additions & 24 deletions src/Nancy.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E944109B-0B7A-4ADE-8602-004CEFA5897D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}"
Expand Down Expand Up @@ -129,9 +131,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Authentication.T
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Demo.Authentication.Token.TestingDemo", "Nancy.Demo.Authentication.Token.TestingDemo\Nancy.Demo.Authentication.Token.TestingDemo.csproj", "{9121DA01-7BFD-49F0-9937-0D3E7875ADB9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Metadata.Module", "Nancy.Metadata.Module\Nancy.Metadata.Module.csproj", "{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Metadata.Modules", "Nancy.Metadata.Modules\Nancy.Metadata.Modules.csproj", "{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Metadata.Module.Tests", "Nancy.Metadata.Module.Tests\Nancy.Metadata.Module.Tests.csproj", "{508A3A68-2012-4E62-925F-2F3083A013FC}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Metadata.Modules.Tests", "Nancy.Metadata.Modules.Tests\Nancy.Metadata.Modules.Tests.csproj", "{508A3A68-2012-4E62-925F-2F3083A013FC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -900,17 +902,6 @@ Global
{D79203C0-B672-4751-9C95-C3AB7D3FEFBE} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{B795886D-9D70-45B1-BFB5-AD54CBC9A447} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{BD72B98D-C81A-4013-B606-94B4BA2273E5} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{A1A9E636-A37C-4170-B2E4-99D4F69B415D} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{701765DC-F4F2-4943-A37F-6ED253198158} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{01230F2A-D108-480C-B834-8CE0569FD3B3} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{EDF3E264-2D0F-4440-99FF-45D279A598A9} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{211560C3-FDDF-46D6-AB0C-F3BC04B173B5} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{14A66047-5F67-4774-B0E3-195D1D25B6A5} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{D6B2480C-2A52-4D02-9477-D387D7A486E5} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{D8EBA39B-63AE-4A66-BD0E-F7F95E572135} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{864AF449-0902-44FC-BEEE-06BA9A6F4A8F} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{97FA024A-F6ED-4086-BCC1-1A51BE63474C} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{776D244D-BC4D-4BBB-A478-CAF2D04520E1} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{3D44A461-3133-4B49-A74B-D25632A12FE5} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{FE32460D-547C-4EB9-A768-541255CCAA83} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
Expand All @@ -921,16 +912,6 @@ Global
{A3BF6450-DE9A-4C11-8E3C-66D9A8EC93F5} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{2026DD2D-E041-4A14-8A04-D5B39B8B7C40} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{BDA5E175-07D7-4E6F-B46F-C2CF7D63E231} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{8F9F910D-416E-4B28-BE59-D76670405F56} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{FBC35268-377B-4DBE-87E3-B22D1314BEC6} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{CA24ED85-DD68-4C10-B80A-D81C6745FCB8} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{429873F5-1E53-4ECC-A9EC-7950C789C6DF} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{6EED2486-39BF-491D-B033-720DFCFD1211} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{8EE6F976-F11F-44B3-B065-F5AAA598B30D} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{3C131D45-AF1D-4659-8B26-A9F55EED0D20} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{508A3A68-2012-4E62-925F-2F3083A013FC} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{5F2DD52D-471B-4946-8F7B-F050C88EFC52} = {4A24657F-9695-437B-9702-2541ED280628}
{98940A30-1B48-4F71-A6BA-85F0AAF31A2F} = {4A24657F-9695-437B-9702-2541ED280628}
{EF660223-4DFD-4E36-BF36-9DD6AFB3F837} = {4A24657F-9695-437B-9702-2541ED280628}
Expand All @@ -943,15 +924,36 @@ Global
{4885B9DF-D99C-4A1C-8606-259D32A58C33} = {4A24657F-9695-437B-9702-2541ED280628}
{DE91D085-70DF-4892-B0E3-B849E9BF6AF5} = {4A24657F-9695-437B-9702-2541ED280628}
{911196F4-B88F-4940-B1FD-D30F5290D06D} = {4A24657F-9695-437B-9702-2541ED280628}
{A1A9E636-A37C-4170-B2E4-99D4F69B415D} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{F417B81C-B914-4BFD-8299-6BBD11072B01} = {4A24657F-9695-437B-9702-2541ED280628}
{701765DC-F4F2-4943-A37F-6ED253198158} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{01230F2A-D108-480C-B834-8CE0569FD3B3} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{8F9F910D-416E-4B28-BE59-D76670405F56} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{FBC35268-377B-4DBE-87E3-B22D1314BEC6} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{3F18F5DA-93E0-4513-8BF4-BC8EE5C4117C} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{EDF3E264-2D0F-4440-99FF-45D279A598A9} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{CA24ED85-DD68-4C10-B80A-D81C6745FCB8} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{211560C3-FDDF-46D6-AB0C-F3BC04B173B5} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{B5E3586D-81DE-49C3-83BC-062684795127} = {4A24657F-9695-437B-9702-2541ED280628}
{BAE74CD5-57C2-40E3-8F7A-EDE5721C2ACC} = {4A24657F-9695-437B-9702-2541ED280628}
{396F0BCE-5B51-4B6A-931E-312880C24725} = {4A24657F-9695-437B-9702-2541ED280628}
{14A66047-5F67-4774-B0E3-195D1D25B6A5} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{429873F5-1E53-4ECC-A9EC-7950C789C6DF} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{F56F3983-0C34-4AEC-B418-A8AFFA63F1C4} = {4A24657F-9695-437B-9702-2541ED280628}
{D6B2480C-2A52-4D02-9477-D387D7A486E5} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{D8EBA39B-63AE-4A66-BD0E-F7F95E572135} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{6EED2486-39BF-491D-B033-720DFCFD1211} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{B6929D0B-5104-4C7E-979D-F4914E813FA6} = {4A24657F-9695-437B-9702-2541ED280628}
{8EE6F976-F11F-44B3-B065-F5AAA598B30D} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{864AF449-0902-44FC-BEEE-06BA9A6F4A8F} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{34DDDA42-4041-4F92-87A6-F0E8CE12C7E3} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{972C2D45-49B6-4109-9A3A-0C8BC9225B95} = {4A24657F-9695-437B-9702-2541ED280628}
{3C131D45-AF1D-4659-8B26-A9F55EED0D20} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
{97FA024A-F6ED-4086-BCC1-1A51BE63474C} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{35460AA4-B94A-4B64-9418-7243EC3D2F01} = {4A24657F-9695-437B-9702-2541ED280628}
{9121DA01-7BFD-49F0-9937-0D3E7875ADB9} = {4A24657F-9695-437B-9702-2541ED280628}
{DC8AAA8B-7FD0-47C4-9413-3CC94088BCC4} = {E944109B-0B7A-4ADE-8602-004CEFA5897D}
{508A3A68-2012-4E62-925F-2F3083A013FC} = {A427F9F8-0A6F-4EEA-837F-FCDAB6E7D4B3}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Nancy.Demo.Hosting.Aspnet\Nancy.Demo.Hosting.Aspnet.csproj
Expand Down

0 comments on commit 060fa49

Please sign in to comment.