From 851b0b613e0e39492e03fb28a012da5d6c1f652a Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Fri, 30 Dec 2022 22:01:44 +0100 Subject: [PATCH] (#63) Shared: extract everything that's possible for clean compilation --- .../Build/IsExternalInit.cs | 0 {src/WpfMath => WpfMath.Shared}/CharFont.cs | 0 .../Data/DefaultTexFont.xml | 0 .../Data/GlueSettings.xml | 0 .../Data/PredefinedColors.xml | 4 ++-- .../Data/PredefinedTexFormulas.xml | 0 .../Data/TexFormulaSettings.xml | 0 .../Data/TexSymbols.xml | 0 .../DelimiterMappingNotFoundException.cs | 0 .../TexCharacterMappingNotFoundException.cs | 0 .../Exceptions/TexException.cs | 0 .../Exceptions/TexNotSupportedException.cs | 0 .../Exceptions/TexParseException.cs | 0 .../TextStyleMappingNotFoundException.cs | 0 .../Exceptions/TypeFaceNotFoundException.cs | 0 .../Fonts/cmex10.ttf | Bin .../Fonts/cmmi10.ttf | Bin .../Fonts/cmr10.ttf | Bin .../Fonts/cmsy10.ttf | Bin .../FormulaNotFoundException.cs | 0 .../Parsers/AtomAppendMode.cs | 0 .../Transformations/Transformation.cs | 0 .../Transformations/TransformationKind.cs | 0 {src/WpfMath => WpfMath.Shared}/SourceSpan.cs | 0 .../SymbolMappingNotFoundException.cs | 0 .../SymbolNotFoundException.cs | 0 {src/WpfMath => WpfMath.Shared}/TexEnums.cs | 0 .../TexFontMetrics.cs | 0 .../TexFontUtilities.cs | 0 .../TexUtilities.cs | 0 .../Utils/Result.cs | 0 .../Utils/TupleExtensions.cs | 2 -- WpfMath.Shared/WpfMath.Shared.csproj | 21 ++++++++++++++++++ .../XmlUtilities.cs | 0 src/WpfMath/WpfMath.csproj | 11 ++++----- 35 files changed, 27 insertions(+), 11 deletions(-) rename {src/WpfMath => WpfMath.Shared}/Build/IsExternalInit.cs (100%) rename {src/WpfMath => WpfMath.Shared}/CharFont.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Data/DefaultTexFont.xml (100%) rename {src/WpfMath => WpfMath.Shared}/Data/GlueSettings.xml (100%) rename {src/WpfMath => WpfMath.Shared}/Data/PredefinedColors.xml (96%) rename {src/WpfMath => WpfMath.Shared}/Data/PredefinedTexFormulas.xml (100%) rename {src/WpfMath => WpfMath.Shared}/Data/TexFormulaSettings.xml (100%) rename {src/WpfMath => WpfMath.Shared}/Data/TexSymbols.xml (100%) rename {src/WpfMath => WpfMath.Shared}/DelimiterMappingNotFoundException.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Exceptions/TexCharacterMappingNotFoundException.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Exceptions/TexException.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Exceptions/TexNotSupportedException.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Exceptions/TexParseException.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Exceptions/TextStyleMappingNotFoundException.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Exceptions/TypeFaceNotFoundException.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Fonts/cmex10.ttf (100%) rename {src/WpfMath => WpfMath.Shared}/Fonts/cmmi10.ttf (100%) rename {src/WpfMath => WpfMath.Shared}/Fonts/cmr10.ttf (100%) rename {src/WpfMath => WpfMath.Shared}/Fonts/cmsy10.ttf (100%) rename {src/WpfMath => WpfMath.Shared}/FormulaNotFoundException.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Parsers/AtomAppendMode.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Rendering/Transformations/Transformation.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Rendering/Transformations/TransformationKind.cs (100%) rename {src/WpfMath => WpfMath.Shared}/SourceSpan.cs (100%) rename {src/WpfMath => WpfMath.Shared}/SymbolMappingNotFoundException.cs (100%) rename {src/WpfMath => WpfMath.Shared}/SymbolNotFoundException.cs (100%) rename {src/WpfMath => WpfMath.Shared}/TexEnums.cs (100%) rename {src/WpfMath => WpfMath.Shared}/TexFontMetrics.cs (100%) rename {src/WpfMath => WpfMath.Shared}/TexFontUtilities.cs (100%) rename {src/WpfMath => WpfMath.Shared}/TexUtilities.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Utils/Result.cs (100%) rename {src/WpfMath => WpfMath.Shared}/Utils/TupleExtensions.cs (95%) rename {src/WpfMath => WpfMath.Shared}/XmlUtilities.cs (100%) diff --git a/src/WpfMath/Build/IsExternalInit.cs b/WpfMath.Shared/Build/IsExternalInit.cs similarity index 100% rename from src/WpfMath/Build/IsExternalInit.cs rename to WpfMath.Shared/Build/IsExternalInit.cs diff --git a/src/WpfMath/CharFont.cs b/WpfMath.Shared/CharFont.cs similarity index 100% rename from src/WpfMath/CharFont.cs rename to WpfMath.Shared/CharFont.cs diff --git a/src/WpfMath/Data/DefaultTexFont.xml b/WpfMath.Shared/Data/DefaultTexFont.xml similarity index 100% rename from src/WpfMath/Data/DefaultTexFont.xml rename to WpfMath.Shared/Data/DefaultTexFont.xml diff --git a/src/WpfMath/Data/GlueSettings.xml b/WpfMath.Shared/Data/GlueSettings.xml similarity index 100% rename from src/WpfMath/Data/GlueSettings.xml rename to WpfMath.Shared/Data/GlueSettings.xml diff --git a/src/WpfMath/Data/PredefinedColors.xml b/WpfMath.Shared/Data/PredefinedColors.xml similarity index 96% rename from src/WpfMath/Data/PredefinedColors.xml rename to WpfMath.Shared/Data/PredefinedColors.xml index d1e20524..dd7dc479 100644 --- a/src/WpfMath/Data/PredefinedColors.xml +++ b/WpfMath.Shared/Data/PredefinedColors.xml @@ -1,5 +1,5 @@ - + @@ -68,4 +68,4 @@ - \ No newline at end of file + diff --git a/src/WpfMath/Data/PredefinedTexFormulas.xml b/WpfMath.Shared/Data/PredefinedTexFormulas.xml similarity index 100% rename from src/WpfMath/Data/PredefinedTexFormulas.xml rename to WpfMath.Shared/Data/PredefinedTexFormulas.xml diff --git a/src/WpfMath/Data/TexFormulaSettings.xml b/WpfMath.Shared/Data/TexFormulaSettings.xml similarity index 100% rename from src/WpfMath/Data/TexFormulaSettings.xml rename to WpfMath.Shared/Data/TexFormulaSettings.xml diff --git a/src/WpfMath/Data/TexSymbols.xml b/WpfMath.Shared/Data/TexSymbols.xml similarity index 100% rename from src/WpfMath/Data/TexSymbols.xml rename to WpfMath.Shared/Data/TexSymbols.xml diff --git a/src/WpfMath/DelimiterMappingNotFoundException.cs b/WpfMath.Shared/DelimiterMappingNotFoundException.cs similarity index 100% rename from src/WpfMath/DelimiterMappingNotFoundException.cs rename to WpfMath.Shared/DelimiterMappingNotFoundException.cs diff --git a/src/WpfMath/Exceptions/TexCharacterMappingNotFoundException.cs b/WpfMath.Shared/Exceptions/TexCharacterMappingNotFoundException.cs similarity index 100% rename from src/WpfMath/Exceptions/TexCharacterMappingNotFoundException.cs rename to WpfMath.Shared/Exceptions/TexCharacterMappingNotFoundException.cs diff --git a/src/WpfMath/Exceptions/TexException.cs b/WpfMath.Shared/Exceptions/TexException.cs similarity index 100% rename from src/WpfMath/Exceptions/TexException.cs rename to WpfMath.Shared/Exceptions/TexException.cs diff --git a/src/WpfMath/Exceptions/TexNotSupportedException.cs b/WpfMath.Shared/Exceptions/TexNotSupportedException.cs similarity index 100% rename from src/WpfMath/Exceptions/TexNotSupportedException.cs rename to WpfMath.Shared/Exceptions/TexNotSupportedException.cs diff --git a/src/WpfMath/Exceptions/TexParseException.cs b/WpfMath.Shared/Exceptions/TexParseException.cs similarity index 100% rename from src/WpfMath/Exceptions/TexParseException.cs rename to WpfMath.Shared/Exceptions/TexParseException.cs diff --git a/src/WpfMath/Exceptions/TextStyleMappingNotFoundException.cs b/WpfMath.Shared/Exceptions/TextStyleMappingNotFoundException.cs similarity index 100% rename from src/WpfMath/Exceptions/TextStyleMappingNotFoundException.cs rename to WpfMath.Shared/Exceptions/TextStyleMappingNotFoundException.cs diff --git a/src/WpfMath/Exceptions/TypeFaceNotFoundException.cs b/WpfMath.Shared/Exceptions/TypeFaceNotFoundException.cs similarity index 100% rename from src/WpfMath/Exceptions/TypeFaceNotFoundException.cs rename to WpfMath.Shared/Exceptions/TypeFaceNotFoundException.cs diff --git a/src/WpfMath/Fonts/cmex10.ttf b/WpfMath.Shared/Fonts/cmex10.ttf similarity index 100% rename from src/WpfMath/Fonts/cmex10.ttf rename to WpfMath.Shared/Fonts/cmex10.ttf diff --git a/src/WpfMath/Fonts/cmmi10.ttf b/WpfMath.Shared/Fonts/cmmi10.ttf similarity index 100% rename from src/WpfMath/Fonts/cmmi10.ttf rename to WpfMath.Shared/Fonts/cmmi10.ttf diff --git a/src/WpfMath/Fonts/cmr10.ttf b/WpfMath.Shared/Fonts/cmr10.ttf similarity index 100% rename from src/WpfMath/Fonts/cmr10.ttf rename to WpfMath.Shared/Fonts/cmr10.ttf diff --git a/src/WpfMath/Fonts/cmsy10.ttf b/WpfMath.Shared/Fonts/cmsy10.ttf similarity index 100% rename from src/WpfMath/Fonts/cmsy10.ttf rename to WpfMath.Shared/Fonts/cmsy10.ttf diff --git a/src/WpfMath/FormulaNotFoundException.cs b/WpfMath.Shared/FormulaNotFoundException.cs similarity index 100% rename from src/WpfMath/FormulaNotFoundException.cs rename to WpfMath.Shared/FormulaNotFoundException.cs diff --git a/src/WpfMath/Parsers/AtomAppendMode.cs b/WpfMath.Shared/Parsers/AtomAppendMode.cs similarity index 100% rename from src/WpfMath/Parsers/AtomAppendMode.cs rename to WpfMath.Shared/Parsers/AtomAppendMode.cs diff --git a/src/WpfMath/Rendering/Transformations/Transformation.cs b/WpfMath.Shared/Rendering/Transformations/Transformation.cs similarity index 100% rename from src/WpfMath/Rendering/Transformations/Transformation.cs rename to WpfMath.Shared/Rendering/Transformations/Transformation.cs diff --git a/src/WpfMath/Rendering/Transformations/TransformationKind.cs b/WpfMath.Shared/Rendering/Transformations/TransformationKind.cs similarity index 100% rename from src/WpfMath/Rendering/Transformations/TransformationKind.cs rename to WpfMath.Shared/Rendering/Transformations/TransformationKind.cs diff --git a/src/WpfMath/SourceSpan.cs b/WpfMath.Shared/SourceSpan.cs similarity index 100% rename from src/WpfMath/SourceSpan.cs rename to WpfMath.Shared/SourceSpan.cs diff --git a/src/WpfMath/SymbolMappingNotFoundException.cs b/WpfMath.Shared/SymbolMappingNotFoundException.cs similarity index 100% rename from src/WpfMath/SymbolMappingNotFoundException.cs rename to WpfMath.Shared/SymbolMappingNotFoundException.cs diff --git a/src/WpfMath/SymbolNotFoundException.cs b/WpfMath.Shared/SymbolNotFoundException.cs similarity index 100% rename from src/WpfMath/SymbolNotFoundException.cs rename to WpfMath.Shared/SymbolNotFoundException.cs diff --git a/src/WpfMath/TexEnums.cs b/WpfMath.Shared/TexEnums.cs similarity index 100% rename from src/WpfMath/TexEnums.cs rename to WpfMath.Shared/TexEnums.cs diff --git a/src/WpfMath/TexFontMetrics.cs b/WpfMath.Shared/TexFontMetrics.cs similarity index 100% rename from src/WpfMath/TexFontMetrics.cs rename to WpfMath.Shared/TexFontMetrics.cs diff --git a/src/WpfMath/TexFontUtilities.cs b/WpfMath.Shared/TexFontUtilities.cs similarity index 100% rename from src/WpfMath/TexFontUtilities.cs rename to WpfMath.Shared/TexFontUtilities.cs diff --git a/src/WpfMath/TexUtilities.cs b/WpfMath.Shared/TexUtilities.cs similarity index 100% rename from src/WpfMath/TexUtilities.cs rename to WpfMath.Shared/TexUtilities.cs diff --git a/src/WpfMath/Utils/Result.cs b/WpfMath.Shared/Utils/Result.cs similarity index 100% rename from src/WpfMath/Utils/Result.cs rename to WpfMath.Shared/Utils/Result.cs diff --git a/src/WpfMath/Utils/TupleExtensions.cs b/WpfMath.Shared/Utils/TupleExtensions.cs similarity index 95% rename from src/WpfMath/Utils/TupleExtensions.cs rename to WpfMath.Shared/Utils/TupleExtensions.cs index c5e2ae1a..46e7881e 100644 --- a/src/WpfMath/Utils/TupleExtensions.cs +++ b/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 index ff7e7c4f..c1b0180a 100644 --- a/WpfMath.Shared/WpfMath.Shared.csproj +++ b/WpfMath.Shared/WpfMath.Shared.csproj @@ -5,4 +5,25 @@ WpfMath + + + + + + + + + + + + + + + + + + + + + diff --git a/src/WpfMath/XmlUtilities.cs b/WpfMath.Shared/XmlUtilities.cs similarity index 100% rename from src/WpfMath/XmlUtilities.cs rename to WpfMath.Shared/XmlUtilities.cs diff --git a/src/WpfMath/WpfMath.csproj b/src/WpfMath/WpfMath.csproj index e1d119af..f8a13c76 100644 --- a/src/WpfMath/WpfMath.csproj +++ b/src/WpfMath/WpfMath.csproj @@ -1,4 +1,5 @@ + netcoreapp3.1;net452 true @@ -36,17 +37,13 @@ Fixed: - - - - - + - + - +