consolidate CommonSecurity to Common.dll

build/build_dotnet.cmd

@@ -3,18 +3,19 @@ set CURRENT_DIR=%cd%
 cd /d %~dp0..
 
 cd Azaion.Suite
-dotnet publish -c Release -r win-x64 -p:SatelliteResourceLanguages="en" -p:DebugSymbols=false -p:ForPublish=true --self-contained true
+dotnet publish -c Release -r win-x64 -p:SatelliteResourceLanguages="en" -p:DebugSymbols=false --self-contained true
 cd ..\Azaion.LoaderUI
-dotnet publish -c Release -r win-x64 -p:SatelliteResourceLanguages="en" -p:DebugSymbols=false -p:ForPublish=true --self-contained true
+dotnet publish -c Release -r win-x64 -p:SatelliteResourceLanguages="en" -p:DebugSymbols=false --self-contained true
 cd ..
 
 xcopy Azaion.Suite\bin\Release\net8.0-windows\win-x64\publish dist\ /s /e /q
 del dist\config.json
 move dist\config.production.json dist\config.json
 
-robocopy "dist" "dist-azaion" "Azaion.Annotator.dll" "Azaion.Dataset.dll" "Azaion.Common.dll" "Azaion.CommonSecurity.dll" "Azaion.Suite.dll" "Azaion.Suite.exe" /MOV
-robocopy "dist" "dist-azaion" "Azaion.Suite.runtimeconfig.json" "Azaion.Suite.deps.json" "config.json" "logo.png" /MOV
-robocopy "dist" "dist-azaion" "Azaion.LoaderUI.exe" "Azaion.LoaderUI.runtimeconfig.json" "Azaion.Suite.deps.json" "config.json" "logo.png" /MOV
+robocopy "dist" "dist-azaion" "Azaion.Annotator.dll" "Azaion.Dataset.dll" "Azaion.Common.dll" "Azaion.CommonSecurity.dll" /MOV
+robocopy "dist" "dist-azaion" "Azaion.Suite.dll" "Azaion.Suite.exe" "Azaion.Suite.runtimeconfig.json" "Azaion.Suite.deps.json" "config.json" "logo.png" /MOV
+robocopy "Azaion.LoaderUI\bin\Release\net8.0-windows\win-x64\publish" "dist-dlls" "Azaion.LoaderUI.dll" "Azaion.LoaderUI.exe" "Azaion.LoaderUI.runtimeconfig.json" ^
+ "Azaion.LoaderUI.deps.json" "loaderconfig.json"
 
 if exist dist\libvlc\win-x86 rmdir dist\libvlc\win-x86 /s /q
 robocopy "dist" "dist-dlls" /E /MOVE

build/init.cmd

@@ -1,24 +1,19 @@
-echo Make dirs, copy init dlls
-REM Save the current directory
+@echo off
+echo Make dirs, copy init dlls
 set CURRENT_DIR=%cd%
-
-REM Change to the parent directory of the current location
 cd /d %~dp0..
 
-REM Remove and recreate the dist-dlls and dist-azaion directories
 if exist dist-dlls rmdir dist-dlls /s /q
 mkdir dist-dlls
 if exist dist-azaion rmdir dist-azaion /s /q
 mkdir dist-azaion
 if exist dist rmdir dist /s /q
 mkdir dist
+del "AzaionSuite.Iterative.*"
 
 echo Copying shared libs
 
-REM Copy the shared libs from the source location to dist-dlls
 robocopy "C:\\share" "dist-dlls" "*"
 
-REM Return to the original directory
 cd /d %CURRENT_DIR%
-
 echo Init script completed.

build/publish-full.cmd

@@ -0,0 +1,17 @@
+@echo off
+pushd %~dp0..
+
+call build\init
+
+call build\build_dotnet
+
+call Azaion.Inference\build_inference
+
+call ..\gps-denied\image-matcher\build_gps
+
+call build\download_models
+
+echo building installer...
+iscc build\installer.full.iss
+
+popd

build/publish.cmd

@@ -1,6 +1,7 @@
-rem
- @echo off
-pushd %~dp0..
+setlocal enabledelayedexpansion
+@echo off
+set CURRENT_DIR=%cd%
+cd /d %~dp0..
 
 call build\init
 
@@ -17,4 +18,7 @@ call build\download_models
 echo building installer...
 iscc build\installer.iterative.iss
 
-popd
+call build\upload.cmd "suite"
+
+cd /d %CURRENT_DIR%
+echo Done!

build/upload.cmd

@@ -0,0 +1,43 @@
+setlocal enabledelayedexpansion
+@echo off
+set CURRENT_DIR=%cd%
+cd /d %~dp0..
+
+set API_URL=https://api.azaion.com
+set RESOURCES_FOLDER=%1
+set EMAIL=uploader@azaion.com
+set PASSWORD=Az@1on_10Upl0@der
+
+set "UPLOAD_FILE="
+for /f "delims=" %%i in ('dir /b /a-d "AzaionSuite.Iterative*"') do (
+    if not defined UPLOAD_FILE set "UPLOAD_FILE=%%i"
+)
+
+if not defined UPLOAD_FILE (
+    echo No matching file found.
+    exit /b
+)
+
+echo Logging in and retrieving token...
+for /f "tokens=*" %%i in ('curl -s -X POST -H "Content-Type: application/json" ^
+   -d "{\"email\":\"%EMAIL%\",\"password\":\"%PASSWORD%\"}" %API_URL%/login') do set RESPONSE=%%i
+
+for /f "tokens=2 delims=:" %%a in ('echo %RESPONSE% ^| findstr /i "token"') do (
+    set "TOKEN=%%a"
+    set "TOKEN=!TOKEN:~1,-1!"
+    set "TOKEN=!TOKEN:~0,-2!"
+)
+
+echo clear suite folder
+
+curl -X POST %API_URL%/resources/clear/%RESOURCES_FOLDER% -d {} -H "Authorization: Bearer %TOKEN%"
+
+echo Uploading files to resources...
+
+curl --location %API_URL%/resources/%RESOURCES_FOLDER% ^
+    -H "Authorization: Bearer %TOKEN%" ^
+    -H "Content-Type: multipart/form-data" ^
+    --form "data=@%UPLOAD_FILE%"
+
+cd /d %CURRENT_DIR%
+echo Done!