Skip to content

Added costura support #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2014
Merged

Added costura support #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion GitVersion/FodyWeavers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<Caseless />
<Publicize />
<Fielder />
<Virtuosity />
<JetBrainsAnnotations />
<Costura />
</Weavers>
74 changes: 48 additions & 26 deletions GitVersion/GitVersion.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,18 @@
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\Packages\LibGit2Sharp.0.16.0.0\lib\net35\NativeBinaries\amd64\git2-65e9dc6.dll">
<Link>costura64\git2-65e9dc6.dll</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\Packages\LibGit2Sharp.0.16.0.0\lib\net35\NativeBinaries\amd64\git2-65e9dc6.pdb">
<Link>costura64\git2-65e9dc6.pdb</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\Packages\LibGit2Sharp.0.16.0.0\lib\net35\NativeBinaries\x86\git2-65e9dc6.dll">
<Link>costura32\git2-65e9dc6.dll</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\Packages\LibGit2Sharp.0.16.0.0\lib\net35\NativeBinaries\x86\git2-65e9dc6.pdb">
<Link>costura32\git2-65e9dc6.pdb</Link>
</EmbeddedResource>
<Content Include="FodyWeavers.xml">
<SubType>Designer</SubType>
</Content>
Expand All @@ -157,17 +169,8 @@
<Target Name="AfterBuild" DependsOnTargets="Clean">
<!-- NugetExeBuild -->
<MakeDir Directories="$(SolutionDir)NuGetExeBuild" />
<CreateItem Include="$(SolutionDir)GitVersion\bin\$(ConfigurationName)\NativeBinaries\amd64\*.dll">
<Output TaskParameter="Include" ItemName="amd64" />
</CreateItem>
<Copy SourceFiles="@(amd64)" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools\NativeBinaries\amd64" />
<CreateItem Include="$(SolutionDir)GitVersion\bin\$(ConfigurationName)\NativeBinaries\x86\*.dll">
<Output TaskParameter="Include" ItemName="x86" />
</CreateItem>
<Copy SourceFiles="@(x86)" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools\NativeBinaries\x86" />
<Copy SourceFiles="$(OutputPath)\GitVersion.pdb" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools" />
<Copy SourceFiles="$(OutputPath)\GitVersion.exe" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools" />
<Copy SourceFiles="$(OutputPath)\LibGit2Sharp.dll" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools" />
<Copy SourceFiles="$(ProjectDir)NugetExeAssets\chocolateyInstall.ps1" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools" />
<Copy SourceFiles="$(ProjectDir)NugetExeAssets\chocolateyUninstall.ps1" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools" />
<Copy SourceFiles="$(ProjectDir)NugetExeAssets\GitVersion.nuspec" DestinationFolder="$(SolutionDir)NuGetExeBuild" />
Expand All @@ -182,33 +185,52 @@
<!-- Gem -->
<MakeDir Directories="$(SolutionDir)GemBuild" />
<MakeDir Directories="$(SolutionDir)GemBuild\bin" />
<CreateItem Include="$(SolutionDir)GitVersion\bin\$(ConfigurationName)\NativeBinaries\amd64\*.dll">
<Output TaskParameter="Include" ItemName="amd64" />
</CreateItem>
<Copy SourceFiles="@(amd64)" DestinationFolder="$(SolutionDir)GemBuild\bin\NativeBinaries\amd64" />
<CreateItem Include="$(SolutionDir)GitVersion\bin\$(ConfigurationName)\NativeBinaries\x86\*.dll">
<Output TaskParameter="Include" ItemName="x86" />
</CreateItem>
<Copy SourceFiles="@(x86)" DestinationFolder="$(SolutionDir)GemBuild\bin\NativeBinaries\x86" />
<Copy SourceFiles="$(OutputPath)\GitVersion.pdb" DestinationFolder="$(SolutionDir)GemBuild\bin" />
<Copy SourceFiles="$(OutputPath)\GitVersion.exe" DestinationFolder="$(SolutionDir)GemBuild\bin" />
<Copy SourceFiles="$(OutputPath)\LibGit2Sharp.dll" DestinationFolder="$(SolutionDir)GemBuild\bin" />
<Copy SourceFiles="$(ProjectDir)GemAssets\gitversion" DestinationFolder="$(SolutionDir)GemBuild\bin" />
<Copy SourceFiles="$(ProjectDir)GemAssets\gitversion.gemspec" DestinationFolder="$(SolutionDir)GemBuild" />
</Target>
<PropertyGroup>
<PostBuildEvent>
if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries"
if not exist "$(TargetDir)NativeBinaries\x86" md "$(TargetDir)NativeBinaries\x86"
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.16.0.0\lib\net35\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86"
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.16.0.0\lib\net35\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\Fody.1.22.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.22.1\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Fody.1.22.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.22.1\build\Fody.targets'))" />
</Target>
<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
<ParameterGroup>
<Config Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem" />
<Files Output="false" Required="true" ParameterType="Microsoft.Build.Framework.ITaskItem[]" />
</ParameterGroup>
<Task Evaluate="true">
<Reference xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Include="System.Xml" />
<Reference xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Include="System.Xml.Linq" />
<Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System" />
<Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.IO" />
<Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.Xml.Linq" />
<Code xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Type="Fragment" Language="cs"><![CDATA[
var config = XElement.Load(Config.ItemSpec).Elements("Costura").FirstOrDefault();

if (config == null) return true;

var excludedAssemblies = new List<string>();
var attribute = config.Attribute("ExcludeAssemblies");
if (attribute != null)
foreach (var item in attribute.Value.Split('|').Select(x => x.Trim()).Where(x => x != string.Empty))
excludedAssemblies.Add(item);
var element = config.Element("ExcludeAssemblies");
if (element != null)
foreach (var item in element.Value.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim()).Where(x => x != string.Empty))
excludedAssemblies.Add(item);

var filesToCleanup = Files.Select(f => f.ItemSpec).Where(f => !excludedAssemblies.Contains(Path.GetFileNameWithoutExtension(f), StringComparer.InvariantCultureIgnoreCase));

foreach (var item in filesToCleanup)
File.Delete(item);
]]></Code>
</Task>
</UsingTask>
<Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
<CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
</Target>
</Project>
1 change: 1 addition & 0 deletions GitVersion/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Caseless.Fody" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
<package id="Costura.Fody" version="1.1.0.0" targetFramework="net40" developmentDependency="true" />
<package id="Fielder.Fody" version="1.0.7.0" targetFramework="net40" developmentDependency="true" />
<package id="Fody" version="1.22.1" targetFramework="net40" developmentDependency="true" />
<package id="JetBrainsAnnotations.Fody" version="1.0.2" targetFramework="net40" developmentDependency="true" />
Expand Down
17 changes: 0 additions & 17 deletions GitVersionTask/GitVersionTask.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,31 +88,14 @@
<UsingTask TaskName="PepitaPackage.CreatePackageTask" AssemblyFile="$(SolutionDir)Tools\Pepita\PepitaPackage.dll" />
<Target Name="AfterBuild" DependsOnTargets="Clean">
<MakeDir Directories="$(SolutionDir)NuGetTaskBuild" />
<CreateItem Include="$(SolutionDir)GitVersionTask\bin\$(ConfigurationName)\NativeBinaries\amd64\*.dll">
<Output TaskParameter="Include" ItemName="amd64" />
</CreateItem>
<Copy SourceFiles="@(amd64)" DestinationFolder="$(SolutionDir)NuGetTaskBuild\NativeBinaries\amd64" />
<CreateItem Include="$(SolutionDir)GitVersionTask\bin\$(ConfigurationName)\NativeBinaries\x86\*.dll">
<Output TaskParameter="Include" ItemName="x86" />
</CreateItem>
<Copy SourceFiles="@(x86)" DestinationFolder="$(SolutionDir)NuGetTaskBuild\NativeBinaries\x86" />
<Copy SourceFiles="$(OutputPath)\GitVersionTask.dll" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
<Copy SourceFiles="$(OutputPath)\GitVersionTask.pdb" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
<Copy SourceFiles="$(OutputPath)\GitVersion.exe" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
<Copy SourceFiles="$(OutputPath)\GitVersion.pdb" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
<Copy SourceFiles="$(OutputPath)\LibGit2Sharp.dll" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersionTask.targets" DestinationFolder="$(SolutionDir)NuGetTaskBuild\Build" />
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersionTask.nuspec" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetTaskBuild" MetadataAssembly="$(OutputPath)GitVersionTask.dll" />
</Target>
<PropertyGroup>
<PostBuildEvent>
if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries"
if not exist "$(TargetDir)NativeBinaries\x86" md "$(TargetDir)NativeBinaries\x86"
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.16.0.0\lib\net35\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86"
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.16.0.0\lib\net35\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\Fody.1.22.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.22.1\build\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand Down