Merge branch 'Gerardo/Compilacion.net' into develop

# Conflicts:
#	Conexion/Cstr_socket.cs
#	Helper/HelperGdb.cs
#	Services/EjecServ.cs
#	Services/LanzaSrv/LanzaLimpSrv.cs
#	Services/ProcesoEjecServ.cs
#	View/Configuracion/PaneConfigView.xaml
#	View/Limpieza/PaneLimpiezaSub2.xaml.cs
#	ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs

Conexion/Cstr_socket.cs

@@ -24,7 +24,7 @@ namespace OliviaAddIn
         //devuelve -1 si no se ha podido crear socket
         //0 si no se puede conectar
         //1 si conectado
-       public bool conecta(string ip, int puerto, string ip_local = "")
+       public bool conecta(string ip, int puerto, string ip_local="")
        {
            termina();
            try
@@ -120,7 +120,7 @@ namespace OliviaAddIn
        unsafe public static extern IntPtr str_socket_crea();
 
        [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
-       unsafe public static extern int str_socket_conecta(IntPtr soc, String ip, int puerto, String ip_local = null);
+       unsafe public static extern int str_socket_conecta(IntPtr soc, String ip, int puerto, String ip_local=null);
 
        [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
        unsafe public static extern int str_socket_envia(IntPtr soc, String txt);//solo este

Config.daml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ArcGIS defaultAssembly="OliviaAddInPro.dll" defaultNamespace="OliviaAddInPro" xmlns="http://schemas.esri.com/DADF/Registry" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.esri.com/DADF/Registry file:///C:/Program%20Files/ArcGIS/Pro/bin/ArcGIS.Desktop.Framework.xsd">
-  <AddInInfo id="{10742570-cf59-42f2-bea2-2a38002a06ee}" version="3.1" desktopVersion="3.0.3.36057">
+  <AddInInfo id="{10742570-cf59-42f2-bea2-2a38002a06ee}" version="3.2" desktopVersion="3.0.3.36057">
     <Name>OliviaAddInPro</Name>
     <Description>AddIn de Optimización de la Limpieza Viaria para ArcGIs Pro</Description>
     <Image>Images\AddinDesktop32.png</Image>
     <Author>VSM</Author>
     <Company>VSM - Narvaling</Company>
-    <Date>18/01/2023 12:00:00, 2023</Date>
+    <Date>18/04/2023 12:00:00, 2023</Date>
     <Subject>Framework</Subject>
     <!-- Note subject can be one or more of these topics:
                     Content, Framework, Editing, Geodatabase, Geometry, Geoprocessing, Layouts, Map Authoring, Map Exploration -->

Helper/HelperGdb.cs

@@ -27,6 +27,7 @@ using ArcGIS.Core.CIM;
 using System.Threading;
 using ArcGIS.Core.Data.Exceptions;
 using Microsoft.Win32;
+using Microsoft.WindowsAPICodePack.Dialogs;
 
 namespace OliviaAddInPro.Helper
 {
@@ -2139,6 +2140,17 @@ namespace OliviaAddInPro.Helper
          */
         public static string FolderBrowseDlg(string title_, string initloc_)
         {
+            var openFileDialog = new CommonOpenFileDialog();
+            //{ IsFolderPicker = true };
+            if(!String.IsNullOrEmpty(initloc_))
+                openFileDialog.InitialDirectory = initloc_;
+            openFileDialog.IsFolderPicker = true;
+            //openFileDialog.InitialDirectory = initloc_;
+            openFileDialog.Title = title_;
+            //openFileDialog.Filter = "Folders";
+            //if (openFileDialog.ShowDialog() == true)
+            if (openFileDialog.ShowDialog() == CommonFileDialogResult.Ok)
+                return openFileDialog.FileName;
             return null;
         }
 

OliviaAddInPro.csproj

@@ -47,6 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" />
+    <PackageReference Include="Microsoft.WindowsAPICodePack.Shell" Version="1.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 	<Reference Include="ArcGIS.Desktop.Framework">
       <HintPath>C:\Program Files\ArcGIS\Pro\bin\ArcGIS.Desktop.Framework.dll</HintPath>

OliviaAddInPro.sln

@@ -8,13 +8,25 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{10742570-CF59-42F2-BEA2-2A38002A06EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10742570-CF59-42F2-BEA2-2A38002A06EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10742570-CF59-42F2-BEA2-2A38002A06EE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10742570-CF59-42F2-BEA2-2A38002A06EE}.Debug|x64.Build.0 = Debug|Any CPU
+		{10742570-CF59-42F2-BEA2-2A38002A06EE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{10742570-CF59-42F2-BEA2-2A38002A06EE}.Debug|x86.Build.0 = Debug|Any CPU
 		{10742570-CF59-42F2-BEA2-2A38002A06EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10742570-CF59-42F2-BEA2-2A38002A06EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10742570-CF59-42F2-BEA2-2A38002A06EE}.Release|x64.ActiveCfg = Release|Any CPU
+		{10742570-CF59-42F2-BEA2-2A38002A06EE}.Release|x64.Build.0 = Release|Any CPU
+		{10742570-CF59-42F2-BEA2-2A38002A06EE}.Release|x86.ActiveCfg = Release|Any CPU
+		{10742570-CF59-42F2-BEA2-2A38002A06EE}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("VSM - Narvaling")]
 [assembly: AssemblyProduct("OliviaAddInPro")]
-[assembly: AssemblyCopyright("Copyright © VSM 2022")]
+[assembly: AssemblyCopyright("Copyright © VSM 2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.2.0.0")]
+[assembly: AssemblyFileVersion("3.2.0.0")]

Services/FinProcServ.cs

@@ -230,8 +230,8 @@ namespace OliviaAddInPro.Services
             if (OliviaGlob.CompruebaExistePath(OliviaGlob.Paths.PathGuardCsv))
                 Path = OliviaGlob.Paths.PathGuardCsv;
             else
-                Path = HelperGdb.SaveFileDlg(Title, DirData, null, ArcGIS.Desktop.Catalog.ItemFilters.Folders);
-
+                //Path = HelperGdb.SaveFileDlg(Title, DirData, null, ArcGIS.Desktop.Catalog.ItemFilters.Folders);
+                 Path = HelperGdb.FolderBrowseDlg(Title, DirData);
             if (string.IsNullOrEmpty(Path) || Path.Length == 0)
             {
                 bool ok = HelperGlobal.ponMsg("Se va a perder el archivo que contiene la secuencia en planificación, ¿está seguro?", 

View/Configuracion/PaneConfigView.xaml.cs

@@ -25,7 +25,6 @@ namespace OliviaAddInPro
         public PaneConfigView()
         {
            InitializeComponent();
-            
         }
         private void OnGuardar(object sender, RoutedEventArgs e)
         {

View/Configuracion/PropertyGridFilePickerFolder.xaml.cs

@@ -53,7 +53,8 @@ namespace OliviaAddInPro.View.Configuracion
         private void PickFileButton_Click(object sender, RoutedEventArgs e)
         {
             OpenFileDialog fd = new OpenFileDialog();
-            var st = HelperGdb.SaveFileDlg("Seleccione carpeta", null, null, ArcGIS.Desktop.Catalog.ItemFilters.Folders);
+            //var st = HelperGdb.SaveFileDlg("Seleccione carpeta", null, null, ArcGIS.Desktop.Catalog.ItemFilters.Folders);
+            var st = HelperGdb.FolderBrowseDlg("Seleccione carpeta", null);
             if (!string.IsNullOrEmpty(st))
             {
                 Value = st;