some changes

dgmjr-io · Jun 9, 2024 · ae3e8e6 · ae3e8e6
1 parent 84be150
commit ae3e8e6
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 42 deletions.
diff --git a/src/Common/CopyLocalLockFileAssemblies.props b/src/Common/CopyLocalLockFileAssemblies.props
@@ -1,17 +1,17 @@
 <!--
  * CopyLocalLockFileAssemblies.props
- * 
+ *
  *   Created: 2022-11-25-01:40:12
  *   Modified: 2022-11-25-01:40:12
- * 
+ *
  *   Author: David G. Moore, Jr. <[email protected]>
- *   
+ *
  *   Copyright © 2022-2023 David G. Moore, Jr., All Rights Reserved
  *      License: MIT (https://opensource.org/licenses/MIT)
 -->
 
 <Project>
-    <PropertyGroup>
-        <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-    </PropertyGroup>
+  <PropertyGroup>
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
 </Project>
diff --git a/src/Common/DgmjrSdkDll.props b/src/Common/DgmjrSdkDll.props
@@ -1,5 +1,6 @@
 <Project>
     <PropertyGroup>
+        <IsDgmjrSdk>$(MSBuildProjectName.Equals('DgmjrSdk'))</IsDgmjrSdk>
         <DgmjrSdkDll Condition="$(IsDgmjrSdk)">$(MSBuildThisFileDirectory)../bin/DgmjrSdk.dll</DgmjrSdkDll>
         <DgmjrSdkDll Condition="!$(IsDgmjrSdk)">$(MSBuildThisFileDirectory)../lib/DgmjrSdk.dll</DgmjrSdkDll>
     </PropertyGroup>

diff --git a/src/Common/GlobalUsings.cs b/src/Common/GlobalUsings.cs
@@ -1,13 +1,10 @@
 /*
- * DgmjrNamespace.cs
- *
- *   Created: 2023-01-10-10:37:17
- *   Modified: 2023-01-10-10:37:17
- *
- *   Author: David G. Moore, Jr. <[email protected]>
- *
- *   Copyright © 2022-2023 David G. Moore, Jr., All Rights Reserved
- *      License: MIT (https://opensource.org/licenses/MIT)
+ * GlobalUsings.cs
+ *     Created: 2024-02-10T11:07:06-05:00
+ *    Modified: 2024-04-24T21:20:28-04:00
+ *      Author: David G. Moore, Jr. <[email protected]>
+ *   Copyright: © 2022 - 2024 David G. Moore, Jr., All Rights Reserved
+ *     License: MIT (https://opensource.org/licenses/MIT)
  */
 
 #pragma warning disable CD1607 // The file needs documentation headers.

diff --git a/src/Common/ItemDefinitionGroups.props b/src/Common/ItemDefinitionGroups.props
@@ -1,13 +1,10 @@
 <!--
  * ItemDefinitionGroups.props
- *
- *   Created: 2022-10-24-08:10:51
- *   Modified: 2023-10-12-08:22:44
- *
- *   Author: David G. Moore, Jr. <[email protected]>
- *
- *   Copyright © 2022 - 2023 David G. Moore, Jr., All Rights Reserved
- *      License: MIT (https://opensource.org/licenses/MIT)
+ *     Created: 2024-02-10T11:07:06-05:00
+ *    Modified: 2024-04-24T21:17:27-04:00
+ *      Author: David G. Moore, Jr. <[email protected]>
+ *   Copyright: © 2022 - 2024 David G. Moore, Jr., All Rights Reserved
+ *     License: MIT (https://opensource.org/licenses/MIT)
 -->
 
 <Project>
@@ -21,7 +18,7 @@
       <!-- Generate "PKG_Package_Id" properties, which point to the package's restored location on disk -->
       <GeneratePathProperty>true</GeneratePathProperty>
       <IncludeAssets>Compile; Runtime; Build; BuildMultitargeting; BuildTransitive; Native</IncludeAssets>
-      <ExcludeAssets>ContentFiles; Analyzers</ExcludeAssets>
+      <ExcludeAssets>ContentFiles; Analyzers; Native</ExcludeAssets>
     </PackageReference>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>

diff --git a/src/Common/SourceLinkPatch.props b/src/Common/SourceLinkPatch.props
@@ -1,18 +1,18 @@
 <!--
  * SourceLinkPatch.props
- * 
+ *
  *   Created: 2022-11-24-08:07:21
  *   Modified: 2022-11-24-08:07:21
- * 
+ *
  *   Author: David G. Moore, Jr. <[email protected]>
- *   
+ *
  *   Copyright © 2022-2023 David G. Moore, Jr., All Rights Reserved
  *      License: MIT (https://opensource.org/licenses/MIT)
 -->
 
 <Project>
 	<PropertyGroup>
-		<_MicrosoftSourceLinkCommonAssemblyFile>$(Pkg_Microsoft_SourceLink_Common)/tools/Microsoft.SourceLink.Common.dll</_MicrosoftSourceLinkCommonAssemblyFile>
-		<MicrosoftBuildTasksGitAssemblyFile>$(Pkg_Microsoft_Build_Tasks_Git)/tools/Microsoft.Build.Tasks.Git.dll</MicrosoftBuildTasksGitAssemblyFile>
+		<!-- <_MicrosoftSourceLinkCommonAssemblyFile>$(Pkg_Microsoft_SourceLink_Common)/tools/Microsoft.SourceLink.Common.dll</_MicrosoftSourceLinkCommonAssemblyFile> -->
+		<!-- <MicrosoftBuildTasksGitAssemblyFile>$(Pkg_Microsoft_Build_Tasks_Git)/tools/Microsoft.Build.Tasks.Git.dll</MicrosoftBuildTasksGitAssemblyFile> -->
 	</PropertyGroup>
 </Project>
diff --git a/src/Dgmjr.NET.Sdk.csproj b/src/Dgmjr.NET.Sdk.csproj
@@ -0,0 +1,98 @@
+<!--
+ * Dgmjr.NET.Sdk.csproj
+ *     Created: 2024-04-30T19:48:21-04:00
+ *    Modified: 2024-04-30T19:56:07-04:00
+ *      Author: David G. Moore, Jr. <[email protected]>
+ *   Copyright: © 2022 - 2024 David G. Moore, Jr., All Rights Reserved
+ *     License: MIT (https://opensource.org/licenses/MIT)
+-->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <ProjectGuid>EB008C4C-9C3A-4498-A19D-34A42B6E2CE1</ProjectGuid>
+    <ProjectTypeGuid>FAE04EC0-301F-11D3-BF4B-00C04F79EFBC</ProjectTypeGuid>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <IsNuGetized>true</IsNuGetized>
+    <IsPackable>true</IsPackable>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <OutputPath>$(MSBuildThisFileDirectory)lib</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Title>The DGMJR-IO SDK</Title>
+    <Description>The DGMJR-IO SDK is a collection of `.props` and `.targets` files that are used to build and package the DGMJR projects.</Description>
+    <!-- <TargetFrameworks>netstandard1.0;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks> -->
+    <PackageId>$(MSbuildProjectName)</PackageId>
+    <LangVersion>preview</LangVersion>
+    <PackageType>MSBuildSdk</PackageType>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <IncludeInSolutionFile>true</IncludeInSolutionFile>
+    <DevelopmentDependency>true</DevelopmentDependency>
+    <NoWarn>$(NoWarn);MSB4011</NoWarn>
+    <PackageIcon>icon.png</PackageIcon>
+    <IsUsingNETSDK>true</IsUsingNETSDK>
+    <!-- <PackageVersionOverride Condition="'$(PackageVersionOverride)' == '' And '$(Configuration)' != 'Local'">0.0.23</PackageVersionOverride> -->
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageFile Include="./Assets/*" PackagePath="Assets/%(Filename)%(Extension)" />
+    <PackageFile Include="./Common/*.cs" PackagePath="Common/%(Filename)%(Extension)" />
+    <!-- <PackageFile Include="./Build/*.props" PackagePath="Build/%(Filename)%(Extension)" />
+    <PackageFile Include="./Build/*.targets" PackagePath="Build/%(Filename)%(Extension)" />
+    <PackageFile Include="./Build/Custom/*.*" PackagePath="Build/Custom/%(Filename)%(Extension)" />
+    <PackageFile Include="./BuildMultiTargeting/*" PackagePath="BuildMultiTargeting/%(Filename)%(Extension)" />    -->
+    <PackageFile Include="./Common/*.props" PackagePath="Common/%(Filename)%(Extension)" />
+    <PackageFile Include="./Targets/*.targets" PackagePath="Targets/%(Filename)%(Extension)" />
+    <!-- <PackageFile Include="./Build/Custom/*.*" PackagePath="Build/Custom/%(Filename)%(Extension)" /> -->
+    <!-- <PackageFile Include="./BuildMultiTargeting/*" PackagePath="BuildMultiTargeting/%(Filename)%(Extension)" /> -->
+    <PackageFile Include="./LICENSE.md" PackagePath="%(Filename)%(Extension)" />
+    <PackageFile Include="./Scripts/*" PackagePath="Scripts/%(Filename)%(Extension)" />
+    <PackageFile Include="./Sdk/*" PackagePath="Sdk/%(Filename)%(Extension)" />
+    <PackageFile Include="./lib/*.dll" PackagePath="lib/%(Filename)%(Extension)" />
+    <PackageFile Include="./lib/*.dll" Pack="true" PackagePath="lib/$(TargetFramework)/%(Filename)%(Extension)" />
+    <PackageFile Include="./lib/**/*.dll" Pack="true" PackagePath="lib/netstandard2.0/%(Filename)%(Extension)" />
+  </ItemGroup>
+  <Target Name="PrepareGitConstants" />
+  <Target Name="GitInfo" />
+  <ItemGroup>
+    <PackageTag Include="sdk" Visible="false" />
+    <PackageTag Include="build-defaults" Visible="false" />
+    <PackageTag Include="dgmjrsdk" Visible="false" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="./LICENSE.md" LogicalName="%(Filename)%(Extension)" />
+    <EmbeddedResource Include="./README_TEMPLATE.md" LogicalName="%(Filename)%(Extension)" />
+    <EmbeddedResource Include="./frontmatter_template.yml" LogicalName="%(Filename)%(Extension)" />
+    <EmbeddedResource Include="./Assets/icon.png"  LogicalName="DEFAULT_PACKAGE_ICON.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="YamlDotNet" />
+    <PackageReference Include="MSBuild.Usings" IncludeAssets="Build;BuildTransitive;BuildMultitargeting;Runtime;Compile" ExcludeAssets="ContentFiles;Native;Analyzers" PrivateAssets="None" />
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <Using Include="System.Collections.Generic.IDictionary&lt;string,string&gt;" Alias="IStringDictionary" />
+    <Using Include="System.Collections.Generic.Dictionary&lt;string,string&gt;" Alias="StringDictionary" />
+    <Using Include="System.Collections.Generic.KeyValuePair&lt;string,string&gt;" Alias="StrKvp" />
+    <Using Include="Dgmjr.Sdk.Models" />
+    <Using Include="System.Text.RegularExpressions" />
+    <Using Include="System.String" Static="true" />
+    <Using Include="System.IO.File" Static="true" />
+    <Using Include="System.IO.Path" Static="true" />
+    <Using Include="Microsoft.Build.Framework" />
+    <Using Include="Microsoft.Build.Execution" />
+    <Using Include="System.Runtime.CompilerServices" />
+    <Using Include="System.Reflection" />
+    <Using Include="System.Diagnostics" />
+    <Using Include="System.Text.RegularExpressions" />
+    <Using Include="System.String" Static="true" />
+    <Using Include="System.IO.File" Static="true" />
+    <Using Include="System.IO.Path" Static="true" />
+    <Using Include="Microsoft.Build.Framework" />
+    <Using Include="Microsoft.Build.Execution" />
+    <Using Include="System.Runtime.CompilerServices" />
+    <Using Include="System.Reflection" />
+    <Using Include="System.Diagnostics" />
+  </ItemGroup>
+</Project>
diff --git a/src/DgmjrSdk.csproj b/src/DgmjrSdk.csproj
@@ -1,13 +1,10 @@
 <!--
- * DgmjrSdk.nuproj
- *
- *   Created: 2023-01-08-11:51:57
- *   Modified: 2023-01-08-11:51:57
- *
- *   Author: David G. Moore, Jr. <[email protected]>
- *
- *   Copyright © 2022-2023 David G. Moore, Jr., All Rights Reserved
- *      License: MIT (https://opensource.org/licenses/MIT)
+ * DgmjrSdk.csproj
+ *     Created: 2023-12-21T23:17:07-05:00
+ *    Modified: 2024-04-30T19:56:29-04:00
+ *      Author: David G. Moore, Jr. <[email protected]>
+ *   Copyright: © 2022 - 2024 David G. Moore, Jr., All Rights Reserved
+ *     License: MIT (https://opensource.org/licenses/MIT)
 -->
 
 <Project Sdk="Microsoft.NET.Sdk">
@@ -35,7 +32,7 @@
     <NoWarn>$(NoWarn);MSB4011</NoWarn>
     <PackageIcon>icon.png</PackageIcon>
     <IsUsingNETSDK>true</IsUsingNETSDK>
-    <PackageVersionOverride Condition="'$(PackageVersionOverride)' == '' And '$(Configuration)' != 'Local'">0.0.23</PackageVersionOverride>
+    <!-- <PackageVersionOverride Condition="'$(PackageVersionOverride)' == '' And '$(Configuration)' != 'Local'">0.0.23</PackageVersionOverride> -->
   </PropertyGroup>
   <ItemGroup>
     <PackageFile Include="./Assets/*" PackagePath="Assets/%(Filename)%(Extension)" />

diff --git a/src/Sdk/Sdk.props b/src/Sdk/Sdk.props
@@ -14,6 +14,7 @@
   <PropertyGroup>
     <DgmjrSdkProps>$(MSBuildThisFileDirectory)Sdk.props</DgmjrSdkProps>
     <ImportMicrosoftNetSdk>!$(UsingMicrosoftNETSdk.Equals("true"))</ImportMicrosoftNetSdk>
+    <UsingDgmjrNetSdk>true</UsingDgmjrNetSdk>
   </PropertyGroup>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition="$(ImportMicrosoftNetSdk)" />
   <Import Project="$(MSBuildThisFileDirectory)Common.props" />

diff --git a/src/Sdk/Sdk.targets b/src/Sdk/Sdk.targets
@@ -15,6 +15,6 @@
     <DgmjrSdkTargets>$(MSBuildThisFileDirectory)Sdk.targets</DgmjrSdkTargets>
   </PropertyGroup>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="$(ImportMicrosoftNetSdk)" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="'$(ImportMicrosoftNetSdk)' == 'true'" />
   <Import Project="$(MSBuildThisFileDirectory)Common.targets" />
 </Project>
diff --git a/src/Targets/PackageTags.targets b/src/Targets/PackageTags.targets
@@ -24,7 +24,7 @@
     <DistinctPackageTag Include="@(PackageTag->Distinct())" />
   </ItemGroup>
   <PropertyGroup>
-    <PackageTags>@(DistinctPackageTag, ' ')</PackageTags>
+    <PackageTags>$(@(DistinctPackageTag, ' '))</PackageTags>
     <PackageTags>$(PackageTags.ToLower())</PackageTags>
   </PropertyGroup>
 </Project>
diff --git a/src/Tasks/EnsurePackageIcon.cs b/src/Tasks/EnsurePackageIcon.cs
@@ -12,7 +12,6 @@ namespace Dgmjr.Sdk.Tasks;
 /// </summary>
 public class EnsurePackageIcon : MSBTask
 {
-
     /// <summary>the "<inheritdoc cref="Icon" path="/value" />" extension</summary>
     /// <value>.svg</value>
     protected const string Icon = "icon";
@@ -24,10 +23,13 @@ public class EnsurePackageIcon : MSBTask
     /// <summary>the "<inheritdoc cref="_jpg" path="/value" />" extension</summary>
     /// <value>.svg</value>
     protected const string _jpg = ".jpg";
+
     /// <summary>the "<inheritdoc cref="_svg" path="/value" />" extension</summary>
     /// <value>.svg</value>
     protected const string _svg = ".svg";
+
     private const string DEFAULT_PACKAGE_ICON_PNG = "DEFAULT_PACKAGE_ICON.png";
+
     /// <summary>
     /// Supported icon extensions
     /// </summary>