{ "format": 1, "restore": { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {} }, "projects": { "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "version": "1.0.0", "restore": { "projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj", "projectName": "Entidades", "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj", "packagesPath": "/home/fede/.nuget/packages/", "outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/", ======= "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": {} ======= "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {} >>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) ======= "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": {} >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) ======= "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj": {} >>>>>>> c493033 (cosas que faltaban) }, "projects": { "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", "projectName": "Entidades", <<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", <<<<<<< HEAD "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\", >>>>>>> 8ad9dc6 (faltan controladoras) ======= "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\", >>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" ======= "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj", ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj", >>>>>>> c493033 (cosas que faltaban) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) ], "originalTargetFrameworks": [ "net6.0" ], "sources": { <<<<<<< HEAD ======= "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) "https://api.nuget.org/v3/index.json": {}, "https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": {} } }, "warningProperties": { "warnAsError": [ "NU1605" ] } }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "imports": [ "net461", "net462", "net47", "net471", "net472", "net48", "net481" ], "assetTargetFallback": true, "warn": true, "downloadDependencies": [ { "name": "Microsoft.AspNetCore.App.Ref", "version": "[6.0.31, 6.0.31]" }, { "name": "Microsoft.NETCore.App.Ref", "version": "[6.0.31, 6.0.31]" } ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" } }, <<<<<<< HEAD "runtimeIdentifierGraphPath": "/var/run/host/usr/share/dotnet/sdk/8.0.106/RuntimeIdentifierGraph.json" } } }, <<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": { "version": "1.0.0", "restore": { "projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj", "projectName": "Modelo", "projectPath": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj", "packagesPath": "/home/fede/.nuget/packages/", "outputPath": "/home/fede/proyectos/Final_OOP/Modelo/obj/", ======= "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": { ======= "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": { >>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) ======= "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" } } }, <<<<<<< HEAD "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": { >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) ======= "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj": { >>>>>>> c493033 (cosas que faltaban) "version": "1.0.0", "restore": { "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj", "projectName": "Modelo", <<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", <<<<<<< HEAD "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\obj\\", >>>>>>> 8ad9dc6 (faltan controladoras) ======= "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\obj\\", >>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" ======= "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj", ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj", >>>>>>> c493033 (cosas que faltaban) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) ], "originalTargetFrameworks": [ "net6.0" ], "sources": { <<<<<<< HEAD ======= "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) "https://api.nuget.org/v3/index.json": {}, "https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {} }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "projectReferences": { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD "/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) ======= "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) ======= "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj" >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) ======= "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj" >>>>>>> c493033 (cosas que faltaban) } } } }, "warningProperties": { "warnAsError": [ "NU1605" ] } }, "frameworks": { "net6.0": { "targetAlias": "net6.0", "imports": [ "net461", "net462", "net47", "net471", "net472", "net48", "net481" ], "assetTargetFallback": true, "warn": true, "downloadDependencies": [ { "name": "Microsoft.AspNetCore.App.Ref", "version": "[6.0.31, 6.0.31]" }, { "name": "Microsoft.NETCore.App.Ref", "version": "[6.0.31, 6.0.31]" } ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" } }, <<<<<<< HEAD "runtimeIdentifierGraphPath": "/var/run/host/usr/share/dotnet/sdk/8.0.106/RuntimeIdentifierGraph.json" ======= "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json" >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) } } } } }