Skip to content

Commit a3010e3

Browse files
author
Chris Crutchfield
committed
conflicts resolved
2 parents f28cc46 + 1451dd7 commit a3010e3

File tree

2 files changed

+28
-54
lines changed

2 files changed

+28
-54
lines changed

‎src/Cake.GitVersioning/Cake.GitVersioning.csproj‎

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,30 @@
88
<Description>Cake wrapper for Nerdbank.GitVersioning. Stamps your assemblies with semver 2.0 compliant git commit specific version information and provides NuGet versioning information as well.</Description>
99
<Copyright>Copyright © Andrew Arnott</Copyright>
1010
<PackageTags>git commit versioning version assemblyinfo</PackageTags>
11-
<PackageLicenseUrl>https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/39ac76891c/LICENSE.txt</PackageLicenseUrl>
12-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1311
<PackageProjectUrl>http://github.com/aarnott/Nerdbank.GitVersioning</PackageProjectUrl>
1412
<SignAssembly>false</SignAssembly>
13+
<!-- We include the whole OutputPath in this tools package. -->
14+
<IncludeBuildOutput>false</IncludeBuildOutput>
15+
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackBuildOutputs</TargetsForTfmSpecificContentInPackage>
1516
<DocumentationRootFolder>..\..\doc</DocumentationRootFolder>
16-
</PropertyGroup>
1717

1818
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1919
<DocumentationFile>C:\git\Nerdbank.GitVersioning\src\..\bin\Cake.GitVersioning\Debug\net461\Cake.GitVersioning.xml</DocumentationFile>
2020
</PropertyGroup>
2121

2222
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
2323
<DocumentationFile>C:\git\Nerdbank.GitVersioning\src\..\bin\Cake.GitVersioning\Release\net461\Cake.GitVersioning.xml</DocumentationFile>
24-
</PropertyGroup>
24+
<PropertyGroup>
25+
26+
<!-- This is a tools package and should express no dependencies. -->
27+
<ItemDefinitionGroup>
28+
<ProjectReference>
29+
<PrivateAssets>all</PrivateAssets>
30+
</ProjectReference>
31+
<PackageReference>
32+
<PrivateAssets>all</PrivateAssets>
33+
</PackageReference>
34+
</ItemDefinitionGroup>
2535

2636
<ItemGroup>
2737
<PackageReference Include="Cake.Core" Version="0.26.0" />
@@ -30,33 +40,20 @@
3040
</ItemGroup>
3141

3242
<ItemGroup>
33-
<ProjectReference Include="..\NerdBank.GitVersioning\NerdBank.GitVersioning.csproj" PrivateAssets="true" />
34-
</ItemGroup>
35-
36-
<ItemGroup>
37-
<Content Include="$(OutputPath)\NerdBank.GitVersioning.dll">
38-
<PackagePath>lib\$(TargetFramework)\</PackagePath>
39-
<Pack>true</Pack>
40-
</Content>
41-
42-
<Content Include="$(OutputPath)\LibGit2Sharp.dll">
43-
<PackagePath>lib\$(TargetFramework)</PackagePath>
44-
<Pack>true</Pack>
45-
</Content>
46-
<Content Include="$(OutputPath)\lib\**\*">
47-
<PackagePath>lib\$(TargetFramework)\lib</PackagePath>
48-
<Pack>true</Pack>
49-
</Content>
50-
51-
<Content Include="$(OutputPath)\Newtonsoft.Json.dll">
52-
<PackagePath>lib\$(TargetFramework)</PackagePath>
53-
<Pack>true</Pack>
54-
</Content>
55-
56-
<Content Include="$(OutputPath)\Validation.dll">
57-
<PackagePath>lib\$(TargetFramework)</PackagePath>
58-
<Pack>true</Pack>
59-
</Content>
43+
<ProjectReference Include="..\NerdBank.GitVersioning\NerdBank.GitVersioning.csproj" />
6044
</ItemGroup>
6145

