Merge pull request #87 from paulushub/develop

paulushub · web-flow · commit 707369e74b17 · 2023-12-19T03:11:01.000+09:00
Updated version information, fixed sample SVG paths
diff --git a/.github/workflows/dotnetpull.yml b/.github/workflows/dotnetpull.yml
@@ -2,7 +2,7 @@ name: .NET
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ master, develop ]
 
 defaults:
   run:
diff --git a/Docs/index.md b/Docs/index.md
@@ -15,13 +15,13 @@ The respository includes
 * **Samples:** For sample applications
 * **Docs:** For the documentations (in markdown format).
 
-The command lines installation options are: For the version `5.0.118`
-* **.NET CLI:** dotnet add package DotNetProjects.SVGImage --version 5.0.118
-* **Package Manager:** NuGet\Install-Package DotNetProjects.SVGImage -Version 5.0.118
+The command lines installation options are: For the version `5.1.0`
+* **.NET CLI:** dotnet add package DotNetProjects.SVGImage --version 5.1.0
+* **Package Manager:** NuGet\Install-Package DotNetProjects.SVGImage -Version 5.1.0
 
-For reference in projects use: For the version `5.0.118`
+For reference in projects use: For the version `5.1.0`
 ```xml
-<PackageReference Include="DotNetProjects.SVGImage" Version="5.0.118" />
+<PackageReference Include="DotNetProjects.SVGImage" Version="5.1.0" />
 ```
 
 ## How to build
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1 +1 @@
-next-version: 5.0.118
+next-version: 5.1.0
diff --git a/README.md b/README.md
@@ -15,13 +15,13 @@ The respository includes
 * **Samples:** For sample applications
 * **Docs:** For the documentations (in markdown format).
 
-The command lines installation options are: For the version `5.0.118`
-* **.NET CLI:** dotnet add package DotNetProjects.SVGImage --version 5.0.118
-* **Package Manager:** NuGet\Install-Package DotNetProjects.SVGImage -Version 5.0.118
+The command lines installation options are: For the version `5.1.0`
+* **.NET CLI:** dotnet add package DotNetProjects.SVGImage --version 5.1.0
+* **Package Manager:** NuGet\Install-Package DotNetProjects.SVGImage -Version 5.1.0
 
-For reference in projects use: For the version `5.0.118`
+For reference in projects use: For the version `5.1.0`
 ```xml
-<PackageReference Include="DotNetProjects.SVGImage" Version="5.0.118" />
+<PackageReference Include="DotNetProjects.SVGImage" Version="5.1.0" />
 ```
 
 ## How to build
diff --git a/Samples/Example/MainWindow.xaml.cs b/Samples/Example/MainWindow.xaml.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.IO.Compression;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Windows;
 
 namespace Example
diff --git a/Samples/IconConverterSample/MainWindow.xaml.cs b/Samples/IconConverterSample/MainWindow.xaml.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Net;
 using System.IO;
-using System.Reflection;
 using System.IO.Compression;
 using System.Windows;
 
@@ -24,7 +23,7 @@ private void OnWindowLoaded(object sender, RoutedEventArgs e)
             InitializeProtocol(); //For the web access
 
             // ICons credit: https://github.com/icons8/flat-color-icons
-            string workingDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            string workingDir = Path.GetFullPath(PageMultiple.SamplesDir);
 
             string iconsPath = Path.Combine(workingDir, PageMultiple.IconZipFile);
             if (!File.Exists(iconsPath))
diff --git a/Samples/IconConverterSample/PageMultiple.xaml.cs b/Samples/IconConverterSample/PageMultiple.xaml.cs
@@ -4,6 +4,7 @@
 using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
+using System.IO.Compression;
 
 namespace IconConverterSample
 {
@@ -43,8 +44,9 @@ public Uri ImageUri
     /// </summary>
     public partial class PageMultiple : Page
     {
-        public const string IconZipFile = @"..\svg-icons.zip";
-        public const string IconFolder  = @"Svg-Icons";
+        public const string SamplesDir  = @"..\..\..\..\Tests";
+        public const string IconZipFile = "svg-icons.zip";
+        public const string IconFolder   = "Svg-Icons";
 
         public PageMultiple()
         {
@@ -56,15 +58,15 @@ public PageMultiple()
 
         private void OnPageLoaded(object sender, RoutedEventArgs e)
         {
-            string workingDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            string workingDir = Path.GetFullPath(SamplesDir);
 
-            string iconsPath = Path.Combine(workingDir, PageMultiple.IconZipFile);
+            string iconsPath = Path.Combine(workingDir, IconZipFile);
             if (!File.Exists(iconsPath))
             {
                 return;
             }
 
-            var iconsDir = new DirectoryInfo(Path.Combine(workingDir, PageMultiple.IconFolder));
+            var iconsDir = new DirectoryInfo(Path.Combine(workingDir, IconFolder));
             if (!iconsDir.Exists)
             {
                 return;
diff --git a/Samples/IconConverterSample/PageSingle.xaml.cs b/Samples/IconConverterSample/PageSingle.xaml.cs
@@ -11,8 +11,7 @@ namespace IconConverterSample
     /// </summary>
     public partial class PageSingle : Page
     {
-        //private const string SvgFileName = @"..\Asian_Openbill.svg";
-        private const string SvgFileName = @"..\Sf_er_nkm.svg";
+        private const string SvgFileName = @"..\..\Resources\Hypocolius.svg";
 
         public static readonly DependencyProperty LocalFileNameProperty = DependencyProperty.Register("LocalFileName", 
             typeof(string), typeof(PageSingle), new PropertyMetadata(SvgFileName));
@@ -35,7 +34,7 @@ private void OnPageLoaded(object sender, RoutedEventArgs e)
         {
             string workingDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
-            string svgFilePath = Path.Combine(workingDir, SvgFileName);
+            string svgFilePath = Path.GetFullPath(Path.Combine(workingDir, SvgFileName));
             if (File.Exists(svgFilePath))
             {
                 inputBox.Text = svgFilePath;
diff --git a/Source/SVGImage/DotNetProjects.SVGImage.csproj b/Source/SVGImage/DotNetProjects.SVGImage.csproj
@@ -11,9 +11,9 @@
 		<Product>DotNetProjects.SVGImage</Product>
 		<Copyright>2020-2023 DotNetProjects</Copyright>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<AssemblyVersion>5.0.117.0</AssemblyVersion>
-		<FileVersion>5.0.117.0</FileVersion>
-		<Version>5.0.117</Version>
+		<AssemblyVersion>5.1.0.0</AssemblyVersion>
+		<FileVersion>5.1.0.0</FileVersion>
+		<Version>5.1.0</Version>
 		<OutputType>Library</OutputType>
 		<Configurations>Debug;Release</Configurations>
 	</PropertyGroup>
@@ -31,7 +31,7 @@
 		<PackageReadmeFile>Readme.md</PackageReadmeFile>
 		<EnablePackageValidation>true</EnablePackageValidation>
 		<!-- NOTE: Detect breaking changes from a previous version -->
-		<PackageValidationBaselineVersion>5.0.117</PackageValidationBaselineVersion>
+		<PackageValidationBaselineVersion>5.0.118</PackageValidationBaselineVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Tests/SvgTestBox/SvgResourceColors.xaml b/Tests/SvgTestBox/SvgResourceColors.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SvgTestBox"
         mc:Ignorable="d"
-        Title="Pick a Color" Height="400" Width="490" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" ShowInTaskbar="False">
+        Title="Pick a Color" Height="410" Width="490" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" ShowInTaskbar="False">
     <Window.Resources>
         <Style x:Key="Item.FocusVisual">
             <Setter Property="Control.Template">

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-next-version: 5.0.118`
	`1`	`+next-version: 5.1.0`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Reflection;`
`5`	`5`	`using System.Windows;`
`6`	`6`	`using System.Windows.Controls;`
	`7`	`+using System.IO.Compression;`
`7`	`8`
`8`	`9`	`namespace IconConverterSample`
`9`	`10`	`{`
`@@ -43,8 +44,9 @@ public Uri ImageUri`
`43`	`44`	`/// </summary>`
`44`	`45`	`public partial class PageMultiple : Page`
`45`	`46`	`{`
`46`		`- public const string IconZipFile = @"..\svg-icons.zip";`
`47`		`- public const string IconFolder = @"Svg-Icons";`
	`47`	`+ public const string SamplesDir = @"..\..\..\..\Tests";`
	`48`	`+ public const string IconZipFile = "svg-icons.zip";`
	`49`	`+ public const string IconFolder = "Svg-Icons";`
`48`	`50`
`49`	`51`	`public PageMultiple()`
`50`	`52`	`{`
`@@ -56,15 +58,15 @@ public PageMultiple()`
`56`	`58`
`57`	`59`	`private void OnPageLoaded(object sender, RoutedEventArgs e)`
`58`	`60`	`{`
`59`		`- string workingDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);`
	`61`	`+ string workingDir = Path.GetFullPath(SamplesDir);`
`60`	`62`
`61`		`- string iconsPath = Path.Combine(workingDir, PageMultiple.IconZipFile);`
	`63`	`+ string iconsPath = Path.Combine(workingDir, IconZipFile);`
`62`	`64`	`if (!File.Exists(iconsPath))`
`63`	`65`	`{`
`64`	`66`	`return;`
`65`	`67`	`}`
`66`	`68`
`67`		`- var iconsDir = new DirectoryInfo(Path.Combine(workingDir, PageMultiple.IconFolder));`
	`69`	`+ var iconsDir = new DirectoryInfo(Path.Combine(workingDir, IconFolder));`
`68`	`70`	`if (!iconsDir.Exists)`
`69`	`71`	`{`
`70`	`72`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@ namespace IconConverterSample`
`11`	`11`	`/// </summary>`
`12`	`12`	`public partial class PageSingle : Page`
`13`	`13`	`{`
`14`		`- //private const string SvgFileName = @"..\Asian_Openbill.svg";`
`15`		`- private const string SvgFileName = @"..\Sf_er_nkm.svg";`
	`14`	`+ private const string SvgFileName = @"..\..\Resources\Hypocolius.svg";`
`16`	`15`
`17`	`16`	`public static readonly DependencyProperty LocalFileNameProperty = DependencyProperty.Register("LocalFileName",`
`18`	`17`	`typeof(string), typeof(PageSingle), new PropertyMetadata(SvgFileName));`
`@@ -35,7 +34,7 @@ private void OnPageLoaded(object sender, RoutedEventArgs e)`
`35`	`34`	`{`
`36`	`35`	`string workingDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);`
`37`	`36`
`38`		`- string svgFilePath = Path.Combine(workingDir, SvgFileName);`
	`37`	`+ string svgFilePath = Path.GetFullPath(Path.Combine(workingDir, SvgFileName));`
`39`	`38`	`if (File.Exists(svgFilePath))`
`40`	`39`	`{`
`41`	`40`	`inputBox.Text = svgFilePath;`