Skip to content

Commit eeffd89

Browse files
author
Jake Ginnivan
committed
Merge branch 'release-2.2.1'
2 parents dfcec58 + 2e06776 commit eeffd89

33 files changed

+85
-89
lines changed

‎Samples/SampleApp.Tests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,3 @@
2121

2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
2323
[assembly: Guid("7b4d34d3-0454-4676-8f40-0ee1c01b984f")]
24-
25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]

‎Samples/SampleApp.Tests/SampleApp.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<Content Include="__TryItOut__.txt" />
8585
</ItemGroup>
8686
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
87+
<Import Project="..\..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets" Condition="Exists('..\..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets') AND $(nCrunch) ==''" />
8788
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8889
Other similar extension points exist, see Microsoft.Common.targets.
8990
<Target Name="BeforeBuild">

‎Samples/SampleApp.Tests/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="GitFlowVersionTask" version="0.2.0" targetFramework="net40" />
34
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net40" />
45
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net40" />
56
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />

‎Samples/SampleApp/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,3 @@
2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
2323
[assembly: Guid("31ee7421-19f6-40b4-9435-d6413bb9319f")]
2424

25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]

‎Samples/SampleApp/SampleApp.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
</Page>
8787
</ItemGroup>
8888
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
89+
<Import Project="..\..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets" Condition="Exists('..\..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets') AND $(nCrunch) ==''" />
8990
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9091
Other similar extension points exist, see Microsoft.Common.targets.
9192
<Target Name="BeforeBuild">

‎Samples/SampleApp/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="GitFlowVersionTask" version="0.2.0" targetFramework="net40" />
34
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net40" />
45
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net40" />
56
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />

‎TestAssembly/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System.Reflection;
2-
using System.Runtime.CompilerServices;
1+
using System.Reflection;
32
using System.Runtime.InteropServices;
43

54
// General Information about an assembly is controlled through the following
@@ -22,15 +21,3 @@
2221
// The following GUID is for the ID of the typelib if this project is exposed to COM
2322
[assembly: Guid("26ee0880-163f-496b-9e49-a18e8deda689")]
2423

25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]

‎TestAssembly/TestAssembly.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
<None Include="packages.config" />
8888
</ItemGroup>
8989
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
90+
<Import Project="..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets" Condition="Exists('..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets') AND $(nCrunch) ==''" />
9091
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9192
Other similar extension points exist, see Microsoft.Common.targets.
9293
<Target Name="BeforeBuild">

‎TestAssembly/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="GitFlowVersionTask" version="0.2.0" targetFramework="net40" />
34
<package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net40" />
45
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net40" />
56
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.30506.0" targetFramework="net40" />

‎TestStack.ConventionTests.Autofac/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,3 @@
2121

2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
2323
[assembly: Guid("97020754-a2a1-4ea8-87d4-964795d79d3f")]
24-
25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]

‎TestStack.ConventionTests.Autofac/ServicesShouldOnlyHaveDependenciesWithLesserLifetime.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void Execute(AutofacRegistrations data, IConventionResultContext result)
3535
}
3636
}
3737

38-
result.Is("Components should not depend on with greater lifetimes", exceptions);
38+
result.Is("Components should not depend on services with lesser lifetimes", exceptions);
3939
}
4040

4141
public string ConventionReason

‎TestStack.ConventionTests.Autofac/TestStack.ConventionTests.Autofac.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
</ProjectReference>
6161
</ItemGroup>
6262
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
63+
<Import Project="..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets" Condition="Exists('..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets') AND $(nCrunch) ==''" />
6364
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6465
Other similar extension points exist, see Microsoft.Common.targets.
6566
<Target Name="BeforeBuild">

‎TestStack.ConventionTests.Autofac/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Autofac" version="3.1.1" targetFramework="net45" />
4+
<package id="GitFlowVersionTask" version="0.2.0" targetFramework="net40" />
45
</packages>

‎TestStack.ConventionTests.Tests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,5 @@
2323
// The following GUID is for the ID of the typelib if this project is exposed to COM
2424
[assembly: Guid("1a65a30e-e057-4058-a155-7ad12ba91cd2")]
2525

26-
// Version information for an assembly consists of the following four values:
27-
//
28-
// Major Version
29-
// Minor Version
30-
// Build Number
31-
// Revision
32-
//
33-
// You can specify all the values or you can default the Build and Revision Numbers
34-
// by using the '*' as shown below:
35-
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("1.0.0.0")]
37-
[assembly: AssemblyFileVersion("1.0.0.0")]
38-
3926
[assembly: ConventionReporter(typeof(HtmlConventionResultsReporter))]
4027
[assembly: ConventionReporter(typeof(MarkdownConventionResultsReporter))]

