Skip to content

Commit 107d782

Browse files
BornToBeRootBornToBeRoot
authored
Feature: Add log4net (BornToBeRoot#1539)
* Feature: Add log4net * Chore: Use 6.0.401 as SDK * Fix: RuntimeIdentifier tag * Chore: Rename file * Chore: Code cleanup * Chore: Move settings save to view model * Docs: Add BornToBeRoot#1539 * Fix: Use sdk 6.0.400 because AppVeyor is not on the latest
1 parent 99445e3 commit 107d782

24 files changed

Lines changed: 358 additions & 55 deletions

File tree

‎Source/NETworkManager.Controls/NETworkManager.Controls.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RootNamespace>NETworkManager.Controls</RootNamespace>
66
<AssemblyName>NETworkManager.Controls</AssemblyName>
77
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
8-
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
8+
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
99
<SelfContained>false</SelfContained>
1010
<UseWPF>true</UseWPF>
1111
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎Source/NETworkManager.Converters/NETworkManager.Converters.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<RootNamespace>NETworkManager.Converters</RootNamespace>
77
<AssemblyName>NETworkManager.Converters</AssemblyName>
88
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
9-
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
9+
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
1010
<SelfContained>false</SelfContained>
1111
<UseWPF>true</UseWPF>
1212
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎Source/NETworkManager.Documentation/LibraryManager.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static string GetLicenseLocation()
2626
/// <summary>
2727
/// Static list with all libraries that are used.
2828
/// </summary>
29-
public static List<LibraryInfo> List => new List<LibraryInfo>
29+
public static List<LibraryInfo> List => new()
3030
{
3131
new LibraryInfo("MahApps.Metro", "https://github.com/mahapps/mahapps.metro", Localization.Resources.Strings.Library_MahAppsMetro_Description, Localization.Resources.Strings.License_MITLicense, "https://github.com/MahApps/MahApps.Metro/blob/master/LICENSE"),
3232
new LibraryInfo("MahApps.Metro.IconPacks", "https://github.com/MahApps/MahApps.Metro.IconPacks", Localization.Resources.Strings.Library_MahAppsMetroIconPacks_Description, Localization.Resources.Strings.License_MITLicense, "https://github.com/MahApps/MahApps.Metro.IconPacks/blob/master/LICENSE"),
@@ -45,6 +45,7 @@ public static string GetLicenseLocation()
4545
new LibraryInfo("Microsoft.Web.WebView2", "https://docs.microsoft.com/en-us/microsoft-edge/webview2/", Localization.Resources.Strings.Library_WebView2_Description, Localization.Resources.Strings.License_MicrosoftWebView2License, "https://www.nuget.org/packages/Microsoft.Web.WebView2/1.0.824-prerelease/License"),
4646
new LibraryInfo("Microsoft.Windows.CsWinRT", "https://github.com/microsoft/cswinrt/tree/master/", Localization.Resources.Strings.Library_CsWinRT_Description, Localization.Resources.Strings.License_MITLicense, "https://github.com/microsoft/CsWinRT/blob/master/LICENSE"),
4747
new LibraryInfo("Microsoft.Xaml.Behaviors.Wpf", "https://github.com/microsoft/XamlBehaviorsWpf", Localization.Resources.Strings.Library_XamlBehaviorsWpf_Description, Localization.Resources.Strings.License_MITLicense, "https://github.com/microsoft/XamlBehaviorsWpf/blob/master/LICENSE"),
48+
new LibraryInfo("log4net", "https://logging.apache.org/log4net/", Localization.Resources.Strings.Library_log4net_Description,Localization.Resources.Strings.License_ApacheLicense2dot0, "https://github.com/apache/logging-log4net/blob/master/LICENSE"),
4849
};
4950
}
5051
}

Source/NETworkManager.Documentation/Licenses/ControlsEx.txt renamed to Source/NETworkManager.Documentation/Licenses/ControlzEx.txt

File renamed without changes.

‎Source/NETworkManager.Documentation/Licenses/log4net.txt‎

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
 Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎Source/NETworkManager.Documentation/NETworkManager.Documentation.csproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,18 @@
66
<RootNamespace>NETworkManager.Documentation</RootNamespace>
77
<AssemblyName>NETworkManager.Documentation</AssemblyName>
88
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
9-
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
9+
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
1010
<SelfContained>false</SelfContained>
1111
<UseWPF>true</UseWPF>
1212
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1313
<DocumentationFile>bin\Debug\NETworkManager.Documentation.xml</DocumentationFile>
1414
</PropertyGroup>
1515
<!-- Target 6.0.0 for compatibility https://github.com/dotnet/core/issues/7176 -->
1616
<ItemGroup>
17-
<FrameworkReference
18-
Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms"
19-
TargetingPackVersion="6.0.0" />
17+
<FrameworkReference Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms" TargetingPackVersion="6.0.0" />
2018
</ItemGroup>
2119
<ItemGroup>
20+
<None Remove="Licenses\log4net.txt" />
2221
<None Remove="Licenses\Microsoft.PowerShell.SDK.txt" />
2322
<None Remove="Licenses\Microsoft.Web.WebView2.txt" />
2423
<None Remove="Licenses\Microsoft.Windows.CsWinRT.txt" />
@@ -37,7 +36,7 @@
3736
<Content Include="Licenses\AirspaceFixer.txt">
3837
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3938
</Content>
40-
<Content Include="Licenses\ControlsEx.txt">
39+
<Content Include="Licenses\ControlzEx.txt">
4140
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4241
</Content>
4342
<Content Include="Licenses\DnsClient.NET.txt">
@@ -55,6 +54,9 @@
5554
<Content Include="Licenses\LoadingIndicators.WPF.txt">
5655
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5756
</Content>
57+
<Content Include="Licenses\log4net.txt">
58+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
59+
</Content>
5860
<Content Include="Licenses\MahApps.Metro.IconPack.txt">
5961
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6062
</Content>

‎Source/NETworkManager.Documentation/ResourceManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public static class ResourceManager
1010
/// <summary>
1111
/// Static list with all resources that are used.
1212
/// </summary>
13-
public static List<ResourceInfo> List => new List<ResourceInfo>
13+
public static List<ResourceInfo> List => new()
1414
{
1515
new ResourceInfo("Organizationally unique identifier", "https://linuxnet.ca/ieee/oui/", Localization.Resources.Strings.Resource_OUI_Description),
1616
new ResourceInfo("Service names and port numbers", "https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml", Localization.Resources.Strings.Resource_ServiceNamePortNumber_Description),

‎Source/NETworkManager.Localization/NETworkManager.Localization.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RootNamespace>NETworkManager.Localization</RootNamespace>
66
<AssemblyName>NETworkManager.Localization</AssemblyName>
77
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
8-
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
8+
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
99
<SelfContained>false</SelfContained>
1010
<UseWPF>true</UseWPF>
1111
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

‎Source/NETworkManager.Localization/Resources/Strings.Designer.cs‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/NETworkManager.Localization/Resources/Strings.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3170,4 +3170,7 @@ Enable profile file encryption in Settings&gt;Profile to store credentials secur
31703170
<data name="LocalInterface" xml:space="preserve">
31713171
<value>Local interface</value>
31723172
</data>
3173+
<data name="Library_log4net_Description" xml:space="preserve">
3174+
<value>log4net is a tool to help the programmer output log statements to a variety of output targets.</value>
3175+
</data>
31733176
</root>

0 commit comments

Comments
 (0)