Skip to content

Commit ce25313

Browse files
paulushubpaulushub
committed
Updated version, moved to VS2022 for .NET6/7 support, code improvements.
- Removed the current project files to *.VS2019.csproj - Versions set to 5.x - Added license to documentations
1 parent 07ade57 commit ce25313

File tree

97 files changed

+2362
-949
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2362
-949
lines changed

‎.github/workflows/gh-pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
publish-docs:
11-
runs-on: windows-2019
11+
runs-on: windows-latest
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v3

‎Docs/api/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The SVG animation elements namespace.
1212
A namespace defining interfaces for loading external documents and resources.
1313

1414
#### [SVGImage.SVG.Filters](xref:SVGImage.SVG.Filters)
15-
A namespace defining some of the SVG filters/
15+
A namespace defining some of the SVG filters.
1616

1717
#### [SVGImage.SVG.PaintServers](xref:SVGImage.SVG.PaintServers)
1818
The namespace defining SVG paint servers.

‎Docs/articles/license.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
The MIT License (MIT)
2+
=====================
3+
4+
Copyright (c) `2020-2023` `PropertyTools and DotNetProjects contributors`
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a
7+
copy of this software and associated documentation files (the
8+
"Software"), to deal in the Software without restriction, including
9+
without limitation the rights to use, copy, modify, merge, publish,
10+
distribute, sublicense, and/or sell copies of the Software, and to
11+
permit persons to whom the Software is furnished to do so, subject to
12+
the following conditions:
13+
14+
The above copyright notice and this permission notice shall be included
15+
in all copies or substantial portions of the Software.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
18+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
20+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
21+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
22+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
23+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎Docs/articles/toc.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
- name: Introduction
22
href: intro.md
3+
- name: License
4+
href: license.md

