preparando merge

2024-08-03 21:17:18 +01:00
parent 04e6a0b9bb
commit 3616449d84
12 changed files with 17 additions and 21 deletions
--- a/.vs/Final_OOP/v17/.suo
+++ b/.vs/Final_OOP/v17/.suo
--- a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs
+++ b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Este código fue generado por una herramienta.
-//     Versión de runtime:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
-//     se vuelve a generar el código.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------

@@ -14,10 +14,10 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Controladora")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5d29abefe62c39b8605b3bc85b3dcc035f95704c")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [assembly: System.Reflection.AssemblyProductAttribute("Controladora")]
 [assembly: System.Reflection.AssemblyTitleAttribute("Controladora")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

-// Generado por la clase WriteCodeFragment de MSBuild.
+// Generated by the MSBuild WriteCodeFragment class.

--- a/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache
+++ b/Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache
@@ -1 +1 @@
-72883d016e7a9fccb0c4aeb9322dc9617d270a24ecd28877ff31bdfa5c7e2559
+f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0
--- a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Controladora
-build_property.ProjectDir = C:\Users\Nacho\Desktop\Final\Controladora\
-build_property.EnableComHosting = 
-build_property.EnableGeneratedComInterfaceComImportInterop = 
+build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Controladora\
--- a/Controladora/obj/Debug/net6.0/Controladora.assets.cache
+++ b/Controladora/obj/Debug/net6.0/Controladora.assets.cache
--- a/Controladora/obj/Debug/net6.0/Controladora.csproj.AssemblyReference.cache
+++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.AssemblyReference.cache
--- a/Entidades/obj/Debug/net6.0/Entidades.assets.cache
+++ b/Entidades/obj/Debug/net6.0/Entidades.assets.cache
--- a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs
+++ b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfo.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Este código fue generado por una herramienta.
-//     Versión de runtime:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
-//     se vuelve a generar el código.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------

@@ -14,12 +14,12 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("Vista")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6f63c328000fe0f795ac17f5c7382d7f3ea78d8a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
 [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")]

-// Generado por la clase WriteCodeFragment de MSBuild.
+// Generated by the MSBuild WriteCodeFragment class.

--- a/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache
+++ b/Vista/obj/Debug/net6.0-windows/Vista.AssemblyInfoInputs.cache
@@ -1 +1 @@
-20b86948091e45c2b60f9ea222bb93ce38b15cf5bfd53784801aa1388ecbfa5a
+a90b7be7f25b3be585c8c3eda0cd50696de263dc
--- a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig
@@ -14,6 +14,4 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Vista
-build_property.ProjectDir = C:\Users\Nacho\Desktop\Final\Vista\
-build_property.EnableComHosting = 
-build_property.EnableGeneratedComInterfaceComImportInterop = 
+build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Vista\
--- a/Vista/obj/Debug/net6.0-windows/Vista.assets.cache
+++ b/Vista/obj/Debug/net6.0-windows/Vista.assets.cache
--- a/Vista/obj/Debug/net6.0-windows/Vista.designer.runtimeconfig.json
+++ b/Vista/obj/Debug/net6.0-windows/Vista.designer.runtimeconfig.json
@@ -12,7 +12,7 @@
      }
    ],
    "additionalProbingPaths": [
-      "C:\\Users\\Nacho\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\fedpo\\.dotnet\\store\\|arch|\\|tfm|",
      "C:\\Users\\Nacho\\.nuget\\packages"
    ],
    "configProperties": {