From d0b07cb6d392283f2bfb54bf98a9b08862b7aab3 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 19 May 2022 12:01:18 +0200 Subject: [PATCH] Update yaml x compilare i 3 progetti dll come nuget --- .gitlab-ci.yml | 71 ++++++++++++++++++- .../EgwProxy.MultiCncLib.vbproj | 3 + .../My Project/AssemblyInfo.vb | 12 ++-- .../My Project/AssemblyInfo.vb | 4 +- 4 files changed, 81 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc85f350..796d5b1a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -182,6 +182,31 @@ EgwProxy.Icoel:build: script: - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' +EgwProxy.MultiCncLib:build: + stage: build + tags: + - win + variables: + APP_NAME: EgwProxy.MultiCncLib + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' + +EgwProxy.OsaiCncLib:build: + stage: build + tags: + - win + variables: + APP_NAME: EgwProxy.OsaiCncLib + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m' # -------------------------------- # STAGING: (nuget beta) @@ -207,7 +232,51 @@ EgwProxy.Icoel:build:staging: - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.csproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB' - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted' - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' - + +EgwProxy.MultiCncLib:build:staging: + stage: staging + needs: ["EgwProxy.MultiCncLib:build"] + tags: + - win + variables: + CONFIG: Debug + APP_NAME: EgwProxy.MultiCncLib + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m' + - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.csproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB' + - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted' + - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' + +EgwProxy.OsaiCncLib:build:staging: + stage: staging + needs: ["EgwProxy.OsaiCncLib:build"] + tags: + - win + variables: + CONFIG: Debug + APP_NAME: EgwProxy.OsaiCncLib + except: + refs: + - main + - master + before_script: + - *nuget-fix + - '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet' + - *version-fix + script: + - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m' + - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.csproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB' + - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted' + - '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted' + # -------------------------------- # RELEASE # -------------------------------- diff --git a/EgwProxy.MultiCncLib/EgwProxy.MultiCncLib.vbproj b/EgwProxy.MultiCncLib/EgwProxy.MultiCncLib.vbproj index ba94fbdc..251e1244 100644 --- a/EgwProxy.MultiCncLib/EgwProxy.MultiCncLib.vbproj +++ b/EgwProxy.MultiCncLib/EgwProxy.MultiCncLib.vbproj @@ -204,6 +204,9 @@ + + VersGen.vb + diff --git a/EgwProxy.MultiCncLib/My Project/AssemblyInfo.vb b/EgwProxy.MultiCncLib/My Project/AssemblyInfo.vb index 2fc16abb..61167e3d 100644 --- a/EgwProxy.MultiCncLib/My Project/AssemblyInfo.vb +++ b/EgwProxy.MultiCncLib/My Project/AssemblyInfo.vb @@ -8,11 +8,11 @@ Imports System.Runtime.InteropServices ' Review the values of the assembly attributes - - - + + +' - +' @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - +' +' diff --git a/EgwProxy.OsaiCncLib/My Project/AssemblyInfo.vb b/EgwProxy.OsaiCncLib/My Project/AssemblyInfo.vb index b0e7691c..63714685 100644 --- a/EgwProxy.OsaiCncLib/My Project/AssemblyInfo.vb +++ b/EgwProxy.OsaiCncLib/My Project/AssemblyInfo.vb @@ -9,9 +9,9 @@ Imports System.Runtime.InteropServices ' Review the values of the assembly attributes - + ' - + '