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

infromes y solucionado error chistoso en repoLote

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:26:31 -03:00
parent 6f5a2ae4c8
commit 04268f23e5
23 changed files with 469 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {}
},
@@ -55,15 +56,19 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj": {}
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\Vista.csproj": {}
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj",
"projectName": "Controladora",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\",
<<<<<<< HEAD
@@ -85,6 +90,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -102,9 +110,10 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
},
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj"
@@ -122,6 +131,13 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj"
},
"C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}
@@ -155,13 +171,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
<<<<<<< HEAD
@@ -180,6 +197,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -228,13 +248,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\",
<<<<<<< HEAD
@@ -253,6 +274,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -270,6 +294,7 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
@@ -284,6 +309,10 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}
@@ -317,7 +346,7 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
@@ -327,6 +356,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
"projectName": "Vista",
@@ -364,9 +394,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\",
<<<<<<< HEAD
@@ -513,6 +547,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Modelo\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -531,6 +568,7 @@
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
@@ -542,6 +580,10 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}
@@ -576,6 +618,7 @@
}
},
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj": {
"version": "1.0.0",
@@ -591,18 +634,25 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj": {
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\Vista.csproj": {
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\Vista.csproj",
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\obj\\",
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -852,6 +902,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -909,13 +960,18 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
},
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
},
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< 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"
@@ -949,6 +1005,10 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}