no pude usar controladoras, no carga los datos ,interface de cliente y provedor

Controladora/obj/Controladora.csproj.nuget.dgspec.json

@@ -1,6 +1,7 @@
 {
   "format": 1,
   "restore": {
+<<<<<<< HEAD
 <<<<<<< HEAD
     "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {}
   },
@@ -15,17 +16,24 @@
         "outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/",
 =======
     "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj": {}
+=======
+    "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj": {}
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
   },
   "projects": {
-    "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj": {
+    "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
+        "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
         "projectName": "Controladora",
-        "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
+        "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
         "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
+<<<<<<< HEAD
         "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\obj\\",
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+        "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\obj\\",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "/home/fede/.nuget/NuGet/NuGet.Config"
@@ -41,6 +49,7 @@
           "net6.0": {
             "targetAlias": "net6.0",
             "projectReferences": {
+<<<<<<< HEAD
 <<<<<<< HEAD
               "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
                 "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -54,6 +63,13 @@
               "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": {
                 "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj"
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+              "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
+                "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj"
+              },
+              "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {
+                "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj"
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
               }
             }
           }
@@ -239,14 +255,14 @@
         }
       }
     },
-    "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
+    "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
+        "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
         "projectName": "Entidades",
-        "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
+        "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
         "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
-        "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\",
+        "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\",
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -299,14 +315,14 @@
         }
       }
     },
-    "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": {
+    "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj",
+        "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
         "projectName": "Modelo",
-        "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj",
+        "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
         "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
-        "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\obj\\",
+        "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\obj\\",
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -323,8 +339,8 @@
           "net6.0": {
             "targetAlias": "net6.0",
             "projectReferences": {
-              "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
+              "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
-                "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj"
+                "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj"
               }
             }
           }

Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs

@@ -19,6 +19,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
 =======
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
@@ -26,6 +27,9 @@ using System.Reflection;
 =======
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")]
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
 [assembly: System.Reflection.AssemblyProductAttribute("Controladora")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Controladora")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache

@@ -1,5 +1,6 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 d7e6838ab345d847cad4078575babed33718cf28a47b8f27d6c4be1f7f7e97a7
 =======
 f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0
@@ -7,3 +8,6 @@ f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0
 =======
 bb93237b0189a4b8b1180fafac8534e65b007ad7d97889b9b241a52a4500d537
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+41b9ae2cc417f11ef0d05afd64f424d30011ec3381b04e193604d3f4663cdb67
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)

Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig

@@ -10,10 +10,14 @@ build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Controladora
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Controladora/
 =======
 build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
 =======

Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-a8e0260e0db6be55f0b0f28b550784baab05fd07
+19830861cd564e51db0c3967ce8e2d2c457eecffb478d0402938a76286038bed

Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt

@@ -16,3 +16,20 @@ C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.pdb
 C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\Controladora.dll
 C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll
 C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\Controladora.pdb
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.dll
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\refint\Controladora.dll
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.pdb
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.deps.json
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.dll
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.pdb
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Entidades.dll
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Modelo.dll
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Modelo.pdb
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Entidades.pdb
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controla.1EE7A4DA.Up2Date
+C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\ref\Controladora.dll

Controladora/obj/project.assets.json

