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
Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs
View File

@@ -13,7 +13,11 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Entidades")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
>>>>>>> 8ad9dc6 (faltan controladoras)
[assembly: System.Reflection.AssemblyProductAttribute("Entidades")]
[assembly: System.Reflection.AssemblyTitleAttribute("Entidades")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

4
Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache
View File

@@ -1 +1,5 @@
<<<<<<< HEAD
c9fd7d1da15719a344d19280a9e21a8dc924eb19882884c600d67b0cd9fae973
=======
390fb09e0b78446d2aeb62456ecd394479e4203d8ba487fbe31e39283ec058af
>>>>>>> 8ad9dc6 (faltan controladoras)

4
Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -8,6 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Entidades
<<<<<<< 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.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =

14
Entidades/obj/Entidades.csproj.nuget.dgspec.json
View File

@@ -1,6 +1,7 @@
{
"format": 1,
"restore": {
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {}
},
"projects": {
@@ -12,6 +13,19 @@
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
"packagesPath": "/home/fede/.nuget/packages/",
"outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/",
=======
"C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.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\\",
>>>>>>> 8ad9dc6 (faltan controladoras)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"

12
Entidades/obj/Release/net6.0/Entidades.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,10 +14,10 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Entidades")]
[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("Entidades")]
[assembly: System.Reflection.AssemblyTitleAttribute("Entidades")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// Generated by the MSBuild WriteCodeFragment class.
// Generado por la clase WriteCodeFragment de MSBuild.

2
Entidades/obj/Release/net6.0/Entidades.AssemblyInfoInputs.cache
View File

@@ -1 +1 @@
1dac91cef82b545d186b8ab941058cf01df1dea3
0f23a71dabcab7104ee2511db3de6cc1ef434f03702a8d033e7694541758b7dd

4
Entidades/obj/Release/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig
View File

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

BIN
Entidades/obj/Release/net6.0/Entidades.assets.cache
View File

Binary file not shown.

BIN
Entidades/obj/Release/net6.0/Entidades.csproj.AssemblyReference.cache
View File

Binary file not shown.

8
Entidades/obj/project.assets.json
View File

@@ -13,11 +13,19 @@
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
"projectName": "Entidades",
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
"packagesPath": "/home/fede/.nuget/packages/",
"outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/",
=======
"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\\",
>>>>>>> 8ad9dc6 (faltan controladoras)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"

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

@@ -1,5 +1,6 @@
{
"version": 2,
<<<<<<< HEAD
"dgSpecHash": "LSnXGupX+sIU3VjCECy137T1ThKtECGacQq+4Cfd3SDyYEpIcp26yf15qIysqN2+1Fwti7c13f3fBKmUt8i0Og==",
"success": true,
"projectFilePath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
@@ -7,5 +8,11 @@
"/home/fede/.nuget/packages/microsoft.netcore.app.ref/6.0.31/microsoft.netcore.app.ref.6.0.31.nupkg.sha512",
"/home/fede/.nuget/packages/microsoft.aspnetcore.app.ref/6.0.31/microsoft.aspnetcore.app.ref.6.0.31.nupkg.sha512"
],
=======
"dgSpecHash": "tQ5wbjPjSSYF0ufyaHkTpMHeLmctkgU0DRXiByR35mv7fgnebDzFc/FQHskLw18SzYXpGgfy8W7o3/JscpL1ZA==",
"success": true,
"projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
"expectedPackageFiles": [],
>>>>>>> 8ad9dc6 (faltan controladoras)
"logs": []
}