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

This commit is contained in:
2024-08-11 18:20:24 -03:00
parent 1aded875ab
commit e82c5a70b8
46 changed files with 6435 additions and 82 deletions

View File

@@ -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")]

View File

@@ -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)

View File

@@ -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 =