Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial conversion to Net 8.0 #9504

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion APSIM.Cli/APSIM.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<BaseOutputPath>../bin</BaseOutputPath>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsNotAsErrors>NU1902;NU1903</WarningsNotAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion APSIM.Documentation/APSIM.Documentation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<BaseOutputPath>../bin</BaseOutputPath>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsNotAsErrors>NU1902;NU1903</WarningsNotAsErrors>
Expand Down
22 changes: 11 additions & 11 deletions APSIM.Interop/APSIM.Interop.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<BaseOutputPath>../bin</BaseOutputPath>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsNotAsErrors>NU1902;NU1903</WarningsNotAsErrors>
Expand All @@ -16,20 +16,20 @@
<ProjectReference Include="../APSIM.Shared/APSIM.Shared.csproj" />
<ProjectReference Include="../Models/Models.csproj" />
<PackageReference Include="CairoSharp" Version="3.24.24.38" />
<PackageReference Include="Mapsui" Version="4.1.7" />
<PackageReference Include="Mapsui.Nts" Version="4.1.7" />
<PackageReference Include="Mapsui.Rendering.Skia" Version="4.1.7" />
<PackageReference Include="Mapsui.Tiling" Version="4.1.7" />
<PackageReference Include="Markdig" Version="0.31.0" />
<PackageReference Include="Mapsui" Version="4.1.8" />
<PackageReference Include="Mapsui.Nts" Version="4.1.8" />
<PackageReference Include="Mapsui.Rendering.Skia" Version="4.1.8" />
<PackageReference Include="Mapsui.Tiling" Version="4.1.8" />
<PackageReference Include="Markdig" Version="0.38.0" />
<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
<PackageReference Include="ProjNET4GeoAPI" Version="1.4.1" />
<EmbeddedResource Include="Resources\**" />
<PackageReference Include="SkiaSharp" Version="2.88.8" />
<PackageReference Include="SkiaSharp" Version="2.88.9" />
<None Remove="Resources\Images\Swim-layers.png" />
<PackageReference Include="OxyPlot.Core" Version="2.1.2" />
<PackageReference Include="OxyPlot.SkiaSharp" Version="2.1.2" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2.3" />
<PackageReference Include="OxyPlot.Core" Version="2.2.0" />
<PackageReference Include="OxyPlot.SkiaSharp" Version="2.2.0" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions APSIM.Interop/Graphing/Axes/SmartDateTimeAxis.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ namespace APSIM.Interop.Graphing.Axes
/// </remarks>
public class SmartDateTimeAxis : DateTimeAxis
{
protected override double CalculateActualInterval(double availableSize, double maxIntervalSize)
protected override double CalculateActualInterval(double availableSize, double maxIntervalSize, double minIntervalCount, double maxIntervalCount)
{
DateTime min = ToDateTime(ActualMinimum);
DateTime max = ToDateTime(ActualMaximum);
DateTime min = ToDateTime(ActualMinimum, DefaultPrecision);
DateTime max = ToDateTime(ActualMaximum, DefaultPrecision);

(DateTimeIntervalType interval, string format) = CalculateInterval(min, max);
IntervalType = interval;
// MinorIntervalType = (DateTimeIntervalType)Math.Max(0, (int)interval - 1);
if (!string.IsNullOrEmpty(format))
this.StringFormat = format;

return base.CalculateActualInterval(availableSize, maxIntervalSize);
return base.CalculateActualInterval(availableSize, maxIntervalSize, minIntervalCount, maxIntervalCount);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions APSIM.Interop/Graphing/CustomSeries/ColumnXYSeries.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ private void MovePointsToItems()
double halfBarWidth = 0.4;
if (this.XAxis.ActualStringFormat != null && this.XAxis.ActualStringFormat.Contains("yyyy"))
{
DateTime d1 = DateTimeAxis.ToDateTime(this.XAxis.ActualMinimum);
DateTime d2 = DateTimeAxis.ToDateTime(this.XAxis.ActualMinimum + 1);
DateTime d1 = DateTimeAxis.ToDateTime(this.XAxis.ActualMinimum, DateTimeAxis.DefaultPrecision);
DateTime d2 = DateTimeAxis.ToDateTime(this.XAxis.ActualMinimum + 1, DateTimeAxis.DefaultPrecision);
halfBarWidth = (d2 - d1).Days / 2.0;
}

Expand Down
4 changes: 2 additions & 2 deletions APSIM.Server/V1/APSIM.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<AssemblyName>apsim-server</AssemblyName>
<BaseOutputPath>../../bin</BaseOutputPath>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Expand All @@ -17,6 +17,6 @@
<ProjectReference Include="../../Models/Models.csproj" />
<ProjectReference Include="../../APSIM.Shared/APSIM.Shared.csproj" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="KubernetesClient" Version="9.0.38" />
<PackageReference Include="KubernetesClient" Version="15.0.1" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions APSIM.Server/ZMQ+msgpack/APSIM.ZMQServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<AssemblyName>ApsimZMQServer</AssemblyName>
<BaseOutputPath>../../bin</BaseOutputPath>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Expand All @@ -14,8 +14,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MessagePack" Version="2.5.187" />
<PackageReference Include="NetMQ" Version="4.0.1.12" />
<PackageReference Include="MessagePack" Version="2.5.192" />
<PackageReference Include="NetMQ" Version="4.0.1.13" />
<ProjectReference Include="../../Models/Models.csproj" />
<ProjectReference Include="../../APSIM.Shared/APSIM.Shared.csproj" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
Expand Down
24 changes: 12 additions & 12 deletions APSIM.Shared/APSIM.Shared.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<BaseOutputPath>../bin</BaseOutputPath>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
Expand All @@ -17,18 +17,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
<PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.0.0" />
<PackageReference Include="Mapsui" Version="4.1.7" />
<PackageReference Include="Mapsui.Nts" Version="4.1.7" />
<PackageReference Include="Mapsui.Rendering.Skia" Version="4.1.7" />
<PackageReference Include="Mapsui.Tiling" Version="4.1.7" />
<PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
<PackageReference Include="ExcelDataReader.DataSet" Version="3.7.0" />
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="10.3.1" />
<PackageReference Include="Mapsui" Version="4.1.8" />
<PackageReference Include="Mapsui.Nts" Version="4.1.8" />
<PackageReference Include="Mapsui.Rendering.Skia" Version="4.1.8" />
<PackageReference Include="Mapsui.Tiling" Version="4.1.8" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SkiaSharp" Version="2.88.8" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="Docker.DotNet" Version="3.125.13" />
<PackageReference Include="SkiaSharp" Version="2.88.9" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
<PackageReference Include="System.Drawing.Common" Version="8.0.11" />
<PackageReference Include="Docker.DotNet" Version="3.125.15" />
</ItemGroup>

<ItemGroup>
Expand Down
34 changes: 17 additions & 17 deletions ApsimNG/ApsimNG.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<BaseOutputPath>../bin</BaseOutputPath>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<ApplicationIcon>ApsimLogo.ico</ApplicationIcon>
Expand Down Expand Up @@ -36,35 +36,35 @@
<ProjectReference Include="..\Gtk.Sheet\Gtk.Sheet.csproj" />

<!-- Shared package references -->
<PackageReference Include="ClosedXML" Version="0.100.3" />
<PackageReference Include="ClosedXML" Version="0.104.2" />
<PackageReference Include="Microsoft.Azure.Batch" Version="15.4.0" />
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.3" />
<PackageReference Include="Microsoft.Azure.Storage.Common" Version="11.2.3" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.5.0" />
<PackageReference Include="OxyPlot.SkiaSharp" Version="2.1.2" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.12.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
<PackageReference Include="OxyPlot.SkiaSharp" Version="2.2.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.CodeDom" Version="6.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
<PackageReference Include="System.CodeDom" Version="8.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
<PackageReference Include="ISO3166" Version="1.0.4" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageReference Include="Microsoft.Toolkit.Parsers" Version="6.1.1" />
<PackageReference Include="Markdig" Version="0.38.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
<PackageReference Include="GtkSharp" Version="3.24.24.38" />
<PackageReference Include="GtkSourceSharp" Version="3.24.24.38" />
<PackageReference Include="OxyPlot.Core" Version="2.1.2" />
<PackageReference Include="OxyPlot.Core" Version="2.2.0" />
<PackageReference Include="OxyPlot.GtkSharp3" Version="2.1.0-Preview1" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="System.Windows.Extensions" Version="6.0.0.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.71" />
<PackageReference Include="System.Drawing.Common" Version="8.0.11" />
<PackageReference Include="System.Windows.Extensions" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ApsimNG/Views/AxisView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ public void SetMinimum(double value, bool isDate)
if (double.IsNaN(value))
entryMin.Text = string.Empty;
else if (isDate)
entryMin.Text = DateUtilities.ValidateDateString(DateTimeAxis.ToDateTime(value).ToShortDateString());
entryMin.Text = DateUtilities.ValidateDateString(DateTimeAxis.ToDateTime(value, DateTimeAxis.DefaultPrecision).ToShortDateString());
else
entryMin.Text = value.ToString();
}
Expand All @@ -304,7 +304,7 @@ public void SetMaximum(double value, bool isDate)
if (double.IsNaN(value))
entryMax.Text = string.Empty;
else if (isDate)
entryMax.Text = DateUtilities.ValidateDateString(DateTimeAxis.ToDateTime(value).ToShortDateString());
entryMax.Text = DateUtilities.ValidateDateString(DateTimeAxis.ToDateTime(value, DateTimeAxis.DefaultPrecision).ToShortDateString());
else
entryMax.Text = value.ToString();
}
Expand Down
2 changes: 1 addition & 1 deletion ApsimNG/Views/GraphView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ public void DrawStackedArea(
if (xIsFloatingPoint)
index = MathUtilities.SafeIndexOf(x.Cast<double>().ToList(), xVal);
else if (xType == typeof(DateTime))
index = Array.IndexOf(x, DateTimeAxis.ToDateTime(xVal));
index = Array.IndexOf(x, DateTimeAxis.ToDateTime(xVal, DateTimeAxis.DefaultPrecision));
else
index = i; // Array.IndexOf(x, xVal); // this is unlikely to work

Expand Down
4 changes: 2 additions & 2 deletions DeepCloner.Core/DeepCloner.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down Expand Up @@ -41,7 +41,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Gtk.Sheet/Gtk.Sheet.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<BaseOutputPath>../../bin</BaseOutputPath>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion Models/CLEM/Groupings/LabourFeedGroup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Models.CLEM.Groupings
[Description("Defines the feed value for specific individuals from the labour pool")]
[Version(1, 0, 1, "")]
[HelpUri(@"Content/Features/Filters/Groups/LabourFeedGroup.htm")]
public class LabourFeedGroup : FilterGroup<LabourType>
public class LabourFeedGroup : LabourGroup
{
/// <summary>
/// Value to supply for each month
Expand Down
5 changes: 0 additions & 5 deletions Models/Core/ApsimXException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ public ApsimXException()

}

/// <summary>Initializes a new instance of the <see cref="ApsimXException"/> class.</summary>
protected ApsimXException(SerializationInfo info, StreamingContext context)
: base(info, context)
{ }

/// <summary>Initializes a new instance of the <see cref="ApsimXException"/> class.</summary>
/// <param name="model">The model.</param>
/// <param name="message">The message.</param>
Expand Down
23 changes: 0 additions & 23 deletions Models/Core/SimulationException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,6 @@ public class SimulationException : Exception, ISerializable
/// </summary>
public string FileName { get; private set; }

/// <summary>
/// Constructor provided for binary deserialization.
/// </summary>
/// <param name="info">Serialization info.</param>
/// <param name="context">Streaming context.</param>
public SimulationException(SerializationInfo info, StreamingContext context) : base(info, context)
{
SimulationName = info.GetString(nameof(SimulationName));
FileName = info.GetString(nameof(FileName));
}

/// <summary>
/// /// Create a <see cref="SimulationException" /> instance.
/// </summary>
Expand Down Expand Up @@ -62,17 +51,5 @@ public override string ToString()
{
return $"ERROR in file: {FileName}{Environment.NewLine}Simulation name: {SimulationName}{Environment.NewLine}{base.ToString()}";
}

/// <summary>
/// Get object data for serialization.
/// </summary>
/// <param name="info">Serialization info.</param>
/// <param name="context">Streaming context.</param>
public override void GetObjectData(SerializationInfo info, StreamingContext context)
{
base.GetObjectData(info, context);
info.AddValue(nameof(SimulationName), SimulationName);
info.AddValue(nameof(FileName), FileName);
}
}
}
2 changes: 1 addition & 1 deletion Models/Core/VariableProperty.cs
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ private void SetFromString(string value)
}
else if (this.DataType == typeof(float[]))
{
this.Value = MathUtilities.StringsToDoubles(stringValues).Cast<float>().ToArray();
this.Value = Array.ConvertAll(MathUtilities.StringsToDoubles(stringValues), value => (float)value);
}
else if (this.DataType == typeof(int[]))
{
Expand Down
26 changes: 13 additions & 13 deletions Models/Models.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<BaseOutputPath>../bin</BaseOutputPath>
<ApplicationIcon />
<StartupObject />
Expand All @@ -22,24 +22,24 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NetMQ" Version="4.0.1.12" />
<PackageReference Include="MessagePack" Version="2.5.187" />
<PackageReference Include="NetMQ" Version="4.0.1.13" />
<PackageReference Include="MessagePack" Version="2.5.192" />
<ProjectReference Include="..\APSIM.Shared\APSIM.Shared.csproj" />
<PackageReference Include="System.Windows.Extensions" Version="6.0.0.0" />
<PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
<PackageReference Include="System.Windows.Extensions" Version="8.0.0" />
<PackageReference Include="ExcelDataReader.DataSet" Version="3.7.0" />
<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.CodeDom" Version="6.0.0" />
<PackageReference Include="System.CodeDom" Version="8.0.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.5.0" />
<PackageReference Include="MigraDocCore.DocumentObjectModel" Version="1.3.47" />
<PackageReference Include="MigraDocCore.Rendering" Version="1.3.47" />
<PackageReference Include="PdfSharpCore" Version="1.3.47" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.12.0" />
<PackageReference Include="MigraDocCore.DocumentObjectModel" Version="1.3.65" />
<PackageReference Include="MigraDocCore.Rendering" Version="1.3.65" />
<PackageReference Include="PdfSharpCore" Version="1.3.65" />

<EmbeddedResource Include="Resources\**" />
<None Remove="Resources\**" />
Expand Down
Loading