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

cambios nacho

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:24:34 -03:00
parent 3beec95408
commit b62fa7b021
52 changed files with 745 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {}
},
@@ -31,16 +32,19 @@
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj": {}
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj": {}
>>>>>>> 3925b59 (cambios nacho)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
"projectName": "Controladora",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\Controladora.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Controladora\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -58,11 +62,11 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj"
"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\\final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.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"
}
}
}
@@ -96,14 +100,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -152,14 +156,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -177,8 +181,8 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj"
"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"
}
}
}
@@ -212,11 +216,12 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
"projectName": "Vista",
@@ -239,10 +244,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
>>>>>>> 3925b59 (cambios nacho)
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -465,6 +473,7 @@
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -476,6 +485,10 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj"
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"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)
}
}
}
@@ -520,6 +533,7 @@
}
},
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {
"version": "1.0.0",
@@ -534,18 +548,25 @@
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj": {
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj": {
>>>>>>> 3925b59 (cambios nacho)
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\obj\\",
>>>>>>> c493033 (cosas que faltaban)
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Vista\\obj\\",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\obj\\",
>>>>>>> 3925b59 (cambios nacho)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
@@ -562,6 +583,7 @@
"targetAlias": "net6.0-windows",
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -598,6 +620,16 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Informes\\Informes.csproj"
>>>>>>> 5479db7 (terminado form de config)
=======
"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(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(2)\\Final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj"
>>>>>>> 3925b59 (cambios nacho)
}
}
}