Merge pull request #82 from LukeOrdelmans/master

bumped net461 to net462, bumped AvalonEdit to 6.3.0 (except for net45)
whistyun · Jan 11, 2024 · d58819c · d58819c
2 parents e65e758 + 8f495e4
commit d58819c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,12 +10,10 @@
     <PackageOutputPath>$(ArtifactsDir)nuget\$(Configuration)\</PackageOutputPath>
   </PropertyGroup>
 
-
-
   <PropertyGroup>
-    <PackageTargetFrameworks>net45;netcoreapp3.0;net6.0-windows</PackageTargetFrameworks>
-    <SampleTargetFrameworks>netcoreapp3.0;net461;net6.0-windows</SampleTargetFrameworks>
-    <TestTargetFrameworks>net461;net6.0-windows</TestTargetFrameworks>
+    <PackageTargetFrameworks>net45;net462;netcoreapp3.0;net6.0-windows</PackageTargetFrameworks>
+    <SampleTargetFrameworks>netcoreapp3.0;net462;net6.0-windows</SampleTargetFrameworks>
+    <TestTargetFrameworks>net462;net6.0-windows</TestTargetFrameworks>
     <PackageVersion>1.23.0</PackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/MdXaml.Html/Core/Parsers/TypicalParseInfo.cs b/MdXaml.Html/Core/Parsers/TypicalParseInfo.cs
@@ -7,7 +7,6 @@
 using System.Reflection;
 using System.Windows;
 using System.Windows.Documents;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace MdXaml.Html.Core.Parsers
 {

diff --git a/MdXaml.Html/MdXaml.Html.csproj b/MdXaml.Html/MdXaml.Html.csproj
@@ -39,7 +39,14 @@
 		<ProjectReference Include="..\..\MdXaml\MdXaml\MdXaml.csproj" />
 		<ProjectReference Include="..\MdXaml.Plugins\MdXaml.Plugins.csproj" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
-    <PackageReference Include="AvalonEdit" Version="6.0.0" />
   </ItemGroup>
 
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+		<PackageReference Include="AvalonEdit" Version="6.0.0" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' != 'net45' ">
+		<PackageReference Include="AvalonEdit" Version="6.3.0" />
+	</ItemGroup>
+
 </Project>
diff --git a/MdXaml/MdXaml.csproj b/MdXaml/MdXaml.csproj
@@ -32,14 +32,18 @@
     <Page Remove="MarkdownMigFree.Style.xaml" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net462'">
     <Reference Include="System.Net.Http" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <PackageReference Include="AvalonEdit" Version="6.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net45' ">
+    <PackageReference Include="AvalonEdit" Version="6.3.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\MdXaml.Plugins\MdXaml.Plugins.csproj" />
   </ItemGroup>