@@ -13475,6 +13475,7 @@
   "project": {
     "version": "1.0.0",
     "restore": {
+<<<<<<< HEAD
 <<<<<<< HEAD
       "projectUniqueName": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj",
       "projectName": "Controladora",
@@ -13483,11 +13484,18 @@
       "outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/",
 =======
       "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
+=======
+      "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
       "projectName": "Controladora",
-      "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
+      "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
       "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
+<<<<<<< HEAD
       "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\obj\\",
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+      "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\obj\\",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
       "projectStyle": "PackageReference",
       "configFilePaths": [
         "/home/fede/.nuget/NuGet/NuGet.Config"
@@ -13503,6 +13511,7 @@
         "net6.0": {
           "targetAlias": "net6.0",
           "projectReferences": {
+<<<<<<< HEAD
 <<<<<<< HEAD
             "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
               "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -13516,6 +13525,13 @@
             "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": {
               "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj"
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+            "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
+              "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj"
+            },
+            "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {
+              "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj"
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
             }
           }
         }

Controladora/obj/project.nuget.cache

@@ -1,5 +1,6 @@
 {
   "version": 2,
+<<<<<<< HEAD
 <<<<<<< HEAD
   "dgSpecHash": "Vs+HTdq8Gqw56GHRk+ivU0JJ/5n6ghHJP2CKgIV+gDHL9rO3WgHHPoz0OWJjyozNRvnYskqZVibjHcSALkg9JQ==",
   "success": true,
@@ -9,6 +10,11 @@
   "success": false,
   "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+  "dgSpecHash": "MYQDimuvgTLgdr4nkAgRSaHTw8GikSKj95s3ws08wKEVVrpNozmS3GJxrppl/rSuADCp+u9k9/QhTzUwq8ILpw==",
+  "success": false,
+  "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
   "expectedPackageFiles": [
     "/home/fede/.nuget/packages/emailer/1.0.0/emailer.1.0.0.nupkg.sha512",
     "/home/fede/.nuget/packages/libuv/1.10.0/libuv.1.10.0.nupkg.sha512",

Entidades/Proveedor.cs

@@ -13,5 +13,6 @@ namespace Entidades
         public string RazonSocial { get; set; }
         public string Direccion { get; set; }
         public bool Habilitado { get; set; }
+        
     }
 }

Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs

@@ -14,10 +14,14 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
 <<<<<<< HEAD
+<<<<<<< HEAD
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
 =======
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")]
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
 [assembly: System.Reflection.AssemblyProductAttribute("Entidades")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Entidades")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache

@@ -1,5 +1,9 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 c9fd7d1da15719a344d19280a9e21a8dc924eb19882884c600d67b0cd9fae973
 =======
 390fb09e0b78446d2aeb62456ecd394479e4203d8ba487fbe31e39283ec058af
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+a687cba9ed7450e5c700a51cb95b1f9a0a0edc042a19f86ad94db189023a05ac
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)

Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig

@@ -9,9 +9,13 @@ build_property.EnforceExtendedAnalyzerRules =
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Entidades
 <<<<<<< HEAD
+<<<<<<< HEAD
 build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Entidades/
 =======
 build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Entidades\
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Entidades\
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 

Entidades/obj/Entidades.csproj.nuget.dgspec.json

@@ -1,6 +1,7 @@
 {
   "format": 1,
   "restore": {
+<<<<<<< HEAD
 <<<<<<< HEAD
     "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {}
   },
@@ -15,17 +16,24 @@
         "outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/",
 =======
     "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {}
+=======
+    "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {}
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
   },
   "projects": {
-    "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
+    "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
+        "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
         "projectName": "Entidades",
-        "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
+        "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
         "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
+<<<<<<< HEAD
         "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\",
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+        "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "/home/fede/.nuget/NuGet/NuGet.Config"

Entidades/obj/project.assets.json

@@ -13,6 +13,7 @@
   "project": {
     "version": "1.0.0",
     "restore": {
+<<<<<<< HEAD
 <<<<<<< HEAD
       "projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
       "projectName": "Entidades",
@@ -21,11 +22,18 @@
       "outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/",
 =======
       "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
+=======
+      "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
       "projectName": "Entidades",
-      "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
+      "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
       "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
+<<<<<<< HEAD
       "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\",
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+      "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
       "projectStyle": "PackageReference",
       "configFilePaths": [
         "/home/fede/.nuget/NuGet/NuGet.Config"

Entidades/obj/project.nuget.cache

@@ -1,5 +1,6 @@
 {
   "version": 2,
+<<<<<<< HEAD
 <<<<<<< HEAD
   "dgSpecHash": "LSnXGupX+sIU3VjCECy137T1ThKtECGacQq+4Cfd3SDyYEpIcp26yf15qIysqN2+1Fwti7c13f3fBKmUt8i0Og==",
   "success": true,
@@ -10,8 +11,11 @@
   ],
 =======
   "dgSpecHash": "tQ5wbjPjSSYF0ufyaHkTpMHeLmctkgU0DRXiByR35mv7fgnebDzFc/FQHskLw18SzYXpGgfy8W7o3/JscpL1ZA==",
+=======
+  "dgSpecHash": "+9QsqENGYd4qIIPCnRA0BRL7UiFYXaYZJR2jVoACt5fTCzrycu1oHCxViXeMxzr+idMIyJGQ/11fIYTFVqnyPA==",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
   "success": true,
-  "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
+  "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
   "expectedPackageFiles": [],
 >>>>>>> 8ad9dc6 (faltan controladoras)
   "logs": []

Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs

@@ -14,10 +14,14 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
 <<<<<<< HEAD
+<<<<<<< HEAD
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
 =======
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")]
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
 [assembly: System.Reflection.AssemblyProductAttribute("Modelo")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Modelo")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache

@@ -1,5 +1,9 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 19528923356c4738a962f057922a97a48b791eef234ebbc88765733e95d58587
 =======
 6c9da482cd44cc74518e5bd440e7d4a72fa32487ea46c6d9bb7a9bacf4043c2b
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+099b8681c0fe3ea241c3236b037e92bb2b80c449b64984e5089c2c47a48ee0b9
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)

Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig

@@ -9,9 +9,13 @@ build_property.EnforceExtendedAnalyzerRules =
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Modelo
 <<<<<<< HEAD
+<<<<<<< HEAD
 build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Modelo/
 =======
 build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Modelo\
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Modelo\
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 

Modelo/obj/Modelo.csproj.nuget.dgspec.json

@@ -1,6 +1,7 @@
 {
   "format": 1,
   "restore": {
+<<<<<<< HEAD
 <<<<<<< HEAD
     "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {}
   },
@@ -15,17 +16,24 @@
         "outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/",
 =======
     "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": {}
+=======
+    "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {}
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
   },
   "projects": {
-    "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
+    "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
+        "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
         "projectName": "Entidades",
-        "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
+        "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
         "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
+<<<<<<< HEAD
         "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\",
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+        "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "/home/fede/.nuget/NuGet/NuGet.Config"
@@ -82,6 +90,7 @@
         }
       }
     },
+<<<<<<< HEAD
 <<<<<<< HEAD
     "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {
       "version": "1.0.0",
@@ -93,14 +102,21 @@
         "outputPath": "/home/fede/proyectos/Final_OOP/Modelo/obj/",
 =======
     "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": {
+=======
+    "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj",
+        "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
         "projectName": "Modelo",
-        "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj",
+        "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
         "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
+<<<<<<< HEAD
         "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\obj\\",
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+        "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\obj\\",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "/home/fede/.nuget/NuGet/NuGet.Config"
@@ -116,6 +132,7 @@
           "net6.0": {
             "targetAlias": "net6.0",
             "projectReferences": {
+<<<<<<< HEAD
 <<<<<<< HEAD
               "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
                 "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -123,6 +140,10 @@
               "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
                 "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj"
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+              "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
+                "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj"
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
               }
             }
           }

Modelo/obj/project.assets.json

@@ -32,6 +32,7 @@
   "project": {
     "version": "1.0.0",
     "restore": {
+<<<<<<< HEAD
 <<<<<<< HEAD
       "projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj",
       "projectName": "Modelo",
@@ -40,11 +41,18 @@
       "outputPath": "/home/fede/proyectos/Final_OOP/Modelo/obj/",
 =======
       "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj",
+=======
+      "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
       "projectName": "Modelo",
-      "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj",
+      "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
       "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
+<<<<<<< HEAD
       "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\obj\\",
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+      "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\obj\\",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
       "projectStyle": "PackageReference",
       "configFilePaths": [
         "/home/fede/.nuget/NuGet/NuGet.Config"
@@ -60,6 +68,7 @@
         "net6.0": {
           "targetAlias": "net6.0",
           "projectReferences": {
+<<<<<<< HEAD
 <<<<<<< HEAD
             "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
               "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -67,6 +76,10 @@
             "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
               "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj"
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+            "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
+              "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj"
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
             }
           }
         }

Modelo/obj/project.nuget.cache

@@ -1,5 +1,6 @@
 {
   "version": 2,
+<<<<<<< HEAD
 <<<<<<< HEAD
   "dgSpecHash": "druJUlWKmOp0ZDp0BX75o9Fs1GyoqoIkTLLMStpqDmZBEy8hoSreNrR/4qjyFeX2PbXxwtpQp0hY2GY2ewsTOQ==",
   "success": true,
@@ -10,8 +11,11 @@
   ],
 =======
   "dgSpecHash": "xK3JnXpdCUpoZcekhyP91lNk41C1CsX+md42EcLnzhmp4nv0wa9QUPqxaUDvd+ItjZUDnL5nqMnWsYofgtcCWA==",
+=======
+  "dgSpecHash": "GHvzI31gpq3LC5PsFVAyJd0HJLioNTu1zueIve1esILQ9QlNaZAenRITvunQ0HsZ06NONsSYihAL5kiY+8UONw==",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
   "success": true,
-  "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj",
+  "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
   "expectedPackageFiles": [],
 >>>>>>> 8ad9dc6 (faltan controladoras)
   "logs": []

Vista/FrmCliente.Designer.cs

@@ -0,0 +1,187 @@
+
+namespace Vista
+{
+    partial class FrmCliente
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            label1 = new Label();
+            label2 = new Label();
+            label3 = new Label();
+            label4 = new Label();
+            label5 = new Label();
+            txtCuit = new TextBox();
+            txtNombre = new TextBox();
+            txtApellido = new TextBox();
+            txtDireccion = new TextBox();
+            txtCorreo = new TextBox();
+            button1 = new Button();
+            button2 = new Button();
+            SuspendLayout();
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(29, 29);
+            label1.Name = "label1";
+            label1.Size = new Size(29, 15);
+            label1.TabIndex = 0;
+            label1.Text = "Cuit";
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(29, 59);
+            label2.Name = "label2";
+            label2.Size = new Size(51, 15);
+            label2.TabIndex = 1;
+            label2.Text = "Nombre";
+            // 
+            // label3
+            // 
+            label3.AutoSize = true;
+            label3.Location = new Point(29, 88);
+            label3.Name = "label3";
+            label3.Size = new Size(51, 15);
+            label3.TabIndex = 2;
+            label3.Text = "Apellido";
+            // 
+            // label4
+            // 
+            label4.AutoSize = true;
+            label4.Location = new Point(29, 117);
+            label4.Name = "label4";
+            label4.Size = new Size(57, 15);
+            label4.TabIndex = 3;
+            label4.Text = "Direccion";
+            // 
+            // label5
+            // 
+            label5.AutoSize = true;
+            label5.Location = new Point(29, 146);
+            label5.Name = "label5";
+            label5.Size = new Size(43, 15);
+            label5.TabIndex = 4;
+            label5.Text = "Correo";
+            // 
+            // txtCuit
+            // 
+            txtCuit.Location = new Point(92, 21);
+            txtCuit.Name = "txtCuit";
+            txtCuit.Size = new Size(173, 23);
+            txtCuit.TabIndex = 5;
+            // 
+            // txtNombre
+            // 
+            txtNombre.Location = new Point(92, 51);
+            txtNombre.Name = "txtNombre";
+            txtNombre.Size = new Size(173, 23);
+            txtNombre.TabIndex = 6;
+            // 
+            // txtApellido
+            // 
+            txtApellido.Location = new Point(91, 80);
+            txtApellido.Name = "txtApellido";
+            txtApellido.Size = new Size(174, 23);
+            txtApellido.TabIndex = 7;
+            // 
+            // txtDireccion
+            // 
+            txtDireccion.Location = new Point(92, 109);
+            txtDireccion.Name = "txtDireccion";
+            txtDireccion.Size = new Size(173, 23);
+            txtDireccion.TabIndex = 8;
+            // 
+            // txtCorreo
+            // 
+            txtCorreo.Location = new Point(91, 138);
+            txtCorreo.Name = "txtCorreo";
+            txtCorreo.Size = new Size(174, 23);
+            txtCorreo.TabIndex = 9;
+            // 
+            // button1
+            // 
+            button1.Location = new Point(29, 190);
+            button1.Name = "button1";
+            button1.Size = new Size(75, 23);
+            button1.TabIndex = 10;
+            button1.Text = "Aceptar";
+            button1.UseVisualStyleBackColor = true;
+            button1.Click += button1_Click;
+            // 
+            // button2
+            // 
+            button2.Location = new Point(158, 190);
+            button2.Name = "button2";
+            button2.Size = new Size(75, 23);
+            button2.TabIndex = 11;
+            button2.Text = "Cancelar";
+            button2.UseVisualStyleBackColor = true;
+            button2.Click += button2_Click;
+            // 
+            // FrmCliente
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(420, 245);
+            Controls.Add(button2);
+            Controls.Add(button1);
+            Controls.Add(txtCorreo);
+            Controls.Add(txtDireccion);
+            Controls.Add(txtApellido);
+            Controls.Add(txtNombre);
+            Controls.Add(txtCuit);
+            Controls.Add(label5);
+            Controls.Add(label4);
+            Controls.Add(label3);
+            Controls.Add(label2);
+            Controls.Add(label1);
+            Name = "FrmCliente";
+            Text = "Form1";
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+
+        #endregion
+
+        private Label label1;
+        private Label label2;
+        private Label label3;
+        private Label label4;
+        private Label label5;
+        private TextBox txtCuit;
+        private TextBox txtNombre;
+        private TextBox txtApellido;
+        private TextBox txtDireccion;
+        private TextBox txtCorreo;
+        private Button button1;
+        private Button button2;
+
+        public EventHandler button1_Click_1 { get; private set; }
+    }
+}

Vista/FrmCliente.cs

@@ -0,0 +1,93 @@
+using Entidades;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Vista
+{
+    public partial class FrmCliente : Form
+    {
+        Cliente cliente;
+        public FrmCliente(Cliente? cliente = null)
+        {
+            InitializeComponent();
+            this.cliente = cliente;
+
+            this.Text = (cliente == null) ?
+                "Agregar Cliente" :
+                "Modificar Cliente";
+        }
+        private bool ValidarDatos()
+        {
+            string devolucion = "";
+
+            /*
+             * complicado de leer pero en estas lineas estan todas las comprobaciones 
+             * que pude pensar en el momento.
+             */
+
+            if (string.IsNullOrEmpty(txtDireccion.Text)) devolucion += "La direccion no deberia ser nulo o vacio\n";
+            if (txtDireccion.Text.Length > 200) devolucion += "La direccion no puede superar los 200 chars\n";
+            if (string.IsNullOrEmpty(txtNombre.Text)) devolucion += "el nombre no puede ser nulo o vacio\n";
+            if (txtNombre.Text.Length > 50) devolucion += "El nombre no puede superar los 50 chars\n";
+            if (string.IsNullOrEmpty(txtApellido.Text)) devolucion += "El Apellido no puede ser nulo o vacio\n";
+            if (string.IsNullOrEmpty(txtCorreo.Text)) devolucion += "El Correo no puede ser nulo o vacio\n";
+
+            if (devolucion == "")
+            {
+                return true;
+            }
+            else
+            {
+                MessageBox.Show(devolucion);
+                return false;
+            }
+
+        }
+        private void button2_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            string msg;
+            if (ValidarDatos())
+            {
+                if (cliente == null)
+                {
+                    cliente = new Cliente
+                    {
+                        Nombre = txtNombre.Text,
+                        Cuit = txtCuit.Text,
+                        Direccion = txtDireccion.Text,
+                        Apellido = txtApellido.Text,
+                        Correo = txtCorreo.Text,    
+                        
+                    };
+                   
+                    // msg = ControladoraCliente.Instance.AgregarCliente(Cliente);
+                }
+                else
+                {
+                   //Cliente.Apellido = txtApellido.Text;
+                   // Cliente.Nombre = txtNombre.Text;
+                   // Cliente.Direccion = txtDireccion.Text;
+                   // Cliente.Correo = txtCorreo.Text;
+                   // Cliente.Cuit = txtCuit.Text;
+                    //   msg = ControladoraCliente.Instance.ModificarCliente(Cliente);
+                }
+                // MessageBox.Show(msg, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                Close();
+            }
+
+
+        }
+    }
+}

Vista/FrmCliente.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Vista/FrmClientes.Designer.cs

@@ -31,6 +31,7 @@
             BtnModificar = new Button();
             BtnEliminar = new Button();
             groupBox1 = new GroupBox();
+            button1 = new Button();
             dataGridView1 = new DataGridView();
             groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit();
@@ -44,6 +45,7 @@
             BtnModificar.TabIndex = 1;
             BtnModificar.Text = "Modificar";
             BtnModificar.UseVisualStyleBackColor = true;
+            BtnModificar.Click += BtnModificar_Click;
             // 
             // BtnEliminar
             // 
@@ -53,9 +55,11 @@
             BtnEliminar.TabIndex = 2;
             BtnEliminar.Text = "Eliminar";
             BtnEliminar.UseVisualStyleBackColor = true;
+            BtnEliminar.Click += BtnEliminar_Click;
             // 
             // groupBox1
             // 
+            groupBox1.Controls.Add(button1);
             groupBox1.Controls.Add(dataGridView1);
             groupBox1.Controls.Add(BtnEliminar);
             groupBox1.Controls.Add(BtnModificar);
@@ -65,6 +69,16 @@
             groupBox1.TabIndex = 3;
             groupBox1.TabStop = false;
             // 
+            // button1
+            // 
+            button1.Location = new Point(6, 302);
+            button1.Name = "button1";
+            button1.Size = new Size(75, 23);
+            button1.TabIndex = 4;
+            button1.Text = "Añadir";
+            button1.UseVisualStyleBackColor = true;
+            button1.Click += button1_Click;
+            // 
             // dataGridView1
             // 
             dataGridView1.AllowUserToAddRows = false;
@@ -98,5 +112,6 @@
         private Button BtnEliminar;
         private GroupBox groupBox1;
         private DataGridView dataGridView1;
+        private Button button1;
     }
 }

Vista/FrmClientes.cs

@@ -1,4 +1,5 @@
-using System;
+using Entidades;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -12,9 +13,62 @@ namespace Vista
 {
     public partial class FrmClientes : Form
     {
+        Cliente cliente;
         public FrmClientes()
         {
             InitializeComponent();
         }
+        private void ActualizarGrilla()
+        {
+
+            dataGridView1.DataSource = null;
+            // dataGridView1.DataSource = listaProveedores;
+            //revisar dataGridView1.DataSource = ControladoraClientes.Instance.RecuperarProveedores();
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            var form = new FrmCliente();
+            form.ShowDialog();
+            ActualizarGrilla();
+        }
+
+        private void BtnModificar_Click(object sender, EventArgs e)
+        {
+            if (dataGridView1.SelectedRows.Count < 1)
+            {
+                MessageBox.Show("Seleccione una linea para modificar");
+                return;
+            }
+
+            Cliente cliente = new Cliente()
+            {
+                Nombre = dataGridView1.SelectedRows[0].Cells["Nombre"].Value.ToString(),
+                Cuit = dataGridView1.SelectedRows[0].Cells["Cuit"].Value.ToString(),
+                Apellido = dataGridView1.SelectedRows[0].Cells["RazonSocial"].Value.ToString(),
+                Direccion = dataGridView1.SelectedRows[0].Cells["Direccion"].Value.ToString(),
+                Correo = dataGridView1.SelectedRows[0].Cells["Correo"].Value.ToString(),
+            };
+
+            var formModificar = new FrmCliente(cliente);
+            formModificar.ShowDialog();
+            ActualizarGrilla();
+        }
+
+        private void BtnEliminar_Click(object sender, EventArgs e)
+        {
+            if (dataGridView1.SelectedRows.Count < 0)
+            {
+                MessageBox.Show("Seleccione una linea para eliminar");
+                return;
+            }
+
+            foreach (DataGridViewRow Fila in dataGridView1.SelectedRows)
+            {  // itera por un loop y elimina las lineas seleccionadas 1 a la vez. 
+                //string devolucion = ControladoraClientes.Instance.EliminarCliente(Fila.Cells["Codigo"].Value.ToString());
+               // MessageBox.Show(devolucion);
+                ActualizarGrilla();
+            }
+        }
     }
 }

Vista/FrmProveedor.Designer.cs

@@ -39,6 +39,7 @@
             label3 = new Label();
             checkBoxHabilitado = new CheckBox();
             label4 = new Label();
+            button1 = new Button();
             ((System.ComponentModel.ISupportInitialize)numCuit).BeginInit();
             SuspendLayout();
             // 
@@ -79,7 +80,6 @@
             numCuit.Name = "numCuit";
             numCuit.Size = new Size(100, 23);
             numCuit.TabIndex = 4;
-            numCuit.ValueChanged += numCuit_ValueChanged;
             // 
             // Nombre
             // 
@@ -135,11 +135,22 @@
             label4.TabIndex = 10;
             label4.Text = "Habilitado";
             // 
+            // button1
+            // 
+            button1.Location = new Point(174, 195);
+            button1.Name = "button1";
+            button1.Size = new Size(75, 23);
+            button1.TabIndex = 11;
+            button1.Text = "Cancelar";
+            button1.UseVisualStyleBackColor = true;
+            button1.Click += button1_Click;
+            // 
             // FrmProveedor
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(409, 230);
+            Controls.Add(button1);
             Controls.Add(label4);
             Controls.Add(checkBoxHabilitado);
             Controls.Add(label3);
@@ -172,5 +183,6 @@
         private Label label3;
         private CheckBox checkBoxHabilitado;
         private Label label4;
+        private Button button1;
     }
 }

Vista/FrmProveedor.cs

@@ -15,9 +15,10 @@ namespace Vista
     {
         Proveedor proveedor;
 
+        List<Proveedor> listaProveedores = new List<Proveedor>();
         public FrmProveedor(Proveedor? proveedor = null)
         {
-            InitializeComponent();
+
             InitializeComponent();
             this.proveedor = proveedor;
 
@@ -65,27 +66,30 @@ namespace Vista
                         Cuit = (Int64)numCuit.Value,
                         Direccion = txtDireccion.Text,
                         RazonSocial = txtSocial.Text,
-                        Habilitado = checkBoxHabilitado.Checked;
+                        Habilitado = checkBoxHabilitado.Checked,
                     };
-
+                    listaProveedores.Add(proveedor);
-               msg = ControladoraProveedores.Instance.AgregarProveedor(proveedor);
+                    // msg = ControladoraProveedores.Instance.AgregarProveedor(proveedor);
                 }
                 else
                 {
+
                     proveedor.Nombre = txtNombre.Text;
                     proveedor.Direccion = txtDireccion.Text;
                     proveedor.RazonSocial = txtSocial.Text;
                     proveedor.Cuit = (Int64)numCuit.Value;
-                msg = ControladoraProveedores.Instance.ModificarProveedor(proveedor);
+                    //  msg = ControladoraProveedores.Instance.ModificarProveedor(proveedor);
                 }
