From afa013fce99e45f56343ded6a48fef1e0ed1a857 Mon Sep 17 00:00:00 2001 From: paulushub Date: Mon, 9 Oct 2023 13:30:18 +0900 Subject: [PATCH] Preparing for version 1.8.2 and bug fixes --- .../GdiSvgTestBox/Properties/AssemblyInfo.cs | 6 +-- .../Properties/AssemblyInfo.cs | 6 +-- .../Properties/AssemblyInfo.cs | 6 +-- .../WpfSvgTestBox/Properties/AssemblyInfo.cs | 6 +-- .../Properties/AssemblyInfo.cs | 6 +-- .../Properties/AssemblyInfo.cs | 6 +-- .../Properties/AssemblyInfo.cs | 6 +-- .../Properties/AssemblyInfo.cs | 6 +-- .../Properties/AssemblyInfo.cs | 6 +-- .../WpfXXETestBox/Properties/AssemblyInfo.cs | 6 +-- Samples/WpfXXETestBox/SettingsPage.xaml.cs | 13 ------ .../Properties/AssemblyInfo.cs | 8 ++-- .../SharpVectors.Converters.Wpf.csproj | 2 +- .../Properties/AssemblyInfo.cs | 8 ++-- .../SharpVectorCore/SharpVectors.Core.csproj | 2 +- .../SharpVectorCss/Properties/AssemblyInfo.cs | 8 ++-- Source/SharpVectorCss/SharpVectors.Css.csproj | 2 +- .../SharpVectorDom/Properties/AssemblyInfo.cs | 8 ++-- Source/SharpVectorDom/SharpVectors.Dom.csproj | 2 +- .../Properties/AssemblyInfo.cs | 8 ++-- .../SharpVectors.Model.csproj | 2 +- .../Properties/AssemblyInfo.cs | 8 ++-- .../SharpVectors.Rendering.Gdi.csproj | 2 +- .../Properties/AssemblyInfo.cs | 8 ++-- .../SharpVectors.Rendering.Wpf.csproj | 2 +- .../Wpf/WpfImageRendering.cs | 8 ++-- .../Properties/AssemblyInfo.cs | 8 ++-- .../SharpVectors.Runtime.Wpf.csproj | 2 +- .../Properties/AssemblyInfo.cs | 8 ++-- .../SharpVectors.Scripting.csproj | 2 +- Source/SharpVectors.Reloaded.nuspec | 41 ++++++++++++++++--- Source/SharpVectors.Wpf.nuspec | 38 ++++++++++++++--- Source/SharpVectors.nuspec | 41 ++++++++++++++++--- 33 files changed, 181 insertions(+), 110 deletions(-) diff --git a/Samples/GdiSvgTestBox/Properties/AssemblyInfo.cs b/Samples/GdiSvgTestBox/Properties/AssemblyInfo.cs index 0bb3a31ad..ca814c663 100644 --- a/Samples/GdiSvgTestBox/Properties/AssemblyInfo.cs +++ b/Samples/GdiSvgTestBox/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("GdiSvgTestBox")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("Open Source, Licensed BSD-3")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/Samples/GdiTestSvgControl/Properties/AssemblyInfo.cs b/Samples/GdiTestSvgControl/Properties/AssemblyInfo.cs index 29929a2e7..7262b5463 100644 --- a/Samples/GdiTestSvgControl/Properties/AssemblyInfo.cs +++ b/Samples/GdiTestSvgControl/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("GdiTestSvgControl")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/Samples/GdiW3cSvgTestSuite/Properties/AssemblyInfo.cs b/Samples/GdiW3cSvgTestSuite/Properties/AssemblyInfo.cs index 9ad8194ae..545b59718 100644 --- a/Samples/GdiW3cSvgTestSuite/Properties/AssemblyInfo.cs +++ b/Samples/GdiW3cSvgTestSuite/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("GdiW3cSvgTestSuite")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/Samples/WpfSvgTestBox/Properties/AssemblyInfo.cs b/Samples/WpfSvgTestBox/Properties/AssemblyInfo.cs index 706f80b21..735aedfa0 100644 --- a/Samples/WpfSvgTestBox/Properties/AssemblyInfo.cs +++ b/Samples/WpfSvgTestBox/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("WpfSvgTestBox")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/Samples/WpfTestOtherSvg/Properties/AssemblyInfo.cs b/Samples/WpfTestOtherSvg/Properties/AssemblyInfo.cs index 49df3f259..3e75e8fb6 100644 --- a/Samples/WpfTestOtherSvg/Properties/AssemblyInfo.cs +++ b/Samples/WpfTestOtherSvg/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("WpfTestOtherSvg")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/Samples/WpfTestSvgControl/Properties/AssemblyInfo.cs b/Samples/WpfTestSvgControl/Properties/AssemblyInfo.cs index 36b5daadb..58e504ba9 100644 --- a/Samples/WpfTestSvgControl/Properties/AssemblyInfo.cs +++ b/Samples/WpfTestSvgControl/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("WpfTestSvgControl")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/Samples/WpfTestSvgSample/Properties/AssemblyInfo.cs b/Samples/WpfTestSvgSample/Properties/AssemblyInfo.cs index 404d42126..dedff5f66 100644 --- a/Samples/WpfTestSvgSample/Properties/AssemblyInfo.cs +++ b/Samples/WpfTestSvgSample/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("WpfTestSvgSample")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/Samples/WpfTestThreadSafety/Properties/AssemblyInfo.cs b/Samples/WpfTestThreadSafety/Properties/AssemblyInfo.cs index c029d4daf..e8a408bc5 100644 --- a/Samples/WpfTestThreadSafety/Properties/AssemblyInfo.cs +++ b/Samples/WpfTestThreadSafety/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("WpfTestThreadSafety")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/Samples/WpfW3cSvgTestSuite/Properties/AssemblyInfo.cs b/Samples/WpfW3cSvgTestSuite/Properties/AssemblyInfo.cs index dc40bab82..c673a9216 100644 --- a/Samples/WpfW3cSvgTestSuite/Properties/AssemblyInfo.cs +++ b/Samples/WpfW3cSvgTestSuite/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("WpfW3cSvgTestSuite")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -50,5 +50,5 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/Samples/WpfXXETestBox/Properties/AssemblyInfo.cs b/Samples/WpfXXETestBox/Properties/AssemblyInfo.cs index aed6d326d..7a821b14a 100644 --- a/Samples/WpfXXETestBox/Properties/AssemblyInfo.cs +++ b/Samples/WpfXXETestBox/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("WpfXXETestBox")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,5 +51,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] diff --git a/Samples/WpfXXETestBox/SettingsPage.xaml.cs b/Samples/WpfXXETestBox/SettingsPage.xaml.cs index 5da7f588f..dd765e459 100644 --- a/Samples/WpfXXETestBox/SettingsPage.xaml.cs +++ b/Samples/WpfXXETestBox/SettingsPage.xaml.cs @@ -19,10 +19,7 @@ public partial class SettingsPage : Page private bool _isInitialising; private bool _isModified; -// private SvgPage _svgPage; - private WpfDrawingSettings _wpfSettings; - private WpfDrawingSettings _conversionSettings; private NotificationManager _notifyIcon; @@ -54,16 +51,6 @@ public MainWindow Window } } - //public SvgPage SvgPage - //{ - // get { - // return _svgPage; - // } - // set { - // _svgPage = value; - // } - //} - private void OnPageUnloaded(object sender, RoutedEventArgs e) { if (_isModified && _mainWindow != null && _wpfSettings != null) diff --git a/Source/SharpVectorConvertersWpf/Properties/AssemblyInfo.cs b/Source/SharpVectorConvertersWpf/Properties/AssemblyInfo.cs index dc192bc67..a0be54751 100644 --- a/Source/SharpVectorConvertersWpf/Properties/AssemblyInfo.cs +++ b/Source/SharpVectorConvertersWpf/Properties/AssemblyInfo.cs @@ -16,7 +16,7 @@ #endif [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("SharpVectors.Converters.Wpf")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("Open Source, Licensed BSD-3")] [assembly: AssemblyCulture("")] @@ -55,9 +55,9 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] -[assembly: AssemblyInformationalVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] +[assembly: AssemblyInformationalVersion("1.8.2.0")] [assembly: XmlnsPrefix("http://sharpvectors.codeplex.com/svgc/", "svgc")] [assembly: XmlnsDefinition("http://sharpvectors.codeplex.com/svgc/", "SharpVectors.Converters")] diff --git a/Source/SharpVectorConvertersWpf/SharpVectors.Converters.Wpf.csproj b/Source/SharpVectorConvertersWpf/SharpVectors.Converters.Wpf.csproj index e429696a7..120e76936 100644 --- a/Source/SharpVectorConvertersWpf/SharpVectors.Converters.Wpf.csproj +++ b/Source/SharpVectorConvertersWpf/SharpVectors.Converters.Wpf.csproj @@ -104,7 +104,7 @@ - + diff --git a/Source/SharpVectorCore/Properties/AssemblyInfo.cs b/Source/SharpVectorCore/Properties/AssemblyInfo.cs index 6723b7064..9e54a21bd 100644 --- a/Source/SharpVectorCore/Properties/AssemblyInfo.cs +++ b/Source/SharpVectorCore/Properties/AssemblyInfo.cs @@ -15,7 +15,7 @@ #endif [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("SharpVectors.Core")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("Open Source, Licensed BSD-3")] [assembly: AssemblyCulture("")] @@ -29,9 +29,9 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] -[assembly: AssemblyInformationalVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] +[assembly: AssemblyInformationalVersion("1.8.2.0")] // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/Source/SharpVectorCore/SharpVectors.Core.csproj b/Source/SharpVectorCore/SharpVectors.Core.csproj index ad7e73a44..22d8eeb67 100644 --- a/Source/SharpVectorCore/SharpVectors.Core.csproj +++ b/Source/SharpVectorCore/SharpVectors.Core.csproj @@ -50,7 +50,7 @@ $(DefineConstants);NETSTANDARD - + diff --git a/Source/SharpVectorCss/Properties/AssemblyInfo.cs b/Source/SharpVectorCss/Properties/AssemblyInfo.cs index e75093f18..2cc8b7a8f 100644 --- a/Source/SharpVectorCss/Properties/AssemblyInfo.cs +++ b/Source/SharpVectorCss/Properties/AssemblyInfo.cs @@ -15,7 +15,7 @@ #endif [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("SharpVectors.Css")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("Open Source, Licensed BSD-3")] [assembly: AssemblyCulture("")] @@ -30,9 +30,9 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] -[assembly: AssemblyInformationalVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] +[assembly: AssemblyInformationalVersion("1.8.2.0")] // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/Source/SharpVectorCss/SharpVectors.Css.csproj b/Source/SharpVectorCss/SharpVectors.Css.csproj index 6093eba22..7d89cdcbf 100644 --- a/Source/SharpVectorCss/SharpVectors.Css.csproj +++ b/Source/SharpVectorCss/SharpVectors.Css.csproj @@ -50,7 +50,7 @@ $(DefineConstants);NETSTANDARD - + diff --git a/Source/SharpVectorDom/Properties/AssemblyInfo.cs b/Source/SharpVectorDom/Properties/AssemblyInfo.cs index eb5158128..82e309d3a 100644 --- a/Source/SharpVectorDom/Properties/AssemblyInfo.cs +++ b/Source/SharpVectorDom/Properties/AssemblyInfo.cs @@ -15,7 +15,7 @@ #endif [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("SharpVectors.Dom")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("Open Source, Licensed BSD-3")] [assembly: AssemblyCulture("")] //[assembly: AllowPartiallyTrustedCallers] @@ -30,9 +30,9 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] -[assembly: AssemblyInformationalVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] +[assembly: AssemblyInformationalVersion("1.8.2.0")] // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/Source/SharpVectorDom/SharpVectors.Dom.csproj b/Source/SharpVectorDom/SharpVectors.Dom.csproj index 43c9d1134..ea6e76a03 100644 --- a/Source/SharpVectorDom/SharpVectors.Dom.csproj +++ b/Source/SharpVectorDom/SharpVectors.Dom.csproj @@ -50,7 +50,7 @@ $(DefineConstants);NETSTANDARD - + diff --git a/Source/SharpVectorModel/Properties/AssemblyInfo.cs b/Source/SharpVectorModel/Properties/AssemblyInfo.cs index 28d6cddcb..60f817e13 100644 --- a/Source/SharpVectorModel/Properties/AssemblyInfo.cs +++ b/Source/SharpVectorModel/Properties/AssemblyInfo.cs @@ -15,7 +15,7 @@ #endif [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("SharpVectors.Model")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("Open Source, Licensed BSD-3")] [assembly: AssemblyCulture("")] @@ -29,9 +29,9 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] -[assembly: AssemblyInformationalVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] +[assembly: AssemblyInformationalVersion("1.8.2.0")] // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/Source/SharpVectorModel/SharpVectors.Model.csproj b/Source/SharpVectorModel/SharpVectors.Model.csproj index fc2d856ba..1b02cbb80 100644 --- a/Source/SharpVectorModel/SharpVectors.Model.csproj +++ b/Source/SharpVectorModel/SharpVectors.Model.csproj @@ -63,7 +63,7 @@ - + \ No newline at end of file diff --git a/Source/SharpVectorRenderingGdi/Properties/AssemblyInfo.cs b/Source/SharpVectorRenderingGdi/Properties/AssemblyInfo.cs index 41a619b8c..bd0f63091 100644 --- a/Source/SharpVectorRenderingGdi/Properties/AssemblyInfo.cs +++ b/Source/SharpVectorRenderingGdi/Properties/AssemblyInfo.cs @@ -15,7 +15,7 @@ #endif [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("SharpVectors.Rendering.Gdi")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("Open Source, Licensed BSD-3")] [assembly: AssemblyCulture("")] @@ -29,9 +29,9 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] -[assembly: AssemblyInformationalVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] +[assembly: AssemblyInformationalVersion("1.8.2.0")] // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/Source/SharpVectorRenderingGdi/SharpVectors.Rendering.Gdi.csproj b/Source/SharpVectorRenderingGdi/SharpVectors.Rendering.Gdi.csproj index e8b0bcccd..da952d090 100644 --- a/Source/SharpVectorRenderingGdi/SharpVectors.Rendering.Gdi.csproj +++ b/Source/SharpVectorRenderingGdi/SharpVectors.Rendering.Gdi.csproj @@ -79,7 +79,7 @@ - + \ No newline at end of file diff --git a/Source/SharpVectorRenderingWpf/Properties/AssemblyInfo.cs b/Source/SharpVectorRenderingWpf/Properties/AssemblyInfo.cs index 48303e20c..824f4c379 100644 --- a/Source/SharpVectorRenderingWpf/Properties/AssemblyInfo.cs +++ b/Source/SharpVectorRenderingWpf/Properties/AssemblyInfo.cs @@ -14,7 +14,7 @@ #endif [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("SharpVectors.Rendering.Wpf")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC")] [assembly: AssemblyTrademark("Open Source, Licensed BSD-3")] [assembly: AssemblyCulture("")] @@ -53,9 +53,9 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] -[assembly: AssemblyInformationalVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] +[assembly: AssemblyInformationalVersion("1.8.2.0")] // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/Source/SharpVectorRenderingWpf/SharpVectors.Rendering.Wpf.csproj b/Source/SharpVectorRenderingWpf/SharpVectors.Rendering.Wpf.csproj index 4efedd3f2..ecc270b4e 100644 --- a/Source/SharpVectorRenderingWpf/SharpVectors.Rendering.Wpf.csproj +++ b/Source/SharpVectorRenderingWpf/SharpVectors.Rendering.Wpf.csproj @@ -69,7 +69,7 @@ - + diff --git a/Source/SharpVectorRenderingWpf/Wpf/WpfImageRendering.cs b/Source/SharpVectorRenderingWpf/Wpf/WpfImageRendering.cs index c6b0c9c1d..8186a524e 100644 --- a/Source/SharpVectorRenderingWpf/Wpf/WpfImageRendering.cs +++ b/Source/SharpVectorRenderingWpf/Wpf/WpfImageRendering.cs @@ -530,10 +530,6 @@ private ImageSource GetBitmap(SvgImageElement element, WpfDrawingContext context { return null; } - if (!svgUri.IsSupported) - { - return null; - } if (string.IsNullOrWhiteSpace(absoluteUri)) { @@ -545,6 +541,10 @@ private ImageSource GetBitmap(SvgImageElement element, WpfDrawingContext context return null; } + if (!svgUri.IsSupported) + { + return null; + } Uri imageUri = new Uri(svgUri.AbsoluteUri); if (!UrlResolvePolicy.Supports(imageUri.Scheme)) { diff --git a/Source/SharpVectorRuntimeWpf/Properties/AssemblyInfo.cs b/Source/SharpVectorRuntimeWpf/Properties/AssemblyInfo.cs index 797909681..e49f39055 100644 --- a/Source/SharpVectorRuntimeWpf/Properties/AssemblyInfo.cs +++ b/Source/SharpVectorRuntimeWpf/Properties/AssemblyInfo.cs @@ -16,7 +16,7 @@ #endif [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("SharpVectors.Runtime")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC, Zooming and Panning Control by Ashley Davis")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC, Zooming and Panning Control by Ashley Davis")] [assembly: AssemblyTrademark("Open Source, Licensed BSD-3")] [assembly: AssemblyCulture("")] @@ -55,9 +55,9 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] -[assembly: AssemblyInformationalVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] +[assembly: AssemblyInformationalVersion("1.8.2.0")] // // In order to sign your assembly you must specify a key to use. Refer to the diff --git a/Source/SharpVectorRuntimeWpf/SharpVectors.Runtime.Wpf.csproj b/Source/SharpVectorRuntimeWpf/SharpVectors.Runtime.Wpf.csproj index dd52a0621..d0fa7392a 100644 --- a/Source/SharpVectorRuntimeWpf/SharpVectors.Runtime.Wpf.csproj +++ b/Source/SharpVectorRuntimeWpf/SharpVectors.Runtime.Wpf.csproj @@ -69,7 +69,7 @@ - + diff --git a/Source/SharpVectorScripting/Properties/AssemblyInfo.cs b/Source/SharpVectorScripting/Properties/AssemblyInfo.cs index 3dd5d11cc..9a1d84eab 100644 --- a/Source/SharpVectorScripting/Properties/AssemblyInfo.cs +++ b/Source/SharpVectorScripting/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Elinam LLC, Japan")] [assembly: AssemblyProduct("SharpVectors.Scripting.Jint")] -[assembly: AssemblyCopyright("Copyright © 2010 - 2022 Elinam LLC, JavaScript-based scripting component for SharpVectors.")] +[assembly: AssemblyCopyright("Copyright © 2010 - 2023 Elinam LLC, JavaScript-based scripting component for SharpVectors.")] [assembly: AssemblyTrademark("Open Source, Licensed BSD-3")] [assembly: AssemblyCulture("")] @@ -32,6 +32,6 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.1.0")] -[assembly: AssemblyFileVersion("1.8.1.0")] -[assembly: AssemblyInformationalVersion("1.8.1.0")] +[assembly: AssemblyVersion("1.8.2.0")] +[assembly: AssemblyFileVersion("1.8.2.0")] +[assembly: AssemblyInformationalVersion("1.8.2.0")] diff --git a/Source/SharpVectorScripting/SharpVectors.Scripting.csproj b/Source/SharpVectorScripting/SharpVectors.Scripting.csproj index 8e8b75756..8e897ee9a 100644 --- a/Source/SharpVectorScripting/SharpVectors.Scripting.csproj +++ b/Source/SharpVectorScripting/SharpVectors.Scripting.csproj @@ -61,7 +61,7 @@ - + diff --git a/Source/SharpVectors.Reloaded.nuspec b/Source/SharpVectors.Reloaded.nuspec index 790560234..b56ac6877 100644 --- a/Source/SharpVectors.Reloaded.nuspec +++ b/Source/SharpVectors.Reloaded.nuspec @@ -13,14 +13,11 @@ https://github.com/ElinamLLC/SharpVectors images\SharpVectors64.png - Copyright (c) 2010 - 2022 Elinam LLC + Copyright (c) 2010 - 2023 Elinam LLC docs\SharpVectors.Reloaded.md - Release 1.8.1 - * WPF: Added controls (SvgBitmap, SvgIcon) to improve binding and supports monochrome SVG. - * WPF: Design-mode support improvements and fixes. - * Options to ignore or accept external resources, contributed by @mb-jp. - * Options to ignore or render bitmaps, contributed by @mb-jp. + Release 1.8.2 + * XXE vulnerability fixes, and added URI resolver controls. * Source codes and manual documentation improvements. * Bug fixes and code improvements. @@ -34,6 +31,7 @@ + @@ -45,6 +43,9 @@ + + + @@ -277,6 +278,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/SharpVectors.Wpf.nuspec b/Source/SharpVectors.Wpf.nuspec index 251c75efb..7e37283d2 100644 --- a/Source/SharpVectors.Wpf.nuspec +++ b/Source/SharpVectors.Wpf.nuspec @@ -13,14 +13,11 @@ https://github.com/ElinamLLC/SharpVectors images\SharpVectors64.png - Copyright (c) 2010 - 2022 Elinam LLC + Copyright (c) 2010 - 2023 Elinam LLC docs\SharpVectors.Wpf.md - Release 1.8.1 - * WPF: Added controls (SvgBitmap, SvgIcon) to improve binding and supports monochrome SVG. - * WPF: Design-mode support improvements and fixes. - * Options to ignore or accept external resources, contributed by @mb-jp. - * Options to ignore or render bitmaps, contributed by @mb-jp. + Release 1.8.2 + * XXE vulnerability fixes, and added URI resolver controls. * Source codes and manual documentation improvements. * Bug fixes and code improvements. @@ -34,6 +31,7 @@ + @@ -45,6 +43,9 @@ + + + @@ -253,6 +254,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/SharpVectors.nuspec b/Source/SharpVectors.nuspec index 1ff810f88..f405427c9 100644 --- a/Source/SharpVectors.nuspec +++ b/Source/SharpVectors.nuspec @@ -13,14 +13,11 @@ https://github.com/ElinamLLC/SharpVectors images\SharpVectors64.png - Copyright (c) 2010 - 2022 Elinam LLC + Copyright (c) 2010 - 2023 Elinam LLC docs\SharpVectors.md - Release 1.8.1 - * WPF: Added controls (SvgBitmap, SvgIcon) to improve binding and supports monochrome SVG. - * WPF: Design-mode support improvements and fixes. - * Options to ignore or accept external resources, contributed by @mb-jp. - * Options to ignore or render bitmaps, contributed by @mb-jp. + Release 1.8.2 + * XXE vulnerability fixes, and added URI resolver controls. * Source codes and manual documentation improvements. * Bug fixes and code improvements. @@ -34,6 +31,7 @@ + @@ -45,6 +43,9 @@ + + + @@ -277,6 +278,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +