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
Entidades/obj/Debug/net6.0/Entidades.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("Entidades")]
[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("Entidades")]
[assembly: System.Reflection.AssemblyTitleAttribute("Entidades")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// Generated by the MSBuild WriteCodeFragment class.
// Generado por la clase WriteCodeFragment de MSBuild.

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

@@ -1,13 +1 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
c9fd7d1da15719a344d19280a9e21a8dc924eb19882884c600d67b0cd9fae973
=======
390fb09e0b78446d2aeb62456ecd394479e4203d8ba487fbe31e39283ec058af
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
a687cba9ed7450e5c700a51cb95b1f9a0a0edc042a19f86ad94db189023a05ac
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
1589bc3738d4d92e8df1687e356ae3d2c87cb333
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
3b03da26f28f96f0323fa94148a70c2466afcf8504bb48681ee28c0bd3312ab4

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

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