-            MessageBox.Show(msg, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                // MessageBox.Show(msg, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 Close();
             }
 
-        private void numCuit_ValueChanged(object sender, EventArgs e)
-        {
 
         }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
     }
 }
-    }

Vista/FrmProveedores.Designer.cs

@@ -51,9 +51,15 @@
             // 
             // dataGridView1
             // 
+            dataGridView1.AllowUserToAddRows = false;
+            dataGridView1.AllowUserToDeleteRows = false;
+            dataGridView1.AllowUserToResizeColumns = false;
+            dataGridView1.AllowUserToResizeRows = false;
+            dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
             dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             dataGridView1.Location = new Point(6, 22);
             dataGridView1.Name = "dataGridView1";
+            dataGridView1.ReadOnly = true;
             dataGridView1.RowTemplate.Height = 25;
             dataGridView1.Size = new Size(550, 235);
             dataGridView1.TabIndex = 3;
@@ -76,6 +82,7 @@
             BtnEliminar.TabIndex = 2;
             BtnEliminar.Text = "Eliminar";
             BtnEliminar.UseVisualStyleBackColor = true;
+            BtnEliminar.Click += BtnEliminar_Click;
             // 
             // BtnModificar
             // 
@@ -85,6 +92,7 @@
             BtnModificar.TabIndex = 1;
             BtnModificar.Text = "Modificar";
             BtnModificar.UseVisualStyleBackColor = true;
