Skip to content

Commit

Permalink
Adding shit that do work
Browse files Browse the repository at this point in the history
  • Loading branch information
dgmjr committed Nov 22, 2024
1 parent 8863708 commit e0244eb
Show file tree
Hide file tree
Showing 18 changed files with 78 additions and 155 deletions.
4 changes: 2 additions & 2 deletions Dgmjr.Build.NoTargets/Common/DgmjrNoTargetsSdkDll.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<Project>
<PropertyGroup>
<DgmjrNoTargetsSdkDll Condition="$(IsDgmjrNoTargetsSdk)">$(MSBuildThisFileDirectory)../bin/Dgmjr.NoTargets.Sdk.dll</DgmjrNoTargetsSdkDll>
<DgmjrNoTargetsSdkDll Condition="!$(IsDgmjrNoTargetsSdk)">$(MSBuildThisFileDirectory)../lib/Dgmjr.NoTargets.Sdk.dll</DgmjrNoTargetsSdkDll>
<DgmjrNoTargetsSdkDll Condition="'$(IsDgmjrNoTargetsSdk)' == 'true'">$(MSBuildThisFileDirectory)../bin/netstandard2.0/Dgmjr.Build.NoTargets.dll</DgmjrNoTargetsSdkDll>
<DgmjrNoTargetsSdkDll Condition="!('$(IsDgmjrNoTargetsSdk)' == 'true')">$(MSBuildThisFileDirectory)../lib/netstandard2.0/Dgmjr.Build.NoTargets.dll</DgmjrNoTargetsSdkDll>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion Dgmjr.Build.NoTargets/Common/EnsureLicense.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Project>
<PropertyGroup>
<EnsureLicense_props>included</EnsureLicense_props>
<PackDependsOn Condition="!$(IsDgmjrNoTargetsSdk)">
<PackDependsOn Condition="!('$(IsDgmjrNoTargetsSdk)' == 'true')">
$(PackDependsOn);
EnsureLicenseFileExists
</PackDependsOn>
Expand Down
50 changes: 0 additions & 50 deletions Dgmjr.Build.NoTargets/Common/GlobalUsings.cs

This file was deleted.

60 changes: 0 additions & 60 deletions Dgmjr.Build.NoTargets/Common/GlobalUsings.props

This file was deleted.

2 changes: 1 addition & 1 deletion Dgmjr.Build.NoTargets/Common/PackageReadme.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Project Condition="'$(PackageReadme_props)' == ''">
<PropertyGroup>
<PackageReadme_props>imported</PackageReadme_props>
<PackDependsOn Condition="!$(IsDgmjrNoTargetsSdk)">
<PackDependsOn Condition="!('$(IsDgmjrNoTargetsSdk)' == 'true')">
$(PackDependsOn);
EnsurePackageReadme;
</PackDependsOn>
Expand Down
7 changes: 4 additions & 3 deletions Dgmjr.Build.NoTargets/Dgmjr.Build.NoTargets.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<ProjectGuid>05edc8d8-c836-4eca-aec7-16e8a7c89e0b</ProjectGuid>
<ProjectTypeGuid>FAE04EC0-301F-11D3-BF4B-00C04F79EFBC</ProjectTypeGuid>
<ProjectTypeGuid>fae04ec0-301f-11d3-bf4b-00c04f79efbc</ProjectTypeGuid>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<IsNuGetized>true</IsNuGetized>
Expand All @@ -20,8 +20,8 @@
<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>
<Title>The DGMJR-IO NoTargets SDK</Title>
<Description>The DGMJR-IO NoTargets SDK is a collection of `.props` and `.targets` files that are used to build and package the DGMJR "no-targets" projects.</Description>
<!-- <TargetFrameworks>netstandard1.0;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks> -->
<PackageId>$(MSbuildProjectName)</PackageId>
<LangVersion>preview</LangVersion>
Expand All @@ -44,6 +44,7 @@
<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)" />
<PackageFile Include="./global.json" Pack="true" PackagePath="%(Filename)%(Extension)" />
</ItemGroup>
<Target Name="PrepareGitConstants" />
<Target Name="GitInfo" />
Expand Down
6 changes: 3 additions & 3 deletions Dgmjr.Build.NoTargets/Sdk/Sdk.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@

