Add LICENSE in package + Fix missing README + Icon

Nodsoft · Jun 17, 2023 · ffa2c6b · ffa2c6b
1 parent ce3ac6e
commit ffa2c6b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,27 +19,29 @@
 		<RepositoryType>Git</RepositoryType>
 		<CommonPackageTags>obsidian, moltenobsidian, vault, markdown, html, extensions</CommonPackageTags>
 		<PackageTags>$(CommonPackageTags)</PackageTags> <!-- Default package tags -->
-		
+
 		<ReadmeFile Condition="Exists('README.md')">README.md</ReadmeFile>
+		<LicenseFile Condition="Exists('LICENSE')">LICENSE</LicenseFile>
 		<PackageIcon Condition="Exists('icon.png')">icon.png</PackageIcon>
 
 		<!-- Generate XML documentation -->
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
 
 
-	<ItemGroup>		
+	<ItemGroup>
 		<!-- Nerdbank.GitVersioning -->
 		<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" Condition="!Exists('packages.config')" PrivateAssets="all" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(PackageAssetsImported) != 'true'">
 		<!-- Import the Readme at build props level if there is none in the project -->
-
-		<None Condition="Exists('README.md') == false" Include="$(_DirectoryBuildPropsBasePath)\README.md" CopyToOutputDirectory="PreserveNewest" />
-		<None Include="$(_DirectoryBuildPropsBasePath)\icon.png" CopyToOutputDirectory="PreserveNewest" />
+
+		<None Condition="Exists('README.md') == false" Include="$(_DirectoryBuildPropsBasePath)\README.md" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="/" />
+		<None Condition="Exists('LICENSE') == false" Include="$(_DirectoryBuildPropsBasePath)\LICENSE" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="/" />
+		<None Include="$(_DirectoryBuildPropsBasePath)\icon.png" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="/" />
 	</ItemGroup>
-	
+
 	<PropertyGroup Condition="$(PackageAssetsImported) != 'true'">
 		<PackageAssetsImported>true</PackageAssetsImported>
 	</PropertyGroup>

diff --git a/Nodsoft.MoltenObsidian.Tool/Nodsoft.MoltenObsidian.Tool.csproj b/Nodsoft.MoltenObsidian.Tool/Nodsoft.MoltenObsidian.Tool.csproj
@@ -2,31 +2,31 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		
+
 		<!--suppress MsbuildTargetFrameworkTagInspection, CheckTagEmptyBody -->
 		<TargetFrameworks></TargetFrameworks>
 		<TargetFramework>net7.0</TargetFramework>
-		
+
 		<PackAsTool>true</PackAsTool>
 		<ToolCommandName>moltenobsidian</ToolCommandName>
 		<Description>Utilitary CLI tool for Molten Obsidian, used for Vault manipulation purposes.</Description>
 		<PackageTags>$(CommonPackageTags), cli, tool, ssg, manifest</PackageTags>
-		
+
 		<!-- Override: No documentation is needed for a CLI tool. Spectre already does it for us. -->
 		<GenerateDocumentationFile>false</GenerateDocumentationFile>
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
-	  <PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
-	  <PackageReference Include="Throw" Version="1.3.1" />
+		<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
+		<PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
+		<PackageReference Include="Throw" Version="1.3.1" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\Nodsoft.MoltenObsidian.Manifest\Nodsoft.MoltenObsidian.Manifest.csproj" />
-	  <ProjectReference Include="..\Vaults\Nodsoft.MoltenObsidian.Vaults.FileSystem\Nodsoft.MoltenObsidian.Vaults.FileSystem.csproj" />
-	  <ProjectReference Include="..\Vaults\Nodsoft.MoltenObsidian.Vaults.Ftp\Nodsoft.MoltenObsidian.Vaults.Ftp.csproj" />
-	  <ProjectReference Include="..\Vaults\Nodsoft.MoltenObsidian.Vaults.Http\Nodsoft.MoltenObsidian.Vaults.Http.csproj" />
+		<ProjectReference Include="..\Nodsoft.MoltenObsidian.Manifest\Nodsoft.MoltenObsidian.Manifest.csproj" />
+		<ProjectReference Include="..\Vaults\Nodsoft.MoltenObsidian.Vaults.FileSystem\Nodsoft.MoltenObsidian.Vaults.FileSystem.csproj" />
+		<ProjectReference Include="..\Vaults\Nodsoft.MoltenObsidian.Vaults.Ftp\Nodsoft.MoltenObsidian.Vaults.Ftp.csproj" />
+		<ProjectReference Include="..\Vaults\Nodsoft.MoltenObsidian.Vaults.Http\Nodsoft.MoltenObsidian.Vaults.Http.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/Vaults/Directory.Build.props b/Vaults/Directory.Build.props
@@ -7,10 +7,11 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="$(PackageAssetsImported) != 'true'">
-		<Content Condition="Exists('README.md') == false" Include="$(_DirectoryBuildPropsBasePath)\README.md" CopyToOutputDirectory="PreserveNewest" />
-		<Content Include="$(_DirectoryBuildPropsBasePath)\..\icon.png" CopyToOutputDirectory="PreserveNewest" />
+		<Content Condition="Exists('README.md') == false" Include="$(_DirectoryBuildPropsBasePath)\README.md" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="/" />
+		<Content Condition="Exists('LICENSE') == false" Include="$(_DirectoryBuildPropsBasePath)\LICENSE" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="/" />
+		<Content Include="$(_DirectoryBuildPropsBasePath)\..\icon.png" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="/" />
 	</ItemGroup>
-	
+
 	<PropertyGroup Condition="$(PackageAssetsImported) != 'true'">
 		<PackageAssetsImported>true</PackageAssetsImported>
 	</PropertyGroup>