From 2c6d71933b19e14fa049b7b4dcd3aaa616246d9f Mon Sep 17 00:00:00 2001
From: David Hall <dahall@byu.net>
Date: Wed, 22 Nov 2023 17:49:48 -0700
Subject: [PATCH] Separated SourceLInk and Package details into separate config
 files for solution

---
 Directory.Build.props | 34 +++-------------------------------
 Package.targets       | 16 ++++++++++++++++
 SourceLink.targets    | 18 ++++++++++++++++++
 3 files changed, 37 insertions(+), 31 deletions(-)
 create mode 100644 Package.targets
 create mode 100644 SourceLink.targets

diff --git a/Directory.Build.props b/Directory.Build.props
index 5661985b..a932609e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,14 +1,9 @@
 <Project>
   <PropertyGroup>
-    <Version>4.0.0-beta</Version>
     <TargetFrameworks>net45;net48;net6.0;net7.0;netstandard2.0;netcoreapp3.1</TargetFrameworks>
     <Configurations>Debug;Release</Configurations>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Vanara.snk</AssemblyOriginatorKeyFile>
-    <Authors>David Hall</Authors>
-    <Company>GitHub Community</Company>
-    <Copyright>Copyright © 2017-2023</Copyright>
     <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -17,13 +12,6 @@
     <LangVersion>latest</LangVersion>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Nullable>enable</Nullable>
-    <PackageIcon>Vanara64x64.png</PackageIcon>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/dahall/vanara</PackageProjectUrl>
-    <Product>Vanara</Product>
-    <RepositoryType>Git</RepositoryType>
-    <RepositoryUrl>https://github.com/dahall/vanara</RepositoryUrl>
-    <RootNamespace>Vanara.PInvoke</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <NoWarn>$(NoWarn);NETSDK1138;SYSLIB0003;SYSLIB0004;SYSLIB0011;IL2026;IL2050;IL2075;IL2067;IL2070;IL2072;IL2077;IL2080;IL2087;IL2090;CS0618;CA1401;CA2101;SYSLIB1054;</NoWarn>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
@@ -31,26 +19,10 @@
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
-  <!-- BEGIN: Source Link configuration. -->
-  <PropertyGroup>
-    <IncludeSymbols>true</IncludeSymbols>
-    <EmbedAllSources>true</EmbedAllSources>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <CIBuild Condition="'$(CIBUILD)' == ''">false</CIBuild>
-    <ContinuousIntegrationBuild>$(CIBUILD)</ContinuousIntegrationBuild>
-    <DeterministicSourcePaths>$(CIBUILD)</DeterministicSourcePaths>
-  </PropertyGroup>
-  <PropertyGroup>
-    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NETSDK1105;NETSDK1138</MSBuildWarningsAsMessages>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Condition="!$(MSBuildProjectDirectory.Contains('UnitTests'))" Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
-  </ItemGroup>
-  <!-- END: Source Link configuration. -->
+  <Import Project="Package.targets" />
+  <Import Condition="('$(MSBuildProjectExtension)'=='.csproj' Or '$(MSBuildProjectExtension)'=='.vbproj') And !$(MSBuildProjectDirectory.Contains('UnitTests'))" Project="$(MSBuildThisFileDirectory)SourceLink.targets"/>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)docs\icons\Vanara64x64.png" Pack="true" PackagePath="\" />
-    <Compile Include="$(MSBuildThisFileDirectory)AsmDef.cs" Link="AsmDef.cs" Condition="'$(MSBuildProjectExtension)' == '.csproj'"/>
+    <Compile Include="$(MSBuildThisFileDirectory)AsmDef.cs" Link="AsmDef.cs" Condition="'$(MSBuildProjectExtension)'=='.csproj'"/>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Package.targets b/Package.targets
new file mode 100644
index 00000000..b756b2d3
--- /dev/null
+++ b/Package.targets
@@ -0,0 +1,16 @@
+<Project>
+  <PropertyGroup Label="VanaraPackage">
+    <Version>4.0.0-beta</Version>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Vanara.snk</AssemblyOriginatorKeyFile>
+    <Authors>David Hall</Authors>
+    <Company>GitHub Community</Company>
+    <Copyright>Copyright © 2017-2023</Copyright>
+    <PackageIcon>Vanara64x64.png</PackageIcon>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/dahall/vanara</PackageProjectUrl>
+    <Product>Vanara</Product>
+    <RepositoryType>Git</RepositoryType>
+    <RepositoryUrl>https://github.com/dahall/vanara</RepositoryUrl>
+    <RootNamespace>Vanara.PInvoke</RootNamespace>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/SourceLink.targets b/SourceLink.targets
new file mode 100644
index 00000000..fbd5eb62
--- /dev/null
+++ b/SourceLink.targets
@@ -0,0 +1,18 @@
+<Project>
+  <PropertyGroup>
+    <IncludeSymbols>true</IncludeSymbols>
+    <EmbedAllSources>true</EmbedAllSources>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <CIBuild Condition="'$(CIBUILD)' == ''">false</CIBuild>
+    <ContinuousIntegrationBuild>$(CIBUILD)</ContinuousIntegrationBuild>
+    <DeterministicSourcePaths>$(CIBUILD)</DeterministicSourcePaths>
+  </PropertyGroup>
+  <PropertyGroup>
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NETSDK1105;NETSDK1138</MSBuildWarningsAsMessages>
+  </PropertyGroup>
+  <ItemGroup Condition="!$(MSBuildProjectDirectory.Contains('UnitTests'))" >
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
+  </ItemGroup>
+</Project>