Merge branch 'release-2.2.1'

Jake Ginnivan · Jake Ginnivan · commit eeffd89d2bf4 · 2013-10-01T20:11:41.000+01:00
diff --git a/Samples/SampleApp.Tests/Properties/AssemblyInfo.cs b/Samples/SampleApp.Tests/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("7b4d34d3-0454-4676-8f40-0ee1c01b984f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Samples/SampleApp.Tests/SampleApp.Tests.csproj b/Samples/SampleApp.Tests/SampleApp.Tests.csproj
@@ -84,6 +84,7 @@
     <Content Include="__TryItOut__.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets" Condition="Exists('..\..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets') AND $(nCrunch) ==''" />
   <!-- 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">
diff --git a/Samples/SampleApp.Tests/packages.config b/Samples/SampleApp.Tests/packages.config
@@ -1,5 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GitFlowVersionTask" version="0.2.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
diff --git a/Samples/SampleApp/Properties/AssemblyInfo.cs b/Samples/SampleApp/Properties/AssemblyInfo.cs
@@ -22,15 +22,3 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("31ee7421-19f6-40b4-9435-d6413bb9319f")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Samples/SampleApp/SampleApp.csproj b/Samples/SampleApp/SampleApp.csproj
@@ -86,6 +86,7 @@
     </Page>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets" Condition="Exists('..\..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets') AND $(nCrunch) ==''" />
   <!-- 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">
diff --git a/Samples/SampleApp/packages.config b/Samples/SampleApp/packages.config
@@ -1,5 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GitFlowVersionTask" version="0.2.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
diff --git a/TestAssembly/Properties/AssemblyInfo.cs b/TestAssembly/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
-﻿using System.Reflection;
-using System.Runtime.CompilerServices;
+﻿using System.Reflection;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -22,15 +21,3 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("26ee0880-163f-496b-9e49-a18e8deda689")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/TestAssembly/TestAssembly.csproj b/TestAssembly/TestAssembly.csproj
@@ -87,6 +87,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets" Condition="Exists('..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets') AND $(nCrunch) ==''" />
   <!-- 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">
diff --git a/TestAssembly/packages.config b/TestAssembly/packages.config
@@ -1,5 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GitFlowVersionTask" version="0.2.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net40" />
   <package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net40" />
diff --git a/TestStack.ConventionTests.Autofac/Properties/AssemblyInfo.cs b/TestStack.ConventionTests.Autofac/Properties/AssemblyInfo.cs
@@ -21,16 +21,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("97020754-a2a1-4ea8-87d4-964795d79d3f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/TestStack.ConventionTests.Autofac/ServicesShouldOnlyHaveDependenciesWithLesserLifetime.cs b/TestStack.ConventionTests.Autofac/ServicesShouldOnlyHaveDependenciesWithLesserLifetime.cs
@@ -35,7 +35,7 @@ public void Execute(AutofacRegistrations data, IConventionResultContext result)
                 }
             }
 
-            result.Is("Components should not depend on with greater lifetimes", exceptions);
+            result.Is("Components should not depend on services with lesser lifetimes", exceptions);
         }
 
         public string ConventionReason
diff --git a/TestStack.ConventionTests.Autofac/TestStack.ConventionTests.Autofac.csproj b/TestStack.ConventionTests.Autofac/TestStack.ConventionTests.Autofac.csproj
@@ -60,6 +60,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets" Condition="Exists('..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets') AND $(nCrunch) ==''" />
   <!-- 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">
diff --git a/TestStack.ConventionTests.Autofac/packages.config b/TestStack.ConventionTests.Autofac/packages.config
@@ -1,4 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="3.1.1" targetFramework="net45" />
+  <package id="GitFlowVersionTask" version="0.2.0" targetFramework="net40" />
 </packages>
diff --git a/TestStack.ConventionTests.Tests/Properties/AssemblyInfo.cs b/TestStack.ConventionTests.Tests/Properties/AssemblyInfo.cs
@@ -23,18 +23,5 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("1a65a30e-e057-4058-a155-7ad12ba91cd2")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
 [assembly: ConventionReporter(typeof(HtmlConventionResultsReporter))]
 [assembly: ConventionReporter(typeof(MarkdownConventionResultsReporter))]
diff --git a/TestStack.ConventionTests.Tests/TestStack.ConventionTests.Tests.csproj b/TestStack.ConventionTests.Tests/TestStack.ConventionTests.Tests.csproj
@@ -105,6 +105,7 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets" Condition="Exists('..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets') AND $(nCrunch) ==''" />
   <!-- 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">
