(#63) Shared: extract everything that's possible for clean compilation

ForNeVeR · Dec 31, 2022 · 851b0b6 · 851b0b6
1 parent 1ab24f2
commit 851b0b6
Show file tree

Hide file tree

Showing 35 changed files with 27 additions and 11 deletions.
diff --git a/src/WpfMath/Build/IsExternalInit.cs → WpfMath.Shared/Build/IsExternalInit.cs b/src/WpfMath/Build/IsExternalInit.cs → WpfMath.Shared/Build/IsExternalInit.cs
diff --git a/src/WpfMath/CharFont.cs → WpfMath.Shared/CharFont.cs b/src/WpfMath/CharFont.cs → WpfMath.Shared/CharFont.cs
diff --git a/src/WpfMath/Data/DefaultTexFont.xml → WpfMath.Shared/Data/DefaultTexFont.xml b/src/WpfMath/Data/DefaultTexFont.xml → WpfMath.Shared/Data/DefaultTexFont.xml
diff --git a/src/WpfMath/Data/GlueSettings.xml → WpfMath.Shared/Data/GlueSettings.xml b/src/WpfMath/Data/GlueSettings.xml → WpfMath.Shared/Data/GlueSettings.xml
diff --git a/src/WpfMath/Data/PredefinedColors.xml → WpfMath.Shared/Data/PredefinedColors.xml b/src/WpfMath/Data/PredefinedColors.xml → WpfMath.Shared/Data/PredefinedColors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<PredefinedColors xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<PredefinedColors>
   <color r="251" g="185" b="130" name="apricot" />
   <color r="0" g="181" b="190" name="aquamarine" />
   <color r="192" g="79" b="23" name="bittersweet" />
@@ -68,4 +68,4 @@
   <color r="255" g="242" b="0" name="yellow" />
   <color r="152" g="204" b="112" name="yellowgreen" />
   <color r="250" g="162" b="26" name="yelloworange" />
-</PredefinedColors>
+</PredefinedColors>
diff --git a/src/WpfMath/Data/PredefinedTexFormulas.xml → ...ath.Shared/Data/PredefinedTexFormulas.xml b/src/WpfMath/Data/PredefinedTexFormulas.xml → ...ath.Shared/Data/PredefinedTexFormulas.xml
diff --git a/src/WpfMath/Data/TexFormulaSettings.xml → WpfMath.Shared/Data/TexFormulaSettings.xml b/src/WpfMath/Data/TexFormulaSettings.xml → WpfMath.Shared/Data/TexFormulaSettings.xml
diff --git a/src/WpfMath/Data/TexSymbols.xml → WpfMath.Shared/Data/TexSymbols.xml b/src/WpfMath/Data/TexSymbols.xml → WpfMath.Shared/Data/TexSymbols.xml
diff --git a/...Math/DelimiterMappingNotFoundException.cs → ...ared/DelimiterMappingNotFoundException.cs b/...Math/DelimiterMappingNotFoundException.cs → ...ared/DelimiterMappingNotFoundException.cs
diff --git a/...s/TexCharacterMappingNotFoundException.cs → ...s/TexCharacterMappingNotFoundException.cs b/...s/TexCharacterMappingNotFoundException.cs → ...s/TexCharacterMappingNotFoundException.cs
diff --git a/src/WpfMath/Exceptions/TexException.cs → WpfMath.Shared/Exceptions/TexException.cs b/src/WpfMath/Exceptions/TexException.cs → WpfMath.Shared/Exceptions/TexException.cs
diff --git a/...th/Exceptions/TexNotSupportedException.cs → ...ed/Exceptions/TexNotSupportedException.cs b/...th/Exceptions/TexNotSupportedException.cs → ...ed/Exceptions/TexNotSupportedException.cs
diff --git a/src/WpfMath/Exceptions/TexParseException.cs → ...th.Shared/Exceptions/TexParseException.cs b/src/WpfMath/Exceptions/TexParseException.cs → ...th.Shared/Exceptions/TexParseException.cs
diff --git a/...ions/TextStyleMappingNotFoundException.cs → ...ions/TextStyleMappingNotFoundException.cs b/...ions/TextStyleMappingNotFoundException.cs → ...ions/TextStyleMappingNotFoundException.cs
diff --git a/...h/Exceptions/TypeFaceNotFoundException.cs → ...d/Exceptions/TypeFaceNotFoundException.cs b/...h/Exceptions/TypeFaceNotFoundException.cs → ...d/Exceptions/TypeFaceNotFoundException.cs
diff --git a/src/WpfMath/Fonts/cmex10.ttf → WpfMath.Shared/Fonts/cmex10.ttf b/src/WpfMath/Fonts/cmex10.ttf → WpfMath.Shared/Fonts/cmex10.ttf
diff --git a/src/WpfMath/Fonts/cmmi10.ttf → WpfMath.Shared/Fonts/cmmi10.ttf b/src/WpfMath/Fonts/cmmi10.ttf → WpfMath.Shared/Fonts/cmmi10.ttf
diff --git a/src/WpfMath/Fonts/cmr10.ttf → WpfMath.Shared/Fonts/cmr10.ttf b/src/WpfMath/Fonts/cmr10.ttf → WpfMath.Shared/Fonts/cmr10.ttf
diff --git a/src/WpfMath/Fonts/cmsy10.ttf → WpfMath.Shared/Fonts/cmsy10.ttf b/src/WpfMath/Fonts/cmsy10.ttf → WpfMath.Shared/Fonts/cmsy10.ttf
diff --git a/src/WpfMath/FormulaNotFoundException.cs → WpfMath.Shared/FormulaNotFoundException.cs b/src/WpfMath/FormulaNotFoundException.cs → WpfMath.Shared/FormulaNotFoundException.cs
diff --git a/src/WpfMath/Parsers/AtomAppendMode.cs → WpfMath.Shared/Parsers/AtomAppendMode.cs b/src/WpfMath/Parsers/AtomAppendMode.cs → WpfMath.Shared/Parsers/AtomAppendMode.cs
diff --git a/...ndering/Transformations/Transformation.cs → ...ndering/Transformations/Transformation.cs b/...ndering/Transformations/Transformation.cs → ...ndering/Transformations/Transformation.cs
diff --git a/...ing/Transformations/TransformationKind.cs → ...ing/Transformations/TransformationKind.cs b/...ing/Transformations/TransformationKind.cs → ...ing/Transformations/TransformationKind.cs
diff --git a/src/WpfMath/SourceSpan.cs → WpfMath.Shared/SourceSpan.cs b/src/WpfMath/SourceSpan.cs → WpfMath.Shared/SourceSpan.cs
diff --git a/...WpfMath/SymbolMappingNotFoundException.cs → ....Shared/SymbolMappingNotFoundException.cs b/...WpfMath/SymbolMappingNotFoundException.cs → ....Shared/SymbolMappingNotFoundException.cs
diff --git a/src/WpfMath/SymbolNotFoundException.cs → WpfMath.Shared/SymbolNotFoundException.cs b/src/WpfMath/SymbolNotFoundException.cs → WpfMath.Shared/SymbolNotFoundException.cs
diff --git a/src/WpfMath/TexEnums.cs → WpfMath.Shared/TexEnums.cs b/src/WpfMath/TexEnums.cs → WpfMath.Shared/TexEnums.cs
diff --git a/src/WpfMath/TexFontMetrics.cs → WpfMath.Shared/TexFontMetrics.cs b/src/WpfMath/TexFontMetrics.cs → WpfMath.Shared/TexFontMetrics.cs
diff --git a/src/WpfMath/TexFontUtilities.cs → WpfMath.Shared/TexFontUtilities.cs b/src/WpfMath/TexFontUtilities.cs → WpfMath.Shared/TexFontUtilities.cs
diff --git a/src/WpfMath/TexUtilities.cs → WpfMath.Shared/TexUtilities.cs b/src/WpfMath/TexUtilities.cs → WpfMath.Shared/TexUtilities.cs
diff --git a/src/WpfMath/Utils/Result.cs → WpfMath.Shared/Utils/Result.cs b/src/WpfMath/Utils/Result.cs → WpfMath.Shared/Utils/Result.cs
diff --git a/src/WpfMath/Utils/TupleExtensions.cs → WpfMath.Shared/Utils/TupleExtensions.cs b/src/WpfMath/Utils/TupleExtensions.cs → WpfMath.Shared/Utils/TupleExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace WpfMath.Utils
 {
 #if NET452 // not needed for .NET Core 3.0+ because there're System.TupleExtensions

diff --git a/WpfMath.Shared/WpfMath.Shared.csproj b/WpfMath.Shared/WpfMath.Shared.csproj
@@ -5,4 +5,25 @@
         <RootNamespace>WpfMath</RootNamespace>
     </PropertyGroup>
 
+    <ItemGroup>
+      <EmbeddedResource Include="Data\DefaultTexFont.xml" />
+      <EmbeddedResource Include="Data\GlueSettings.xml" />
+      <EmbeddedResource Include="Data\PredefinedColors.xml" />
+      <EmbeddedResource Include="Data\PredefinedTexFormulas.xml" />
+      <EmbeddedResource Include="Data\TexFormulaSettings.xml" />
+      <EmbeddedResource Include="Data\TexSymbols.xml" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Resource Include="Fonts\cmex10.ttf" />
+      <Resource Include="Fonts\cmmi10.ttf" />
+      <Resource Include="Fonts\cmr10.ttf" />
+      <Resource Include="Fonts\cmsy10.ttf" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <InternalsVisibleTo Include="WpfMath" />
+        <InternalsVisibleTo Include="WpfMath.Tests" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/WpfMath/XmlUtilities.cs → WpfMath.Shared/XmlUtilities.cs b/src/WpfMath/XmlUtilities.cs → WpfMath.Shared/XmlUtilities.cs
diff --git a/src/WpfMath/WpfMath.csproj b/src/WpfMath/WpfMath.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
     <PropertyGroup>
         <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
         <UseWpf>true</UseWpf>
@@ -36,17 +37,13 @@ Fixed:
     </PropertyGroup>
 
     <ItemGroup>
-        <EmbeddedResource Include="Data/*" />
-        <Resource Include="Fonts\cmex10.ttf" />
-        <Resource Include="Fonts\cmmi10.ttf" />
-        <Resource Include="Fonts\cmr10.ttf" />
-        <Resource Include="Fonts\cmsy10.ttf" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+        <ProjectReference Include="..\..\WpfMath.Shared\WpfMath.Shared.csproj" />
     </ItemGroup>
-
+    
     <ItemGroup>
         <InternalsVisibleTo Include="$(AssemblyName).Tests" />
     </ItemGroup>