[mapguide-commits] r10013 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2022-11-11 05:29:03 -0800 (Fri, 11 Nov 2022)
New Revision: 10013

Added:
   trunk/MgDev/nuget.debug.config
   trunk/MgDev/nuget.release.config
Removed:
   trunk/MgDev/nuget.config
Modified:
   trunk/MgDev/setenvironment64.bat
Log:
#2852: Due to release/debug building out to separate package paths, we cannot use a single nuget.config that covers both. As as result, we'll maintain separate debug/release copies of nuget.config and copy the right one in when running setenvironment64.bat

Deleted: trunk/MgDev/nuget.config
===================================================================
--- trunk/MgDev/nuget.config	2022-11-11 13:08:02 UTC (rev 10012)
+++ trunk/MgDev/nuget.config	2022-11-11 13:29:03 UTC (rev 10013)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <packageSources>
-        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-        <add key="local" value="packages/DotNet/Release" />
-    </packageSources>
-    <config>
-        <add key="globalPackagesFolder" value="packages/Installed" />
-    </config>
-</configuration>
\ No newline at end of file

Added: trunk/MgDev/nuget.debug.config
===================================================================
--- trunk/MgDev/nuget.debug.config	                        (rev 0)
+++ trunk/MgDev/nuget.debug.config	2022-11-11 13:29:03 UTC (rev 10013)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <packageSources>
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+        <add key="local" value="packages/DotNet/Debug" />
+    </packageSources>
+    <config>
+        <add key="globalPackagesFolder" value="packages/Installed" />
+    </config>
+</configuration>
\ No newline at end of file

Copied: trunk/MgDev/nuget.release.config (from rev 10012, trunk/MgDev/nuget.config)
===================================================================
--- trunk/MgDev/nuget.release.config	                        (rev 0)
+++ trunk/MgDev/nuget.release.config	2022-11-11 13:29:03 UTC (rev 10013)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <packageSources>
+        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+        <add key="local" value="packages/DotNet/Release" />
+    </packageSources>
+    <config>
+        <add key="globalPackagesFolder" value="packages/Installed" />
+    </config>
+</configuration>
\ No newline at end of file

Modified: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat	2022-11-11 13:08:02 UTC (rev 10012)
+++ trunk/MgDev/setenvironment64.bat	2022-11-11 13:29:03 UTC (rev 10013)
@@ -159,6 +159,11 @@
   echo swig.exe was found in: %SWIG_DIR% and will be referred to when building language bindings
 )
 
+if not exist nuget.config (
+  echo Using nuget.%PCONF%.config as default nuget.config
+  copy /Y nuget.%PCONF%.config nuget.config
+)
+
 echo Type build.bat to build MapGuide
 
 goto done