Cleanthat

.github/workflows/pack.yml

@@ -21,7 +21,7 @@ jobs:
       with:
         dotnet-version: 8.0.x
     - name: Get global.json
-      uses: dgmjr-actions/download-global.json/releases/latest
+      uses: dgmjr-actions/download-global.json/@latest
     - name: Setup NuGet.exe for use with actions
       # You may pin to the exact commit or the version.
       # uses: NuGet/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f

src/.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-  "dotnet.defaultSolution": "Dgmjr.Primitives.sln"
+    "dotnet.defaultSolution": "Dgmjr.Primitives.sln"
 }

src/Build/ADefaultBuildConfiguration.props

@@ -14,6 +14,6 @@
 <Project>
 	<PropertyGroup>
 		<Configurations>Local;Debug;Staging;Release;Testing</Configurations>
-    <Configuration Condition="'$(Configuration)' == ''">Local</Configuration>
+        <Configuration Condition="'$(Configuration)' == ''">Local</Configuration>
 	</PropertyGroup>
 </Project>

src/Build/AssemblyVersion.targets

@@ -10,6 +10,20 @@
  *      License: MIT (https://opensource.org/licenses/MIT)
 -->
 <Project>
+  <PropertyGroup>
+    <BuildDependsOn>
+      $(BuildDependsOn);
+      SetAssemblyVersion
+    </BuildDependsOn>
+    <RestoreDependsOn>
+      $(RestoreDependsOn);
+      SetAssemblyVersion
+    </RestoreDependsOn>
+    <GetPackageMetadataDependsOn>
+      $(GetPackageMetadataDependsOn);
+      SetAssemblyVersion
+    </GetPackageMetadataDependsOn>
+  </PropertyGroup>
   <Target Name="SetAssemblyVersion" AfterTargets="CoreGenerateAssemblyInfo" BeforeTargets="Build;Restore">
     <PropertyGroup>
       <AssemblyVersion Condition="'$(PackageVersion)' != ''">$([System.Text.RegularExpressions.Regex]::Replace("$(PackageVersion)", "\-.*", "")).0</AssemblyVersion>

src/Build/Authors-Owners.targets

@@ -22,17 +22,11 @@
       <DistinctOwnersFinal Include="@(DistinctOwnersWithEmail->'%(Identity) &lt;%(Email)&gt;');@(DistinctOwnersNoEmail)" />
     </ItemGroup>
     <PropertyGroup>
-      <Authors>@(DistinctAuthorsFinal, ', ')</Authors> 
-      <Owners>@(DistinctOwnersFinal, ', ')</Owners> 
+      <Authors>@(DistinctAuthorsFinal, @(DistinctAuthorsFinal->Count() == 2 ? ' %26 ' : ', '))</Authors>
+      <Owners>@(DistinctOwnersFinal, @(DistinctOwnersFinal->Count() == 2 ? ' %26 ' : ', '))</Owners>
     </PropertyGroup>
     <Message Text="DistinctOwnersFinal: @(DistinctOwnersFinal)" />
     <Message Text="DistinctAuthorsFinal: @(DistinctAuthorsFinal)" />
-    <ItemGroup>
-      <!-- <DistinctAuthors Remove="@(DistinctAuthors)" />
-      <DistinctOwners Remove="@(DistinctOwners)" />
-      <DistinctAuthorsWithEmails Remove="@(DistinctAuthorsWithEmails)" />
-      <DistinctOwnersWithEmails Remove="@(DistinctOwnersWithEmails)" /> -->
-    </ItemGroup>
   </Target>
 
 </Project>

src/Build/BuildConfigurations.props

@@ -1,28 +1,30 @@
 <!--
- BuildConfigurations.props
-
-   Created: 2022-10-21-11:40:42
-   Modified: 2022-10-29-02:46:48
-
-   Author: David G. Moore, Jr. <[email protected]>
-   
-   Copyright © 2022-2023 David G. Moore, Jr., All Rights Reserved
-      License: MIT (https://opensource.org/licenses/MIT)
+ * BuildConfigurations.props
+ *
+ *   Created: 2023-03-28-02:15:29
+ *   Modified: 2023-07-21-05:45:09
+ *
+ *   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>
-    <Configurations>Local;Debug;Staging;Release;Testing</Configurations>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Local' " Label="Local Configuration">
+<PropertyGroup>
+	<Configurations>Local;Debug;Staging;Release;Testing</Configurations>
+</PropertyGroup>
+<PropertyGroup Condition=" '$(Configuration)' == 'Local' " Label="Local Configuration">
 		<DebugType>full</DebugType>
 		<Optimize>false</Optimize>
 		<DefineConstants>$(DefineConstants);TRACE;DEBUG;LOCAL</DefineConstants>
 		<WarningLevel>4</WarningLevel>
 		<NoStdLib>true</NoStdLib>
 		<DefineTrace>true</DefineTrace>
 		<DefineDebug>true</DefineDebug>
-  </PropertyGroup>
+</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)' == 'Local' " Label="Local Configuration">
 		<DebugType>full</DebugType>
 		<Optimize>false</Optimize>
@@ -43,21 +45,15 @@
 	<PropertyGroup Condition=" '$(Configuration)' == 'Staging' " Label="Staging (Release Candidate) Configuration">
 		<DefineConstants>$(DefineConstants);DEBUG;STAGING</DefineConstants>
 		<DebugType>embedded</DebugType>
-    <Optimize>true</Optimize>
+		<Optimize>true</Optimize>
 		<DefineDebug>false</DefineDebug>
 		<DefineTrace>false</DefineTrace>
-    <!-- <BuildRelease>true</BuildRelease>
-    <PackRelease>true</PackRelease>
-    <PublishRelease>true</PublishRelease> -->
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)' == 'Release' " Label="Production / Release Configuration">
 		<DefineConstants>$(DefineConstants);RELEASE;PRODUCTION</DefineConstants>
 		<DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
