Skip to content

Commit

Permalink
fix the msbuild targets/props, nuspec
Browse files Browse the repository at this point in the history
  • Loading branch information
arturcic committed Jun 24, 2019
1 parent c35e707 commit 152de0d
Show file tree
Hide file tree
Showing 12 changed files with 299 additions and 364 deletions.
18 changes: 18 additions & 0 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,24 @@ Task("Copy-Files")
MSBuildSettings = parameters.MSBuildSettings
});
DotNetCorePublish("./src/GitVersionTask/GitVersionTask.csproj", new DotNetCorePublishSettings
{
Framework = parameters.FullFxVersion,
NoBuild = true,
NoRestore = true,
Configuration = parameters.Configuration,
MSBuildSettings = parameters.MSBuildSettings
});
// .NET Core
DotNetCorePublish("./src/GitVersionTask/GitVersionTask.csproj", new DotNetCorePublishSettings
{
Framework = parameters.CoreFxVersion,
NoBuild = true,
NoRestore = true,
Configuration = parameters.Configuration,
MSBuildSettings = parameters.MSBuildSettings
});
var ilMergeDir = parameters.Paths.Directories.ArtifactsBinFullFxILMerge;
var portableDir = parameters.Paths.Directories.ArtifactsBinFullFxPortable.Combine("tools");
var cmdlineDir = parameters.Paths.Directories.ArtifactsBinFullFxCmdline.Combine("tools");
Expand Down
81 changes: 44 additions & 37 deletions src/GitVersionTask/GitVersionTask.nuspec
Original file line number Diff line number Diff line change
@@ -1,38 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>GitVersionTask</id>
<version>1.0.0</version>
<title>GitVersionTask</title>
<authors>GitTools and Contributors</authors>
<owners>GitTools and Contributors</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<developmentDependency>true</developmentDependency>
<license type="expression">MIT</license>
<projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
<iconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</iconUrl>
<description>Stamps an assembly with git information based on SemVer.</description>
<releaseNotes>https://github.com/GitTools/GitVersion/releases</releaseNotes>
<copyright>Copyright GitTools 2019.</copyright>
<tags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</tags>
<dependencies>
<group>
<dependency id="NuGetUtils.MSBuild.Exec" version="$nugetutilsversion$" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="NuGetUtils.MSBuild.Exec" version="$nugetutilsversion$" exclude="Build,Analyzers" />
<dependency id="LibGit2Sharp" version="$libgit2sharpversion$" exclude="Build,Analyzers" />
<dependency id="YamlDotNet" version="$yamldotnetversion$" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETFramework4.6.1">
<dependency id="NuGetUtils.MSBuild.Exec" version="$nugetutilsversion$" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\NugetAssets\build\**" target="build" />
<file src="..\NugetAssets\build\GitVersionTask.targets" target="buildMultiTargeting" />
<file src="..\bin\$configuration$\**" target="build" />
<file src="..\NuGetUtils.MSBuild.Exec.Version.props" target="build" />
</files>
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>GitVersionTask</id>
<version>1.0.0</version>
<title>GitVersionTask</title>
<authors>GitTools and Contributors</authors>
<owners>GitTools and Contributors</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<developmentDependency>true</developmentDependency>
<license type="expression">MIT</license>
<projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
<iconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</iconUrl>
<description>Stamps an assembly with git information based on SemVer.</description>
<releaseNotes>https://github.com/GitTools/GitVersion/releases</releaseNotes>
<copyright>Copyright GitTools 2019.</copyright>
<tags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</tags>
</metadata>
<files>
<!--
List platforms explicitly. If a new platform is supported by libgit2 update RuntimeIdMap method to handle it.
-->
<file src="netcoreapp2.1\publish\runtimes\**\*.so" target="tools\netstandard2.0\runtimes" />
<file src="netcoreapp2.1\publish\runtimes\**\*.dylib" target="tools\netstandard2.0\runtimes" />
<file src="netcoreapp2.1\publish\runtimes\win-x86\native\*.dll" target="tools\netstandard2.0\runtimes\win-x86\native" />
<file src="netcoreapp2.1\publish\runtimes\win-x64\native\*.dll" target="tools\netstandard2.0\runtimes\win-x64\native" />

<file src="netcoreapp2.1\publish\LibGit2Sharp.dll" target="tools\netstandard2.0" />
<file src="netcoreapp2.1\publish\Newtonsoft.Json.dll" target="tools\netstandard2.0" />
<file src="netcoreapp2.1\publish\YamlDotNet.dll" target="tools\netstandard2.0" />
<file src="netcoreapp2.1\publish\GitVersion*" target="tools\netstandard2.0" />

<file src="net461\GitVersion*" target="tools\net461" />
<file src="net461\LibGit2Sharp.*" target="tools\net461" />
<file src="net461\YamlDotNet.*" target="tools\net461" />

<file src="net461\lib\linux-x64\*.so" target="tools\net461\lib\linux-x64" />
<file src="net461\lib\osx\*.dylib" target="tools\net461\lib\osx" />
<file src="net461\lib\win32\**\*.dll" target="tools\net461\lib\win32" />

<file src="..\..\build\*.*" target="build" />
<file src="..\..\buildMultiTargeting\*.*" target="buildMultiTargeting" />

</files>
</package>
6 changes: 0 additions & 6 deletions src/GitVersionTask/NuGetUtils.MSBuild.Exec.Version.props

This file was deleted.

13 changes: 0 additions & 13 deletions src/GitVersionTask/NugetAssets/build/GitVersionTask.targets

This file was deleted.

41 changes: 0 additions & 41 deletions src/GitVersionTask/NugetAssets/build/Infrastructure.props

This file was deleted.

This file was deleted.

Loading

0 comments on commit 152de0d

Please sign in to comment.