diff --git a/TestStack.ConventionTests.Tests/packages.config b/TestStack.ConventionTests.Tests/packages.config
@@ -3,6 +3,7 @@
   <package id="ApprovalTests" version="3.0.01" targetFramework="net40" />
   <package id="ApprovalUtilities" version="3.0.01" targetFramework="net40" />
   <package id="Autofac" version="3.1.1" targetFramework="net40" />
+  <package id="GitFlowVersionTask" version="0.2.0" targetFramework="net40" />
   <package id="NSubstitute" version="1.6.1.0" targetFramework="net40" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
 </packages>
diff --git a/TestStack.ConventionTests/Conventions/ViewModelShouldInheritFromINotifyPropertyChanged.cs b/TestStack.ConventionTests/Conventions/ViewModelShouldInheritFromINotifyPropertyChanged.cs
@@ -20,7 +20,7 @@ public void Execute(Types data, IConventionResultContext result)
             var failingData = data.TypesToVerify.Where(t => t.Name.EndsWith(viewModelSuffix, StringComparison.InvariantCultureIgnoreCase))
                 .Where(t => !notifyPropertyChanged.IsAssignableFrom(t));
 
-            result.Is("ViewModels (types named *{0}) should inherit from INotifyPropertyChanged",
+            result.Is(string.Format("ViewModels (types named *{0}) should inherit from INotifyPropertyChanged", viewModelSuffix),
                 failingData);
         }
 