+		<Optimize>true</Optimize>
 		<DefineDebug>false</DefineDebug>
 		<DefineTrace>false</DefineTrace>
-    <!-- <BuildRelease>true</BuildRelease>
-    <PackRelease>true</PackRelease>
-    <PublishRelease>true</PublishRelease> -->
 	</PropertyGroup>
 </Project>

src/Build/Copyright.targets

@@ -1,17 +1,18 @@
 <!--
- Copyright.targets
-
-   Created: 2022-10-21-11:40:42
-   Modified: 2022-10-29-02:47:20
-
-   Author: David G. Moore, Jr. <[email protected]>
-
-   Copyright © 2022-2023 David G. Moore, Jr., All Rights Reserved
-      License: MIT (https://opensource.org/licenses/MIT)
+ * Copyright.targets
+ * 
+ *   Created: 2023-06-30-09:31:22
+ *   Modified: 2023-06-30-09:32:54
+ * 
+ *   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>
+    <Copyright_targets>Imported</Copyright_targets>
     <GetPackageMetadataDependsOn>
       $(GetPackageMetadataDependsOn);
       SetPackageCopyright

src/Build/DevelopmentDependencies.targets

@@ -18,7 +18,7 @@
       Condition="('$(Configuration)' == 'Testing' Or '$(Configuration)' == 'Local')" 
       TreatAsPackageReference="true" />
   </ItemGroup>
-
+  
   <ItemGroup>
     <PackageReference Include="@(LocalCodeGenerator->'%(Identity)')" 
       IncludeAssets="Analyzers"

src/Build/GetPackageContents.targets

@@ -11,7 +11,8 @@
 -->
 
 <Project>
-	<Target Name="_PreparePackageContents" BeforeTargets="GetPackageContents" Condition="'$(PackAllBinOutput)' != 'false'">
+	<Target Name="_PreparePackageContents" BeforeTargets="GetPackageContents" Condition="'$(PackAllBinOutput)' != 'false' And '$(GetPackageContents_targets)' == ''">
+		<PropertyGroup><GetPackageContents_targets>Imported</GetPackageContents_targets></PropertyGroup>
 		<ItemGroup>
 			<!-- <_PackageFile Include="$(OutputPath)**/*.dll" TargetFramework="%(RecursiveDir)/" />
 			<_PackageFile Include="$(OutputPath)**/*.xml" TargetFramework="%(RecursiveDir)/" />

src/Build/GetPackageVersion.targets

@@ -11,8 +11,9 @@
 -->
 
 <Project>
-    <Target Name="GetPackageVersion" Outputs="PackageVersion" DependsOnTargets="GitInfo">
+    <Target Name="GetPackageVersion" Outputs="PackageVersion" DependsOnTargets="GitInfo" Condition="'$(GetPackageVersion_targets)' == ''">
         <PropertyGroup>
+            <GetPackageVersion_targets>Imported</GetPackageVersion_targets>
             <PackageVersion Condition="'$(PackageVersion)' == ''">$([System.Text.RegularExpressions.Regex]::Match($(GitVersionInformation), 'PackageVersion: (.*)').Groups[1].Value)</PackageVersion>
         </PropertyGroup>
     </Target>

src/Build/GlobalUsings.props

@@ -18,30 +18,30 @@
     <Using Include="System.Console" Static="true" />
     <Using Include="System.Convert" Alias="Convert" />
     <Using Include="System.Convert" Static="true" />
-    <Using Include="System.DateTime" Alias="@datetime" />
+    <Using Include="System.DateTime" Alias="datetime" />
     <Using Include="System.DateTime" Static="true" />
-    <Using Include="System.DateOnly" Alias="@date" Condition="$(DefinedConstants.Contains('NET7_0_OR_GREATER'))" />
-    <Using Include="System.TimeOnly" Alias="@time" Condition="$(DefinedConstants.Contains('NET7_0_OR_GREATER'))" />
+    <Using Include="System.DateOnly" Alias="date" Condition="$(DefineConstants.Contains('NET7_0_OR_GREATER'))" />
+    <Using Include="System.TimeOnly" Alias="time" Condition="$(DefineConstants.Contains('NET7_0_OR_GREATER'))" />
     <Using Include="System.Diagnostics.CodeAnalysis" />
     <Using Include="System.Diagnostics" />
     <Using Include="System.Environment" Alias="env" />
     <Using Include="System.Environment" Static="true" />
-    <Using Include="System.Guid" Alias="@guid" />
-    <Using Include="System.Int128" Alias="vlong" Condition="$(DefinedConstants.Contains('NET7_0_OR_GREATER'))" />
+    <Using Include="System.Guid" Alias="guid" />
+    <Using Include="System.Int128" Alias="vlong" Condition="$(DefineConstants.Contains('NET7_0_OR_GREATER'))" />
     <Using Include="System.IO" />
     <Using Include="System.Linq.Expressions" />
     <Using Include="System.Linq" />
     <Using Include="System.Math" Static="true" />
-    <Using Include="System.Numerics.BigInteger" Alias="@bigint" Condition="!$(TargetFramework.Contains('NETSTANDARD'))" />
+    <Using Include="System.Numerics.BigInteger" Alias="bigint" Condition="!$(TargetFramework.Contains('NETSTANDARD'))" />
     <Using Include="System.Reflection" />
     <Using Include="System.Runtime.CompilerServices" />
     <Using Include="System.String" Static="true" />
     <Using Include="System.StringComparison" Static="true" />
     <Using Include="System.Threading.Tasks" />
     <Using Include="System.Threading" />
-    <Using Include="System.TimeSpan" Alias="@duration" />
-    <Using Include="System.Type" Alias="@type" />
-    <Using Include="System.UInt128" Alias="uvlong" Condition="$(DefinedConstants.Contains('NET7_0_OR_GREATER'))" />
+    <Using Include="System.TimeSpan" Alias="duration" />
+    <Using Include="System.Type" Alias="type" />
+    <Using Include="System.UInt128" Alias="uvlong" Condition="$(DefineConstants.Contains('NET7_0_OR_GREATER'))" />
     <Using Include="System.UriKind" Static="true" />
     <Using Include="System" />
   </ItemGroup>

src/Build/ItemDefinitionGroups.props

@@ -13,6 +13,9 @@
 <Project>
   <ItemDefinitionGroup>
       <Using Visible="false" />
+      <PackageTag Visible="false" />
+      <Author Visible="false" />
+      <Owner Visible="false" />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <PackageReference>
@@ -33,7 +36,7 @@
 		</ProjectReference>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
-    <SourceGenerator />
+    <SourceGenerator Visible="false" />
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <UsingsPackageReference>

src/Build/NuGetizer.targets

@@ -12,7 +12,7 @@
 
 <Project>
   <Target Name="AssignNuGetizerPropsForTestingProject">
-    <PropertyGroup Label="Targets for Testing projects" Condition="'$(IsTestingproject)' != 'true'">
+    <PropertyGroup Label="Targets for Testing projects" Condition="'$(IsTestingproject)' == 'true'">
       <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     </PropertyGroup>
   </Target>

src/Build/PackageIcon.props

@@ -1,17 +1,14 @@
 <!--
- PackageIcon.props
-
-   Created: 2022-10-21-11:40:42
-   Modified: 2022-10-29-02:48:27
-
-   Author: David G. Moore, Jr. <[email protected]>
-   
-   Copyright © 2022-2023 David G. Moore, Jr., All Rights Reserved
-      License: MIT (https://opensource.org/licenses/MIT)
+ * PackageIcon.targets
+ *
+ *   Created: 2023-01-24-02:07:11
+ *   Modified: 2023-01-24-02:07:11
+ *
+ *   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>
-
-  <ItemGroup>
-  </ItemGroup>
 </Project>

src/Build/PackageIcon.targets

@@ -11,15 +11,23 @@
 -->
 
 <Project>
-  <Target Name="EnsurePackageIcon" BeforeTargets="GetPackageContents" Condition="'$(IsInnerBuild)' == 'false'">
-    <PropertyGroup>
-      <PackageIcon Condition="'$(PackageIcon)' == '' And !Exists($(PackageIcon)) And Exists('$(MSBuildProjectDirectory)/Icon.jpg')">$(MSBuildProjectDirectory)/Icon.jpg</PackageIcon>
-      <PackageIcon Condition="'$(PackageIcon)' == '' And !Exists($(PackageIcon)) And Exists('$(MSBuildProjectDirectory)/Icon.jpeg')">$(MSBuildProjectDirectory)/Icon.jpeg</PackageIcon>
-      <PackageIcon Condition="'$(PackageIcon)' == '' And !Exists($(PackageIcon)) And Exists('$(MSBuildProjectDirectory)/Icon.png')">$(MSBuildProjectDirectory)/Icon.png</PackageIcon>
-      <PackageIcon Condition="'$(PackageIcon)' == '' And !Exists($(PackageIcon)) And Exists('$(MSBuildThisFileDirectory)../Assets/icon.png')">$(MSBuildThisFileDirectory)../Assets/icon.png</PackageIcon>
-    </PropertyGroup>
-    <ItemGroup>
-      <PackageFile Include="$(PackageIcon)" Condition="Exists($(PackageIcon))" PackagePath="icon.png" Pack="true" />
-    </ItemGroup>
-  </Target>
+	<PropertyGroup>
+		<PackageIconFile Condition="'$(PackageIcon)' == '' And $(PackageIconFile) == '' And !Exists($(PackageIcon)) And Exists('$(MSBuildProjectDirectory)/Icon.jpg')">$(MSBuildProjectDirectory)/Icon.jpg</PackageIconFile>
+		<PackageIconFile Condition="'$(PackageIcon)' == '' And $(PackageIconFile) == '' And !Exists($(PackageIcon)) And Exists('$(MSBuildProjectDirectory)/Icon.jpeg')">$(MSBuildProjectDirectory)/Icon.jpeg</PackageIconFile>
+		<PackageIconFile Condition="'$(PackageIcon)' == '' And $(PackageIconFile) == '' And !Exists($(PackageIcon)) And Exists('$(MSBuildProjectDirectory)/Icon.png')">$(MSBuildProjectDirectory)/Icon.png</PackageIconFile>
+		<PackageIconFile Condition="'$(PackageIcon)' == '' And $(PackageIconFile) == '' And !Exists($(PackageIcon)) And Exists('$(MSBuildThisFileDirectory)../Assets/Icon.png')">$(MSBuildThisFileDirectory)../Assets/Icon.png</PackageIconFile>
+	</PropertyGroup>
+	<Target Name="EnsurePackageIcon" BeforeTargets="GetPackageMetadata" Condition="'$(IsOuterBuild)' != 'false'">
+		<ItemGroup>
+			<PackageFile Include="$(PackageIconFile)" Condition="Exists($(PackageIconFile)) And $(PackageIconFile.EndsWith('.png'))" PackagePath="Icon.png" Pack="true" IsPackageIcon="true" />
+			<PackageFile Include="$(PackageIconFile)" Condition="Exists($(PackageIconFile)) And $(PackageIconFile.EndsWith('.jpeg'))" PackagePath="Icon.jpeg" Pack="true" IsPackageIcon="true" />
+			<PackageFile Include="$(PackageIconFile)" Condition="Exists($(PackageIconFile)) And $(PackageIconFile.EndsWith('.jpg'))" PackagePath="Icon.jpg" Pack="true" IsPackageIcon="true" />
+		</ItemGroup>
+		<PropertyGroup>
+			<PackageIcon Condition="Exists($(PackageIconFile)) And $(PackageIconFile.EndsWith('.png'))">Icon.png</PackageIcon>
+			<PackageIcon Condition="Exists($(PackageIconFile)) And $(PackageIconFile.EndsWith('.jpg'))">Icon.jpg</PackageIcon>
+			<PackageIcon Condition="Exists($(PackageIconFile)) And $(PackageIconFile.EndsWith('.jpeg'))">Icon.jpeg</PackageIcon>
+		</PropertyGroup>
+		<Warning Text="PackageIcon: $(PackageIcon)" />
+	</Target>
 </Project>

src/Build/PackageMetadata.props

@@ -12,6 +12,7 @@
 
 <Project>
   <PropertyGroup>
+    <PackageMetadata_props>Imported</PackageMetadata_props>
     <PackageId Condition="'$(PackageId)' == ''">$(MSBuildProjectName)</PackageId>
     <Company Condition="'$(Company)' == ''">DGMJR-IO</Company>
     <Product Condition="'$(Product)' == ''">DGMJR-IO Core Libraries</Product>