Merge remote-tracking branch 'origin/release/2.0.1'

Author: mindaugasveblauskas

.gitlab-ci.yml

@@ -38,6 +38,7 @@ build-release:
     - git clone -b windows-vpn --single-branch "https://gitlab-ci-token:${CI_JOB_TOKEN}@${I18N_CACHE_REPO}" --depth 1
     - python ci\main.py add-languages
     - python ci\main.py add-commit-hash $env:CI_COMMIT_SHORT_SHA
+    - python ci\main.py defaultConfig
     - echo "Building release..."
     - MSBuild.exe /consoleloggerparameters:ErrorsOnly /maxcpucount /nologo /property:Configuration=Release /verbosity:quiet "ProtonVpn.sln"
   artifacts:
@@ -62,6 +63,7 @@ build-debug:
     - git clone -b windows-vpn --single-branch "https://gitlab-ci-token:${CI_JOB_TOKEN}@${I18N_CACHE_REPO}" --depth 1
     - python ci\main.py add-languages
     - python ci\main.py add-commit-hash $env:CI_COMMIT_SHORT_SHA
+    - python ci\main.py defaultConfig
     - echo "Building debug..."
     - MSBuild.exe /consoleloggerparameters:ErrorsOnly /maxcpucount /nologo /property:Configuration=Debug /verbosity:quiet "ProtonVpn.sln"
   artifacts:
@@ -110,7 +112,6 @@ prepare-internal-beta-release:
     - python -m pip install -r ci\python-libs.txt
     - python ci\prepare-internal-beta.py
   only:
-    - master
     - /^release.*$/
 
 build-installer-for-debug:

COPYING.md

@@ -50,8 +50,6 @@ Proton VPN Windows app includes the following 3rd party software:
   | [Apache License 2.0](https://github.com/MichaCo/DnsClient.NET/blob/master/LICENSE).
 * [DynamicExpresso.Core](https://github.com/davideicardi/DynamicExpresso) by Davide Icardi
   | [The MIT License](https://github.com/davideicardi/DynamicExpresso/blob/master/LICENSE).
-* [FontAwesome.WPF](https://github.com/charri/Font-Awesome-WPF/) by charri
-  | [The MIT License](https://github.com/charri/Font-Awesome-WPF/blob/master/LICENSE).
 * [MvvmLightLibsStd10](http://www.mvvmlight.net/) by Laurent Bugnion (GalaSoft)
   | [The MIT License](https://github.com/lbugnion/mvvmlight/blob/master/LICENSE). 
 * [Newtonsoft.Json](https://www.newtonsoft.com/json) by James Newton-King

ProtonVpn.sln

@@ -76,10 +76,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProtonVPN.CalloutDriver", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.NetworkFilter", "src\ProtonVPN.NetworkFilter\ProtonVPN.NetworkFilter.csproj", "{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.UpdateService", "src\ProtonVPN.UpdateService\ProtonVPN.UpdateService.csproj", "{3AED8207-E3C7-46D6-840D-CAE920ADD775}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.UpdateServiceContract", "src\ProtonVPN.UpdateServiceContract\ProtonVPN.UpdateServiceContract.csproj", "{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.MarkupValidator", "src\ProtonVPN.MarkupValidator\ProtonVPN.MarkupValidator.csproj", "{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtonVPN.TlsVerify", "src\ProtonVPN.TlsVerify\ProtonVPN.TlsVerify.csproj", "{643CA26B-B80E-4E6A-AAE4-BCEC021D2AA0}"
@@ -377,30 +373,6 @@ Global
 		{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}.Release|x64.Build.0 = Release|Any CPU
 		{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}.Release|x86.ActiveCfg = Release|Any CPU
 		{1CF1B8BF-57EB-4E49-B644-0A8F2DFEEB58}.Release|x86.Build.0 = Release|Any CPU
-		{3AED8207-E3C7-46D6-840D-CAE920ADD775}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AED8207-E3C7-46D6-840D-CAE920ADD775}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AED8207-E3C7-46D6-840D-CAE920ADD775}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3AED8207-E3C7-46D6-840D-CAE920ADD775}.Debug|x64.Build.0 = Debug|Any CPU
-		{3AED8207-E3C7-46D6-840D-CAE920ADD775}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3AED8207-E3C7-46D6-840D-CAE920ADD775}.Debug|x86.Build.0 = Debug|Any CPU
-		{3AED8207-E3C7-46D6-840D-CAE920ADD775}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3AED8207-E3C7-46D6-840D-CAE920ADD775}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AED8207-E3C7-46D6-840D-CAE920ADD775}.Release|x64.ActiveCfg = Release|Any CPU
-		{3AED8207-E3C7-46D6-840D-CAE920ADD775}.Release|x64.Build.0 = Release|Any CPU
-		{3AED8207-E3C7-46D6-840D-CAE920ADD775}.Release|x86.ActiveCfg = Release|Any CPU
-		{3AED8207-E3C7-46D6-840D-CAE920ADD775}.Release|x86.Build.0 = Release|Any CPU
-		{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}.Debug|x64.Build.0 = Debug|Any CPU
-		{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}.Debug|x86.Build.0 = Debug|Any CPU
-		{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}.Release|x64.ActiveCfg = Release|Any CPU
-		{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}.Release|x64.Build.0 = Release|Any CPU
-		{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}.Release|x86.ActiveCfg = Release|Any CPU
-		{BB748EA2-EA18-4E6C-AB22-CCC1D91E8844}.Release|x86.Build.0 = Release|Any CPU
 		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BA03F069-6A26-45D1-8B05-6E61E3D9D1E1}.Debug|x64.ActiveCfg = Debug|Any CPU