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

This commit is contained in:
2024-08-11 18:20:24 -03:00
parent 1aded875ab
commit e82c5a70b8
46 changed files with 6435 additions and 82 deletions

View File

@@ -14,10 +14,14 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
=======
[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("Entidades")]
[assembly: System.Reflection.AssemblyTitleAttribute("Entidades")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@@ -1,5 +1,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
c9fd7d1da15719a344d19280a9e21a8dc924eb19882884c600d67b0cd9fae973
=======
390fb09e0b78446d2aeb62456ecd394479e4203d8ba487fbe31e39283ec058af
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
a687cba9ed7450e5c700a51cb95b1f9a0a0edc042a19f86ad94db189023a05ac
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)

View File

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

View File

@@ -1,6 +1,7 @@
{
"format": 1,
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {}
},
@@ -15,17 +16,24 @@
"outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/",
=======
"C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {}
=======
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.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\\",
<<<<<<< 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"

View File

@@ -13,6 +13,7 @@
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
"projectName": "Entidades",
@@ -21,11 +22,18 @@
"outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/",
=======
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
=======
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
"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\\",
<<<<<<< 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"

View File

@@ -1,5 +1,6 @@
{
"version": 2,
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "LSnXGupX+sIU3VjCECy137T1ThKtECGacQq+4Cfd3SDyYEpIcp26yf15qIysqN2+1Fwti7c13f3fBKmUt8i0Og==",
"success": true,
@@ -10,8 +11,11 @@
],
=======
"dgSpecHash": "tQ5wbjPjSSYF0ufyaHkTpMHeLmctkgU0DRXiByR35mv7fgnebDzFc/FQHskLw18SzYXpGgfy8W7o3/JscpL1ZA==",
=======
"dgSpecHash": "+9QsqENGYd4qIIPCnRA0BRL7UiFYXaYZJR2jVoACt5fTCzrycu1oHCxViXeMxzr+idMIyJGQ/11fIYTFVqnyPA==",
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
"success": true,
"projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
"projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
"expectedPackageFiles": [],
>>>>>>> 8ad9dc6 (faltan controladoras)
"logs": []