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

feat: terminados 4 de 7 forms

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:25:05 -03:00
parent 502f10131c
commit ab890dbf98
60 changed files with 753 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {}
},
@@ -35,16 +36,20 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {}
>>>>>>> 3925b59 (cambios nacho)
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": {}
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {
"C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj",
"projectName": "Controladora",
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
@@ -68,8 +73,11 @@
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
>>>>>>> 3925b59 (cambios nacho)
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -96,6 +104,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -144,6 +153,13 @@
"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"
>>>>>>> 3925b59 (cambios nacho)
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj"
},
"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)
}
}
}
@@ -323,14 +339,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -379,14 +395,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {
"C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj",
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -404,8 +420,8 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
"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\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj"
}
}
}

4
Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -15,6 +15,7 @@ build_property.RootNamespace = Controladora
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Controladora/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\
@@ -39,3 +40,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\C
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Controladora\
>>>>>>> 3925b59 (cambios nacho)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\Controladora\
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)

4
Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache
View File

@@ -1,5 +1,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
07cbdde4e47ec2d3a6db548797ff84a15aa08946633217fe5ed64773b3cc8491
=======
39c8634b9e930bb7c3ea67187f4543b71aaf8be2
>>>>>>> 82ef086 (a)
=======
dba3ec7c7a0b4bd2c09ad0be4ae57d8a36772676
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)

17
Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt
View File

@@ -32,3 +32,20 @@ C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.d
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.pdb
C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Controladora.dll
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Controladora.pdb
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Entidades.dll
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Modelo.dll
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Modelo.pdb
C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Entidades.pdb
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CopyComplete
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.dll
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll

BIN
Controladora/obj/Debug/net6.0/Controladora.dll
View File

Binary file not shown.

BIN
Controladora/obj/Debug/net6.0/Controladora.pdb
View File

Binary file not shown.

BIN
Controladora/obj/Debug/net6.0/ref/Controladora.dll
View File

Binary file not shown.

BIN
Controladora/obj/Debug/net6.0/refint/Controladora.dll
View File

Binary file not shown.

16
Controladora/obj/project.assets.json
View File

@@ -60,6 +60,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj",
"projectName": "Controladora",
@@ -94,10 +95,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
>>>>>>> 3925b59 (cambios nacho)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
"projectName": "Controladora",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -124,6 +128,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -172,6 +177,13 @@
"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"
>>>>>>> 3925b59 (cambios nacho)
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj"
},
"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)
}
}
}

6
Controladora/obj/project.nuget.cache
View File

@@ -5,6 +5,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "Vs+HTdq8Gqw56GHRk+ivU0JJ/5n6ghHJP2CKgIV+gDHL9rO3WgHHPoz0OWJjyozNRvnYskqZVibjHcSALkg9JQ==",
"success": true,
@@ -619,8 +620,11 @@
=======
"dgSpecHash": "r6yZkn7vz8/vk90IKpsbux5MO0+aB5kxgPItYHl5ZJHIUAUs/bsNzJEgYyHcVZOte6JF54JInW9sHlpZnQcQMQ==",
>>>>>>> 3925b59 (cambios nacho)
=======
"dgSpecHash": "IpwbiXL3dRwH5wx4tbGN8sdWb7j6j3mIXiyS0Hjs/qZK1voDpRMu2YLROEx5AIgE25tapPlkUXWChBlhRVT26A==",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj",
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj",
"expectedPackageFiles": [],
>>>>>>> c493033 (cosas que faltaban)
"logs": []