Removed direct dependencies to assemblies by linking helper classes

HerrKnarz · Mar 21, 2023 · fe51c13 · fe51c13
1 parent 063b16e
commit fe51c13
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 26 deletions.
diff --git a/Generic/CompanyCompanion/CompanyCompanion.csproj b/Generic/CompanyCompanion/CompanyCompanion.csproj
@@ -45,6 +45,12 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Common\KNARZhelper\Log.cs">
+      <Link>Shared\Log.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Common\KNARZhelper\StringHelper.cs">
+      <Link>Shared\StringHelper.cs</Link>
+    </Compile>
     <Compile Include="CompanyCompanion.cs" />
     <Compile Include="CompanyCompanionSettings.cs" />
     <Compile Include="ViewModels\GameList.cs" />
@@ -231,12 +237,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Common\KNARZhelper\KNARZhelper.csproj">
-      <Project>{e3e24870-27f7-400e-b411-47acd9c8b562}</Project>
-      <Name>KNARZhelper</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="PlayniteSDK">
       <Version>6.8.0</Version>

diff --git a/Generic/KNARZtools/KNARZtools.csproj b/Generic/KNARZtools/KNARZtools.csproj
@@ -45,6 +45,12 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Common\KNARZhelper\Log.cs">
+      <Link>Log.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Common\KNARZhelper\StringHelper.cs">
+      <Link>StringHelper.cs</Link>
+    </Compile>
     <Compile Include="KNARZtools.cs" />
     <Compile Include="KNARZtoolsSettings.cs" />
     <Compile Include="KNARZtoolsSettingsView.xaml.cs">
@@ -77,12 +83,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Common\KNARZhelper\KNARZhelper.csproj">
-      <Project>{e3e24870-27f7-400e-b411-47acd9c8b562}</Project>
-      <Name>KNARZhelper</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="PlayniteSDK">
       <Version>6.8.0</Version>

diff --git a/Generic/LinkUtilities/LinkUtilities.csproj b/Generic/LinkUtilities/LinkUtilities.csproj
@@ -50,6 +50,15 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Common\KNARZhelper\Log.cs">
+      <Link>Shared\Log.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Common\KNARZhelper\MiscHelper.cs">
+      <Link>Shared\MiscHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Common\KNARZhelper\StringHelper.cs">
+      <Link>Shared\StringHelper.cs</Link>
+    </Compile>
     <Compile Include="Helper\ParseHelper.cs" />
     <Compile Include="LinkActions\DoAfterChange.cs" />
     <Compile Include="LinkActions\RemoveDuplicates.cs" />
@@ -309,11 +318,6 @@
       <Version>6.8.0</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Common\KNARZhelper\KNARZhelper.csproj">
-      <Project>{e3e24870-27f7-400e-b411-47acd9c8b562}</Project>
-      <Name>KNARZhelper</Name>
-    </ProjectReference>
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Metadata/WikipediaMetadata/HtmlParser.cs b/Metadata/WikipediaMetadata/HtmlParser.cs
@@ -13,7 +13,7 @@ namespace WikipediaMetadata
     /// <summary>
     /// Parser for the html code of a wikipedia page fetched by the rest api, to get the description and additional links.
     /// </summary>
-    public class HtmlParser
+    internal class HtmlParser
     {
         private readonly PluginSettings _settings;
 

diff --git a/Metadata/WikipediaMetadata/Properties/AssemblyInfo.cs b/Metadata/WikipediaMetadata/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
@@ -32,4 +33,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]
+
+[assembly: InternalsVisibleTo("WikipediaMetadata.Test")]
diff --git a/Metadata/WikipediaMetadata/WikipediaMetadata.csproj b/Metadata/WikipediaMetadata/WikipediaMetadata.csproj
@@ -45,6 +45,18 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\Common\KNARZhelper\Log.cs">
+      <Link>Shared\Log.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Common\KNARZhelper\MiscHelper.cs">
+      <Link>Shared\MiscHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Common\KNARZhelper\PlatformHelper.cs">
+      <Link>Shared\PlatformHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Common\KNARZhelper\StringHelper.cs">
+      <Link>Shared\StringHelper.cs</Link>
+    </Compile>
     <Compile Include="GameFinder.cs" />
     <Compile Include="Models\PluginSettings.cs" />
     <Compile Include="Models\TagSetting.cs" />
@@ -352,11 +364,5 @@
       <Version>6.8.0</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Common\KNARZhelper\KNARZhelper.csproj">
-      <Project>{E3E24870-27F7-400E-B411-47ACD9C8B562}</Project>
-      <Name>KNARZhelper</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>