‎TestStack.ConventionTests.Tests/TestStack.ConventionTests.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
</ItemGroup>
106106
<ItemGroup />
107107
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
108+
<Import Project="..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets" Condition="Exists('..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets') AND $(nCrunch) ==''" />
108109
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
109110
Other similar extension points exist, see Microsoft.Common.targets.
110111
<Target Name="BeforeBuild">

‎TestStack.ConventionTests.Tests/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<package id="ApprovalTests" version="3.0.01" targetFramework="net40" />
44
<package id="ApprovalUtilities" version="3.0.01" targetFramework="net40" />
55
<package id="Autofac" version="3.1.1" targetFramework="net40" />
6+
<package id="GitFlowVersionTask" version="0.2.0" targetFramework="net40" />
67
<package id="NSubstitute" version="1.6.1.0" targetFramework="net40" />
78
<package id="NUnit" version="2.6.2" targetFramework="net40" />
89
</packages>

‎TestStack.ConventionTests/Conventions/ViewModelShouldInheritFromINotifyPropertyChanged.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void Execute(Types data, IConventionResultContext result)
2020
var failingData = data.TypesToVerify.Where(t => t.Name.EndsWith(viewModelSuffix, StringComparison.InvariantCultureIgnoreCase))
2121
.Where(t => !notifyPropertyChanged.IsAssignableFrom(t));
2222

23-
result.Is("ViewModels (types named *{0}) should inherit from INotifyPropertyChanged",
23+
result.Is(string.Format("ViewModels (types named *{0}) should inherit from INotifyPropertyChanged", viewModelSuffix),
2424
failingData);
2525
}
2626

‎TestStack.ConventionTests/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,3 @@
2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
2323

2424
[assembly: Guid("ae7bce97-3d40-4d7c-932f-37f1c7b041a2")]
25-
26-
// Version information for an assembly consists of the following four values:
27-
//
28-
// Major Version
29-
// Minor Version
30-
// Build Number
31-
// Revision
32-
//
33-
// You can specify all the values or you can default the Build and Revision Numbers
34-
// by using the '*' as shown below:
35-
// [assembly: AssemblyVersion("1.0.*")]
36-
37-
[assembly: AssemblyVersion("1.0.0.0")]
38-
[assembly: AssemblyFileVersion("1.0.0.0")]

‎TestStack.ConventionTests/Reporting/TypeDataFormatter.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace TestStack.ConventionTests.Reporting
22
{
33
using System;
4+
using TestStack.ConventionTests.ConventionData;
45

56
public class TypeDataFormatter : IReportDataFormatter
67
{
@@ -11,16 +12,15 @@ public bool CanFormat(object data)
1112

1213
public string FormatString(object data)
1314
{
14-
return ((Type)data).FullName;
15+
return ((Type)data).ToTypeNameString();
1516
}
1617

1718
public string FormatHtml(object data)
1819
{
1920
var type = ((Type)data);
20-
var ns = type.Namespace;
21-
if (ns == null)
22-
return type.Name;
23-
return string.Format("{0}.<strong>{1}</strong>", ns, type.Name);
21+
var oldValue = string.Format("{0}.", type.Namespace);
22+
var newValue = string.Format("{0}.<strong>", type.Namespace);
23+
return string.Format("{0}</strong>", FormatString(data).Replace(oldValue, newValue));
2424
}
2525
}
2626
}

‎TestStack.ConventionTests/TestStack.ConventionTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,5 @@
132132
<Target Name="AfterBuild">
133133
<Copy SourceFiles="..\Readme.md" DestinationFiles="$(OutputPath)\Readme.txt" Condition="'$(NCrunch)' != '1'" />
134134
</Target>
135+
<Import Project="..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets" Condition="Exists('..\packages\GitFlowVersionTask.0.2.0\Build\GitFlowVersionTask.targets') AND $(nCrunch) ==''" />
135136
</Project>

‎TestStack.ConventionTests/TestStack.ConventionTests.ncrunchproject

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
<AnalyseExecutionTimes>true</AnalyseExecutionTimes>
1414
<IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
1515
<DefaultTestTimeout>60000</DefaultTestTimeout>
16-
<UseBuildConfiguration />
17-
<UseBuildPlatform />
18-
<ProxyProcessPath />
16+
<UseBuildConfiguration></UseBuildConfiguration>
17+
<UseBuildPlatform></UseBuildPlatform>
18+
<ProxyProcessPath></ProxyProcessPath>
1919
<UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
2020
<MSTestThreadApartmentState>STA</MSTestThreadApartmentState>
2121
<BuildProcessArchitecture>x86</BuildProcessArchitecture>
22+
<AdditionalFilesToInclude>..\packages\GitFlowVersionTask.0.2.0\Build\**.*</AdditionalFilesToInclude>
2223
</ProjectConfiguration>