diff --git a/TestStack.ConventionTests/Properties/AssemblyInfo.cs b/TestStack.ConventionTests/Properties/AssemblyInfo.cs
@@ -22,17 +22,3 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 
 [assembly: Guid("ae7bce97-3d40-4d7c-932f-37f1c7b041a2")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/TestStack.ConventionTests/Reporting/TypeDataFormatter.cs b/TestStack.ConventionTests/Reporting/TypeDataFormatter.cs
@@ -1,6 +1,7 @@
 namespace TestStack.ConventionTests.Reporting
 {
     using System;
+    using TestStack.ConventionTests.ConventionData;
 
     public class TypeDataFormatter : IReportDataFormatter
     {
@@ -11,16 +12,15 @@ public bool CanFormat(object data)
 
         public string FormatString(object data)
         {
-            return ((Type)data).FullName;
+            return ((Type)data).ToTypeNameString();
         }
 
         public string FormatHtml(object data)
         {
             var type = ((Type)data);
-            var ns = type.Namespace;
-            if (ns == null)
-                return type.Name;
-            return string.Format("{0}.<strong>{1}</strong>", ns, type.Name);
+            var oldValue = string.Format("{0}.", type.Namespace);
+            var newValue = string.Format("{0}.<strong>", type.Namespace);
+            return string.Format("{0}</strong>", FormatString(data).Replace(oldValue, newValue));
         }
     }
 }
diff --git a/TestStack.ConventionTests/TestStack.ConventionTests.csproj b/TestStack.ConventionTests/TestStack.ConventionTests.csproj
@@ -132,4 +132,5 @@
   <Target Name="AfterBuild">
     <Copy SourceFiles="..\Readme.md" DestinationFiles="$(OutputPath)\Readme.txt" Condition="'$(NCrunch)' != '1'" />
   </Target>
+  <Import Project="..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets" Condition="Exists('..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets') AND $(nCrunch) ==''" />
 </Project>
diff --git a/TestStack.ConventionTests/TestStack.ConventionTests.ncrunchproject b/TestStack.ConventionTests/TestStack.ConventionTests.ncrunchproject
@@ -13,10 +13,11 @@
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
   <DefaultTestTimeout>60000</DefaultTestTimeout>
-  <UseBuildConfiguration />
-  <UseBuildPlatform />
-  <ProxyProcessPath />
+  <UseBuildConfiguration></UseBuildConfiguration>
+  <UseBuildPlatform></UseBuildPlatform>
+  <ProxyProcessPath></ProxyProcessPath>
   <UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
   <MSTestThreadApartmentState>STA</MSTestThreadApartmentState>
   <BuildProcessArchitecture>x86</BuildProcessArchitecture>
+  <AdditionalFilesToInclude>..\packages\GitFlowVersionTask.0.2.0\Build\**.*</AdditionalFilesToInclude>
 </ProjectConfiguration>
diff --git a/TestStack.ConventionTests/packages.config b/TestStack.ConventionTests/packages.config
@@ -2,5 +2,6 @@
 <packages>
   <package id="ApprovalTests" version="3.0.01" targetFramework="net40" />
   <package id="ApprovalUtilities" version="3.0.01" targetFramework="net40" />
+  <package id="GitFlowVersionTask" version="0.2.0" targetFramework="net40" />
   <package id="Mono.Cecil" version="0.9.5.4" targetFramework="net40" />
 </packages>
diff --git a/packages/GitFlowVersionTask.0.2.0/Build/GitFlowVersionTask.targets b/packages/GitFlowVersionTask.0.2.0/Build/GitFlowVersionTask.targets
@@ -0,0 +1,40 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)..\</SolutionDir>
+  </PropertyGroup>
+
+  <UsingTask
+      TaskName="GitFlowVersionTask.UpdateAssemblyInfo"
+      AssemblyFile="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
+
+    <Target Name="UpdateAssemblyInfo"
+            BeforeTargets="CoreCompile">
+        <GitFlowVersionTask.UpdateAssemblyInfo 
+          SolutionDirectory="$(SolutionDir)" 
+          ProjectFile="$(ProjectPath)" 
+          SignAssembly="$(SignAssembly)"
+          CompileFiles ="@(Compile)">
+          <Output 
+            TaskParameter="AssemblyInfoTempFilePath" 
+            PropertyName="AssemblyInfoTempFilePath" />
+        </GitFlowVersionTask.UpdateAssemblyInfo>
+        <Message Text="$(AssemblyInfoTempFilePath)" />
+
+        <Message Text="BeforeInjection @(Compile)" />
+        <ItemGroup>
+            <Compile Include="$(AssemblyInfoTempFilePath)" />
+        </ItemGroup>
+        <Message Text="AfterInjection @(Compile)" />
+    </Target>
+
+  <!--Support for ncrunch-->
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
+    <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.pdb" />
+  </ItemGroup>
+
+
+</Project>
+
+
diff --git a/packages/GitFlowVersionTask.0.2.0/GitFlowVersion.exe b/packages/GitFlowVersionTask.0.2.0/GitFlowVersion.exe
diff --git a/packages/GitFlowVersionTask.0.2.0/GitFlowVersion.pdb b/packages/GitFlowVersionTask.0.2.0/GitFlowVersion.pdb
diff --git a/packages/GitFlowVersionTask.0.2.0/GitFlowVersionTask.0.2.0.nupkg b/packages/GitFlowVersionTask.0.2.0/GitFlowVersionTask.0.2.0.nupkg
diff --git a/packages/GitFlowVersionTask.0.2.0/GitFlowVersionTask.0.2.0.nuspec b/packages/GitFlowVersionTask.0.2.0/GitFlowVersionTask.0.2.0.nuspec
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>GitFlowVersionTask</id>
+    <version>0.2.0</version>
+    <title>GitFlowVersionTask</title>
+    <authors>NServiceBus Ltd</authors>
+    <owners>NServiceBus Ltd</owners>
+    <licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
+    <projectUrl>http://github.com/Particular/GitFlowVersion</projectUrl>
+    <iconUrl>https://raw.github.com/Particular/GitFlowVersion/master/Icons/package_icon.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Stamps an assembly with git information based on SemVer.</description>
+    <releaseNotes />
+    <copyright />
+    <language>en-AU</language>
+    <tags>Git Versioning ILWeaving GitFlowVersion GitFlow SemVer Cecil</tags>
+  </metadata>
+</package>
diff --git a/packages/GitFlowVersionTask.0.2.0/GitFlowVersionTask.dll b/packages/GitFlowVersionTask.0.2.0/GitFlowVersionTask.dll
diff --git a/packages/GitFlowVersionTask.0.2.0/GitFlowVersionTask.pdb b/packages/GitFlowVersionTask.0.2.0/GitFlowVersionTask.pdb
diff --git a/packages/GitFlowVersionTask.0.2.0/LibGit2Sharp.dll b/packages/GitFlowVersionTask.0.2.0/LibGit2Sharp.dll
diff --git a/packages/GitFlowVersionTask.0.2.0/NativeBinaries/amd64/git2-32e4992.dll b/packages/GitFlowVersionTask.0.2.0/NativeBinaries/amd64/git2-32e4992.dll
diff --git a/packages/GitFlowVersionTask.0.2.0/NativeBinaries/x86/git2-32e4992.dll b/packages/GitFlowVersionTask.0.2.0/NativeBinaries/x86/git2-32e4992.dll
diff --git a/packages/repositories.config b/packages/repositories.config
@@ -3,6 +3,8 @@
   <repository path="..\ConventionTests\packages.config" />
   <repository path="..\SampleApp.Tests\packages.config" />
   <repository path="..\SampleApp\packages.config" />
+  <repository path="..\Samples\SampleApp.Tests\packages.config" />
+  <repository path="..\Samples\SampleApp\packages.config" />
   <repository path="..\TestAssembly\packages.config" />
   <repository path="..\TestStack.ConventionTests.Autofac\packages.config" />
   <repository path="..\TestStack.ConventionTests.Tests\packages.config" />
