fede/Final_OOP
Archived
2
0
Fork 0
Code Issues 4 Pull Requests 1 Packages Projects 2 Releases Wiki Activity

trayendo cambios de nacho

Browse Source
This commit is contained in:
fedpo
2024-08-06 06:26:05 +01:00
parent d9b810b550 88e614d538
commit f03870d284
61 changed files with 606 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Controladora/obj/Controladora.csproj.nuget.dgspec.json
View File

@@ -1,6 +1,7 @@
{
"format": 1,
"restore": {
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": {}
},
"projects": {
@@ -12,6 +13,19 @@
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\",
=======
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": {}
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj",
"projectName": "Controladora",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\obj\\",
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -29,11 +43,19 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
},
"C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj"
=======
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
},
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj"
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
}
}
}
@@ -67,6 +89,7 @@
}
}
},
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
@@ -75,6 +98,16 @@
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
=======
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\",
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -123,6 +156,7 @@
}
}
},
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {
"version": "1.0.0",
"restore": {
@@ -131,6 +165,16 @@
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\",
=======
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj",
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\obj\\",
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -148,8 +192,13 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
=======
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
}
}
}

23
Controladora/obj/Debug/net6.0/Controladora.AssemblyInfo.cs
View File

@@ -1,23 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using System;
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")]
[assembly: System.Reflection.AssemblyProductAttribute("Controladora")]
[assembly: System.Reflection.AssemblyTitleAttribute("Controladora")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// Generated by the MSBuild WriteCodeFragment class.

1
Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache
View File

@@ -1 +0,0 @@
f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0

11
Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -1,11 +0,0 @@
is_global = true
build_property.TargetFramework = net6.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Controladora
build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Controladora\

1
Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache
View File

@@ -1 +0,0 @@
de87b0b29efe8d95b2a1e8b4f776d31f322c9a28

17
Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt
View File

@@ -49,20 +49,3 @@ C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb
C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll
C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json
C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Controladora.dll
C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Controladora.pdb
C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Entidades.dll
C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Modelo.dll
C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Modelo.pdb
C:\Users\fedpo\Desktop\final actual\Controladora\bin\Debug\net6.0\Entidades.pdb
C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache
C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig
C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache
C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs
C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache
C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CopyComplete
C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.dll
C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll
C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb
C:\Users\fedpo\Desktop\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll

BIN
Controladora/obj/Debug/net6.0/Controladora.dll
View File

Binary file not shown.

BIN
Controladora/obj/Debug/net6.0/Controladora.pdb
View File

Binary file not shown.

BIN
Controladora/obj/Debug/net6.0/ref/Controladora.dll
View File

Binary file not shown.

BIN
Controladora/obj/Debug/net6.0/refint/Controladora.dll
View File

Binary file not shown.

16
Controladora/obj/project.assets.json
View File

@@ -51,11 +51,19 @@
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj",
"projectName": "Controladora",
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\",
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj",
"projectName": "Controladora",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\obj\\",
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -73,11 +81,19 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
},
"C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj"
=======
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
},
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj"
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
}
}
}

8
Controladora/obj/project.nuget.cache
View File

@@ -1,8 +0,0 @@
{
"version": 2,
"dgSpecHash": "np352cObafySekJtDAqC2j8SApn6fgTohMHmvXCjxDtYRAbC7VcWOpg6GF7hfyKvsXu6RvlV5bEzt/dHdTMzpg==",
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj",
"expectedPackageFiles": [],
"logs": []
}