‎TestStack.ConventionTests/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
<packages>
33
<package id="ApprovalTests" version="3.0.01" targetFramework="net40" />
44
<package id="ApprovalUtilities" version="3.0.01" targetFramework="net40" />
5+
<package id="GitFlowVersionTask" version="0.2.0" targetFramework="net40" />
56
<package id="Mono.Cecil" version="0.9.5.4" targetFramework="net40" />
67
</packages>

‎packages/GitFlowVersionTask.0.2.0/Build/GitFlowVersionTask.targets

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)..\</SolutionDir>
5+
</PropertyGroup>
6+
7+
<UsingTask
8+
TaskName="GitFlowVersionTask.UpdateAssemblyInfo"
9+
AssemblyFile="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
10+
11+
<Target Name="UpdateAssemblyInfo"
12+
BeforeTargets="CoreCompile">
13+
<GitFlowVersionTask.UpdateAssemblyInfo
14+
SolutionDirectory="$(SolutionDir)"
15+
ProjectFile="$(ProjectPath)"
16+
SignAssembly="$(SignAssembly)"
17+
CompileFiles ="@(Compile)">
18+
<Output
19+
TaskParameter="AssemblyInfoTempFilePath"
20+
PropertyName="AssemblyInfoTempFilePath" />
21+
</GitFlowVersionTask.UpdateAssemblyInfo>
22+
<Message Text="$(AssemblyInfoTempFilePath)" />
23+
24+
<Message Text="BeforeInjection @(Compile)" />
25+
<ItemGroup>
26+
<Compile Include="$(AssemblyInfoTempFilePath)" />
27+
</ItemGroup>
28+
<Message Text="AfterInjection @(Compile)" />
29+
</Target>
30+
31+
<!--Support for ncrunch-->
32+
<ItemGroup>
33+
<None Include="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
34+
<None Include="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.pdb" />
35+
</ItemGroup>
36+
37+
38+
</Project>
39+
40+

‎packages/GitFlowVersionTask.0.2.0/GitFlowVersion.exe

36.5 KB
Binary file not shown.

‎packages/GitFlowVersionTask.0.2.0/GitFlowVersion.pdb

75.5 KB
Binary file not shown.

‎packages/GitFlowVersionTask.0.2.0/GitFlowVersionTask.0.2.0.nupkg

887 KB
Binary file not shown.

‎packages/GitFlowVersionTask.0.2.0/GitFlowVersionTask.0.2.0.nuspec

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<id>GitFlowVersionTask</id>
5+
<version>0.2.0</version>
6+
<title>GitFlowVersionTask</title>
7+
<authors>NServiceBus Ltd</authors>
8+
<owners>NServiceBus Ltd</owners>
9+
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
10+
<projectUrl>http://github.com/Particular/GitFlowVersion</projectUrl>
11+
<iconUrl>https://raw.github.com/Particular/GitFlowVersion/master/Icons/package_icon.png</iconUrl>
12+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13+
<description>Stamps an assembly with git information based on SemVer.</description>
14+
<releaseNotes />
15+
<copyright />
16+
<language>en-AU</language>
17+
<tags>Git Versioning ILWeaving GitFlowVersion GitFlow SemVer Cecil</tags>
18+
</metadata>
19+
</package>

‎packages/GitFlowVersionTask.0.2.0/GitFlowVersionTask.dll

10.5 KB
Binary file not shown.

‎packages/GitFlowVersionTask.0.2.0/GitFlowVersionTask.pdb

17.5 KB
Binary file not shown.

‎packages/GitFlowVersionTask.0.2.0/LibGit2Sharp.dll

234 KB
Binary file not shown.

‎packages/GitFlowVersionTask.0.2.0/NativeBinaries/amd64/git2-32e4992.dll

787 KB
Binary file not shown.

‎packages/GitFlowVersionTask.0.2.0/NativeBinaries/x86/git2-32e4992.dll

591 KB
Binary file not shown.

‎packages/repositories.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<repository path="..\ConventionTests\packages.config" />
44
<repository path="..\SampleApp.Tests\packages.config" />
55
<repository path="..\SampleApp\packages.config" />
6+
<repository path="..\Samples\SampleApp.Tests\packages.config" />
7+
<repository path="..\Samples\SampleApp\packages.config" />
68
<repository path="..\TestAssembly\packages.config" />
79
<repository path="..\TestStack.ConventionTests.Autofac\packages.config" />
810
<repository path="..\TestStack.ConventionTests.Tests\packages.config" />

0 commit comments

Comments
 (0)