<Project Condition="'$(DgmjrSdkProps)' == ''">
<PropertyGroup>
<TargetFramework>netstandard1.0</TargetFramework>
<DgmjrNoTargetsSdkProps>$(MSBuildThisFileDirectory)Sdk.props</DgmjrNoTargetsSdkProps>
<ImportMicrosoftNetSdk>!$(UsingMicrosoftNETSdk.Equals("true"))</ImportMicrosoftNetSdk>
<UsingDgmjrNoTargetsSdk>true</UsingDgmjrNoTargetsSdk>
</PropertyGroup>
<Import Project="Sdk.props" Sdk="Microsoft.Build.NoTargets/3.7.56" Condition="$(ImportMicrosoftNetSdk)" />
<Import Project="Sdk.props" Sdk="Microsoft.Build.NoTargets" Condition="'$(ImportMicrosoftNetSdk)' == 'true'" />

<PropertyGroup>
<IsDgmjrNoTargetsSdk Condition="'$(MSBuildProjectName)' == 'Dgmjr.NoTargets.Sdk'">true</IsDgmjrNoTargetsSdk>
<IsDgmjrNoTargetsSdk Condition="'$(IsDgmjrNoTargetsSdk)' == ''">false</IsDgmjrNoTargetsSdk>
<UsingDgmjrNoTargetsSdk>true</UsingDgmjrNoTargetsSdk>
<DgmjrNoTargetsSdkDll Condition="$(IsDgmjrNoTargetsSdk)">$(MSBuildThisFileDirectory)../lib/Dgmjr.NET.Sdk.dll</DgmjrNoTargetsSdkDll>
<DgmjrNoTargetsSdkDll Condition="'$(IsDgmjrNoTargetsSdk)' == 'true'">$(MSBuildThisFileDirectory)../lib/Dgmjr.NET.Sdk.dll</DgmjrNoTargetsSdkDll>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFrameworks)' != '' and '$(TargetFramework)' == ''">
<IsCrossTargetingBuild>true</IsCrossTargetingBuild>
Expand Down Expand Up @@ -58,7 +59,6 @@
<Import Project="$(MSBuildThisFileDirectory)../Common/EnablePreviewFeatures.props" />
<Import Project="$(MSBuildThisFileDirectory)../Common/EnsureLicense.props" />
<Import Project="$(MSBuildThisFileDirectory)../Common/GenerateMarkdownDocs.props" />
<Import Project="$(MSBuildThisFileDirectory)../Common/GlobalUsings.props" />
<Import Project="$(MSBuildThisFileDirectory)../Common/ImplicitUsings.props" />
<Import Project="$(MSBuildThisFileDirectory)../Common/ImportProjectName.props" />
<Import Project="$(MSBuildThisFileDirectory)../Common/ItemDefinitionGroups.props" />
Expand Down
4 changes: 2 additions & 2 deletions Dgmjr.Build.NoTargets/Targets/EnsureLicense.targets
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<Import Project="../Common/DgmjrNoTargetsSdkDll.props" Condition="'$(DgmjrNoTargetsSdkDll)' == ''" />
<UsingTask TaskName="Dgmjr.NoTargets.Sdk.Tasks.EnsureLicenseFileExists" AssemblyFile="$(DgmjrNoTargetsSdkDll)" />

