redo DgmjrSdk

dgmjr-io · Jun 29, 2024 · 5112bba · 5112bba
1 parent 3af9f8e
commit 5112bba
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 296 deletions.
diff --git a/src/Common/DgmjrSdkDll.props b/src/Common/DgmjrSdkDll.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
-        <IsDgmjrSdk>$(MSBuildProjectName.StartsWith('DgmjrSdk'))</IsDgmjrSdk>
-        <DgmjrSdkDll Condition="$(MSBuildProjectName.StartsWith('DgmjrSdk'))">$(MSBuildThisFileDirectory)../bin/DgmjrSdk.dll</DgmjrSdkDll>
-        <DgmjrSdkDll Condition="!$(MSBuildProjectName.StartsWith('DgmjrSdk'))">$(MSBuildThisFileDirectory)../lib/DgmjrSdk.dll</DgmjrSdkDll>
+        <IsDgmjrSdk>($(MSBuildProjectName.StartsWith('DgmjrSdk')) Or $(MSBuildProjectName.StartsWith('Dgmjr.Sdk')))</IsDgmjrSdk>
+        <DgmjrSdkDll Condition="($(MSBuildProjectName.StartsWith('DgmjrSdk')) Or $(MSBuildProjectName.StartsWith('Dgmjr.Sdk')))">$(MSBuildThisFileDirectory)../bin/DgmjrSdk.dll</DgmjrSdkDll>
+        <DgmjrSdkDll Condition="!($(MSBuildProjectName.StartsWith('DgmjrSdk')) Or $(MSBuildProjectName.StartsWith('Dgmjr.Sdk')))">$(MSBuildThisFileDirectory)../lib/DgmjrSdk.dll</DgmjrSdkDll>
     </PropertyGroup>
 </Project>
diff --git a/src/Common/EnsureLicense.props b/src/Common/EnsureLicense.props
@@ -14,7 +14,7 @@
   <PropertyGroup>
     <EnsureLicense_props>included</EnsureLicense_props>
     <DgmjrSdkDll>$(MSBuildThisFileDirectory)/../lib/netstandard2.0/DgmjrSdk.dll</DgmjrSdkDll>
-    <PackDependsOn Condition="!$(MSBuildProjectName.StartsWith('DgmjrSdk'))">
+    <PackDependsOn Condition="!($(MSBuildProjectName.StartsWith('DgmjrSdk')) Or $(MSBuildProjectName.StartsWith('Dgmjr.Sdk')))">
       $(PackDependsOn);
       EnsureLicenseFileExists
     </PackDependsOn>

diff --git a/src/Common/GlobalUsings.props b/src/Common/GlobalUsings.props
@@ -3,9 +3,9 @@
     <IsCompilingFromCode>@(Compile->Count()) &gt; 0</IsCompilingFromCode>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)GlobalUsings.cs" Condition="!$(MSBuildProjectName.StartsWith('DgmjrSdk')) And '$(MSBuildProjectExtension)' == '.csproj'" />
+    <Compile Include="$(MSBuildThisFileDirectory)GlobalUsings.cs" Condition="!($(MSBuildProjectName.StartsWith('DgmjrSdk')) Or $(MSBuildProjectName.StartsWith('Dgmjr.Sdk'))) And '$(MSBuildProjectExtension)' == '.csproj'" />
   </ItemGroup>
-  <ItemGroup Condition="!$(MSBuildProjectName.StartsWith('DgmjrSdk')) And '$(MSBuildProjectExtension)' == '.csproj' And @(Compile->Count()) &gt; 0">
+  <ItemGroup Condition="!($(MSBuildProjectName.StartsWith('DgmjrSdk')) Or $(MSBuildProjectName.StartsWith('Dgmjr.Sdk'))) And '$(MSBuildProjectExtension)' == '.csproj' And @(Compile->Count()) &gt; 0">
     <!-- <Using Include="System.Text.Encoding" Static="true" /> -->
     <Using Include="System.AppContext" Static="true" />
     <Using Include="System.AppDomain" Static="true" />

diff --git a/src/Common/ItemDefinitionGroups.props b/src/Common/ItemDefinitionGroups.props
@@ -56,6 +56,12 @@
       <GeneratePathProperty>true</GeneratePathProperty>
       <IncludeAssets>Build; BuildMultitargeting; BuildTransitive;</IncludeAssets>
       <ExcludeAssets>Compile; Runtime; Analyzers; Native; ContentFiles</ExcludeAssets>
+      <Visible>false</Visible>
     </Usings>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <Using>
+      <Visible>false</Visible>
+    </Using>
+  </ItemDefinitionGroup>
 </Project>
diff --git a/src/Common/PackageReadme.props b/src/Common/PackageReadme.props
@@ -14,7 +14,7 @@
   <PropertyGroup>
     <PackageReadme_props>imported</PackageReadme_props>
     <!-- <DgmjrSdkDll>$(MSBuildThisFileDirectory)/../lib/netstandard2.0/DgmjrSdk.dll</DgmjrSdkDll> -->
-    <PackDependsOn Condition="!$(IsDgmjrSdk)">
+    <PackDependsOn Condition="!($(MSBuildProjectName.StartsWith('DgmjrSdk')) Or $(MSBuildProjectName.StartsWith('Dgmjr.Sdk')))">
       $(PackDependsOn);
       EnsurePackageReadme;
     </PackDependsOn>

diff --git a/src/Dgmjr.NET.Sdk.csproj b/src/Dgmjr.NET.Sdk.csproj
diff --git a/src/DgmjrSdk.Web.csproj b/src/DgmjrSdk.Web.csproj
diff --git a/src/Sdk/Common.props b/src/Sdk/Common.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <IsDgmjrSdk>$(MSBuildProjectName.StartsWith('DgmjrSdk'))</IsDgmjrSdk>
+    <IsDgmjrSdk>($(MSBuildProjectName.StartsWith('DgmjrSdk')) || $(MSBuildProjectName.StartsWith('Dgmjr.Sdk')))</IsDgmjrSdk>
     <UsingDgmjrSdk>true</UsingDgmjrSdk>
-    <DgmjrSdkDll>$(MSBuildThisFileDirectory)../lib/DgmjrSdk.dll</DgmjrSdkDll>
+    <DgmjrSdkDll Condition="'$(MSBuildProjectName)'">$(MSBuildThisFileDirectory)../lib/DgmjrSdk.dll</DgmjrSdkDll>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFrameworks)' != '' and '$(TargetFramework)' == ''">
     <IsCrossTargetingBuild>true</IsCrossTargetingBuild>

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