fede/Final_Das
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Hecho Irepositorio y borrado codigo viejo de repositorios. Además configuré entity framework

Browse Source
This commit is contained in:
fedpo
2024-08-12 16:48:54 -03:00
parent 01d975c47f
commit b7177439ef
75 changed files with 9512 additions and 17769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Modelo/obj/Debug/net6.0/Modelo.AssemblyInfo.cs
View File

@@ -1,10 +1,6 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
<<<<<<< HEAD
=======
// Runtime Version:4.0.30319.42000
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -17,22 +13,10 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Modelo")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[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+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.AssemblyInformationalVersionAttribute("1.0.0")]
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d11016fe50f731cc9fc7ccc12e78610c74ea7248")]
[assembly: System.Reflection.AssemblyProductAttribute("Modelo")]
[assembly: System.Reflection.AssemblyTitleAttribute("Modelo")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// Generated by the MSBuild WriteCodeFragment class.
// Generado por la clase WriteCodeFragment de MSBuild.

14
Modelo/obj/Debug/net6.0/Modelo.AssemblyInfoInputs.cache
View File

@@ -1,13 +1 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
19528923356c4738a962f057922a97a48b791eef234ebbc88765733e95d58587
=======
6c9da482cd44cc74518e5bd440e7d4a72fa32487ea46c6d9bb7a9bacf4043c2b
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
099b8681c0fe3ea241c3236b037e92bb2b80c449b64984e5089c2c47a48ee0b9
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
96d0d59bfa69a3c27ef653a551fb81c45157d195
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
0bd1191dea479777ed8a0ff9a03fc7d9bd03d44f30c310a50911f912ebc8fc3e

40
Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -8,46 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Modelo
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< 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 =
=======
build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Modelo\
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Modelo\
>>>>>>> c493033 (cosas que faltaban)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Modelo\
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Modelo\
>>>>>>> 3925b59 (cambios nacho)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\Modelo\
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
=======
build_property.ProjectDir = C:\Users\fedpo\Desktop\final actual\Modelo\
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
=======
build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Modelo\
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actua2l\Final actual\Modelo\
>>>>>>> 88e614d (god)