<Target Name="EnsureLicenseFileExists" BeforeTargets="Pack;GetPackageContents" Condition="!$(IsDgmjrNoTargetsSdk)">
<Target Name="EnsureLicenseFileExists" BeforeTargets="Pack;GetPackageContents" Condition="!('$(IsDgmjrNoTargetsSdk)' == 'true')">
<Message Importance="High" Text="Ensuring DGMJR-SDK license file exists" />
<EnsureLicenseFileExists MSBuildProjectFullPath="$(MSBuildProjectFullPath)" />
</Target>
<Target Name="EnsureLicenseFileExists" BeforeTargets="Pack;GetPackageContents" Condition="$(IsDgmjrNoTargetsSdk)" />
<Target Name="EnsureLicenseFileExists" BeforeTargets="Pack;GetPackageContents" Condition="('$(IsDgmjrNoTargetsSdk)' == 'true')" />
</Project>
2 changes: 1 addition & 1 deletion Dgmjr.Build.NoTargets/Targets/PackageIcon.targets
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Project InitialTargets="EnsurePackageIcon">
<Import Project="../Common/DgmjrNoTargetsSdkDll.props" Condition="'$(DgmjrNoTargetsSdkDll)' == ''" />
<UsingTask TaskName="Dgmjr.NoTargets.Sdk.Tasks.EnsurePackageIcon" AssemblyFile="$(DgmjrNoTargetsSdkDll)" />
<Target Name="EnsurePackageIcon" BeforeTargets="GetPackageMetadata" Condition="$(IsDgmjrNoTargetsSdk)" />
<Target Name="EnsurePackageIcon" BeforeTargets="GetPackageMetadata" Condition="'$(IsDgmjrNoTargetsSdk)' == 'true'" />
<Target Name="EnsurePackageIcon" BeforeTargets="GetPackageMetadata" Condition="'$(IsOuterBuild)' != 'false' And !$(IsDgmjrNoTargetsSdk)">
<Message Importance="High" Text="Ensuring DGMJR-SDK icon file exists" />
<EnsurePackageIcon MSBuildProjectFullPath="$(MSBuildProjectFullPath)">
Expand Down
2 changes: 1 addition & 1 deletion Dgmjr.Build.NoTargets/Targets/PackageReadme.targets
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<Import Project="../Common/DgmjrNoTargetsSdkDll.props" Condition="'$(DgmjrNoTargetsSdkDll)' == ''" />
<UsingTask TaskName="Dgmjr.NoTargets.Sdk.Tasks.EnsurePackageReadmeFileExists" AssemblyFile="$(DgmjrNoTargetsSdkDll)" />

<Target Name="EnsurePackageReadme" BeforeTargets="GetPackageContents" DependsOnTargets="GitInfo;GetPackageMetadata;SetPackageDescription" Condition="$(IsDgmjrNoTargetsSdk)" />
<Target Name="EnsurePackageReadme" BeforeTargets="GetPackageContents" DependsOnTargets="GitInfo;GetPackageMetadata;SetPackageDescription" Condition="'$(IsDgmjrNoTargetsSdk)' == 'true'" />

<Target Name="EnsurePackageReadme" BeforeTargets="GetPackageContents" DependsOnTargets="GitInfo;GetPackageMetadata;SetPackageDescription" Condition="'$(IsOuterBuild)' != 'false' And !$(IsDgmjrNoTargetsSdk)">
<EnsurePackageReadmeFileExists MSBuildProjectFullPath="$(MSBuildProjectFullPath)" />
Expand Down
10 changes: 10 additions & 0 deletions Dgmjr.Build.NoTargets/global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"$schema": "https://schemas.jsonschema.xyz/global.json.schema",
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.56",
"Microsoft.Build.CentralPackageVersions": "2.1.3",
"JustInTimeVersioningSdk": "0.0.1-Local",
"NuGetPush": "0.0.1-Local",
"Dgmjr.NET.Sdk": "0.0.25"
}
}
18 changes: 9 additions & 9 deletions Dgmjr.NET.Sdk.Web/Dgmjr.NET.Sdk.Web.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
* DgmjrSdk.csproj
* DgmjrNetWebSdk.csproj
* Created: 2023-12-21T23:17:07-05:00
* Modified: 2024-04-30T19:56:29-04:00
* Author: David G. Moore, Jr. <[email protected]>
Expand Down Expand Up @@ -47,8 +47,8 @@
<!-- <PackageFile Include="./BuildMultiTargeting/*" PackagePath="BuildMultiTargeting/%(Filename)%(Extension)" /> -->
<PackageFile Include="./LICENSE.md" PackagePath="%(Filename)%(Extension)" />
<PackageFile Include="./Scripts/*" PackagePath="Scripts/%(Filename)%(Extension)" />
<PackageFile Include="./Sdk/Sdk.Web.props" PackagePath="Sdk/Sdk%(Extension)" />
<PackageFile Include="./Sdk/Sdk.Web.targets" PackagePath="Sdk/Sdk%(Extension)" />
<PackageFile Include="./Sdk/Sdk.props" PackagePath="Sdk/Sdk%(Extension)" />
<PackageFile Include="./Sdk/Sdk.targets" PackagePath="Sdk/Sdk%(Extension)" />
<PackageFile Include="./Sdk/Common.*" PackagePath="Sdk/%(Filename)%(Extension)" />
<PackageFile Include="./lib/*.dll" PackagePath="lib/%(Filename)%(Extension)" />
<PackageFile Include="./lib/*.dll" Pack="true" PackagePath="lib/$(TargetFramework)/%(Filename)%(Extension)" />
Expand All @@ -59,13 +59,13 @@
<ItemGroup>
<PackageTag Include="sdk" Visible="false" />
<PackageTag Include="build-defaults" Visible="false" />
<PackageTag Include="dgmjrsdk" Visible="false" />
<PackageTag Include="DgmjrNetWebSdk" Visible="false" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="./LICENSE.md" LogicalName="%(Filename)%(Extension)" />
<EmbeddedResource Include="./README_TEMPLATE.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" />
<EmbeddedResource Include="./Assets/icon.png" LogicalName="DEFAULT_PACKAGE_ICON.png" /> -->
</ItemGroup>
<ItemGroup>
<PackageReference Include="YamlDotNet" />
Expand All @@ -74,10 +74,10 @@
<ItemGroup>
</ItemGroup>
<ItemGroup>
<Using Include="System.Collections.Generic.IDictionary&lt;string,string&gt;" Alias="IStringDictionary" />
<!-- <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.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" />
Expand Down
24 changes: 24 additions & 0 deletions Dgmjr.NET.Sdk.Web/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
title: MIT License
description: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files..yadda, yadda, yadda...
keywords:
- license
- mit
- IP
- copyright
lastmod: 2023-08-29T17:14:54.338Z
date: 2023-07-13T05:44:46.048Z
license: MIT
type: license
slug: mit-license
---

