Skip to content

Commit 152de0d

Browse files
arturcicarturcic
committed
fix the msbuild targets/props, nuspec
1 parent c35e707 commit 152de0d

12 files changed

+299
-364
lines changed

‎build.cake

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,24 @@ Task("Copy-Files")
238238
MSBuildSettings = parameters.MSBuildSettings
239239
});
240240

241+
DotNetCorePublish("./src/GitVersionTask/GitVersionTask.csproj", new DotNetCorePublishSettings
242+
{
243+
Framework = parameters.FullFxVersion,
244+
NoBuild = true,
245+
NoRestore = true,
246+
Configuration = parameters.Configuration,
247+
MSBuildSettings = parameters.MSBuildSettings
248+
});
249+
250+
// .NET Core
251+
DotNetCorePublish("./src/GitVersionTask/GitVersionTask.csproj", new DotNetCorePublishSettings
252+
{
253+
Framework = parameters.CoreFxVersion,
254+
NoBuild = true,
255+
NoRestore = true,
256+
Configuration = parameters.Configuration,
257+
MSBuildSettings = parameters.MSBuildSettings
258+
});
241259
var ilMergeDir = parameters.Paths.Directories.ArtifactsBinFullFxILMerge;
242260
var portableDir = parameters.Paths.Directories.ArtifactsBinFullFxPortable.Combine("tools");
243261
var cmdlineDir = parameters.Paths.Directories.ArtifactsBinFullFxCmdline.Combine("tools");

‎src/GitVersionTask/GitVersionTask.nuspec

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,45 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3-
<metadata>
4-
<id>GitVersionTask</id>
5-
<version>1.0.0</version>
6-
<title>GitVersionTask</title>
7-
<authors>GitTools and Contributors</authors>
8-
<owners>GitTools and Contributors</owners>
9-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10-
<developmentDependency>true</developmentDependency>
11-
<license type="expression">MIT</license>
12-
<projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
13-
<iconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</iconUrl>
14-
<description>Stamps an assembly with git information based on SemVer.</description>
15-
<releaseNotes>https://github.com/GitTools/GitVersion/releases</releaseNotes>
16-
<copyright>Copyright GitTools 2019.</copyright>
17-
<tags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</tags>
18-
<dependencies>
19-
<group>
20-
<dependency id="NuGetUtils.MSBuild.Exec" version="$nugetutilsversion$" exclude="Build,Analyzers" />
21-
</group>
22-
<group targetFramework=".NETStandard2.0">
23-
<dependency id="NuGetUtils.MSBuild.Exec" version="$nugetutilsversion$" exclude="Build,Analyzers" />
24-
<dependency id="LibGit2Sharp" version="$libgit2sharpversion$" exclude="Build,Analyzers" />
25-
<dependency id="YamlDotNet" version="$yamldotnetversion$" exclude="Build,Analyzers" />
26-
</group>
27-
<group targetFramework=".NETFramework4.6.1">
28-
<dependency id="NuGetUtils.MSBuild.Exec" version="$nugetutilsversion$" exclude="Build,Analyzers" />
29-
</group>
30-
</dependencies>
31-
</metadata>
32-
<files>
33-
<file src="..\NugetAssets\build\**" target="build" />
34-
<file src="..\NugetAssets\build\GitVersionTask.targets" target="buildMultiTargeting" />
35-
<file src="..\bin\$configuration$\**" target="build" />
36-
<file src="..\NuGetUtils.MSBuild.Exec.Version.props" target="build" />
37-
</files>
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3+
<metadata>
4+
<id>GitVersionTask</id>
5+
<version>1.0.0</version>
6+
<title>GitVersionTask</title>
7+
<authors>GitTools and Contributors</authors>
8+
<owners>GitTools and Contributors</owners>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<developmentDependency>true</developmentDependency>
11+
<license type="expression">MIT</license>
12+
<projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
13+
<iconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</iconUrl>
14+
<description>Stamps an assembly with git information based on SemVer.</description>
15+
<releaseNotes>https://github.com/GitTools/GitVersion/releases</releaseNotes>
16+
<copyright>Copyright GitTools 2019.</copyright>
17+
<tags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</tags>
18+
</metadata>
19+
<files>
20+
<!--
21+
List platforms explicitly. If a new platform is supported by libgit2 update RuntimeIdMap method to handle it.
22+
-->
23+
<file src="netcoreapp2.1\publish\runtimes\**\*.so" target="tools\netstandard2.0\runtimes" />
24+
<file src="netcoreapp2.1\publish\runtimes\**\*.dylib" target="tools\netstandard2.0\runtimes" />
25+
<file src="netcoreapp2.1\publish\runtimes\win-x86\native\*.dll" target="tools\netstandard2.0\runtimes\win-x86\native" />
26+
<file src="netcoreapp2.1\publish\runtimes\win-x64\native\*.dll" target="tools\netstandard2.0\runtimes\win-x64\native" />
27+
28+
<file src="netcoreapp2.1\publish\LibGit2Sharp.dll" target="tools\netstandard2.0" />
29+
<file src="netcoreapp2.1\publish\Newtonsoft.Json.dll" target="tools\netstandard2.0" />
30+
<file src="netcoreapp2.1\publish\YamlDotNet.dll" target="tools\netstandard2.0" />
31+
<file src="netcoreapp2.1\publish\GitVersion*" target="tools\netstandard2.0" />
32+
33+
<file src="net461\GitVersion*" target="tools\net461" />
34+
<file src="net461\LibGit2Sharp.*" target="tools\net461" />
35+
<file src="net461\YamlDotNet.*" target="tools\net461" />
36+
37+
<file src="net461\lib\linux-x64\*.so" target="tools\net461\lib\linux-x64" />
38+
<file src="net461\lib\osx\*.dylib" target="tools\net461\lib\osx" />
39+
<file src="net461\lib\win32\**\*.dll" target="tools\net461\lib\win32" />
40+
41+
<file src="..\..\build\*.*" target="build" />
42+
<file src="..\..\buildMultiTargeting\*.*" target="buildMultiTargeting" />
43+
44+
</files>
3845
</package>

‎src/GitVersionTask/NuGetUtils.MSBuild.Exec.Version.props

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/GitVersionTask/NugetAssets/build/GitVersionTask.targets

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/GitVersionTask/NugetAssets/build/Infrastructure.props

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎src/GitVersionTask/NugetAssets/build/functionality/GitVersionBuild.targets

Lines changed: 0 additions & 121 deletions
This file was deleted.

0 commit comments

Comments
 (0)