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

merge gigante

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:19:38 -03:00
parent 6498597664
commit 1aded875ab
84 changed files with 3063 additions and 84 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

@@ -18,10 +18,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")]
>>>>>>> 3616449 (preparando merge)
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
>>>>>>> 8ad9dc6 (faltan controladoras)
[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,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
5433dac5452fa5db31338aa45759172473b740a8027bf6a5b338d0bd8e08a305
=======
a90b7be7f25b3be585c8c3eda0cd50696de263dc
>>>>>>> 3616449 (preparando merge)
=======
244ec86832aa35c5b9c5e6ebfc71403d927ad498ea5d0b2c0c49514ce34338d6
>>>>>>> 8ad9dc6 (faltan controladoras)

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

@@ -9,7 +9,11 @@ build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Vista
<<<<<<< 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.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
=======

12
Vista/obj/Release/net6.0-windows/Vista.AssemblyInfo.cs
View File

@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// Este código fue generado por una herramienta.
// Versión de runtime:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
// se vuelve a generar el código.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -14,12 +14,12 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Vista")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
[assembly: System.Reflection.AssemblyProductAttribute("Vista")]
[assembly: System.Reflection.AssemblyTitleAttribute("Vista")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")]
[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")]
// Generated by the MSBuild WriteCodeFragment class.
// Generado por la clase WriteCodeFragment de MSBuild.

2
Vista/obj/Release/net6.0-windows/Vista.AssemblyInfoInputs.cache
View File

@@ -1 +1 @@
5c7eeffe8c03c0c0400edc2779c1a5f49505ced7
281e45d05d567e56bd25031aebcd2e38799f1146d63fd738a708cca7c575e649

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

@@ -14,4 +14,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Vista
build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Vista\
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Vista\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =

BIN
Vista/obj/Release/net6.0-windows/Vista.csproj.AssemblyReference.cache
View File

Binary file not shown.

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

@@ -1,6 +1,7 @@
{
"format": 1,
"restore": {
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {}
},
"projects": {
@@ -12,6 +13,79 @@
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj",
"packagesPath": "/home/fede/.nuget/packages/",
"outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/",
=======
"C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj": {}
},
"projects": {
"C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
},
"restoreAuditProperties": {
"enableAudit": "true",
"auditLevel": "low",
"auditMode": "direct"
}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48",
"net481"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
"C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
"projectName": "Vista",
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\obj\\",
>>>>>>> 8ad9dc6 (faltan controladoras)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
@@ -24,6 +98,7 @@
"https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {}
},
"frameworks": {
<<<<<<< HEAD
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
@@ -108,6 +183,15 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {}
=======
"net6.0-windows7.0": {
"targetAlias": "net6.0-windows",
"projectReferences": {
"C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj"
}
}
>>>>>>> 8ad9dc6 (faltan controladoras)
}
},
"warningProperties": {

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

@@ -2,6 +2,7 @@
"version": 3,
"targets": {
"net6.0-windows7.0": {
<<<<<<< HEAD
"Emailer/1.0.0": {
"type": "package",
"dependencies": {
@@ -5451,6 +5452,8 @@
"bin/placeholder/Controladora.dll": {}
}
},
=======
>>>>>>> 8ad9dc6 (faltan controladoras)
"Entidades/1.0.0": {
"type": "project",
"framework": ".NETCoreApp,Version=v6.0",
@@ -5460,6 +5463,7 @@
"runtime": {
"bin/placeholder/Entidades.dll": {}
}
<<<<<<< HEAD
},
"Modelo/1.0.0": {
"type": "project",
@@ -5473,10 +5477,13 @@
"runtime": {
"bin/placeholder/Modelo.dll": {}
}
=======
>>>>>>> 8ad9dc6 (faltan controladoras)
}
}
},
"libraries": {
<<<<<<< HEAD
"Emailer/1.0.0": {
"sha512": "MKz/p7Nq4omeANwvqEm0RJRX2VRTkFwn0dmGHkxt5/TeWilN/rBEUMiGTX2ySHqh/QbQviPXnwfZQFaTK6JbGA==",
"type": "package",
@@ -13471,20 +13478,28 @@
"path": "../Controladora/Controladora.csproj",
"msbuildProject": "../Controladora/Controladora.csproj"
},
=======
>>>>>>> 8ad9dc6 (faltan controladoras)
"Entidades/1.0.0": {
"type": "project",
"path": "../Entidades/Entidades.csproj",
"msbuildProject": "../Entidades/Entidades.csproj"
<<<<<<< HEAD
},
"Modelo/1.0.0": {
"type": "project",
"path": "../Modelo/Modelo.csproj",
"msbuildProject": "../Modelo/Modelo.csproj"
=======
>>>>>>> 8ad9dc6 (faltan controladoras)
}
},
"projectFileDependencyGroups": {
"net6.0-windows7.0": [
<<<<<<< HEAD
"Controladora >= 1.0.0",
=======
>>>>>>> 8ad9dc6 (faltan controladoras)
"Entidades >= 1.0.0"
]
},
@@ -13494,11 +13509,19 @@
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
"projectName": "Vista",
"projectPath": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
"packagesPath": "/home/fede/.nuget/packages/",
"outputPath": "/home/fede/proyectos/Final_OOP/Vista/obj/",
=======
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
"projectName": "Vista",
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\obj\\",
>>>>>>> 8ad9dc6 (faltan controladoras)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
@@ -13514,11 +13537,16 @@
"net6.0-windows7.0": {
"targetAlias": "net6.0-windows",
"projectReferences": {
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
},
"/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)
}
}
}

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

@@ -1,5 +1,6 @@
{
"version": 2,
<<<<<<< HEAD
"dgSpecHash": "NrgVcMaE+xOpA8UnmFhQwGflGRDAICnz8EffGQ+5vJrqniVecS26UDqJMYcJ2SmlijA3PT49NDmcrKADdBbkcQ==",
"success": true,
"projectFilePath": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
@@ -300,5 +301,11 @@
"/home/fede/.nuget/packages/microsoft.aspnetcore.app.ref/6.0.31/microsoft.aspnetcore.app.ref.6.0.31.nupkg.sha512",
"/home/fede/.nuget/packages/microsoft.netcore.app.host.linux-x64/6.0.31/microsoft.netcore.app.host.linux-x64.6.0.31.nupkg.sha512"
],
=======
"dgSpecHash": "tIuYRzaRYu8CXIPBh4BkJLvLrV0+lbBu/oLywxi4tl+wzrbcEqF9p2ndCdBxrhOTXwiWqf0FfmH6xCdhaeSQxA==",
"success": true,
"projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
"expectedPackageFiles": [],
>>>>>>> 8ad9dc6 (faltan controladoras)
"logs": []
}