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

por ahora todo menos orden de compra y remito

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:25:17 -03:00
parent ab890dbf98
commit 75c9f8ed9b
72 changed files with 985 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Controladora/obj/Controladora.csproj.nuget.dgspec.json
View File

@@ -7,6 +7,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {}
},
@@ -39,17 +40,21 @@
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": {}
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
=======
"C:\\Users\\fedpo\\Desktop\\final actual\\Controladora\\Controladora.csproj": {}
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": {
"C:\\Users\\fedpo\\Desktop\\final actual\\Controladora\\Controladora.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\final actual\\Controladora\\Controladora.csproj",
"projectName": "Controladora",
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
@@ -76,8 +81,11 @@
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
=======
"projectPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Controladora\\Controladora.csproj",
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Controladora\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -105,6 +113,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -160,6 +169,13 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj"
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
=======
"C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\Entidades.csproj"
},
"C:\\Users\\fedpo\\Desktop\\final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Modelo\\Modelo.csproj"
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
}
}
}
@@ -339,14 +355,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -395,14 +411,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj": {
"C:\\Users\\fedpo\\Desktop\\final actual\\Modelo\\Modelo.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\final actual\\Modelo\\Modelo.csproj",
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -420,8 +436,8 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\Entidades.csproj"
}
}
}