Skip to content

Commit

Permalink
SVG.NET library updated to 3.4.7 to fix SVG export namespace prefix n…
Browse files Browse the repository at this point in the history
…ot set accordingly
  • Loading branch information
Fruchtzwerg94 committed Feb 22, 2024
1 parent 74709a4 commit 1eca090
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
@@ -1,6 +1,6 @@
# X.X.X.X (XX.XX.XXXX)
- Set generation working directory to current file to allow relative includes
- SVG.NET library updated to 3.4.6, dependent ExCSS library updated to 4.2.3
- SVG.NET library updated to 3.4.7, dependent ExCSS library updated to 4.2.3 to fix SVG export namespace prefix not set accordingly

# 1.6.0.10 (13.07.2023)
- PlantUML version updated to 1.2023.10
Expand Down
4 changes: 2 additions & 2 deletions PlantUmlViewer/PlantUmlViewer/Forms/PreviewWindow.cs
Expand Up @@ -541,14 +541,14 @@ private void AddMetadata(SvgDocument svg)

//Add metadata
SvgUnknownElement metadata = new SvgUnknownElement("metadata");
NonSvgElement rdfMetadata = new NonSvgElement("RDF", "rdf");
NonSvgElement rdfMetadata = new NonSvgElement("RDF", NAMESPACE_RDF);
rdfMetadata.Namespaces["rdf"] = NAMESPACE_RDF;
rdfMetadata.Namespaces["dc"] = NAMESPACE_DC;
rdfMetadata.Namespaces["puv"] = NAMESPACE_PUV;

rdfMetadata.Children.Add(new NonSvgElement("product", NAMESPACE_PUV) { Content = AssemblyAttributes.Product });
rdfMetadata.Children.Add(new NonSvgElement("version", NAMESPACE_PUV) { Content = AssemblyAttributes.Version });
rdfMetadata.Children.Add(new NonSvgElement("plantuml", NAMESPACE_PUV) { Content = PlantUmlViewer.PLANT_UML_VERSION });
rdfMetadata.Children.Add(new NonSvgElement("plantumlviewer", NAMESPACE_PUV) { Content = PlantUmlViewer.PLANT_UML_VERSION });

NonSvgElement rdfMetadataDescription = new NonSvgElement("Description", NAMESPACE_RDF);
rdfMetadataDescription.Children.Add(new NonSvgElement("creator", NAMESPACE_DC) { Content = WindowsIdentity.GetCurrent().Name });
Expand Down
5 changes: 4 additions & 1 deletion PlantUmlViewer/PlantUmlViewer/PlantUmlViewer.csproj
Expand Up @@ -80,7 +80,7 @@
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Svg, Version=3.4.0.0, Culture=neutral, PublicKeyToken=12a0bac221edeae2, processorArchitecture=MSIL">
<HintPath>..\packages\Svg.3.4.6\lib\net462\Svg.dll</HintPath>
<HintPath>..\packages\Svg.3.4.7\lib\net462\Svg.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
Expand Down Expand Up @@ -183,12 +183,15 @@
<ItemGroup>
<EmbeddedResource Include="Forms\AboutWindow.resx">
<DependentUpon>AboutWindow.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Forms\PreviewWindow.resx">
<DependentUpon>PreviewWindow.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Forms\OptionsWindow.resx">
<DependentUpon>OptionsWindow.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
Expand Down
12 changes: 6 additions & 6 deletions PlantUmlViewer/PlantUmlViewer/Properties/AssemblyInfo.cs
Expand Up @@ -2,20 +2,20 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("PlantUmlViewer")]
[assembly: AssemblyDescription("PlantUML Viewer")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Schmidt")]
[assembly: AssemblyProduct("PlantUML Viewer by Philipp Schmidt")]
[assembly: AssemblyCopyright("Copyright © 2022 - 2023, all rights reserved")]
[assembly: AssemblyCopyright("Copyright © 2022 - 2024, all rights reserved")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

Expand All @@ -25,11 +25,11 @@
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// 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.6.0.10")]
Expand Down
4 changes: 2 additions & 2 deletions PlantUmlViewer/PlantUmlViewer/packages.config
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CyotekImageBox" version="1.4.0-beta.1" targetFramework="net462" />
<package id="ExCSS" version="4.2.3" targetFramework="net462" />
<package id="Fizzler" version="1.2.1" targetFramework="net462" />
<package id="ILMerge" version="3.0.41" targetFramework="net462" />
<package id="MSBuild.ILMerge.Task" version="1.1.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="Svg" version="3.4.6" targetFramework="net462" />
<package id="Svg" version="3.4.7" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Memory" version="4.5.5" targetFramework="net462" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
Expand Down

0 comments on commit 1eca090

Please sign in to comment.