Merge pull request #15 from amageed/nuget-prep

Refactor to prepare for NuGet v0.2.0 release
amageed · Mar 4, 2014 · 8426c40 · 8426c40
2 parents f3534c4 + fc9ec30
commit 8426c40
Show file tree

Hide file tree

Showing 28 changed files with 61 additions and 109 deletions.
diff --git a/src/Regextra.PassphraseRegex/Properties/AssemblyInfo.cs b/src/Regextra.PassphraseRegex/Properties/AssemblyInfo.cs
@@ -1,22 +1,8 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Regextra")]
-[assembly: AssemblyDescription("Regextra simplifies some tasks typically solved via regex so that you no longer have (problems){2}")]
+[assembly: AssemblyTitle("Regextra.PassphraseRegex")]
+[assembly: AssemblyDescription("Generates regex validation pattern to enforce common passphrase criteria")]
 [assembly: AssemblyCompany("Ahmad Mageed")]
 [assembly: AssemblyProduct("Regextra")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("0106694d-6479-4508-ad14-1ee83ec2bda2")]
-
-[assembly: AssemblyVersion("0.2.0")]
+[assembly: AssemblyCopyright("Copyright © Ahmad Mageed 2013-2014")]
+[assembly: AssemblyVersion("0.1.0")]
diff --git a/src/Regextra.PassphraseRegex/Regextra.0.1.0.0.nupkg b/src/Regextra.PassphraseRegex/Regextra.0.1.0.0.nupkg
diff --git a/src/Regextra.PassphraseRegex/Regextra.PassphraseRegex.csproj b/src/Regextra.PassphraseRegex/Regextra.PassphraseRegex.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Regextra</RootNamespace>
-    <AssemblyName>Regextra</AssemblyName>
+    <AssemblyName>Regextra.PassphraseRegex</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />

diff --git a/src/Regextra.Template.Benchmarks/Properties/AssemblyInfo.cs b/src/Regextra.Template.Benchmarks/Properties/AssemblyInfo.cs
diff --git a/src/Regextra.Template/Properties/AssemblyInfo.cs b/src/Regextra.Template/Properties/AssemblyInfo.cs
diff --git a/src/Regextra.Template.Benchmarks/App.config → src/Regextra.TemplateBenchmarks/App.config b/src/Regextra.Template.Benchmarks/App.config → src/Regextra.TemplateBenchmarks/App.config
diff --git a/...Regextra.Template.Benchmarks/Benchmark.cs → src/Regextra.TemplateBenchmarks/Benchmark.cs b/...Regextra.Template.Benchmarks/Benchmark.cs → src/Regextra.TemplateBenchmarks/Benchmark.cs
@@ -3,7 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 
-namespace TemplatePerformanceBenchmarks
+namespace Regextra.TemplatePerformanceBenchmarks
 {
     public class Benchmark
     {

diff --git a/...tra.Template.Benchmarks/BenchmarkGroup.cs → ...xtra.TemplateBenchmarks/BenchmarkGroup.cs b/...tra.Template.Benchmarks/BenchmarkGroup.cs → ...xtra.TemplateBenchmarks/BenchmarkGroup.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace TemplatePerformanceBenchmarks
+namespace Regextra.TemplatePerformanceBenchmarks
 {
     public class BenchmarkGroup
     {

diff --git a/...nchmarks/Formatters/TemplateReflection.cs → ...nchmarks/Formatters/TemplateReflection.cs b/...nchmarks/Formatters/TemplateReflection.cs → ...nchmarks/Formatters/TemplateReflection.cs
@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 
-namespace Regextra
+namespace Regextra.TemplatePerformanceBenchmarks.Formatters
 {
     public static class TemplateReflection
     {

diff --git a/...tra.Template.Benchmarks/Models/Address.cs → ...xtra.TemplateBenchmarks/Models/Address.cs b/...tra.Template.Benchmarks/Models/Address.cs → ...xtra.TemplateBenchmarks/Models/Address.cs
diff --git a/...xtra.Template.Benchmarks/Models/Person.cs → ...extra.TemplateBenchmarks/Models/Person.cs b/...xtra.Template.Benchmarks/Models/Person.cs → ...extra.TemplateBenchmarks/Models/Person.cs
diff --git a/src/Regextra.Template.Benchmarks/Program.cs → src/Regextra.TemplateBenchmarks/Program.cs b/src/Regextra.Template.Benchmarks/Program.cs → src/Regextra.TemplateBenchmarks/Program.cs
@@ -2,10 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using Regextra;
+using Regextra.TemplatePerformanceBenchmarks.Formatters;
 using Regextra.TemplatePerformanceBenchmarks.Models;
 using SmartFormat;
 
-namespace TemplatePerformanceBenchmarks
+namespace Regextra.TemplatePerformanceBenchmarks
 {
     class Program
     {

diff --git a/src/Regextra.TemplateBenchmarks/Properties/AssemblyInfo.cs b/src/Regextra.TemplateBenchmarks/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+using System.Reflection;
+
+[assembly: AssemblyTitle("Regextra.TemplateBenchmarks")]
+[assembly: AssemblyProduct("Regextra.TemplateBenchmarks")]
+[assembly: AssemblyCopyright("Copyright © Ahmad Mageed 2014")]
+[assembly: AssemblyVersion("0.1.0")]
diff --git a/...marks/Regextra.Template.Benchmarks.csproj → ...hmarks/Regextra.TemplateBenchmarks.csproj b/...marks/Regextra.Template.Benchmarks.csproj → ...hmarks/Regextra.TemplateBenchmarks.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{C11BE8D3-39B9-4090-9615-1AD32C0D6EF6}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TemplatePerformanceBenchmarks</RootNamespace>
-    <AssemblyName>TemplatePerformanceBenchmarks</AssemblyName>
+    <RootNamespace>Regextra.TemplateBenchmarks</RootNamespace>
+    <AssemblyName>Regextra.TemplateBenchmarks</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -32,7 +32,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>TemplatePerformanceBenchmarks.Program</StartupObject>
+    <StartupObject>Regextra.TemplatePerformanceBenchmarks.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="SmartFormat">
@@ -65,9 +65,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Regextra.Template\Regextra.Template.csproj">
+    <ProjectReference Include="..\Regextra\Regextra.csproj">
       <Project>{a7501e06-391f-4b3e-bb3f-342781b94569}</Project>
-      <Name>Regextra.Template</Name>
+      <Name>Regextra</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/...extra.Template.Benchmarks/packages.config → ...gextra.TemplateBenchmarks/packages.config b/...extra.Template.Benchmarks/packages.config → ...gextra.TemplateBenchmarks/packages.config
diff --git a/src/Regextra.sln b/src/Regextra.sln
@@ -5,11 +5,11 @@ VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Regextra.PassphraseRegex", "Regextra.PassphraseRegex\Regextra.PassphraseRegex.csproj", "{D8A9A4F3-C1BA-429D-9F65-DA792D262020}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Regextra.Template", "Regextra.Template\Regextra.Template.csproj", "{A7501E06-391F-4B3E-BB3F-342781B94569}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Regextra.Tests", "tests\Regextra.Tests\Regextra.Tests.csproj", "{B6D60D15-E39D-4CDF-A242-19283311EE6A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Regextra.Template.Benchmarks", "Regextra.Template.Benchmarks\Regextra.Template.Benchmarks.csproj", "{C11BE8D3-39B9-4090-9615-1AD32C0D6EF6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Regextra.TemplateBenchmarks", "Regextra.TemplateBenchmarks\Regextra.TemplateBenchmarks.csproj", "{C11BE8D3-39B9-4090-9615-1AD32C0D6EF6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Regextra", "Regextra\Regextra.csproj", "{A7501E06-391F-4B3E-BB3F-342781B94569}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,10 +21,6 @@ Global
 		{D8A9A4F3-C1BA-429D-9F65-DA792D262020}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D8A9A4F3-C1BA-429D-9F65-DA792D262020}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D8A9A4F3-C1BA-429D-9F65-DA792D262020}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7501E06-391F-4B3E-BB3F-342781B94569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7501E06-391F-4B3E-BB3F-342781B94569}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7501E06-391F-4B3E-BB3F-342781B94569}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7501E06-391F-4B3E-BB3F-342781B94569}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B6D60D15-E39D-4CDF-A242-19283311EE6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B6D60D15-E39D-4CDF-A242-19283311EE6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B6D60D15-E39D-4CDF-A242-19283311EE6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -33,6 +29,10 @@ Global
 		{C11BE8D3-39B9-4090-9615-1AD32C0D6EF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C11BE8D3-39B9-4090-9615-1AD32C0D6EF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C11BE8D3-39B9-4090-9615-1AD32C0D6EF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7501E06-391F-4B3E-BB3F-342781B94569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7501E06-391F-4B3E-BB3F-342781B94569}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7501E06-391F-4B3E-BB3F-342781B94569}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7501E06-391F-4B3E-BB3F-342781B94569}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Regextra/Properties/AssemblyInfo.cs b/src/Regextra/Properties/AssemblyInfo.cs
@@ -0,0 +1,8 @@
+using System.Reflection;
+
+[assembly: AssemblyTitle("Regextra")]
+[assembly: AssemblyDescription("Regextra simplifies tasks typically solved via regex so that you no longer have (problems){2}. It includes a passphrase regex builder, named template formatter, and more!")]
+[assembly: AssemblyCompany("Ahmad Mageed")]
+[assembly: AssemblyProduct("Regextra")]
+[assembly: AssemblyCopyright("Copyright © Ahmad Mageed 2013-2014")]
+[assembly: AssemblyVersion("0.2.0")]
diff --git a/src/Regextra/Regextra.0.2.0.0.nupkg b/src/Regextra/Regextra.0.2.0.0.nupkg
diff --git a/...egextra.Template/Regextra.Template.csproj → src/Regextra/Regextra.csproj b/...egextra.Template/Regextra.Template.csproj → src/Regextra/Regextra.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{A7501E06-391F-4B3E-BB3F-342781B94569}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Regextra.Template</RootNamespace>
-    <AssemblyName>Regextra.Template</AssemblyName>
+    <RootNamespace>Regextra</RootNamespace>
+    <AssemblyName>Regextra</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -31,7 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FastMember">
+    <Reference Include="FastMember, Version=1.0.0.9, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FastMember.1.0.0.11\lib\net40\FastMember.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -46,6 +47,12 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Template.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Regextra.PassphraseRegex\Regextra.PassphraseRegex.csproj">
+      <Project>{d8a9a4f3-c1ba-429d-9f65-da792d262020}</Project>
+      <Name>Regextra.PassphraseRegex</Name>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>

diff --git a/...raseRegex/Regextra.PassphraseRegex.nuspec → src/Regextra/Regextra.nuspec b/...raseRegex/Regextra.PassphraseRegex.nuspec → src/Regextra/Regextra.nuspec
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package >
+<package>
   <metadata>
     <id>$id$</id>
     <version>$version$</version>
@@ -10,7 +10,7 @@
     <projectUrl>https://github.com/amageed/Regextra</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
-    <copyright>Copyright 2014</copyright>
-    <tags>Regextra Regex Regular Expressions Passphrase Password Validation</tags>
+    <copyright>Copyright 2013-2014</copyright>
+    <tags>Regextra Regex Regular Expressions Passphrase Password Validation Named Template Format</tags>
   </metadata>
 </package>
diff --git a/src/Regextra.Template/Template.cs → src/Regextra/Template.cs b/src/Regextra.Template/Template.cs → src/Regextra/Template.cs
diff --git a/src/Regextra.Template/packages.config → src/Regextra/packages.config b/src/Regextra.Template/packages.config → src/Regextra/packages.config
diff --git a/...s/PassphraseRegexTests/CharactersTests.cs → ...exTests/PassphraseRegexCharactersTests.cs b/...s/PassphraseRegexTests/CharactersTests.cs → ...exTests/PassphraseRegexCharactersTests.cs
@@ -8,7 +8,7 @@
 namespace Regextra.Tests.PassphraseRegexTests
 {
     [TestFixture]
-    public class CharactersTests
+    public class PassphraseRegexCharactersTests
     {
         [Test]
         public void Can_Specify_Contained_Characters()

diff --git a/...ests/PassphraseRegexTests/GeneralTests.cs → ...RegexTests/PassphraseRegexGeneralTests.cs b/...ests/PassphraseRegexTests/GeneralTests.cs → ...RegexTests/PassphraseRegexGeneralTests.cs
@@ -8,7 +8,7 @@
 namespace Regextra.Tests.PassphraseRegexTests
 {
     [TestFixture]
-    public class GeneralTests
+    public class PassphraseRegexGeneralTests
     {
         [Test]
         public void Invalid_Result_When_Rules_Are_Empty()

diff --git a/....Tests/PassphraseRegexTests/RangeTests.cs → ...seRegexTests/PassphraseRegexRangeTests.cs b/....Tests/PassphraseRegexTests/RangeTests.cs → ...seRegexTests/PassphraseRegexRangeTests.cs
@@ -8,7 +8,7 @@
 namespace Regextra.Tests.PassphraseRegexTests
 {
     [TestFixture]
-    public class RangeTests
+    public class PassphraseRegexRangeTests
     {
         [Test]
         public void Can_Specify_Range_Rule()

diff --git a/...a.Tests/PassphraseRegexTests/TextTests.cs → ...aseRegexTests/PassphraseRegexTextTests.cs b/...a.Tests/PassphraseRegexTests/TextTests.cs → ...aseRegexTests/PassphraseRegexTextTests.cs
@@ -8,7 +8,7 @@
 namespace Regextra.Tests.PassphraseRegexTests
 {
     [TestFixture]
-    public class TextTests
+    public class PassphraseRegexTextTests
     {
         [Test]
         public void Can_Specify_Includes_Text_Rule()

diff --git a/src/Tests/Regextra.Tests/Properties/AssemblyInfo.cs b/src/Tests/Regextra.Tests/Properties/AssemblyInfo.cs
@@ -1,20 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("Regextra.Tests")]
 [assembly: AssemblyProduct("Regextra")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("849d03f6-277c-41dd-94c5-376e33092133")]
-
-[assembly: AssemblyVersion("0.1.0")]
+[assembly: AssemblyCopyright("Copyright © Ahmad Mageed 2013-2014")]
+[assembly: AssemblyVersion("0.2.0")]
diff --git a/src/Tests/Regextra.Tests/Regextra.Tests.csproj b/src/Tests/Regextra.Tests/Regextra.Tests.csproj
@@ -55,11 +55,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="PassphraseRegexTests\CharactersTests.cs" />
-    <Compile Include="PassphraseRegexTests\GeneralTests.cs" />
+    <Compile Include="PassphraseRegexTests\PassphraseRegexCharactersTests.cs" />
+    <Compile Include="PassphraseRegexTests\PassphraseRegexGeneralTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PassphraseRegexTests\RangeTests.cs" />
-    <Compile Include="PassphraseRegexTests\TextTests.cs" />
+    <Compile Include="PassphraseRegexTests\PassphraseRegexRangeTests.cs" />
+    <Compile Include="PassphraseRegexTests\PassphraseRegexTextTests.cs" />
     <Compile Include="TemplateTests\Models\Address.cs" />
     <Compile Include="TemplateTests\Models\Person.cs" />
     <Compile Include="TemplateTests\TemplateNestedPropertyTests.cs" />
@@ -73,9 +73,9 @@
       <Project>{d8a9a4f3-c1ba-429d-9f65-da792d262020}</Project>
       <Name>Regextra.PassphraseRegex</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Regextra.Template\Regextra.Template.csproj">
+    <ProjectReference Include="..\..\Regextra\Regextra.csproj">
       <Project>{a7501e06-391f-4b3e-bb3f-342781b94569}</Project>
-      <Name>Regextra.Template</Name>
+      <Name>Regextra</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />