no pude usar controladoras, no carga los datos ,interface de cliente y provedor
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"format": 1,
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {}
|
||||
},
|
||||
@@ -15,17 +16,24 @@
|
||||
"outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/",
|
||||
=======
|
||||
"C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj": {}
|
||||
=======
|
||||
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj": {}
|
||||
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
||||
},
|
||||
"projects": {
|
||||
"C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj": {
|
||||
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
|
||||
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
|
||||
"projectName": "Controladora",
|
||||
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
|
||||
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
|
||||
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
|
||||
<<<<<<< HEAD
|
||||
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\obj\\",
|
||||
>>>>>>> 8ad9dc6 (faltan controladoras)
|
||||
=======
|
||||
"outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\obj\\",
|
||||
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"/home/fede/.nuget/NuGet/NuGet.Config"
|
||||
@@ -41,6 +49,7 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
|
||||
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
|
||||
@@ -54,6 +63,13 @@
|
||||
"C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": {
|
||||
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.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"
|
||||
},
|
||||
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {
|
||||
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj"
|
||||
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -239,14 +255,14 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"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",
|
||||
@@ -299,14 +315,14 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": {
|
||||
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj",
|
||||
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
|
||||
"projectName": "Modelo",
|
||||
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj",
|
||||
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
|
||||
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\obj\\",
|
||||
"outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\obj\\",
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -323,8 +339,8 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
"C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj"
|
||||
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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("Controladora")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("Controladora")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
d7e6838ab345d847cad4078575babed33718cf28a47b8f27d6c4be1f7f7e97a7
|
||||
=======
|
||||
f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0
|
||||
@@ -7,3 +8,6 @@ f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0
|
||||
=======
|
||||
bb93237b0189a4b8b1180fafac8534e65b007ad7d97889b9b241a52a4500d537
|
||||
>>>>>>> 8ad9dc6 (faltan controladoras)
|
||||
=======
|
||||
41b9ae2cc417f11ef0d05afd64f424d30011ec3381b04e193604d3f4663cdb67
|
||||
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
||||
|
||||
@@ -10,10 +10,14 @@ build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = Controladora
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Controladora/
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\
|
||||
>>>>>>> 8ad9dc6 (faltan controladoras)
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\
|
||||
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
=======
|
||||
|
||||
@@ -1 +1 @@
|
||||
a8e0260e0db6be55f0b0f28b550784baab05fd07
|
||||
19830861cd564e51db0c3967ce8e2d2c457eecffb478d0402938a76286038bed
|
||||
|
||||
@@ -16,3 +16,20 @@ C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.pdb
|
||||
C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\Controladora.dll
|
||||
C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll
|
||||
C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\Controladora.pdb
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.dll
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\refint\Controladora.dll
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.pdb
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.deps.json
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.dll
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.pdb
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Entidades.dll
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Modelo.dll
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Modelo.pdb
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Entidades.pdb
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controla.1EE7A4DA.Up2Date
|
||||
C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\ref\Controladora.dll
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -13475,6 +13475,7 @@
|
||||
"project": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj",
|
||||
"projectName": "Controladora",
|
||||
@@ -13483,11 +13484,18 @@
|
||||
"outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/",
|
||||
=======
|
||||
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
|
||||
=======
|
||||
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
|
||||
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
||||
"projectName": "Controladora",
|
||||
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
|
||||
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
|
||||
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
|
||||
<<<<<<< HEAD
|
||||
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\obj\\",
|
||||
>>>>>>> 8ad9dc6 (faltan controladoras)
|
||||
=======
|
||||
"outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\obj\\",
|
||||
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"/home/fede/.nuget/NuGet/NuGet.Config"
|
||||
@@ -13503,6 +13511,7 @@
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
|
||||
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
|
||||
@@ -13516,6 +13525,13 @@
|
||||
"C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": {
|
||||
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.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"
|
||||
},
|
||||
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {
|
||||
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj"
|
||||
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"version": 2,
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"dgSpecHash": "Vs+HTdq8Gqw56GHRk+ivU0JJ/5n6ghHJP2CKgIV+gDHL9rO3WgHHPoz0OWJjyozNRvnYskqZVibjHcSALkg9JQ==",
|
||||
"success": true,
|
||||
@@ -9,6 +10,11 @@
|
||||
"success": false,
|
||||
"projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
|
||||
>>>>>>> 8ad9dc6 (faltan controladoras)
|
||||
=======
|
||||
"dgSpecHash": "MYQDimuvgTLgdr4nkAgRSaHTw8GikSKj95s3ws08wKEVVrpNozmS3GJxrppl/rSuADCp+u9k9/QhTzUwq8ILpw==",
|
||||
"success": false,
|
||||
"projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj",
|
||||
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
|
||||
"expectedPackageFiles": [
|
||||
"/home/fede/.nuget/packages/emailer/1.0.0/emailer.1.0.0.nupkg.sha512",
|
||||
"/home/fede/.nuget/packages/libuv/1.10.0/libuv.1.10.0.nupkg.sha512",
|
||||
|
||||
Reference in New Issue
Block a user