+            BtnModificar.Click += BtnModificar_Click;
             // 
             // FrmProveedores
             // 

Vista/FrmProveedores.cs

@@ -1,4 +1,5 @@
-using System;
+using Entidades;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -10,16 +11,20 @@ using System.Windows.Forms;
 
 namespace Vista
 {
+
     public partial class FrmProveedores : Form
     {
+      
         public FrmProveedores()
         {
+
             InitializeComponent();
         }
         private void ActualizarGrilla()
         {
 
             dataGridView1.DataSource = null;
+           // dataGridView1.DataSource = listaProveedores;
             //revisar dataGridView1.DataSource = ControladoraProveedor.Instance.RecuperarProveedores();
         }
         private void BtnAdd_Click(object sender, EventArgs e)
@@ -28,5 +33,42 @@ namespace Vista
             form.ShowDialog();
             ActualizarGrilla();
         }
+
+        private void BtnModificar_Click(object sender, EventArgs e)
+        {
+            if (dataGridView1.SelectedRows.Count < 1)
+            {
+                MessageBox.Show("Seleccione una linea para modificar");
+                return;
+            }
+
+            Proveedor proveedor = new Proveedor()
+            {
+                Nombre = dataGridView1.SelectedRows[0].Cells["Nombre"].Value.ToString(),
+                Cuit = (Int64)dataGridView1.SelectedRows[0].Cells["Cuit"].Value,
+                RazonSocial = dataGridView1.SelectedRows[0].Cells["RazonSocial"].Value.ToString(),
+                Direccion = dataGridView1.SelectedRows[0].Cells["Direccion"].Value.ToString()
+            };
+
+            var formModificar = new FrmProveedor(proveedor);
+            formModificar.ShowDialog();
+            ActualizarGrilla();
+        }
+
+        private void BtnEliminar_Click(object sender, EventArgs e)
+        {
+            if (dataGridView1.SelectedRows.Count < 0)
+            {
+                MessageBox.Show("Seleccione una linea para eliminar");
+                return;
+            }
+
+            foreach (DataGridViewRow Fila in dataGridView1.SelectedRows)
+            {  // itera por un loop y elimina las lineas seleccionadas 1 a la vez. 
+             //   string devolucion = ControladoraProveedores.Instance.EliminarProveedor(Fila.Cells["Codigo"].Value.ToString());
+          //      MessageBox.Show(devolucion);
+                ActualizarGrilla();
+            }
+        }
     }
 }

