punker76 · pull · Jan 7, 2022 · Jan 7, 2022 · Jan 7, 2022 · Jan 7, 2022
diff --git a/appveyor.yml → .github/appveyor.yml b/appveyor.yml → .github/appveyor.yml
@@ -1,4 +1,4 @@
-image: Visual Studio 2019
+image: Visual Studio 2022
 branches:
   only:
    - master

diff --git a/.mergify.yml → .github/mergify.yml b/.mergify.yml → .github/mergify.yml
@@ -1,31 +1,31 @@
-pull_request_rules:
-  - name: automatic merge for pull request based on label
-    conditions:
-      - label~=LGTM$
-      - check-success=Analyze (csharp)
-      - check-success=CodeQL
-      - check-success=continuous-integration/appveyor/pr
-    actions:
-      merge:
-        method: merge
-  - name: automatic merge for Dependabot pull requests
-    conditions:
-      - author=dependabot[bot]      
-      - check-success=continuous-integration/appveyor/pr
-    actions:
-      merge:
-        method: merge
-  - name: automatic merge for Transifex pull requests
-    conditions:
-      - author=transifex-integration[bot]
-      - check-success=continuous-integration/appveyor/pr
-    actions:
-      merge:
-        method: merge
-  - name: automatic merge for ImgBot pull requests
-    conditions:
-      - author=imgbot[bot]
-      - check-success=continuous-integration/appveyor/pr
-    actions:
-      merge:
-        method: merge
+pull_request_rules:
+  - name: automatic merge for pull request based on label
+    conditions:
+      - label~=LGTM$
+      - check-success=Analyze (csharp)
+      - check-success=CodeQL
+      - check-success=continuous-integration/appveyor/pr
+    actions:
+      merge:
+        method: merge
+  - name: automatic merge for Dependabot pull requests
+    conditions:
+      - author=dependabot[bot]      
+      - check-success=continuous-integration/appveyor/pr
+    actions:
+      merge:
+        method: merge
+  - name: automatic merge for Transifex pull requests
+    conditions:
+      - author=transifex-integration[bot]
+      - check-success=continuous-integration/appveyor/pr
+    actions:
+      merge:
+        method: merge
+  - name: automatic merge for ImgBot pull requests
+    conditions:
+      - author=imgbot[bot]
+      - check-success=continuous-integration/appveyor/pr
+    actions:
+      merge:
+        method: merge
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -1,5 +1,5 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 30
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 7
 # Issues with these labels will never be considered stale

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -4,15 +4,15 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [ master ]
   schedule:
     - cron: '29 7 * * 1'
 
 jobs:
   analyze:
     name: Analyze
-    runs-on: windows-latest
+    # runs-on: windows-latest
+    runs-on: windows-2019
     # Ignore dependabot, ImgBot and transifex-integration
     if: github.actor!= 'dependabot[bot]' &&
         github.actor!= 'imgbot[bot]' &&
@@ -27,27 +27,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
-    # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}        
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
       uses: github/codeql-action/autobuild@v1
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/Chocolatey/networkmanager.nuspec b/Chocolatey/networkmanager.nuspec
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>NETworkManager</id>
-    <version>2021.6.26.0</version>
+    <version>2022.2.22.0</version>
     <owners>BornToBeRoot</owners>
     <title>NETworkManager</title>
     <authors>BornToBeRoot</authors>

diff --git a/Chocolatey/tools/chocolateyinstall.ps1 b/Chocolatey/tools/chocolateyinstall.ps1
@@ -1,6 +1,6 @@
 $ErrorActionPreference = 'Stop'
 $toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
