trayendo cambios de nacho

This commit is contained in:
fedpo
2024-08-06 06:26:05 +01:00
61 changed files with 606 additions and 368 deletions

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("Informes")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("Informes")]
[assembly: System.Reflection.AssemblyTitleAttribute("Informes")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// Generated by the MSBuild WriteCodeFragment class.

View File

@@ -1 +0,0 @@
55f9793ce92bee586e65f5b38a3a7676261de34c

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 = Informes
build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Informes\

View File

@@ -1 +0,0 @@
100fa21bf2f76b06ab70964d65200e354f5837e3

View File

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

View File

@@ -1,6 +1,7 @@
{
"format": 1,
"restore": {
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": {}
},
"projects": {
@@ -12,6 +13,19 @@
"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\\Informes\\Informes.csproj": {}
},
"projects": {
"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",
@@ -60,6 +74,7 @@
}
}
},
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": {
"version": "1.0.0",
"restore": {
@@ -68,6 +83,16 @@
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\",
=======
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\obj\\",
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -85,8 +110,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
}
}
}

View File

@@ -32,11 +32,19 @@
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\",
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\obj\\",
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -54,8 +62,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
}
}
}

View File

@@ -1,8 +0,0 @@
{
"version": 2,
"dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==",
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
"expectedPackageFiles": [],
"logs": []
}