Skip to content

Commit 0ba2eda

Browse files
bert2bert2
authored
Merge branch 'master' into bugfix/issue-1536-ignore-versions-in-branch-names
2 parents ad59a80 + 459bf46 commit 0ba2eda

File tree

10 files changed

+15
-14
lines changed

10 files changed

+15
-14
lines changed

‎nuspec/GitVersion.CommandLine.DotNetCore.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>GitVersion.CommandLine.DotNetCore</title>
77
<authors>GitTools and Contributors</authors>
88
<owners>GitTools and Contributors</owners>
9-
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
9+
<license type="expression">MIT</license>
1010
<projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
1111
<iconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎nuspec/GitVersion.CommandLine.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>GitVersion.CommandLine</title>
77
<authors>GitTools and Contributors</authors>
88
<owners>GitTools and Contributors</owners>
9-
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
9+
<license type="expression">MIT</license>
1010
<projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
1111
<iconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎src/GitTools.Core/GitTools.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageTags>git tools</PackageTags>
1313
<Description>Core library for GitTools</Description>
1414
<Copyright>Copyright GitTools 2018.</Copyright>
15-
<PackageLicenseUrl>https://github.com/GitTools/GitTools.Core/blob/master/LICENSE</PackageLicenseUrl>
15+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1616
<PackageIconUrl>https://raw.github.com/GitTools/GitTools.Core/master/GitTools_logo.png</PackageIconUrl>
1717
<DefineConstants>TRACE;LIBLOG_PORTABLE;</DefineConstants>
1818
</PropertyGroup>
@@ -25,4 +25,4 @@
2525
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
2626
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
2727
</ItemGroup>
28-
</Project>
28+
</Project>

‎src/GitTools.Testing.Tests/GitTools.Testing.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageTags>git tools testing</PackageTags>
2020
<Copyright>Copyright GitTools 2015</Copyright>
2121
<PackageProjectUrl>https://github.com/GitTools/GitTools.Core</PackageProjectUrl>
22-
<PackageLicenseUrl>https://github.com/GitTools/GitTools.Core/blob/master/LICENSE</PackageLicenseUrl>
22+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2323
<PackageIconUrl>https://raw.github.com/GitTools/GitTools.Core/master/GitTools_logo.png</PackageIconUrl>
2424
</PropertyGroup>
2525
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

‎src/GitVersionCore/GitVersionCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageTags>Git;Versioning;GitVersion;GitFlowVersion;GitFlow;GitHubFlow;SemVer</PackageTags>
1616
<Description>Derives SemVer information from a repository following GitFlow or GitHubFlow. This is the Core library which both GitVersion cli and Task use allowing programatic usage of GitVersion.</Description>
1717
<Copyright>Copyright GitTools 2018.</Copyright>
18-
<PackageLicenseUrl>http://www.opensource.org/licenses/mit-license.php</PackageLicenseUrl>
18+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1919
<PackageIconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</PackageIconUrl>
2020
<PackageReleaseNotes>https://github.com/GitTools/GitVersion/releases</PackageReleaseNotes>
2121
<!--Additional assembly info -->

‎src/GitVersionCore/NugetAssets/GitVersion.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<title>GitVersion</title>
77
<authors>GitTools and Contributors</authors>
88
<owners>GitTools and Contributors</owners>
9-
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
9+
<license type="expression">MIT</license>
1010
<projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
1111
<iconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎src/GitVersionExe/GitVersion.Tool.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<PackageTags>Git;Versioning;GitVersion;GitFlowVersion;GitFlow;GitHubFlow;SemVer</PackageTags>
1414
<Description>Derives SemVer information from a repository following GitFlow or GitHubFlow. This is the .NET Core Global Tool allowing usage of GitVersion from command line.</Description>
1515
<Copyright>Copyright GitTools 2018.</Copyright>
16-
<PackageLicenseUrl>http://www.opensource.org/licenses/mit-license.php</PackageLicenseUrl>
1716
<PackageIconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</PackageIconUrl>
1817
<PackageReleaseNotes>https://github.com/GitTools/GitVersion/releases</PackageReleaseNotes>
1918
</PropertyGroup>