Vista/FrmRemitos.Designer.cs

@@ -31,8 +31,6 @@
             groupBox1 = new GroupBox();
             dataGridView1 = new DataGridView();
             BtnAdd = new Button();
-            BtnEliminar = new Button();
-            BtnModificar = new Button();
             groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit();
             SuspendLayout();
@@ -41,8 +39,6 @@
             // 
             groupBox1.Controls.Add(dataGridView1);
             groupBox1.Controls.Add(BtnAdd);
-            groupBox1.Controls.Add(BtnEliminar);
-            groupBox1.Controls.Add(BtnModificar);
             groupBox1.Location = new Point(12, 12);
             groupBox1.Name = "groupBox1";
             groupBox1.Size = new Size(776, 351);
@@ -67,24 +63,6 @@
             BtnAdd.Text = "Añadir";
             BtnAdd.UseVisualStyleBackColor = true;
             // 
-            // BtnEliminar
-            // 
-            BtnEliminar.Location = new Point(215, 302);
-            BtnEliminar.Name = "BtnEliminar";
-            BtnEliminar.Size = new Size(75, 23);
-            BtnEliminar.TabIndex = 2;
-            BtnEliminar.Text = "Eliminar";
-            BtnEliminar.UseVisualStyleBackColor = true;
-            // 
-            // BtnModificar
-            // 
-            BtnModificar.Location = new Point(108, 302);
-            BtnModificar.Name = "BtnModificar";
-            BtnModificar.Size = new Size(75, 23);
-            BtnModificar.TabIndex = 1;
-            BtnModificar.Text = "Modificar";
-            BtnModificar.UseVisualStyleBackColor = true;
-            // 
             // FrmRemitos
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -104,7 +82,5 @@
         private GroupBox groupBox1;
         private DataGridView dataGridView1;
         private Button BtnAdd;
-        private Button BtnEliminar;
-        private Button BtnModificar;
     }
 }

Vista/Vista.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Compile Update="FrmProveedor.cs">
+    <Compile Update="FrmCliente.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Update="FrmAddVentas.cs">
@@ -13,6 +13,9 @@
     <Compile Update="FrmOrdenDeCompra.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Update="FrmProveedor.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Update="FrmRemitos.cs">
       <SubType>Form</SubType>
     </Compile>

Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs

@@ -19,6 +19,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
 =======
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
@@ -26,6 +27,9 @@ using System.Reflection;
 =======
 [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")]
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
 [assembly: System.Reflection.AssemblyProductAttribute("Vista")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Vista")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache

@@ -1,5 +1,6 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 5433dac5452fa5db31338aa45759172473b740a8027bf6a5b338d0bd8e08a305
 =======
 a90b7be7f25b3be585c8c3eda0cd50696de263dc
@@ -7,3 +8,6 @@ a90b7be7f25b3be585c8c3eda0cd50696de263dc
 =======
 244ec86832aa35c5b9c5e6ebfc71403d927ad498ea5d0b2c0c49514ce34338d6
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+14dd92a1eca361463bdac6313faec43ff2400fcede9eb6798b98887050929b0b
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)

Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig

@@ -10,10 +10,14 @@ build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Vista
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Vista/
 =======
 build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Vista\
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Vista\
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
 =======

Vista/obj/Vista.csproj.nuget.dgspec.json

@@ -1,6 +1,7 @@
 {
   "format": 1,
   "restore": {
+<<<<<<< HEAD
 <<<<<<< HEAD
     "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {}
   },
@@ -15,16 +16,19 @@
         "outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/",
 =======
     "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj": {}
+=======
+    "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj": {}
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
   },
   "projects": {
-    "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
+    "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
+        "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
         "projectName": "Entidades",
-        "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
+        "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
         "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
-        "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\",
+        "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\",
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -77,15 +81,19 @@
         }
       }
     },