‎Docs/docfx.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"_appFaviconPath": "images/dotnetprojects.png",
5656
"_enableDiagrams": true,
5757
"_enableSearch": true,
58-
"_appFooter": "<div class=\"d-flex flex-column flex-sm-row justify-content-between pt-1\"><p> &copy; 2010 - 2023 DotNetProjects</p><p>Made with <a href=\"https://dotnet.github.io/docfx\">DocFX</a></p></div>",
58+
"_appFooter": "<div class=\"d-flex flex-column flex-sm-row justify-content-between pt-1\"><p> &copy; 2020 - 2023 DotNetProjects</p><p>Made with <a href=\"https://dotnet.github.io/docfx\">DocFX</a></p></div>",
5959
"_gitContribute": {
6060
"repo": "https://github.com/dotnetprojects/SVGImage",
6161
"branch": "master"

‎Docs/template/public/main.css‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
/* Checkout https://getbootstrap.com/docs/5.3/customize/color/ for more customization options */
22
.navbar-brand #logo {
3-
width: 42px;
3+
width: 36px;
44
height: 36px;
5+
margin-right:10px;
56
}
6-
7+
/*
78
#navbar ul.navbar-nav {
89
margin-top: -3px;
910
}
11+
*/

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014 PropertyTools contributors
3+
Copyright (c) 2023 PropertyTools and DotNetProjects contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a
66
copy of this software and associated documentation files (the

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ Besides the bug fixes, new features are added including the following:
88
- Support of styles.
99
- Simple Animation support.
1010

11+
## Documentations
12+
For the User Manual and API References see [Documentation](http://dotnetprojects.github.io/SVGImage/).
13+
1114
## Framework support
1215
The SVGImage control library targets the following frameworks
1316
* .NET Framework, Version 4.0
@@ -16,6 +19,7 @@ The SVGImage control library targets the following frameworks
1619
* .NET Framework, Version 4.7
1720
* .NET Framework, Version 4.8
1821
* .NET Core, Version 3.1
22+
* .NET 6 ~ 7
1923

2024
## License
2125
The SVGImage control library is relicensed under [MIT License](https://github.com/dotnetprojects/SVGImage/blob/master/LICENSE),

‎Samples/ClipArtViewer/ClipArtViewer.VS2017.csproj‎

Lines changed: 0 additions & 184 deletions
This file was deleted.

‎Samples/ClipArtViewer/ClipArtViewer.VS2019.csproj‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
<PropertyGroup>
3+
<TargetFrameworks>net40;net45;net46;net47;net48;netcoreapp3.1</TargetFrameworks>
4+
<OutputType>WinExe</OutputType>
5+
<UseWPF>true</UseWPF>
6+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7+
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
8+
<RootNamespace>ClipArtViewer</RootNamespace>
9+
<AssemblyName>ClipArtViewer</AssemblyName>
10+
<AppConfig Condition="'$(TargetFramework)' == 'net40'">App.net40.config</AppConfig>
11+
<AutoUnifyAssemblyReferences Condition="'$(TargetFramework)' == 'net40'">false</AutoUnifyAssemblyReferences>
12+
<Configurations>Debug;Release</Configurations>
13+
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15+
<DebugType>full</DebugType>
16+
<DebugSymbols>true</DebugSymbols>
17+
<DefineConstants>DEBUG;TRACE</DefineConstants>
18+
<WarningLevel>4</WarningLevel>
19+
<OutputPath>Output\</OutputPath>
20+
</PropertyGroup>
21+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
22+
<DefineConstants>TRACE</DefineConstants>
23+
<WarningLevel>4</WarningLevel>
24+
<OutputPath>Output\</OutputPath>
25+
</PropertyGroup>
26+
<PropertyGroup>
27+
<ApplicationIcon>ClipArtViewer.ico</ApplicationIcon>
28+
</PropertyGroup>
29+
<ItemGroup>
30+
<ProjectReference Include="..\..\Source\SVGImage\DotNetProjects.SVGImage.VS2019.csproj" />
31+
</ItemGroup>
32+
<ItemGroup>
33+
<Compile Update="Properties\Resources.Designer.cs">
34+
<AutoGen>True</AutoGen>
35+
<DesignTime>True</DesignTime>
36+
<DependentUpon>Resources.resx</DependentUpon>
37+
</Compile>
38+
<Compile Update="Properties\Settings.Designer.cs">
39+
<AutoGen>True</AutoGen>
40+
<DependentUpon>Settings.settings</DependentUpon>
41+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
42+
</Compile>
43+
<EmbeddedResource Update="Properties\Resources.resx">
44+
<Generator>ResXFileCodeGenerator</Generator>
45+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
46+
</EmbeddedResource>
47+
<None Update="Properties\Settings.settings">
48+
<Generator>SettingsSingleFileGenerator</Generator>
49+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
50+
</None>
51+
</ItemGroup>
52+
<ItemGroup Condition=" '$(TargetFramework)' == 'net40'">
53+
<PackageReference Include="Microsoft.Bcl.Async" Version="1.0.168" />
54+
<Reference Include="ShellFileDialogs">
55+
<HintPath>..\..\Tests\Libs\net40\ShellFileDialogs.dll</HintPath>
56+
</Reference>
57+
<Reference Include="Notifications.Wpf">
58+
<HintPath>..\..\Tests\Libs\net40\Notifications.Wpf.dll</HintPath>
59+
</Reference>
60+
</ItemGroup>
61+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45'">
62+
<Reference Include="ShellFileDialogs">
63+
<HintPath>..\..\Tests\Libs\net45\ShellFileDialogs.dll</HintPath>
64+
</Reference>
65+
<Reference Include="Notifications.Wpf">
66+
<HintPath>..\..\Tests\Libs\net45\Notifications.Wpf.dll</HintPath>
67+
</Reference>
68+
</ItemGroup>
69+
<ItemGroup Condition=" '$(TargetFramework)' == 'net46'">
70+
<Reference Include="ShellFileDialogs">
71+
<HintPath>..\..\Tests\Libs\net46\ShellFileDialogs.dll</HintPath>
72+
</Reference>
73+
<Reference Include="Notifications.Wpf">
74+
<HintPath>..\..\Tests\Libs\net46\Notifications.Wpf.dll</HintPath>
75+
</Reference>
76+
</ItemGroup>
77+
<ItemGroup Condition=" '$(TargetFramework)' == 'net47'">
78+
<Reference Include="ShellFileDialogs">
79+
<HintPath>..\..\Tests\Libs\net47\ShellFileDialogs.dll</HintPath>
80+
</Reference>
81+
<Reference Include="Notifications.Wpf">
82+
<HintPath>..\..\Tests\Libs\net47\Notifications.Wpf.dll</HintPath>
83+
</Reference>
84+
</ItemGroup>
85+
<ItemGroup Condition=" '$(TargetFramework)' == 'net48'">
86+
<Reference Include="ShellFileDialogs">
87+
<HintPath>..\..\Tests\Libs\net48\ShellFileDialogs.dll</HintPath>
88+
</Reference>
89+
<Reference Include="Notifications.Wpf">
90+
<HintPath>..\..\Tests\Libs\net48\Notifications.Wpf.dll</HintPath>
91+
</Reference>
92+
</ItemGroup>
93+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
94+
<Reference Include="ShellFileDialogs">
95+
<HintPath>..\..\Tests\Libs\netstandard2.1\ShellFileDialogs.dll</HintPath>
96+
</Reference>
97+
<Reference Include="Notifications.Wpf">
98+
<HintPath>..\..\Tests\Libs\netcoreapp3.1\Notifications.Wpf.dll</HintPath>
99+
</Reference>
100+
</ItemGroup>
101+
</Project>

0 commit comments

Comments
 (0)