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

feat: terminados 4 de 7 forms

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:25:05 -03:00
parent 502f10131c
commit ab890dbf98
60 changed files with 753 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -15,6 +15,7 @@ build_property.RootNamespace = Vista
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Vista/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Vista\
@@ -39,3 +40,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\V
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Vista\
>>>>>>> 3925b59 (cambios nacho)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\Vista\
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)

81
Vista/obj/Vista.csproj.nuget.dgspec.json
View File

@@ -6,6 +6,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {}
},
@@ -35,16 +36,19 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj": {}
>>>>>>> 3925b59 (cambios nacho)
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj": {}
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {
"C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj",
"projectName": "Controladora",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -62,11 +66,11 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj"
},
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj"
"C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj"
}
}
}
@@ -100,14 +104,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -156,14 +160,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {
"C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -181,8 +185,8 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj"
}
}
}
@@ -216,12 +220,13 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {
"C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
"projectName": "Vista",
@@ -247,10 +252,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
>>>>>>> 3925b59 (cambios nacho)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -474,6 +482,7 @@
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -489,6 +498,10 @@
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
>>>>>>> 3925b59 (cambios nacho)
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj"
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
}
}
}
@@ -534,6 +547,7 @@
},
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {
"version": "1.0.0",
@@ -551,13 +565,17 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj": {
>>>>>>> 3925b59 (cambios nacho)
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj": {
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj",
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\obj\\",
>>>>>>> c493033 (cosas que faltaban)
@@ -567,6 +585,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\obj\\",
>>>>>>> 3925b59 (cambios nacho)
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\obj\\",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
@@ -584,6 +605,7 @@
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -623,13 +645,22 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj"
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj"
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
},
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj"
},
<<<<<<< HEAD
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj"
>>>>>>> 3925b59 (cambios nacho)
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj"
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
}
}
}

22
Vista/obj/project.assets.json
View File

@@ -13573,6 +13573,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
"projectName": "Vista",
@@ -13607,10 +13608,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
>>>>>>> 3925b59 (cambios nacho)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -13637,6 +13641,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -13681,13 +13686,22 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj"
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj"
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
},
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj"
},
<<<<<<< HEAD
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj"
>>>>>>> 3925b59 (cambios nacho)
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj"
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
}
}
}

6
Vista/obj/project.nuget.cache
View File

@@ -6,6 +6,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "NrgVcMaE+xOpA8UnmFhQwGflGRDAICnz8EffGQ+5vJrqniVecS26UDqJMYcJ2SmlijA3PT49NDmcrKADdBbkcQ==",
"success": true,
@@ -625,8 +626,11 @@
=======
"dgSpecHash": "9xoX6uTcIEHTfvrkxbiNwJryG4RwhPq70t4kNMVhRSGHltn2QOmFl8cQl5qjiBimTD2Zuo2MWeKOifxctKIbdg==",
>>>>>>> 3925b59 (cambios nacho)
=======
"dgSpecHash": "u13WwQGaPCePxL1JyQkpyhXuHxLQ97k9ktwi/o+F5Yk11GsR1/fPqs1rMKxJn/R3EX1AhoyxsvvOwv1MhGTPhQ==",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj",
"expectedPackageFiles": [],
>>>>>>> c493033 (cosas que faltaban)
"logs": []