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

no pude usar controladoras, no carga los datos ,interface de cliente y provedor

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:20:24 -03:00
parent 1aded875ab
commit e82c5a70b8
46 changed files with 6435 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs
View File

@@ -19,6 +19,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
@@ -26,6 +27,9 @@ using System.Reflection;
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")]
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
[assembly: System.Reflection.AssemblyProductAttribute("Vista")]
[assembly: System.Reflection.AssemblyTitleAttribute("Vista")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

4
Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache
View File

@@ -1,5 +1,6 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
5433dac5452fa5db31338aa45759172473b740a8027bf6a5b338d0bd8e08a305
=======
a90b7be7f25b3be585c8c3eda0cd50696de263dc
@@ -7,3 +8,6 @@ a90b7be7f25b3be585c8c3eda0cd50696de263dc
=======
244ec86832aa35c5b9c5e6ebfc71403d927ad498ea5d0b2c0c49514ce34338d6
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
14dd92a1eca361463bdac6313faec43ff2400fcede9eb6798b98887050929b0b
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)

4
Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -10,10 +10,14 @@ build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Vista
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Vista/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Vista\
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Vista\
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
=======

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

@@ -1,6 +1,7 @@
{
"format": 1,
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {}
},
@@ -15,16 +16,19 @@
"outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/",
=======
"C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj": {}
=======
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj": {}
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
},
"projects": {
"C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\",
"outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -77,15 +81,19 @@
}
}
},
"C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj": {
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
"projectName": "Vista",
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
<<<<<<< HEAD
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\obj\\",
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
"outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\obj\\",
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
@@ -102,11 +110,16 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
},
"/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj"
=======
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj"
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
}
}
}

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

@@ -13509,6 +13509,7 @@
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
"projectName": "Vista",
@@ -13517,11 +13518,18 @@
"outputPath": "/home/fede/proyectos/Final_OOP/Vista/obj/",
=======
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
=======
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
"projectName": "Vista",
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
<<<<<<< HEAD
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\obj\\",
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
"outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\obj\\",
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
@@ -13537,6 +13545,7 @@
"net6.0-windows7.0": {
"targetAlias": "net6.0-windows",
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -13547,6 +13556,10 @@
"C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj"
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj"
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
}
}
}

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

@@ -1,5 +1,6 @@
{
"version": 2,
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "NrgVcMaE+xOpA8UnmFhQwGflGRDAICnz8EffGQ+5vJrqniVecS26UDqJMYcJ2SmlijA3PT49NDmcrKADdBbkcQ==",
"success": true,
@@ -303,8 +304,11 @@
],
=======
"dgSpecHash": "tIuYRzaRYu8CXIPBh4BkJLvLrV0+lbBu/oLywxi4tl+wzrbcEqF9p2ndCdBxrhOTXwiWqf0FfmH6xCdhaeSQxA==",
=======
"dgSpecHash": "hleejJDgsDTscOjcjAaqsz7O8bRKdelLTFiNGc0rJ/YKvc+AuQ7Vc0530fJwdTW+IjGZB03MheqWXYO7aqD5eA==",
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
"success": true,
"projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
"projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
"expectedPackageFiles": [],
>>>>>>> 8ad9dc6 (faltan controladoras)
"logs": []