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.

Sign up for GitHub

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

.NET 6 conversion #1

Merged
merged 6 commits into from
Oct 31, 2023
Merged

.NET 6 conversion #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3389f2
- .NET 6:ified
Oct 31, 2023
5cb80d8
Updated CHANGELOG.txt
Oct 31, 2023
427dd0f
- Removed unused METRO code
Oct 31, 2023
d664f93
- Removed all METRO dependent code
Oct 31, 2023
331d7c9
Added nullable reference type support. The code is a jungle, so there…
Oct 31, 2023
dbb3d79
Removed Rider files
Oct 31, 2023
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
[Bb]in/
[Oo]bj/

.idea/

# mstest test results
TestResults

Expand Down
12 changes: 0 additions & 12 deletions Documents/AIV.cs
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion Documents/CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
RELEASE 3.0.0
NOT YET RELEASED
- Removed UAP support
- Converted project to .NET 6

RELEASE 3.0.0
- Added .NET Core library version
- Upgraded codebase to .NET Standard 2.0 (thanks to honza77)
- Upgraded codebase to use QUickGraphCore library
Expand Down
1 change: 0 additions & 1 deletion Examples/ShowcaseApp.WPF/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/FirstFloor.ModernUI;component/Assets/ModernUI.xaml" />
<ResourceDictionary Source="/FirstFloor.ModernUI;component/Assets/ModernUI.Light.xaml" />
<ResourceDictionary Source="Templates/Accordion.xaml" />
<ResourceDictionary Source="/Themes/Generic.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
Expand Down
2 changes: 1 addition & 1 deletion Examples/ShowcaseApp.WPF/ExampleModels/DataEdge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using GraphX.Measure;
using GraphX.Common.Models;
using ShowcaseApp.WPF.FileSerialization;
using YAXLib;
using YAXLib.Attributes;

namespace ShowcaseApp.WPF
{
Expand Down
14 changes: 8 additions & 6 deletions Examples/ShowcaseApp.WPF/FileSerialization/YAXPointArraySerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System;
using System.Linq;
using System.Text;
using System.Xml.Linq;
using GraphX.Measure;
using YAXLib;
using YAXLib.Customization;

namespace ShowcaseApp.WPF.FileSerialization
{
Expand Down Expand Up @@ -37,32 +39,32 @@ private string Serialize(Point[] list)
return sb.ToString();
}

public Point[] DeserializeFromAttribute(System.Xml.Linq.XAttribute attrib)
public Point[] DeserializeFromAttribute(System.Xml.Linq.XAttribute attrib, ISerializationContext serializationContext)
{
return Deserialize(attrib.Value);
}

public Point[] DeserializeFromElement(System.Xml.Linq.XElement element)
public Point[] DeserializeFromElement(System.Xml.Linq.XElement element, ISerializationContext serializationContext)
{
return Deserialize(element.Value);
}

public Point[] DeserializeFromValue(string value)
public Point[] DeserializeFromValue(string value, ISerializationContext serializationContext)
{
return Deserialize(value);
}

public void SerializeToAttribute(Point[] objectToSerialize, System.Xml.Linq.XAttribute attrToFill)
public void SerializeToAttribute(Point[] objectToSerialize, System.Xml.Linq.XAttribute attrToFill, ISerializationContext serializationContext)
{
attrToFill.Value = Serialize(objectToSerialize);
}

public void SerializeToElement(Point[] objectToSerialize, System.Xml.Linq.XElement elemToFill)
public void SerializeToElement(Point[] objectToSerialize, System.Xml.Linq.XElement elemToFill, ISerializationContext serializationContext)
{
elemToFill.Value = Serialize(objectToSerialize);
}

public string SerializeToValue(Point[] objectToSerialize)
public string SerializeToValue(Point[] objectToSerialize, ISerializationContext serializationContext)
{
return Serialize(objectToSerialize);
}
Expand Down
13 changes: 7 additions & 6 deletions Examples/ShowcaseApp.WPF/FileSerialization/YAXPointSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using GraphX.Measure;
using YAXLib;
using YAXLib.Customization;

namespace ShowcaseApp.WPF.FileSerialization
{
Expand All @@ -14,32 +15,32 @@ private Point Deserialize(string str)
else return new Point();
}

public Point DeserializeFromAttribute(System.Xml.Linq.XAttribute attrib)
public Point DeserializeFromAttribute(System.Xml.Linq.XAttribute attrib, ISerializationContext serializationContext)
{
return Deserialize(attrib.Value);
}

public Point DeserializeFromElement(System.Xml.Linq.XElement element)
public Point DeserializeFromElement(System.Xml.Linq.XElement element, ISerializationContext serializationContext)
{
return Deserialize(element.Value);
}

public Point DeserializeFromValue(string value)
public Point DeserializeFromValue(string value, ISerializationContext serializationContext)
{
return Deserialize(value);
}

public void SerializeToAttribute(Point objectToSerialize, System.Xml.Linq.XAttribute attrToFill)
public void SerializeToAttribute(Point objectToSerialize, System.Xml.Linq.XAttribute attrToFill, ISerializationContext serializationContext)
{
attrToFill.Value = String.Format("{0}|{1}", objectToSerialize.X.ToString(), objectToSerialize.Y.ToString());
}

public void SerializeToElement(Point objectToSerialize, System.Xml.Linq.XElement elemToFill)
public void SerializeToElement(Point objectToSerialize, System.Xml.Linq.XElement elemToFill, ISerializationContext serializationContext)
{
elemToFill.Value = String.Format("{0}|{1}", objectToSerialize.X.ToString(), objectToSerialize.Y.ToString());
}

public string SerializeToValue(Point objectToSerialize)
public string SerializeToValue(Point objectToSerialize, ISerializationContext serializationContext)
{
return String.Format("{0}|{1}", objectToSerialize.X.ToString(), objectToSerialize.Y.ToString());
}
Expand Down
Loading