Skip to content

Commit b1d0240

Browse files
committed
updates to build scripts
1 parent 0466217 commit b1d0240

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

build.cake

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,24 @@ Task("Copy-Files")
233233
OutputDirectory = parameters.Paths.Directories.ArtifactsBinFullFx,
234234
MSBuildSettings = parameters.MSBuildSettings
235235
});
236+
237+
DotNetCorePublish("./src/GitVersion.MsBuild/GitVersion.MsBuild.csproj", new DotNetCorePublishSettings
238+
{
239+
Framework = parameters.FullFxVersion,
240+
NoBuild = true,
241+
NoRestore = true,
242+
Configuration = parameters.Configuration,
243+
MSBuildSettings = parameters.MSBuildSettings
244+
});
245+
246+
DotNetCorePublish("./src/GitVersion.MsBuild/GitVersion.MsBuild.csproj", new DotNetCorePublishSettings
247+
{
248+
Framework = parameters.CoreFxVersion,
249+
NoBuild = true,
250+
NoRestore = true,
251+
Configuration = parameters.Configuration,
252+
MSBuildSettings = parameters.MSBuildSettings
253+
});
236254

237255
var ilMergeDir = parameters.Paths.Directories.ArtifactsBinFullFxILMerge;
238256
var portableDir = parameters.Paths.Directories.ArtifactsBinFullFxPortable.Combine("tools");
@@ -357,9 +375,9 @@ Task("Pack-Nuget")
357375
MSBuildSettings = parameters.MSBuildSettings
358376
};
359377

360-
// GitVersionCore, GitVersionTask, & global tool
378+
// GitVersionCore, GitVersion.MsBuild, & global tool
361379
DotNetCorePack("./src/GitVersionCore", settings);
362-
DotNetCorePack("./src/GitVersionTask", settings);
380+
DotNetCorePack("./src/GitVersion.MsBuild", settings);
363381
DotNetCorePack("./src/GitVersionExe/GitVersion.Tool.csproj", settings);
364382
});
365383

build/parameters.cake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public class BuildParameters
9898
Packages = BuildPackages.GetPackages(
9999
Paths.Directories.NugetRoot,
100100
Version.SemVersion,
101-
new [] { "GitVersion.CommandLine.DotNetCore", "GitVersion.CommandLine", "GitVersionCore", "GitVersionTask", "GitVersion.Tool" },
101+
new [] { "GitVersion.CommandLine.DotNetCore", "GitVersion.CommandLine", "GitVersionCore", "GitVersion.MsBuild", "GitVersion.Tool" },
102102
new [] { "GitVersion.Portable" });
103103

104104
var files = Paths.Files;
@@ -116,8 +116,7 @@ public class BuildParameters
116116
{
117117
["GitVersion.CommandLine.DotNetCore"] = Paths.Directories.ArtifactsBinCoreFx,
118118
["GitVersion.CommandLine"] = Paths.Directories.ArtifactsBinFullFxCmdline,
119-
["GitVersion.Portable"] = Paths.Directories.ArtifactsBinFullFxPortable,
120-
["GitVersion.Tool"] = Paths.Directories.ArtifactsBinCoreFx,
119+
["GitVersion.Portable"] = Paths.Directories.ArtifactsBinFullFxPortable
121120
};
122121

123122
Credentials = BuildCredentials.GetCredentials(context);

src/Directory.Build.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414

1515
</PropertyGroup>
1616
<PropertyGroup>
17-
<PackageVersion_LibGit2Sharp>0.26.0</PackageVersion_LibGit2Sharp>
18-
<PackageVersion_LibGit2SharpNativeBinaries>[2.0.267]</PackageVersion_LibGit2SharpNativeBinaries>
17+
<PackageVersion_LibGit2Sharp>0.26.0</PackageVersion_LibGit2Sharp>
1918
<PackageVersion_JetBrainsAnnotations>2019.1.1</PackageVersion_JetBrainsAnnotations>
2019
<PackageVersion_YamlDotNet>6.0.0</PackageVersion_YamlDotNet>
2120
</PropertyGroup>

src/GitVersionCore/GitVersionCore.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
23-
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2SharpNativeBinaries)" PrivateAssets="contentFiles" />
22+
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
2423
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
2524
<PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
2625
</ItemGroup>

0 commit comments

Comments
 (0)