Skip to content

Commit ec6e369

Browse files
SimonCroppSimonCropp
committed
add nuget for task
1 parent d980913 commit ec6e369

File tree

5 files changed

+101
-12
lines changed

5 files changed

+101
-12
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
## If you have NuGet Package Restore enabled, uncomment this
3838
packages/
3939
ForSample/
40-
NugetBuild/
40+
*NugetBuild*
4141

4242
# Visual Studio profiler
4343
*.psess

‎GitFlowVersionFody/GitFlowVersionFody.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -110,28 +110,28 @@ xcopy /s /y "$(SolutionDir)packages\LibGit2Sharp.0.14.0.0\NativeBinaries\amd64\*
110110
</PropertyGroup>
111111
<Target Name="Clean">
112112
<ItemGroup>
113-
<FilesToDelete Include="$(SolutionDir)NuGetBuild\**\*.*" />
113+
<FilesToDelete Include="$(SolutionDir)GitFlowVersionFodyNuGetBuild\**\*.*" />
114114
</ItemGroup>
115115
<Delete Files="@(FilesToDelete)" />
116116
</Target>
117117
<UsingTask TaskName="PepitaPackage.CreatePackageTask" AssemblyFile="$(SolutionDir)Tools\Pepita\PepitaPackage.dll" />
118118
<Target Name="AfterBuild" DependsOnTargets="Clean">
119-
<MakeDir Directories="$(SolutionDir)NuGetBuild" />
120-
<Exec Command="&quot;$(SolutionDir)Tools\ilmerge.exe&quot; /out:&quot;$(SolutionDir)NuGetBuild\GitFlowVersion.Fody.dll&quot; &quot;$(OutputPath)\GitFlowVersion.Fody.dll&quot; &quot;$(OutputPath)\LibGit2Sharp.dll&quot; &quot;$(OutputPath)\GitFlowVersion.exe&quot; /target:library /targetplatform:v4" />
119+
<MakeDir Directories="$(SolutionDir)GitFlowVersionFodyNuGetBuild" />
120+
<Exec Command="&quot;$(SolutionDir)Tools\ilmerge.exe&quot; /out:&quot;$(SolutionDir)GitFlowVersionFodyNuGetBuild\GitFlowVersion.Fody.dll&quot; &quot;$(OutputPath)\GitFlowVersion.Fody.dll&quot; &quot;$(OutputPath)\LibGit2Sharp.dll&quot; &quot;$(OutputPath)\GitFlowVersion.exe&quot; /target:library /targetplatform:v4" />
121121
<CreateItem Include="$(SolutionDir)GitFlowVersionFody\bin\$(ConfigurationName)\NativeBinaries\amd64\*.dll">
122122
<Output TaskParameter="Include" ItemName="amd64" />
123123
</CreateItem>
124-
<Copy SourceFiles="@(amd64)" DestinationFolder="$(SolutionDir)NuGetBuild\NativeBinaries\amd64" />
125-
<Copy SourceFiles="$(SolutionDir)Tools\Verpatch\verpatch.exe" DestinationFolder="$(SolutionDir)NuGetBuild\" />
124+
<Copy SourceFiles="@(amd64)" DestinationFolder="$(SolutionDir)GitFlowVersionFodyNuGetBuild\NativeBinaries\amd64" />
125+
<Copy SourceFiles="$(SolutionDir)Tools\Verpatch\verpatch.exe" DestinationFolder="$(SolutionDir)GitFlowVersionFodyNuGetBuild\" />
126126
<CreateItem Include="$(SolutionDir)GitFlowVersionFody\bin\$(ConfigurationName)\NativeBinaries\x86\*.dll">
127127
<Output TaskParameter="Include" ItemName="x86" />
128128
</CreateItem>
129-
<Copy SourceFiles="@(x86)" DestinationFolder="$(SolutionDir)NuGetBuild\NativeBinaries\x86" />
130-
<Copy SourceFiles="$(ProjectDir)NugetAssets\Fody_ToBeDeleted.txt" DestinationFolder="$(SolutionDir)NuGetBuild\Content" />
131-
<Copy SourceFiles="$(ProjectDir)NugetAssets\install.ps1" DestinationFolder="$(SolutionDir)NuGetBuild\Tools" />
132-
<Copy SourceFiles="$(ProjectDir)NugetAssets\uninstall.ps1" DestinationFolder="$(SolutionDir)NuGetBuild\Tools" />
133-
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitFlowVersionFody.nuspec" DestinationFolder="$(SolutionDir)NuGetBuild" />
134-
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetBuild" MetadataAssembly="$(OutputPath)GitFlowVersion.Fody.dll" />
129+
<Copy SourceFiles="@(x86)" DestinationFolder="$(SolutionDir)GitFlowVersionFodyNuGetBuild\NativeBinaries\x86" />
130+
<Copy SourceFiles="$(ProjectDir)NugetAssets\Fody_ToBeDeleted.txt" DestinationFolder="$(SolutionDir)GitFlowVersionFodyNuGetBuild\Content" />
131+
<Copy SourceFiles="$(ProjectDir)NugetAssets\install.ps1" DestinationFolder="$(SolutionDir)GitFlowVersionFodyNuGetBuild\Tools" />
132+
<Copy SourceFiles="$(ProjectDir)NugetAssets\uninstall.ps1" DestinationFolder="$(SolutionDir)GitFlowVersionFodyNuGetBuild\Tools" />
133+
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitFlowVersionFody.nuspec" DestinationFolder="$(SolutionDir)GitFlowVersionFodyNuGetBuild" />
134+
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)GitFlowVersionFodyNuGetBuild" MetadataAssembly="$(OutputPath)GitFlowVersion.Fody.dll" />
135135
</Target>
136136
<Import Project="Fody.targets" />
137137
</Project>

‎GitFlowVersionTask/GitFlowVersionTask.csproj

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
</ProjectReference>
6060
</ItemGroup>
6161
<ItemGroup>
62+
<None Include="NugetAssets\GitFlowVersionTask.targets" />
63+
<None Include="NugetAssets\GitFlowVersionTask.nuspec">
64+
<SubType>Designer</SubType>
65+
</None>
6266
<None Include="packages.config" />
6367
</ItemGroup>
6468
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -70,4 +74,33 @@ xcopy /s /y "$(SolutionDir)packages\LibGit2Sharp.0.14.0.0\NativeBinaries\x86\*.*
7074
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
7175
xcopy /s /y "$(SolutionDir)packages\LibGit2Sharp.0.14.0.0\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
7276
</PropertyGroup>
77+
<Target Name="Clean">
78+
<ItemGroup>
79+
<FilesToDelete Include="$(SolutionDir)GitFlowVersionTaskNuGetBuild\**\*.*" />
80+
</ItemGroup>
81+
<Delete Files="@(FilesToDelete)" />
82+
</Target>
83+
<UsingTask TaskName="PepitaPackage.CreatePackageTask" AssemblyFile="$(SolutionDir)Tools\Pepita\PepitaPackage.dll" />
84+
<Target Name="AfterBuild" DependsOnTargets="Clean">
85+
<MakeDir Directories="$(SolutionDir)GitFlowVersionTaskNuGetBuild" />
86+
<CreateItem Include="$(SolutionDir)GitFlowVersionTask\bin\$(ConfigurationName)\NativeBinaries\amd64\*.dll">
87+
<Output TaskParameter="Include" ItemName="amd64" />
88+
</CreateItem>
89+
<Copy SourceFiles="@(amd64)" DestinationFolder="$(SolutionDir)GitFlowVersionTaskNuGetBuild\NativeBinaries\amd64" />
90+
91+
92+
<Copy SourceFiles="$(OutputPath)\GitFlowVersionTask.dll" DestinationFolder="$(SolutionDir)GitFlowVersionTaskNuGetBuild" />
93+
<Copy SourceFiles="$(OutputPath)\GitFlowVersionTask.pdb" DestinationFolder="$(SolutionDir)GitFlowVersionTaskNuGetBuild" />
94+
<Copy SourceFiles="$(OutputPath)\GitFlowVersion.exe" DestinationFolder="$(SolutionDir)GitFlowVersionTaskNuGetBuild" />
95+
<Copy SourceFiles="$(OutputPath)\GitFlowVersion.pdb" DestinationFolder="$(SolutionDir)GitFlowVersionTaskNuGetBuild" />
96+
<Copy SourceFiles="$(OutputPath)\LibGit2Sharp.dll" DestinationFolder="$(SolutionDir)GitFlowVersionTaskNuGetBuild" />
97+
98+
<CreateItem Include="$(SolutionDir)GitFlowVersionTask\bin\$(ConfigurationName)\NativeBinaries\x86\*.dll">
99+
<Output TaskParameter="Include" ItemName="x86" />
100+
</CreateItem>
101+
<Copy SourceFiles="@(x86)" DestinationFolder="$(SolutionDir)GitFlowVersionTaskNuGetBuild\NativeBinaries\x86" />
102+
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitFlowVersionTask.targets" DestinationFolder="$(SolutionDir)GitFlowVersionTaskNuGetBuild\Build" />
103+
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitFlowVersionTask.nuspec" DestinationFolder="$(SolutionDir)GitFlowVersionTaskNuGetBuild" />
104+
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)GitFlowVersionTaskNuGetBuild" MetadataAssembly="$(OutputPath)GitFlowVersionTask.dll" />
105+
</Target>
73106
</Project>

‎GitFlowVersionTask/NugetAssets/GitFlowVersionTask.nuspec

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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>$version$</version>
6+
<title>GitFlowVersionTask</title>
7+
<authors>NServiceBus Ltd</authors>
8+
<owners>nservicebus, simoncropp</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+
<language>en-AU</language>
15+
<tags>Git, Versioning, ILWeaving, GitFlowVersion, GitFlow, SemVer, Cecil</tags>
16+
</metadata>
17+
</package>

‎GitFlowVersionTask/NugetAssets/GitFlowVersionTask.targets

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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+
<Output
18+
TaskParameter="AssemblyInfoTempFilePath"
19+
PropertyName="AssemblyInfoTempFilePath" />
20+
</GitFlowVersionTask.UpdateAssemblyInfo>
21+
<Message Text="$(AssemblyInfoTempFilePath)" />
22+
23+
<Message Text="BeforeInjection @(Compile)" />
24+
<ItemGroup>
25+
<Compile Include="$(AssemblyInfoTempFilePath)" />
26+
</ItemGroup>
27+
<Message Text="AfterInjection @(Compile)" />
28+
</Target>
29+
30+
<!--Support for ncrunch-->
31+
<ItemGroup>
32+
<None Include="$(MSBuildThisFileDirectory)GitFlowVersionTask.dll" />
33+
<None Include="$(MSBuildThisFileDirectory)GitFlowVersionTask.pdb" />
34+
</ItemGroup>
35+
36+
37+
</Project>
38+
39+

0 commit comments

Comments
 (0)