‎src/GitVersionExe/GitVersionExe.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<TargetFrameworks Condition=" '$(TargetFrameworks)' == '' ">net461;netcoreapp2.1</TargetFrameworks>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
99
<PlatformTarget>AnyCPU</PlatformTarget>
10+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1011
<DocumentationFile>bin\$(Configuration)\GitVersion.xml</DocumentationFile>
1112
<NoWarn>1591</NoWarn>
1213
</PropertyGroup>

‎src/GitVersionTask/GitVersionTask.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
<PackageTags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</PackageTags>
1717
<Description>Stamps an assembly with git information based on SemVer.</Description>
1818
<Copyright>Copyright GitTools 2018.</Copyright>
19-
<PackageLicenseUrl>http://www.opensource.org/licenses/mit-license.php</PackageLicenseUrl>
19+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2020
<PackageIconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</PackageIconUrl>
2121
<PackageReleaseNotes>https://github.com/GitTools/GitVersion/releases</PackageReleaseNotes>
2222
<DevelopmentDependency>true</DevelopmentDependency>
2323
<BuildOutputTargetFolder>build</BuildOutputTargetFolder>
2424
<!--<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>-->
2525
<NuspecFile>NugetAssets\GitVersionTask.nuspec</NuspecFile>
2626
<PackageVersion Condition="$(PackageVersion) == '' Or $(PackageVersion) == '*Undefined*'">0.0.1-alpha-0001</PackageVersion>
27-
<NuspecProperties>version=$(PackageVersion);configuration=$(Configuration);utilpackversion=$(PackageVersion_UtilPackNuGetMSBuild);yamldotnetversion=$(PackageVersion_YamlDotNet)</NuspecProperties>
27+
<NuspecProperties>version=$(PackageVersion);configuration=$(Configuration);utilpackversion=$(PackageVersion_UtilPackNuGetMSBuild);yamldotnetversion=$(PackageVersion_YamlDotNet);libgit2sharpversion=$(PackageVersion_LibGit2Sharp)</NuspecProperties>
2828

2929
<!--Additional assembly info -->
3030
<Company>$(Authors)</Company>

‎src/GitVersionTask/NugetAssets/GitVersionTask.nuspec

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<owners>GitTools and Contributors</owners>
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1010
<developmentDependency>true</developmentDependency>
11-
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
11+
<license type="expression">MIT</license>
1212
<projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
1313
<iconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</iconUrl>
1414
<description>Stamps an assembly with git information based on SemVer.</description>
@@ -21,10 +21,11 @@
2121
</group>
2222
<group targetFramework=".NETStandard2.0">
2323
<dependency id="UtilPack.NuGet.MSBuild" version="$utilpackversion$" exclude="Build,Analyzers" />
24-
<dependency id="YamlDotNet" version="$yamldotnetversion$" exclude="Build,Analyzers" />
24+
<dependency id="YamlDotNet" version="$yamldotnetversion$" exclude="Build,Analyzers" />
25+
<dependency id="LibGit2Sharp" version="$libgit2sharpversion$" exclude="Build,Analyzers" />
2526
</group>
2627
<group targetFramework=".NETFramework4.6.1">
27-
<dependency id="UtilPack.NuGet.MSBuild" version="$utilpackversion$" exclude="Build,Analyzers" />
28+
<dependency id="UtilPack.NuGet.MSBuild" version="$utilpackversion$" exclude="Build,Analyzers" />
2829
</group>
2930
</dependencies>
3031
</metadata>
@@ -34,4 +35,4 @@
3435
<file src="..\bin\$configuration$\**" target="build" />
3536
<file src="..\UtilPack.Version.props" target="build" />
3637
</files>
37-
</package>
38+
</package>

0 commit comments

Comments
 (0)