Skip to content

fix for GitVersionTask referencing Microsoft.Extensions.DependencyInjection #2090

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
arturcic merged 2 commits into from
Feb 11, 2020
Merged

fix for GitVersionTask referencing Microsoft.Extensions.DependencyInjection #2090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f969bad
nuspec update, rework packaging GitVersionTask
arturcic Feb 10, 2020
f5e8e3e
add Microsoft.Bcl.AsyncInterfaces
arturcic Feb 10, 2020
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
5 changes: 3 additions & 2 deletions build/pack.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,11 @@ Task("Pack-Nuget")
};

// GitVersionTask, & global tool
DotNetCorePack("./src/GitVersionTask", settings);

settings.ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true");
DotNetCorePack("./src/GitVersionExe/GitVersionExe.csproj", settings);

settings.ArgumentCustomization = null;
DotNetCorePack("./src/GitVersionTask", settings);
});

Task("Pack-Chocolatey")
Expand Down
2 changes: 1 addition & 1 deletion nuspec/GitVersion.CommandLine.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<authors>GitTools and Contributors</authors>
<owners>GitTools and Contributors</owners>
<license type="expression">MIT</license>
<copyright>Copyright GitTools 2020.</copyright>
<projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
<iconUrl>https://raw.githubusercontent.com/GitTools/graphics/master/GitVersion/icon_100x100.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Derives SemVer information from a repository following GitFlow or GitHubFlow.</description>
<language>en-AU</language>
<tags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</tags>
<developmentDependency>true</developmentDependency>
<releaseNotes>https://github.com/GitTools/GitVersion/releases</releaseNotes>
Expand Down
2 changes: 1 addition & 1 deletion nuspec/GitVersion.Portable.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<title>GitVersion</title>
<authors>GitTools and Contributors</authors>
<owners>GitTools and Contributors</owners>
<copyright>Copyright GitTools 2020.</copyright>
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
<projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
<iconUrl>https://raw.githubusercontent.com/GitTools/graphics/master/GitVersion/icon_100x100.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Derives SemVer information from a repository following GitFlow or GitHubFlow.</description>
<language>en-AU</language>
<tags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</tags>
<releaseNotes>https://github.com/GitTools/GitVersion/releases</releaseNotes>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<PackageProjectUrl>https://github.com/GitTools/GitVersion</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageTags>Git;Versioning;GitVersion;GitFlowVersion;GitFlow;GitHubFlow;SemVer</PackageTags>
<Copyright>Copyright GitTools 2019.</Copyright>
<Copyright>Copyright GitTools 2020.</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>package_icon.png</PackageIcon>
<PackageReleaseNotes>https://github.com/GitTools/GitVersion/releases</PackageReleaseNotes>
Expand Down
1 change: 1 addition & 0 deletions src/GitVersionExe/GitVersionExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<ItemGroup Condition="'$(TargetFramework)'=='net472'">
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
9 changes: 1 addition & 8 deletions src/GitVersionTask/GitVersionTask.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,8 @@
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'net472' ">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" PrivateAssets="All" />
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" PrivateAssets="All" />
</ItemGroup>

Expand Down
40 changes: 23 additions & 17 deletions src/GitVersionTask/nuget-files.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FullPublish>bin/$(Configuration)/net472</FullPublish>
<CorePublish>bin/$(Configuration)/netcoreapp2.1/publish</CorePublish>
<RootPublish>../GitVersionExe</RootPublish>
<FullPublish>$(RootPublish)/bin/$(Configuration)/net472</FullPublish>
<CorePublish>$(RootPublish)/bin/$(Configuration)/netcoreapp2.1/publish</CorePublish>
<FullPublishTask>bin/$(Configuration)/net472</FullPublishTask>
<CorePublishTask>bin/$(Configuration)/netcoreapp2.1/publish</CorePublishTask>
<FullTarget>tools/net472</FullTarget>
<CoreTarget>tools/netstandard2.0</CoreTarget>
</PropertyGroup>
<ItemGroup>
<None Include="build/*.*" Pack="true" PackagePath="build" />
<None Include="buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting" />