46+
<Target Name="PackBuildOutputs" DependsOnTargets="SatelliteDllsProjectOutputGroup;DebugSymbolsProjectOutputGroup">
47+
<ItemGroup>
48+
<TfmSpecificPackageFile Include="$(OutputPath)\**\*" Exclude="$(OutputPath)\**\*.xml;$(OutputPath)\**\*.pdb;$(OutputPath)\**\Cake.Core.dll">
49+
<PackagePath>lib\$(TargetFramework)\</PackagePath>
50+
</TfmSpecificPackageFile>
51+
</ItemGroup>
52+
</Target>
53+
54+
<Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
55+
<PropertyGroup>
56+
<PackageLicenseUrl>https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/$(GitCommitIdShort)/LICENSE.txt</PackageLicenseUrl>
57+
</PropertyGroup>
58+
</Target>
6259
</Project>

‎src/Nerdbank.GitVersioning.sln‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nerdbank.GitVersioning.Task
2626
EndProject
2727
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSBuildExtensionTask", "MSBuildExtensionTask\MSBuildExtensionTask.csproj", "{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}"
2828
EndProject
29-
<<<<<<< HEAD
3029
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.GitVersioning", "Cake.GitVersioning\Cake.GitVersioning.csproj", "{1F267A97-DFE3-4166-83B1-9D236B7A09BD}"
31-
=======
32-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nbgv", "nbgv\nbgv.csproj", "{EF4DAF23-6CE9-48C5-84C5-80AC80D3D07D}"
33-
>>>>>>> 7827ebe66c2a628ae05a25d2bcb9831f1be4e075
3430
EndProject
3531
Global
3632
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -56,38 +52,19 @@ Global
5652
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Debug|Any CPU.Build.0 = Debug|Any CPU
5753
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|Any CPU.ActiveCfg = Release|Any CPU
5854
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|Any CPU.Build.0 = Release|Any CPU
59-
<<<<<<< HEAD
6055
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|x64.ActiveCfg = Release|Any CPU
6156
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|x64.Build.0 = Release|Any CPU
6257
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|x86.ActiveCfg = Release|Any CPU
6358
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|x86.Build.0 = Release|Any CPU
64-
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
65-
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
66-
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Debug|x64.ActiveCfg = Debug|Any CPU
67-
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Debug|x64.Build.0 = Debug|Any CPU
68-
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Debug|x86.ActiveCfg = Debug|Any CPU
69-
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Debug|x86.Build.0 = Debug|Any CPU
70-
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
71-
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Release|Any CPU.Build.0 = Release|Any CPU
7259
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Release|x64.ActiveCfg = Release|Any CPU
7360
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Release|x64.Build.0 = Release|Any CPU
7461
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Release|x86.ActiveCfg = Release|Any CPU
7562
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Release|x86.Build.0 = Release|Any CPU
76-
=======
77-
{EF4DAF23-6CE9-48C5-84C5-80AC80D3D07D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78-
{EF4DAF23-6CE9-48C5-84C5-80AC80D3D07D}.Debug|Any CPU.Build.0 = Debug|Any CPU
79-
{EF4DAF23-6CE9-48C5-84C5-80AC80D3D07D}.Release|Any CPU.ActiveCfg = Release|Any CPU
80-
{EF4DAF23-6CE9-48C5-84C5-80AC80D3D07D}.Release|Any CPU.Build.0 = Release|Any CPU
81-
>>>>>>> 7827ebe66c2a628ae05a25d2bcb9831f1be4e075
8263
EndGlobalSection
8364
GlobalSection(SolutionProperties) = preSolution
8465
HideSolutionNode = FALSE
8566
EndGlobalSection
8667
GlobalSection(ExtensibilityGlobals) = postSolution
87-
<<<<<<< HEAD
8868
SolutionGuid = {03CE16EE-A939-43FB-B846-92EB3A797ECF}
89-
=======
90-
SolutionGuid = {4CF7AA29-5BBD-4294-9C92-DA689CF57200}
91-
>>>>>>> 7827ebe66c2a628ae05a25d2bcb9831f1be4e075
9269
EndGlobalSection
9370
EndGlobal

0 commit comments

Comments
 (0)