From b79b6d36163fb08d86963178bc41c9e0ca4d7ca2 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 19 May 2022 16:13:05 +0200
Subject: [PATCH] UPdate nuspec vari

---
 .gitlab-ci.yml                       | 18 +++++++++++++-----
 EgwProxy.Icoel.Debug.nuspec          |  3 ---
 EgwProxy.Icoel.Release.nuspec        |  3 ---
 EgwProxy.Icoel/EgwProxy.Icoel.csproj |  4 ----
 EgwProxy.Icoel/packages.config       |  4 ----
 EgwProxy.MultiCncLib.Debug.nuspec    |  3 ---
 EgwProxy.MultiCncLib.Release.nuspec  |  3 ---
 EgwProxy.OsaiCncLib.Debug.nuspec     |  3 ---
 EgwProxy.OsaiCncLib.Release.nuspec   |  3 ---
 9 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 EgwProxy.Icoel/packages.config

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce859bae..9d7d26c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -270,7 +270,9 @@ EgwProxy.MultiCncLib:build:staging:
    - *nuspec-fix
  script:  
     - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -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.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB'
+    - '& Remove-Item *.nupkg'
+    - '& $env:NUGET_PATH pack "$env:APP_NAME.Debug.nuspec"'
+#    - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.vbproj" -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'
 
@@ -293,7 +295,9 @@ EgwProxy.OsaiCncLib:build:staging:
    - *nuspec-fix
  script:  
     - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -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.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_DEB'
+    - '& Remove-Item *.nupkg'
+    - '& $env:NUGET_PATH pack "$env:APP_NAME.Debug.nuspec"'
+#    - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.vbproj" -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'
 
@@ -377,7 +381,7 @@ EgwProxy.Icoel:build:release:
  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'
     - '& Remove-Item *.nupkg'
-    - '& $env:NUGET_PATH pack "$env:APP_NAME.Debug.nuspec"'
+    - '& $env:NUGET_PATH pack "$env:APP_NAME.Release.nuspec"'
 #    - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.csproj" -properties Configuration=$env:CONFIG -Version $env:NUM_REL'
     - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
     - '& "$env:NUGET_PATH" push *$env:NUM_REL.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
@@ -401,7 +405,9 @@ EgwProxy.MultiCncLib:build:release:
    - *nuspec-fix
  script:  
     - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -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.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_REL'
+    - '& Remove-Item *.nupkg'
+    - '& $env:NUGET_PATH pack "$env:APP_NAME.Release.nuspec"'
+#    - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_REL'
     - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
     - '& "$env:NUGET_PATH" push *$env:NUM_REL.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
 
@@ -424,7 +430,9 @@ EgwProxy.OsaiCncLib:build:release:
    - *nuspec-fix
  script:  
     - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -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.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_REL'
+    - '& Remove-Item *.nupkg'
+    - '& $env:NUGET_PATH pack "$env:APP_NAME.Release.nuspec"'
+#    - '& "$env:NUGET_PATH" pack "$env:APP_NAME\$env:APP_NAME.vbproj" -properties Configuration=$env:CONFIG -Version $env:NUM_REL'
     - '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
     - '& "$env:NUGET_PATH" push *$env:NUM_REL.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
 
diff --git a/EgwProxy.Icoel.Debug.nuspec b/EgwProxy.Icoel.Debug.nuspec
index ee7e7772..5026df13 100644
--- a/EgwProxy.Icoel.Debug.nuspec
+++ b/EgwProxy.Icoel.Debug.nuspec
@@ -11,9 +11,6 @@
     <releaseNotes>#releaseNotes#</releaseNotes>
     <copyright>#copyright#</copyright>
     <tags>EgwProxy.Icoel EgwProxy Icoel</tags>
-    <dependencies>
-      <dependency id="NLog" version="5.0.0" />
-    </dependencies>
   </metadata>
   <files>
     <file src="EgwProxy.Icoel\bin\Debug\EgwProxy*.dll" target="lib" />
diff --git a/EgwProxy.Icoel.Release.nuspec b/EgwProxy.Icoel.Release.nuspec
index b3ff8621..914ded8e 100644
--- a/EgwProxy.Icoel.Release.nuspec
+++ b/EgwProxy.Icoel.Release.nuspec
@@ -11,9 +11,6 @@
     <releaseNotes>#releaseNotes#</releaseNotes>
     <copyright>#copyright#</copyright>
     <tags>EgwProxy.Icoel EgwProxy Icoel</tags>
