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

merge gigante

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:19:38 -03:00
parent 6498597664
commit 1aded875ab
84 changed files with 3063 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@
"version": 3,
"targets": {
"net6.0-windows7.0": {
<<<<<<< HEAD
"Emailer/1.0.0": {
"type": "package",
"dependencies": {
@@ -5451,6 +5452,8 @@
"bin/placeholder/Controladora.dll": {}
}
},
=======
>>>>>>> 8ad9dc6 (faltan controladoras)
"Entidades/1.0.0": {
"type": "project",
"framework": ".NETCoreApp,Version=v6.0",
@@ -5460,6 +5463,7 @@
"runtime": {
"bin/placeholder/Entidades.dll": {}
}
<<<<<<< HEAD
},
"Modelo/1.0.0": {
"type": "project",
@@ -5473,10 +5477,13 @@
"runtime": {
"bin/placeholder/Modelo.dll": {}
}
=======
>>>>>>> 8ad9dc6 (faltan controladoras)
}
}
},
"libraries": {
<<<<<<< HEAD
"Emailer/1.0.0": {
"sha512": "MKz/p7Nq4omeANwvqEm0RJRX2VRTkFwn0dmGHkxt5/TeWilN/rBEUMiGTX2ySHqh/QbQviPXnwfZQFaTK6JbGA==",
"type": "package",
@@ -13471,20 +13478,28 @@
"path": "../Controladora/Controladora.csproj",
"msbuildProject": "../Controladora/Controladora.csproj"
},
=======
>>>>>>> 8ad9dc6 (faltan controladoras)
"Entidades/1.0.0": {
"type": "project",
"path": "../Entidades/Entidades.csproj",
"msbuildProject": "../Entidades/Entidades.csproj"
<<<<<<< HEAD
},
"Modelo/1.0.0": {
"type": "project",
"path": "../Modelo/Modelo.csproj",
"msbuildProject": "../Modelo/Modelo.csproj"
=======
>>>>>>> 8ad9dc6 (faltan controladoras)
}
},
"projectFileDependencyGroups": {
"net6.0-windows7.0": [
<<<<<<< HEAD
"Controladora >= 1.0.0",
=======
>>>>>>> 8ad9dc6 (faltan controladoras)
"Entidades >= 1.0.0"
]
},
@@ -13494,11 +13509,19 @@
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
"projectName": "Vista",
"projectPath": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
"packagesPath": "/home/fede/.nuget/packages/",
"outputPath": "/home/fede/proyectos/Final_OOP/Vista/obj/",
=======
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
"projectName": "Vista",
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\obj\\",
>>>>>>> 8ad9dc6 (faltan controladoras)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
@@ -13514,11 +13537,16 @@
"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"
},
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
=======
"C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj"
>>>>>>> 8ad9dc6 (faltan controladoras)
}
}
}