diff --git a/build/props/Base.props b/build/props/Base.props index 5a816123..8ef4341b 100644 --- a/build/props/Base.props +++ b/build/props/Base.props @@ -4,7 +4,7 @@ <StudioVersion>0.21.0.0</StudioVersion> <CoreVersion>0.31.0.0</CoreVersion> <UniversalFpgaProjectSystemVersion>0.41.0.0</UniversalFpgaProjectSystemVersion> - <EssentialsVersion>0.11.1.0</EssentialsVersion> + <EssentialsVersion>0.11.0.0</EssentialsVersion> <Version>$(CoreVersion)</Version> <Authors>Hendrik Mennen</Authors> <Company>One Ware</Company> diff --git a/src/OneWare.Core/OneWare.Core.csproj b/src/OneWare.Core/OneWare.Core.csproj index a7c5306a..23c2da00 100644 --- a/src/OneWare.Core/OneWare.Core.csproj +++ b/src/OneWare.Core/OneWare.Core.csproj @@ -5,6 +5,7 @@ <Import Project="..\..\build\props\Avalonia.Diagnostics.props"/> <Import Project="..\..\build\props\RestSharp.props"/> <Import Project="..\..\build\props\SharpCompress.props"/> + <Import Project="..\..\build\props\Markdown.Avalonia.props"/> <ItemGroup> <AvaloniaResource Include="Assets\**\*.*"/> diff --git a/src/OneWare.Essentials/OneWare.Essentials.csproj b/src/OneWare.Essentials/OneWare.Essentials.csproj index fa68f9c5..22d6c227 100644 --- a/src/OneWare.Essentials/OneWare.Essentials.csproj +++ b/src/OneWare.Essentials/OneWare.Essentials.csproj @@ -20,7 +20,6 @@ <Import Project="..\..\build\props\Jint.props"/> <Import Project="..\..\build\props\CommunityToolkit.Mvvm.props"/> <Import Project="..\..\build\props\Asmichi.ChildProcess.props"/> - <Import Project="..\..\build\props\Markdown.Avalonia.props"/> <PropertyGroup> <Description>Essentials Needed for One Ware Plugin Development</Description> diff --git a/src/OneWare.Essentials/PackageManager/Compatibility/PluginCompatibilityChecker.cs b/src/OneWare.Essentials/PackageManager/Compatibility/PluginCompatibilityChecker.cs index ea4b119c..b36d2f4c 100644 --- a/src/OneWare.Essentials/PackageManager/Compatibility/PluginCompatibilityChecker.cs +++ b/src/OneWare.Essentials/PackageManager/Compatibility/PluginCompatibilityChecker.cs @@ -43,6 +43,9 @@ public static CompatibilityReport CheckCompatibility(string? deps) var versionString = parts[1].Trim(); var dependencyVersion = Version.Parse(NormalizeVersion(versionString)); + if(dependencyName is "OneWare.Markdown.Avalonia.Tight") dependencyName = "Markdown.Avalonia"; + if(dependencyName is "OneWare.Markdown.Avalonia.SyntaxHigh") dependencyName = "Markdown.Avalonia.SyntaxHigh"; + var assemblies = AppDomain.CurrentDomain.GetAssemblies(); var test = assemblies.SingleOrDefault(x => x.GetName().Name == "Markdown.Avalonia"); diff --git a/src/OneWare.PackageManager/OneWare.PackageManager.csproj b/src/OneWare.PackageManager/OneWare.PackageManager.csproj index f33ff318..091fee24 100644 --- a/src/OneWare.PackageManager/OneWare.PackageManager.csproj +++ b/src/OneWare.PackageManager/OneWare.PackageManager.csproj @@ -1,6 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="..\..\build\props\Base.props"/> <Import Project="..\..\build\props\OneWare.Module.props"/> + <Import Project="..\..\build\props\Markdown.Avalonia.props"/> <ItemGroup> <ProjectReference Include="..\OneWare.Essentials\OneWare.Essentials.csproj"/> diff --git a/src/OneWare.Updater/OneWare.Updater.csproj b/src/OneWare.Updater/OneWare.Updater.csproj index 03563797..79ac2d98 100644 --- a/src/OneWare.Updater/OneWare.Updater.csproj +++ b/src/OneWare.Updater/OneWare.Updater.csproj @@ -1,6 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="..\..\build\props\Base.props"/> <Import Project="..\..\build\props\OneWare.Module.props"/> + <Import Project="..\..\build\props\Markdown.Avalonia.props"/> <ItemGroup> <ProjectReference Include="..\OneWare.Essentials\OneWare.Essentials.csproj"/>