-    <dependencies>
-      <dependency id="NLog" version="5.0.0" />
-    </dependencies>
   </metadata>
   <files>
     <file src="EgwProxy.Icoel\bin\Debug\EgwProxy*.dll" target="lib" />
diff --git a/EgwProxy.Icoel/EgwProxy.Icoel.csproj b/EgwProxy.Icoel/EgwProxy.Icoel.csproj
index 77ee9ad6..b10ce5ca 100644
--- a/EgwProxy.Icoel/EgwProxy.Icoel.csproj
+++ b/EgwProxy.Icoel/EgwProxy.Icoel.csproj
@@ -39,9 +39,6 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.5.0.0\lib\net46\NLog.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -146,7 +143,6 @@
     </None>
     <None Include="docfx.json" />
     <None Include="index.md" />
-    <None Include="packages.config" />
     <None Include="toc.yml" />
   </ItemGroup>
   <ItemGroup>
diff --git a/EgwProxy.Icoel/packages.config b/EgwProxy.Icoel/packages.config
deleted file mode 100644
index b76cf6c3..00000000
--- a/EgwProxy.Icoel/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NLog" version="5.0.0" targetFramework="net462" />
-</packages>
\ No newline at end of file
diff --git a/EgwProxy.MultiCncLib.Debug.nuspec b/EgwProxy.MultiCncLib.Debug.nuspec
index effaa1dd..497ba011 100644
--- a/EgwProxy.MultiCncLib.Debug.nuspec
+++ b/EgwProxy.MultiCncLib.Debug.nuspec
@@ -11,9 +11,6 @@
     <releaseNotes>#releaseNotes#</releaseNotes>
     <copyright>#copyright#</copyright>
     <tags>EgwProxy.MultiCncLib EgwProxy MultiCncLib FANUC SIEMENS OSAI</tags>
-    <dependencies>
-      <dependency id="NLog" version="5.0.0" />
-    </dependencies>
   </metadata>
   <files>
     <file src="EgwProxy.MultiCncLib\bin\Debug\EgwProxy*.dll" target="lib" />
diff --git a/EgwProxy.MultiCncLib.Release.nuspec b/EgwProxy.MultiCncLib.Release.nuspec
index cf4357b1..5d82fe43 100644
--- a/EgwProxy.MultiCncLib.Release.nuspec
+++ b/EgwProxy.MultiCncLib.Release.nuspec
@@ -11,9 +11,6 @@
     <releaseNotes>#releaseNotes#</releaseNotes>
     <copyright>#copyright#</copyright>
     <tags>EgwProxy.MultiCncLib EgwProxy MultiCncLib FANUC SIEMENS OSAI</tags>
-    <dependencies>
-      <dependency id="NLog" version="5.0.0" />
-    </dependencies>
   </metadata>
   <files>
     <file src="EgwProxy.MultiCncLib\bin\Debug\EgwProxy*.dll" target="lib" />
diff --git a/EgwProxy.OsaiCncLib.Debug.nuspec b/EgwProxy.OsaiCncLib.Debug.nuspec
index 4bff8be7..ebddc897 100644
--- a/EgwProxy.OsaiCncLib.Debug.nuspec
+++ b/EgwProxy.OsaiCncLib.Debug.nuspec
@@ -11,9 +11,6 @@
     <releaseNotes>#releaseNotes#</releaseNotes>
     <copyright>#copyright#</copyright>
     <tags>EgwProxy.OsaiCncLib EgwProxy OsaiCncLib</tags>
-    <dependencies>
-      <dependency id="NLog" version="5.0.0" />
-    </dependencies>
   </metadata>
   <files>
     <file src="EgwProxy.OsaiCncLib\bin\Debug\EgwProxy*.dll" target="lib" />
diff --git a/EgwProxy.OsaiCncLib.Release.nuspec b/EgwProxy.OsaiCncLib.Release.nuspec
index e7f4ec50..18dde968 100644
--- a/EgwProxy.OsaiCncLib.Release.nuspec
+++ b/EgwProxy.OsaiCncLib.Release.nuspec
@@ -11,9 +11,6 @@
     <releaseNotes>#releaseNotes#</releaseNotes>
     <copyright>#copyright#</copyright>
     <tags>EgwProxy.OsaiCncLib EgwProxy OsaiCncLib OSAI</tags>
-    <dependencies>
-      <dependency id="NLog" version="5.0.0" />
-    </dependencies>
   </metadata>
   <files>
     <file src="EgwProxy.OsaiCncLib\bin\Debug\EgwProxy*.dll" target="lib" />