# MIT License

Copyright (c) 2022-2023 [David G. Moore, Jr.](mailto:[email protected] "Send David an email") ([@dgmjr](https://github.com/dgmjr "Contact david on GitHub")), All Rights Reserved

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
17 changes: 7 additions & 10 deletions Dgmjr.NET.Sdk.Web/Sdk/Sdk.props
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
<!--
* Sdk.props
*
* Created: 2022-12-19-01:17:17
* Modified: 2022-12-19-01:17:19
*
* 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-06-29T01:14:44-04:00
* Modified: 2024-10-18T02:35:17-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 Condition="'$(DgmjrSdkWebProps)' == ''">
<Project Condition="'$(DgmjrNetWebSdkWebProps)' == ''">
<PropertyGroup>
<DgmjrSdkWebProps>$(MSBuildThisFileDirectory)Sdk.props</DgmjrSdkWebProps>
<DgmjrNetWebSdkWebProps>$(MSBuildThisFileDirectory)Sdk.props</DgmjrNetWebSdkWebProps>
<ImportMicrosoftNetSdkWeb>!$(UsingMicrosoftNETSdkWeb.Equals("true"))</ImportMicrosoftNetSdkWeb>
<UsingDgmjrNetSdkWeb>true</UsingDgmjrNetSdkWeb>
</PropertyGroup>
Expand Down
19 changes: 8 additions & 11 deletions Dgmjr.NET.Sdk.Web/Sdk/Sdk.targets
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
<!--
* Sdk.props
*
* Created: 2022-12-19-01:17:17
* Modified: 2022-12-19-01:17:19
*
* Author: David G. Moore, Jr. <[email protected]>
*
* Copyright © 2022-2023 David G. Moore, Jr., All Rights Reserved
* License: MIT (https://opensource.org/licenses/MIT)
* Sdk.targets
* Created: 2024-06-29T01:14:44-04:00
* Modified: 2024-10-18T02:35:38-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 Condition="'$(DgmjrSdkTargets)' == ''">
<Project Condition="'$(DgmjrNetWebSdkTargets)' == ''">
<PropertyGroup>
<DgmjrSdkTargets>$(MSBuildThisFileDirectory)Sdk.targets</DgmjrSdkTargets>
<DgmjrNetWebSdkTargets>$(MSBuildThisFileDirectory)Sdk.targets</DgmjrNetWebSdkTargets>
</PropertyGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.Web" Condition="'$(ImportMicrosoftNetSdkWeb)' == 'true'" />
Expand Down
Binary file modified Dgmjr.NET.Sdk.Web/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e0244eb

Please sign in to comment.