Skip to content

Commit f0b9438

Browse files
authored
Fix nuget build warning regarding deprecated license property (#266)
1 parent 2df4258 commit f0b9438

File tree

5 files changed

+5
-21
lines changed

5 files changed

+5
-21
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,7 @@ jobs:
5858
inputs:
5959
ProjectDirectory: 'src/nerdbank-gitversioning.npm'
6060

61-
- task: VSBuild@1
62-
inputs:
63-
vsVersion: 15.0
64-
msbuildArgs: /t:build,pack /m /bl:"$(Build.ArtifactStagingDirectory)/build_logs/msbuild.binlog"
65-
platform: $(BuildPlatform)
66-
configuration: $(BuildConfiguration)
61+
- script: dotnet build src -c $(BuildConfiguration) --no-restore /t:build,pack /bl:"$(Build.ArtifactStagingDirectory)/build_logs/msbuild.binlog"
6762
displayName: Build NuGet package and tests
6863

6964
- task: gulp@0

src/Cake.GitVersioning/Cake.GitVersioning.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<Copyright>Copyright © Andrew Arnott</Copyright>
1010
<PackageTags>git commit versioning version assemblyinfo</PackageTags>
1111
<PackageProjectUrl>http://github.com/aarnott/Nerdbank.GitVersioning</PackageProjectUrl>
12+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1213
<SignAssembly>false</SignAssembly>
1314
<!-- We include the whole OutputPath in this tools package. -->
1415
<IncludeBuildOutput>false</IncludeBuildOutput>
@@ -50,10 +51,4 @@
5051
</TfmSpecificPackageFile>
5152
</ItemGroup>
5253
</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>
5954
</Project>

src/Directory.Build.props

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,4 @@
1414
<PackageTags>git commit versioning version assemblyinfo</PackageTags>
1515
<PackageProjectUrl>https://github.com/aarnott/Nerdbank.GitVersioning</PackageProjectUrl>
1616
</PropertyGroup>
17-
18-
<Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
19-
<PropertyGroup>
20-
<PackageLicenseUrl>https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/$(GitCommitIdShort)/LICENSE.txt</PackageLicenseUrl>
21-
</PropertyGroup>
22-
</Target>
2317
</Project>

src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
1717
</PropertyGroup>
1818

19-
<Target Name="SetNuSpecPropertiesFinal" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion;SetNuSpecProperties">
19+
<Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
2020
<PropertyGroup>
2121
<LibGit2SharpNativeBinaries>$(NuGetPackageRoot)libgit2sharp.nativebinaries\1.0.258\</LibGit2SharpNativeBinaries>
22-
<NuspecProperties>$(NuspecProperties);LicenseUrl=$(PackageLicenseUrl);Version=$(Version);BaseOutputPath=$(OutputPath);LibGit2SharpNativeBinaries=$(LibGit2SharpNativeBinaries)</NuspecProperties>
22+
<NuspecProperties>$(NuspecProperties);Version=$(Version);BaseOutputPath=$(OutputPath);LibGit2SharpNativeBinaries=$(LibGit2SharpNativeBinaries)</NuspecProperties>
2323
</PropertyGroup>
2424
</Target>
2525

src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1010
<releaseNotes>https://github.com/AArnott/Nerdbank.GitVersioning/releases</releaseNotes>
1111
<developmentDependency>true</developmentDependency>
12-
<licenseUrl>$LicenseUrl$</licenseUrl>
12+
<license type="expression">MIT</license>
1313
<projectUrl>https://github.com/aarnott/Nerdbank.GitVersioning</projectUrl>
1414
<description>Stamps your assemblies with semver 2.0 compliant git commit specific version information and provides NuGet versioning information as well.</description>
1515
<tags>git commit versioning version assemblyinfo</tags>

0 commit comments

Comments
 (0)