Skip to content

Commit

Permalink
Merge pull request #354 from dansiegel/dev/ds/update-packaging
Browse files Browse the repository at this point in the history
Update NuGet properties
  • Loading branch information
dansiegel authored Dec 22, 2024
2 parents a42f662 + b500337 commit 182d4c9
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 16 deletions.
6 changes: 3 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
<Copyright>© 2016-$([System.DateTime]::Now.ToString(`yyyy`)) Dan Siegel</Copyright>
<MinVerMinimumMajorMinor>2.1</MinVerMinimumMajorMinor>
<MinVerDefaultPreReleaseIdentifiers>pre</MinVerDefaultPreReleaseIdentifiers>
<PackageIconUrl>https://raw.githubusercontent.com/dansiegel/Mobile.BuildTools/master/logo/icon.png</PackageIconUrl>
<PackageIcon>icon.png</PackageIcon>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageReleaseNotes>https://github.com/dansiegel/Mobile.BuildTools/releases</PackageReleaseNotes>
<PackageProjectUrl>https://mobilebuildtools.com</PackageProjectUrl>
<LocalArtifactStagingDirectory>$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'Artifacts'))</LocalArtifactStagingDirectory>
Expand Down Expand Up @@ -39,7 +38,8 @@
</PropertyGroup>

<ItemGroup Condition="$(IsPackable)">
<None Include="$(MSBuildThisFileDirectory)logo\icon.png" Pack="true" PackagePath="\icon.png" />
<None Include="$(MSBuildThisFileDirectory)LICENSE" Pack="true" PackagePath="\" Visible="false" />
<None Include="$(MSBuildThisFileDirectory)logo\icon.png" Pack="true" PackagePath="\" Visible="false" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 0 additions & 8 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@
<NoWarn>$(NoWarn);NU1903</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="Exists('ReadMe.md')">
<PackageReadmeFile>ReadMe.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup Condition="Exists('ReadMe.md')">
<None Include="ReadMe.md" Pack="true" PackagePath="/ReadMe.md" />
</ItemGroup>

<!--<Target Name="BundlePackageBuildPropsAndTargets"
BeforeTargets="Build;CoreBuild;CoreCompile;Pack">
Expand Down
6 changes: 3 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
<PackageVersion Include="NuGet.Build.Packaging" Version="0.2.5-dev.10" />
<PackageVersion Include="NuGetizer" Version="1.2.3" />
<PackageVersion Include="NuGetizer" Version="1.2.4" />
<PackageVersion Include="Microsoft.Web.Xdt" Version="3.1.0" />
<PackageVersion Include="Fizzler" Version="1.3.0" />
<PackageVersion Include="HarfBuzzSharp" Version="7.3.0.2" />
<PackageVersion Include="PolySharp" Version="1.14.1" />
<PackageVersion Include="PolySharp" Version="1.15.0" />
<PackageVersion Include="ShimSkiaSharp" Version="2.0.0.1" />
<PackageVersion Include="SkiaSharp" Version="2.88.8" />
<PackageVersion Include="SkiaSharp.HarfBuzz" Version="2.80.2" />
Expand All @@ -45,7 +45,7 @@
<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.12" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="xunit" Version="2.9.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
Expand Down
2 changes: 0 additions & 2 deletions src/Mobile.BuildTools/Mobile.BuildTools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackFolder>build</PackFolder>
<IncludeSource>false</IncludeSource>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
Expand All @@ -27,7 +26,6 @@
<None Include="*.targets;*.props" Pack="true" PackFolder="$(PackFolder)" />
<None Update="buildTransitive\*.targets;buildTransitive\*.props" Pack="true" PackFolder="buildTransitive" />
<None Update="Resources\*" Pack="true" PackagePath="$(PackFolder)/resources/%(Filename)%(Extension)" />
<None Update="readme.md" Pack="true" PackagePath="readme.md" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 182d4c9

Please sign in to comment.