<None Include="$(CorePublish)/runtimes/**/*.so" Pack="true" PackagePath="$(CoreTarget)/runtimes" />
<None Include="$(CorePublish)/runtimes/**/*.dylib" Pack="true" PackagePath="$(CoreTarget)/runtimes" />
<None Include="$(CorePublish)/runtimes/win-x86/native/*.dll" Pack="true" PackagePath="$(CoreTarget)/runtimes/win-x86/native" />
<None Include="$(CorePublish)/runtimes/win-x64/native/*.dll" Pack="true" PackagePath="$(CoreTarget)/runtimes/win-x64/native" />
<None Include="$(CorePublish)/runtimes/**/*.so" Pack="true" PackagePath="$(CoreTarget)/runtimes" />
<None Include="$(CorePublish)/runtimes/**/*.dylib" Pack="true" PackagePath="$(CoreTarget)/runtimes" />
<None Include="$(CorePublish)/runtimes/win-x86/native/*.dll" Pack="true" PackagePath="$(CoreTarget)/runtimes/win-x86/native" />
<None Include="$(CorePublish)/runtimes/win-x64/native/*.dll" Pack="true" PackagePath="$(CoreTarget)/runtimes/win-x64/native" />

<None Include="$(CorePublish)/GitVersion*" Pack="true" PackagePath="$(CoreTarget)" />
<None Include="$(CorePublish)/LibGit2Sharp.dll" Pack="true" PackagePath="$(CoreTarget)" />
<None Include="$(CorePublish)/YamlDotNet.dll" Pack="true" PackagePath="$(CoreTarget)" />
<None Include="$(CorePublish)/Microsoft.Extensions*" Pack="true" PackagePath="$(CoreTarget)" />
<None Include="$(CorePublishTask)/GitVersion*" Pack="true" PackagePath="$(CoreTarget)" />
<None Include="$(CorePublish)/LibGit2Sharp.dll" Pack="true" PackagePath="$(CoreTarget)" />
<None Include="$(CorePublish)/YamlDotNet.dll" Pack="true" PackagePath="$(CoreTarget)" />
<None Include="$(CorePublish)/Microsoft.Extensions*" Pack="true" PackagePath="$(CoreTarget)" />
<None Include="$(CorePublish)/Microsoft.Bcl.AsyncInterfaces.dll" Pack="true" PackagePath="$(CoreTarget)" />

<None Include="$(FullPublish)/lib/linux-x64/*.so" Pack="true" PackagePath="$(FullTarget)/lib/linux-x64" />
<None Include="$(FullPublish)/lib/osx/*.dylib" Pack="true" PackagePath="$(FullTarget)/lib/osx" />
<None Include="$(FullPublish)/lib/win32/**/*.dll" Pack="true" PackagePath="$(FullTarget)/lib/win32" />
<None Include="$(FullPublish)/lib/linux-x64/*.so" Pack="true" PackagePath="$(FullTarget)/lib/linux-x64" />
<None Include="$(FullPublish)/lib/osx/*.dylib" Pack="true" PackagePath="$(FullTarget)/lib/osx" />
<None Include="$(FullPublish)/lib/win32/**/*.dll" Pack="true" PackagePath="$(FullTarget)/lib/win32" />

<None Include="$(FullPublishTask)/GitVersion*" Pack="true" PackagePath="$(FullTarget)" />
<None Include="$(FullPublish)/LibGit2Sharp.*" Pack="true" PackagePath="$(FullTarget)" />
<None Include="$(FullPublish)/YamlDotNet.dll" Pack="true" PackagePath="$(FullTarget)" />
<None Include="$(FullPublish)/Microsoft.Extensions*" Pack="true" PackagePath="$(FullTarget)" />
<None Include="$(FullPublish)/Microsoft.Bcl.AsyncInterfaces.dll" Pack="true" PackagePath="$(FullTarget)" />

<None Include="$(FullPublish)/GitVersion*" Pack="true" PackagePath="$(FullTarget)" />
<None Include="$(FullPublish)/LibGit2Sharp.*" Pack="true" PackagePath="$(FullTarget)" />
<None Include="$(FullPublish)/YamlDotNet.dll" Pack="true" PackagePath="$(FullTarget)" />
<None Include="$(FullPublish)/Microsoft.Extensions*" Pack="true" PackagePath="$(FullTarget)" />
</ItemGroup>
</Project>