Merge branch 'release/3.0.7'

Author: Mindaugas Veblauskas

.editorconfig

@@ -285,3 +285,7 @@ resharper_arrange_this_qualifier_highlighting=hint
 
 # IDE1006: Naming Styles
 dotnet_diagnostic.ide1006.severity=warning
+
+# Ignore that our code is compatible only with Windows
+# CA1416: Validate platform compatibility
+dotnet_diagnostic.CA1416.severity = none

.gitlab-ci.yml

@@ -45,18 +45,19 @@ build-release:
     - echo "Building native dependencies..."
     - 'c:\nuget\nuget.exe restore ProtonVPN.InstallActions.sln'
     - cmd.exe /c BuildDependencies.bat
+    - cmd.exe /c BuildGoSrp.bat src\bin\win-x64\publish\Resources
     - dotnet publish src\ProtonVPN.MarkupValidator\ProtonVPN.MarkupValidator.csproj --arch x64 -c Release --no-self-contained -o src\bin
     - echo "Downloading translations from crowdin..."
     - python ci\main.py lint-languages
     - python ci\main.py add-commit-hash $env:CI_COMMIT_SHORT_SHA
     - python ci\main.py defaultConfig
     - echo "Publishing release..."
-    - dotnet publish ProtonVpn.sln --arch x64 -c Release --no-self-contained --verbosity q -o src\bin
+    - dotnet publish ProtonVpn.sln -c Release -r win-x64 --self-contained
     - msbuild src\ProtonVPN.NativeHost\NativeHost.vcxproj /p:Configuration=Release /p:Platform=x64
   artifacts:
     expire_in: 1 day
     paths:
-      - src/bin
+      - src/bin/win-x64/publish
       - src/ProtonVPN.NativeHost/bin
   only:
     - master
@@ -72,18 +73,19 @@ build-debug:
     - echo "Building native dependencies..."
     - 'c:\nuget\nuget.exe restore ProtonVPN.InstallActions.sln'
     - cmd.exe /c BuildDependencies.bat
+    - cmd.exe /c BuildGoSrp.bat src\bin\win-x64\publish\Resources
     - dotnet publish src\ProtonVPN.MarkupValidator\ProtonVPN.MarkupValidator.csproj --arch x64 -c Release --no-self-contained -o src\bin
     - echo "Downloading translations from crowdin..."
     - python ci\main.py lint-languages
     - python ci\main.py add-commit-hash $env:CI_COMMIT_SHORT_SHA
     - python ci\main.py defaultConfig
     - echo "Publishing debug..."
-    - dotnet publish ProtonVpn.sln --arch x64 -c Debug --no-self-contained --verbosity q -o src\bin
+    - dotnet publish ProtonVpn.sln -c Debug -r win-x64 --self-contained
     - msbuild src\ProtonVPN.NativeHost\NativeHost.vcxproj /p:Configuration=Release /p:Platform=x64
   artifacts:
     expire_in: 1 day
     paths:
-      - src/bin
+      - src/bin/win-x64/publish
       - src/ProtonVPN.NativeHost/bin
   except:
     - master
@@ -96,6 +98,7 @@ tests:
   tags:
     - windows-dot-net
   script:
+    - cmd.exe /c BuildGoSrp.bat src\bin\Resources
     - dotnet restore ProtonVpn.sln
     - dotnet build ProtonVpn.sln
     - coverlet src\bin --target "dotnet" --targetargs "test ProtonVpn.sln -l ""console;verbosity=normal"" --filter ""TestCategory!=UI&TestCategory!=Connection"" --no-restore --no-build" --format cobertura --output .\coverage-reports --exclude "[*.Tests*]*" --exclude "[ProtonVPN.MarkupValidator]*" --exclude "[TestTools*]*" --exclude "[*.Installers]*"
@@ -185,7 +188,7 @@ ui-test:
       - $SCREENSHOT_PATH
       - "results/*"
     expire_in: 1 weeks
-    
+
 connection-test:
   stage: ui-test
   tags:
@@ -210,7 +213,7 @@ connection-test:
       - $SCREENSHOT_PATH
       - "results/*"
     expire_in: 1 weeks
-    
+
 win-11-test:
   stage: ui-test
   when: manual

BuildDependencies.bat

@@ -1,23 +1,16 @@
-set outputDir=..\bin\Resources\
+set outputDir=..\bin\win-x64\publish\Resources\
 set platformToolset=v143
 set GOARCH=amd64
 
 msbuild src\ProtonVPN.IpFilter\ProtonVPN.IpFilter.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=x64 /p:Configuration=Release /p:OutDir=%outputDir%
 msbuild src\ProtonVPN.NetworkUtil\ProtonVPN.NetworkUtil.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=x64 /p:Configuration=Release /p:OutDir=%outputDir%
-msbuild src\ProtonVPN.InstallActions\ProtonVPN.InstallActions.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=Win32 /p:Configuration=Release
-msbuild src\ProtonVPN.InstallActions\ProtonVPN.InstallActions.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=x64 /p:Configuration=Release
-
-::GoSrp.dll
-pushd %~dp0\src\srp\windows\cshared
-set fn=GoSrp
-set gn=main.go
-set CGO_ENABLED=1
-go build -buildmode=c-shared -v -ldflags="-s -w" -o ..\..\..\bin\Resources\%fn%.dll %gn%
+msbuild src\ProtonVPN.InstallActions\ProtonVPN.InstallActions.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=Win32 /p:Configuration=Release /p:OutDir=%outputDir%..\
+msbuild src\ProtonVPN.InstallActions\ProtonVPN.InstallActions.vcxproj /p:PlatformToolset=%platformToolset% /p:Platform=x64 /p:Configuration=Release /p:OutDir=%outputDir%..\
 
 ::LocalAgent.dll
 pushd %~dp0\src\ProtonVPN.LocalAgent\localAgentWin
 set GOOS=windows
 set GO111MODULE=off
 set CGO_CFLAGS=-O3 -Wall -Wno-unused-function -Wno-switch -std=gnu11 -DWINVER=0x0601
 set CC=x86_64-w64-mingw32-gcc
-go build -buildmode c-shared -ldflags="-w -s" -trimpath -v -o "..\..\bin\Resources\LocalAgent.dll" || exit /b 1
+go build -buildmode c-shared -ldflags="-w -s" -trimpath -v -o "..\..\bin\win-x64\publish\Resources\LocalAgent.dll" || exit /b 1

BuildGoSrp.bat

@@ -0,0 +1,4 @@
+pushd %~dp0\src\srp\windows\cshared
+set CGO_ENABLED=1
+go build -buildmode=c-shared -v -ldflags="-s -w" -o GoSrp.dll main.go
+echo F| xcopy GoSrp.dll %~dp0%1\GoSrp.dll