cosas que faltaban

This commit is contained in:
2024-08-11 18:23:17 -03:00
parent 08cb7d769f
commit c6ed194e04
77 changed files with 2333 additions and 25531 deletions

View File

@@ -3,6 +3,7 @@
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {}
},
@@ -23,16 +24,19 @@
=======
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Vista\\Vista.csproj": {}
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
=======
"C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\Vista.csproj": {}
>>>>>>> c493033 (cosas que faltaban)
},
"projects": {
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj",
"projectName": "Controladora",
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Controladora\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -50,11 +54,11 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj"
},
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj"
"C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj"
}
}
}
@@ -68,16 +72,6 @@
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"dependencies": {
"Emailer": {
"target": "Package",
"version": "[1.0.0, )"
},
"webhookSharp": {
"target": "Package",
"version": "[1.0.0, )"
}
},
"imports": [
"net461",
"net462",
@@ -98,14 +92,14 @@
}
}
},
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -154,9 +148,10 @@
}
}
},
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
"projectName": "Vista",
@@ -173,10 +168,13 @@
"/home/fede/.nuget/NuGet/NuGet.Config"
=======
"projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj",
>>>>>>> c493033 (cosas que faltaban)
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -398,8 +396,13 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
=======
"C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj"
>>>>>>> c493033 (cosas que faltaban)
}
}
}
@@ -443,6 +446,7 @@
}
}
},
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {
"version": "1.0.0",
"restore": {
@@ -451,6 +455,16 @@
"projectPath": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
"packagesPath": "/home/fede/.nuget/packages/",
"outputPath": "/home/fede/proyectos/Final_OOP/Vista/obj/",
=======
"C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\Vista.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\Vista.csproj",
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\obj\\",
>>>>>>> c493033 (cosas que faltaban)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
@@ -466,6 +480,7 @@
"net6.0-windows7.0": {
"targetAlias": "net6.0-windows",
"projectReferences": {
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
},
@@ -481,6 +496,13 @@
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
=======
"C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj"
},
"C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj"
>>>>>>> c493033 (cosas que faltaban)
}
}
}