-    "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj": {
+    "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
+        "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
         "projectName": "Vista",
-        "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
+        "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
         "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
+<<<<<<< HEAD
         "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\obj\\",
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+        "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\obj\\",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "/home/fede/.nuget/NuGet/NuGet.Config"
@@ -102,11 +110,16 @@
           "net6.0": {
             "targetAlias": "net6.0",
             "projectReferences": {
+<<<<<<< HEAD
               "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
                 "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
               },
               "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {
                 "projectPath": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj"
+=======
+              "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
+                "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj"
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
               }
             }
           }

Vista/obj/project.assets.json

@@ -13509,6 +13509,7 @@
   "project": {
     "version": "1.0.0",
     "restore": {
+<<<<<<< HEAD
 <<<<<<< HEAD
       "projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
       "projectName": "Vista",
@@ -13517,11 +13518,18 @@
       "outputPath": "/home/fede/proyectos/Final_OOP/Vista/obj/",
 =======
       "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
+=======
+      "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
       "projectName": "Vista",
-      "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
+      "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
       "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
+<<<<<<< HEAD
       "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\obj\\",
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+      "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\obj\\",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
       "projectStyle": "PackageReference",
       "configFilePaths": [
         "/home/fede/.nuget/NuGet/NuGet.Config"
@@ -13537,6 +13545,7 @@
         "net6.0-windows7.0": {
           "targetAlias": "net6.0-windows",
           "projectReferences": {
+<<<<<<< HEAD
 <<<<<<< HEAD
             "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
               "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -13547,6 +13556,10 @@
             "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
               "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj"
 >>>>>>> 8ad9dc6 (faltan controladoras)
+=======
+            "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
+              "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj"
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
             }
           }
         }

Vista/obj/project.nuget.cache

@@ -1,5 +1,6 @@
 {
   "version": 2,
+<<<<<<< HEAD
 <<<<<<< HEAD
   "dgSpecHash": "NrgVcMaE+xOpA8UnmFhQwGflGRDAICnz8EffGQ+5vJrqniVecS26UDqJMYcJ2SmlijA3PT49NDmcrKADdBbkcQ==",
   "success": true,
@@ -303,8 +304,11 @@
   ],
 =======
   "dgSpecHash": "tIuYRzaRYu8CXIPBh4BkJLvLrV0+lbBu/oLywxi4tl+wzrbcEqF9p2ndCdBxrhOTXwiWqf0FfmH6xCdhaeSQxA==",
+=======
+  "dgSpecHash": "hleejJDgsDTscOjcjAaqsz7O8bRKdelLTFiNGc0rJ/YKvc+AuQ7Vc0530fJwdTW+IjGZB03MheqWXYO7aqD5eA==",
+>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
   "success": true,
-  "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
+  "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
   "expectedPackageFiles": [],
 >>>>>>> 8ad9dc6 (faltan controladoras)
   "logs": []