Making these files SDK-neutral

dgmjr-io · Jun 10, 2024 · c936f30 · c936f30
1 parent 742f603
commit c936f30
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.frontmatter/database/mediaDb.json b/.frontmatter/database/mediaDb.json
@@ -1 +1 @@
-{}
+{"users":{"justin":{"github":{"bots":{"whatruin2v3bot":{"whatruin2v3bot":{}}}}}}}
diff --git a/src/Common/DgmjrSdkDll.props b/src/Common/DgmjrSdkDll.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
-        <IsDgmjrSdk>$(MSBuildProjectName.Equals('DgmjrSdk'))</IsDgmjrSdk>
-        <DgmjrSdkDll Condition="$(IsDgmjrSdk)">$(MSBuildThisFileDirectory)../bin/DgmjrSdk.dll</DgmjrSdkDll>
-        <DgmjrSdkDll Condition="!$(IsDgmjrSdk)">$(MSBuildThisFileDirectory)../lib/DgmjrSdk.dll</DgmjrSdkDll>
+        <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>
     </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)' != 'DgmjrSdk'">
+    <PackDependsOn Condition="!$(MSBuildProjectName.StartsWith('DgmjrSdk'))">
       $(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)' != 'DgmjrSdk' And '$(MSBuildProjectExtension)' == '.csproj'" />
+    <Compile Include="$(MSBuildThisFileDirectory)GlobalUsings.cs" Condition="!$(MSBuildProjectName.StartsWith('DgmjrSdk')) And '$(MSBuildProjectExtension)' == '.csproj'" />
   </ItemGroup>
-  <ItemGroup Condition="'$(MSBuildProjectName)' != 'Dgmjr.NET.Sdk' And '$(MSBuildProjectExtension)' == '.csproj' And @(Compile->Count()) &gt; 0">
+  <ItemGroup Condition="!$(MSBuildProjectName.StartsWith('DgmjrSdk')) 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" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{}
		{"users":{"justin":{"github":{"bots":{"whatruin2v3bot":{"whatruin2v3bot":{}}}}}}}