diff --git a/src/Common/CopyLocalLockFileAssemblies.props b/src/Common/CopyLocalLockFileAssemblies.props index 3633a90..e130b41 100644 --- a/src/Common/CopyLocalLockFileAssemblies.props +++ b/src/Common/CopyLocalLockFileAssemblies.props @@ -1,17 +1,17 @@ - - false - + + false + diff --git a/src/Common/DgmjrSdkDll.props b/src/Common/DgmjrSdkDll.props index 8452ec5..e525c0e 100644 --- a/src/Common/DgmjrSdkDll.props +++ b/src/Common/DgmjrSdkDll.props @@ -1,5 +1,6 @@ + $(MSBuildProjectName.Equals('DgmjrSdk')) $(MSBuildThisFileDirectory)../bin/DgmjrSdk.dll $(MSBuildThisFileDirectory)../lib/DgmjrSdk.dll diff --git a/src/Common/GlobalUsings.cs b/src/Common/GlobalUsings.cs index ee4a2d7..4acf786 100644 --- 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. - * - * 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. + * 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 index f449db5..c94b6c8 100755 --- a/src/Common/ItemDefinitionGroups.props +++ b/src/Common/ItemDefinitionGroups.props @@ -1,13 +1,10 @@ @@ -21,7 +18,7 @@ true Compile; Runtime; Build; BuildMultitargeting; BuildTransitive; Native - ContentFiles; Analyzers + ContentFiles; Analyzers; Native diff --git a/src/Common/SourceLinkPatch.props b/src/Common/SourceLinkPatch.props index 3c6dc56..67cbe49 100644 --- a/src/Common/SourceLinkPatch.props +++ b/src/Common/SourceLinkPatch.props @@ -1,18 +1,18 @@ - <_MicrosoftSourceLinkCommonAssemblyFile>$(Pkg_Microsoft_SourceLink_Common)/tools/Microsoft.SourceLink.Common.dll - $(Pkg_Microsoft_Build_Tasks_Git)/tools/Microsoft.Build.Tasks.Git.dll + + diff --git a/src/Dgmjr.NET.Sdk.csproj b/src/Dgmjr.NET.Sdk.csproj new file mode 100644 index 0000000..4c88c0e --- /dev/null +++ b/src/Dgmjr.NET.Sdk.csproj @@ -0,0 +1,98 @@ + + + + + netstandard2.0 + EB008C4C-9C3A-4498-A19D-34A42B6E2CE1 + FAE04EC0-301F-11D3-BF4B-00C04F79EFBC + true + true + true + true + false + $(MSBuildThisFileDirectory)lib + + + The DGMJR-IO SDK + The DGMJR-IO SDK is a collection of `.props` and `.targets` files that are used to build and package the DGMJR projects. + + $(MSbuildProjectName) + preview + MSBuildSdk + true + true + true + $(NoWarn);MSB4011 + icon.png + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/DgmjrSdk.csproj b/src/DgmjrSdk.csproj index 6928812..13dd127 100644 --- a/src/DgmjrSdk.csproj +++ b/src/DgmjrSdk.csproj @@ -1,13 +1,10 @@ @@ -35,7 +32,7 @@ $(NoWarn);MSB4011 icon.png true - 0.0.23 + diff --git a/src/Sdk/Sdk.props b/src/Sdk/Sdk.props index 0cfcf66..22a84bf 100644 --- a/src/Sdk/Sdk.props +++ b/src/Sdk/Sdk.props @@ -14,6 +14,7 @@ $(MSBuildThisFileDirectory)Sdk.props !$(UsingMicrosoftNETSdk.Equals("true")) + true diff --git a/src/Sdk/Sdk.targets b/src/Sdk/Sdk.targets index 6587ca5..064ce4c 100644 --- a/src/Sdk/Sdk.targets +++ b/src/Sdk/Sdk.targets @@ -15,6 +15,6 @@ $(MSBuildThisFileDirectory)Sdk.targets - + diff --git a/src/Targets/PackageTags.targets b/src/Targets/PackageTags.targets index 3e64279..75154c0 100755 --- a/src/Targets/PackageTags.targets +++ b/src/Targets/PackageTags.targets @@ -24,7 +24,7 @@ - @(DistinctPackageTag, ' ') + $(@(DistinctPackageTag, ' ')) $(PackageTags.ToLower()) diff --git a/src/Tasks/EnsurePackageIcon.cs b/src/Tasks/EnsurePackageIcon.cs index 65289f5..19be5cc 100644 --- a/src/Tasks/EnsurePackageIcon.cs +++ b/src/Tasks/EnsurePackageIcon.cs @@ -12,7 +12,6 @@ namespace Dgmjr.Sdk.Tasks; /// public class EnsurePackageIcon : MSBTask { - /// the "" extension /// .svg protected const string Icon = "icon"; @@ -24,10 +23,13 @@ public class EnsurePackageIcon : MSBTask /// the "" extension /// .svg protected const string _jpg = ".jpg"; + /// the "" extension /// .svg protected const string _svg = ".svg"; + private const string DEFAULT_PACKAGE_ICON_PNG = "DEFAULT_PACKAGE_ICON.png"; + /// /// Supported icon extensions ///