Clean up Directory.Build.props/targets a bit.

vezel-dev · Apr 17, 2024 · 8640e05 · 8640e05
1 parent 14240d2
commit 8640e05
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -16,8 +16,10 @@
         <IsPackable>false</IsPackable>
         <IsPublishable>false</IsPublishable>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <PackageIcon>zig.png</PackageIcon>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://ziglang.org</PackageProjectUrl>
+        <PackageReadmeFile>PACKAGE.md</PackageReadmeFile>
         <PackageReleaseNotes>https://ziglang.org/download/$(ZigVersion)/release-notes.html</PackageReleaseNotes>
         <RepositoryUrl>https://github.com/vezel-dev/zig-toolsets.git</RepositoryUrl>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,19 +1,10 @@
 <Project>
-    <Choose>
-        <When Condition="'$(IsPackable)' == 'true'">
-            <PropertyGroup>
-                <PackageIcon>zig.png</PackageIcon>
-                <PackageReadmeFile>PACKAGE.md</PackageReadmeFile>
-            </PropertyGroup>
-
-            <ItemGroup>
-                <None Include="$(MSBuildThisFileDirectory)PACKAGE.md; $(MSBuildThisFileDirectory)zig.png"
-                      Pack="true"
-                      PackagePath=""
-                      Visible="false" />
-            </ItemGroup>
-        </When>
-    </Choose>
+    <ItemGroup Condition="'$(IsPackable)' == 'true'">
+        <None Include="$(MSBuildThisFileDirectory)PACKAGE.md; $(MSBuildThisFileDirectory)zig.png"
+              Pack="true"
+              PackagePath=""
+              Visible="false" />
+    </ItemGroup>
 
     <!--
     Get rid of the restored package(s) in the repository's local package cache.