Skip to content

Commit 5ede69d

Browse files
BornToBeRootBornToBeRoot
committed
Merge branch 'master' into feature/profile_groups
2 parents cbcc14c + 30ae6bc commit 5ede69d

41 files changed

Lines changed: 3925 additions & 702 deletions

Some content is hidden

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

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches: [ master ]
66
pull_request:
7-
# The branches below must be a subset of the branches above
87
branches: [ master ]
98
schedule:
109
- cron: '29 7 * * 1'
@@ -27,27 +26,13 @@ jobs:
2726
- name: Checkout repository
2827
uses: actions/checkout@v2
2928

30-
# Initializes the CodeQL tools for scanning.
3129
- name: Initialize CodeQL
3230
uses: github/codeql-action/init@v1
3331
with:
3432
languages: ${{ matrix.language }}
3533

36-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
37-
# If this step fails, then you should remove it and run the build manually (see below)
3834
- name: Autobuild
3935
uses: github/codeql-action/autobuild@v1
4036

41-
# ℹ️ Command-line programs to run using the OS shell.
42-
# 📚 https://git.io/JvXDl
43-
44-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
45-
# and modify them (or add more) to build your code if your project
46-
# uses a compiled language
47-
48-
#- run: |
49-
# make bootstrap
50-
# make release
51-
5237
- name: Perform CodeQL Analysis
5338
uses: github/codeql-action/analyze@v1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Library</OutputType>
55
<RootNamespace>NETworkManager.Controls</RootNamespace>
66
<AssemblyName>NETworkManager.Controls</AssemblyName>
7-
<TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
7+
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
88
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
99
<UseWPF>true</UseWPF>
1010
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AppDesignerFolder>Properties</AppDesignerFolder>
66
<RootNamespace>NETworkManager.Converters</RootNamespace>
77
<AssemblyName>NETworkManager.Converters</AssemblyName>
8-
<TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
8+
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
99
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
1010
<UseWPF>true</UseWPF>
1111
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -28,7 +28,7 @@
2828

2929
<ItemGroup>
3030
<PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
31-
<PackageReference Include="MahApps.Metro" Version="2.4.7" />
31+
<PackageReference Include="MahApps.Metro" Version="2.4.9" />
3232
</ItemGroup>
3333

3434
</Project>

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

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Library</OutputType>
55
<RootNamespace>NETworkManager.Localization</RootNamespace>
66
<AssemblyName>NETworkManager.Localization</AssemblyName>
7-
<TargetFramework>net5.0-windows10.0.17763.0</TargetFramework>
7+
<TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
88
<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
99
<UseWPF>true</UseWPF>
1010
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -49,7 +49,7 @@
4949
</ItemGroup>
5050

5151
<ItemGroup>
52-
<PackageReference Include="MahApps.Metro" Version="2.4.7" />
52+
<PackageReference Include="MahApps.Metro" Version="2.4.9" />
5353
</ItemGroup>
5454

5555
<ItemGroup>

‎Source/NETworkManager.Localization/Resources/Strings.it-IT.resx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,7 +2017,7 @@ URL: https://api.github.com/</value>
20172017
<data name="HelpMessage_CheckPublicIPAddress" xml:space="preserve">
20182018
<value>L'indirizzo IP pubblico è determinato tramite ipify.org.
20192019

2020-
URL: https://api.ipify.org/</value>
2020+
URL: https://api.ipify.org e https://api6.ipify.org</value>
20212021
</data>
20222022
<data name="Privacy" xml:space="preserve">
20232023
<value>Privacy</value>
@@ -2363,7 +2363,7 @@ $$hostname$$ --&gt; Nome host</value>
23632363
<value>Nome dominio</value>
23642364
</data>
23652365
<data name="TimeoutS" xml:space="preserve">
2366-
<value>Timeout</value>
2366+
<value>Timeout (s)</value>
23672367
</data>
23682368
<data name="ReportAnIssueOrCreateAFeatureRequest" xml:space="preserve">
23692369
<value>Segnala un problema o richiedi nuova funzionalità</value>
@@ -2969,8 +2969,7 @@ Se selezioni 'Unisci', i profili attuali verranno copiati nella cartella.</value
29692969
'Unisci' copierà i file del profilo nella cartella di destinazione, ma non sovrascriverà i file del profilo di uscita.
29702970
'Usa altra cartella' userà i file del profilo esistenti nella cartella di destinazione.
29712971

2972-
Quindi l'applicazione verrà riavviata!
2973-
</value>
2972+
Quindi l'applicazione verrà riavviata!</value>
29742973
</data>
29752974
<data name="UseOther" xml:space="preserve">
29762975
<value>Usa altri</value>

0 commit comments

Comments
 (0)