-$url        = 'https://github.com/BornToBeRoot/NETworkManager/releases/download/2021.6.26.0/NETworkManager_2021.6.26.0_Setup.exe'
+$url        = 'https://github.com/BornToBeRoot/NETworkManager/releases/download/2022.2.22.0/NETworkManager_2022.2.22.0_Setup.exe'
 
 $packageArgs = @{
   packageName   = $env:ChocolateyPackageName
@@ -9,7 +9,7 @@ $packageArgs = @{
   url           = $url
   softwareName  = 'NETworkManager*'
 
-  checksum      = 'EAA8D1CC1F76FABD0C26DF70B9E23A21F9F83355D70D0FCCD43E5677A1AE7EAE'
+  checksum      = 'F0CF905B14622588E658977BC2E7B85042858FA4191CDAEF4F84C1BAE2DC9311'
   checksumType  = 'sha256'
 
   silentArgs   = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /TASKS="desktopicon" /SP-'

diff --git a/Images/Create-ImagesFromSVG.ps1 b/Images/Create-ImagesFromSVG.ps1
@@ -0,0 +1,10 @@
+$ConvertPath =  "C:\Tools\ImageMagick-7.1.0-portable-Q16-x64\convert.exe"
+
+$sizes = "16","24","32","48","64","96","128","256","512"
+
+foreach($size in $sizes)
+{
+    Start-Process -FilePath $ConvertPath -ArgumentList "-density 1200 -background transparent $PSScriptRoot\NETworkManager.svg -resize $($size)x$($size) $PSScriptRoot\NETworkManager_$($size)x$($size).png" -NoNewWindow -Wait
+}
+
+Start-Process -FilePath $ConvertPath -ArgumentList "-density 1200 -background transparent $PSScriptRoot\NETworkManager.svg -define icon:auto-resize $PSScriptRoot\NETworkManager.ico" -NoNewWindow -Wait
diff --git a/Images/NETworkManager.ico b/Images/NETworkManager.ico
diff --git a/Images/NETworkManager.svg b/Images/NETworkManager.svg
diff --git a/Images/NETworkManager_128x128.png b/Images/NETworkManager_128x128.png
diff --git a/Images/NETworkManager_16x16.png b/Images/NETworkManager_16x16.png
diff --git a/Images/NETworkManager_24x24.png b/Images/NETworkManager_24x24.png
diff --git a/Images/NETworkManager_256x256.png b/Images/NETworkManager_256x256.png
diff --git a/Images/NETworkManager_32x32.png b/Images/NETworkManager_32x32.png
diff --git a/Images/NETworkManager_48x48.png b/Images/NETworkManager_48x48.png
diff --git a/Images/NETworkManager_512x512.png b/Images/NETworkManager_512x512.png
diff --git a/Images/NETworkManager_64x64.png b/Images/NETworkManager_64x64.png
diff --git a/Images/NETworkManager_96x96.png b/Images/NETworkManager_96x96.png
diff --git a/Images/NETworkManager_InnoSetup.bmp b/Images/NETworkManager_InnoSetup.bmp
diff --git a/Images/v1/NETworkManager.ico b/Images/v1/NETworkManager.ico
diff --git a/Images/v1/NETworkManager.svg b/Images/v1/NETworkManager.svg
diff --git a/Images/NETworkManager48x48.png → Images/v1/NETworkManager48x48.png b/Images/NETworkManager48x48.png → Images/v1/NETworkManager48x48.png
diff --git a/Images/v1/NETworkManager_InnoSetup.bmp b/Images/v1/NETworkManager_InnoSetup.bmp
diff --git a/Images/SplashScreen.png → Images/v1/SplashScreen.png b/Images/SplashScreen.png → Images/v1/SplashScreen.png
diff --git a/Images/SplashScreen.xcf → Images/v1/SplashScreen.xcf b/Images/SplashScreen.xcf → Images/v1/SplashScreen.xcf
diff --git a/InnoSetup.iss b/InnoSetup.iss
@@ -1,8 +1,8 @@
-; Script generated by the Inno Setup Script Wizard.
+; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "NETworkManager"
-#define MyAppVersion "2021.6.26.0"
+#define MyAppVersion "2022.2.22.0"
 #define MyAppPublisher "BornToBeRoot"
 #define MyAppURL "https://github.com/BornToBeRoot/NETworkManager/"
 #define MyAppExeName "NETworkManager.exe"
@@ -38,19 +38,21 @@ ArchitecturesInstallIn64BitMode=x64
 WizardSmallImageFile=Images\NETworkManager_InnoSetup.bmp
 
 [Languages]
-Name: "english";    MessagesFile: "compiler:Default.isl"
-Name: "brasilian";  MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
-Name: "czech";      MessagesFile: "compiler:Languages\Czech.isl"
-Name: "dutch";      MessagesFile: "compiler:Languages\Dutch.isl"
-Name: "french";     MessagesFile: "compiler:Languages\French.isl"
-Name: "german";     MessagesFile: "compiler:Languages\German.isl"
-Name: "italian";    MessagesFile: "compiler:Languages\Italian.isl"
-Name: "japanese";   MessagesFile: "compiler:Languages\Japanese.isl"
-Name: "polish";     MessagesFile: "compiler:Languages\Polish.isl"
-Name: "russian";    MessagesFile: "compiler:Languages\Russian.isl"
-Name: "spanish";    MessagesFile: "compiler:Languages\Spanish.isl"
-Name: "slovenian";  MessagesFile: "compiler:Languages\Slovenian.isl"
-Name: "turkish";    MessagesFile: "compiler:Languages\Turkish.isl"
+Name: "english";            MessagesFile: "compiler:Default.isl"
+Name: "brasilian";          MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"
+Name: "chinesesimplified";  MessagesFile: "compiler:Languages\ChineseSimplified.isl"
+Name: "chinesetraditional"; MessagesFile: "compiler:Languages\ChineseTraditional.isl"
+Name: "czech";              MessagesFile: "compiler:Languages\Czech.isl"
+Name: "dutch";              MessagesFile: "compiler:Languages\Dutch.isl"
+Name: "french";             MessagesFile: "compiler:Languages\French.isl"
+Name: "german";             MessagesFile: "compiler:Languages\German.isl"
+Name: "italian";            MessagesFile: "compiler:Languages\Italian.isl"
+Name: "japanese";           MessagesFile: "compiler:Languages\Japanese.isl"
+Name: "polish";             MessagesFile: "compiler:Languages\Polish.isl"
+Name: "russian";            MessagesFile: "compiler:Languages\Russian.isl"
+Name: "spanish";            MessagesFile: "compiler:Languages\Spanish.isl"
+Name: "slovenian";          MessagesFile: "compiler:Languages\Slovenian.isl"
+Name: "turkish";            MessagesFile: "compiler:Languages\Turkish.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"

diff --git a/README.md b/README.md
@@ -1,9 +1,7 @@
 <div align="center">       
   <h1>NETworkManager</h1>
-  <h3>A powerful tool for managing networks and troubleshoot network problems!</h3>
-
+  <h3>A powerful tool for managing networks and troubleshoot network problems!</h3> 
   <img alt="NETworkManager Preview" src="https://github.com/BornToBeRoot/NETworkManager/blob/master/docs/Preview.gif?raw=true" />
-
   <p>   
     <a href="https://github.com/BornToBeroot/NETworkManager/releases" target="_blank">
       <img alt="All releases" src="https://img.shields.io/github/downloads/BornToBeroot/NETworkManager/total.svg?style=for-the-badge&logo=github" />
@@ -40,6 +38,7 @@
 </div>
 
 # More informations
+- [Features](https://borntoberoot.net/NETworkManager/Features)
 - [Download](https://borntoberoot.net/NETworkManager/Download)
 - [Changelog](https://borntoberoot.net/NETworkManager/Changelog)
 - [Documentation](https://borntoberoot.net/NETworkManager/Documentation/Application)
@@ -49,15 +48,16 @@
 
 # Build
 __Requirements__
-- [SDK .NET 5.0](https://dotnet.microsoft.com/download/dotnet/5.0)
-- Visual Studio with `.NET desktop development` and `Universal Windows Platform development` 
+- [SDK .NET 6.x](https://dotnet.microsoft.com/download/dotnet/6.0)
+- Visual Studio 2019 or later with `.NET desktop development` and `Universal Windows Platform development` 
 
 __Optional__
 - [InnoSetup](https://jrsoftware.org/isinfo.php) (if you want to create an installer)
+  - Download `ChineseSimplified.isl` and `ChineseTraditional.isl` from the [official repo](https://github.com/jrsoftware/issrc/blob/main/Files/Languages/Unofficial/) and place them in the language folder of InnoSetup
 
-__Steps__
-1. Clone or download the repository
-2. Run the `.\build.ps1` script with PowerShell (alternatively open the `Source/NETworkManager.sln` in Visual Studio)
+__Build__
+1. Clone or download the repository: `git clone https://github.com/BornToBeRoot/NETworkManager`
+2. Run the `.\build.ps1` script with PowerShell to compile the solution and create a portable and a setup version (or open the file `Source/NETworkManager.sln` in Visual Studio to debug or build the solution)
 
 You can also copy & paste this command in your PowerShell console :smile:
 ```PowerShell

diff --git a/Scripts/Remove-OriginalStringsFromTranslatedFiles.ps1 b/Scripts/Remove-OriginalStringsFromTranslatedFiles.ps1
diff --git a/Scripts/Rename-TransifexFiles.ps1 b/Scripts/Rename-TransifexFiles.ps1
diff --git a/Source/GlobalAssemblyInfo.cs b/Source/GlobalAssemblyInfo.cs
@@ -1,10 +1,10 @@
-using System.Reflection;
+using System.Reflection;
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyCopyright("Copyright © 2016-2021 BornToBeRoot")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("2021.6.26.0")]
-[assembly: AssemblyFileVersion("2021.6.26.0")]
+[assembly: AssemblyVersion("2022.2.22.0")]
+[assembly: AssemblyFileVersion("2022.2.22.0")]
diff --git a/Source/NETworkManager.Controls/NETworkManager.Controls.csproj b/Source/NETworkManager.Controls/NETworkManager.Controls.csproj
@@ -1,15 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <ProjectGuid>{95EA884C-E498-4A47-A316-DC890BF7F0D2}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>NETworkManager.Controls</RootNamespace>
-    <AssemblyName>NETworkManager.Controls</AssemblyName>
-    <TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
-    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
-    <UseWPF>true</UseWPF>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
-  </ItemGroup>
+	<PropertyGroup>
+		<ProjectGuid>{95EA884C-E498-4A47-A316-DC890BF7F0D2}</ProjectGuid>
+		<OutputType>Library</OutputType>
+		<RootNamespace>NETworkManager.Controls</RootNamespace>
+		<AssemblyName>NETworkManager.Controls</AssemblyName>
+		<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
+		<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+		<SelfContained>false</SelfContained>
+		<UseWPF>true</UseWPF>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+	</PropertyGroup>
+	<!-- Target 6.0.0 for compatibility https://github.com/dotnet/core/issues/7176 -->
+	<ItemGroup>
+		<FrameworkReference
+		Update="Microsoft.WindowsDesktop.App;Microsoft.WindowsDesktop.App.WPF;Microsoft.WindowsDesktop.App.WindowsForms"
+		TargetingPackVersion="6.0.0" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
+	</ItemGroup>
 </Project>
diff --git a/Source/NETworkManager.Converters/GroupViewNameToTranslatedStringConverter.cs b/Source/NETworkManager.Converters/GroupViewNameToTranslatedStringConverter.cs
@@ -0,0 +1,43 @@
+using NETworkManager.Localization.Translators;
+using NETworkManager.Profiles;
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace NETworkManager.Converters
+{
+    /// <summary>
+    /// Convert <see cref="GroupViewName"/> to translated <see cref="string"/> or wise versa.
+    /// </summary>
+    public sealed class GroupViewNameToTranslatedStringConverter : IValueConverter
+    {
+        /// <summary>
+        /// Convert <see cref="GroupViewName"/> to translated <see cref="string"/>. 
+        /// </summary>
+        /// <param name="value">Object from type <see cref="GroupViewName"/>.</param>
+        /// <param name="targetType"></param>
+        /// <param name="parameter"></param>
+        /// <param name="culture"></param>
+        /// <returns>Translated <see cref="GroupViewName"/>.</returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (!(value is GroupViewName name))
+                return "-/-";
+
+            return GroupViewNameTranslator.GetInstance().Translate(name);
+        }
+
+        /// <summary>
+        /// !!! Method not implemented !!!
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="targetType"></param>
+        /// <param name="parameter"></param>
+        /// <param name="culture"></param>
+        /// <returns></returns>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}