infromes y solucionado error chistoso en repoLote

This commit is contained in:
2024-08-11 18:26:31 -03:00
parent 6f5a2ae4c8
commit 04268f23e5
23 changed files with 469 additions and 56 deletions

View File

@@ -11,6 +11,7 @@ build_property.RootNamespace = Informes
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Informes\
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actua2l\Final actual\Informes\
@@ -21,3 +22,6 @@ build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Informes\
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
build_property.ProjectDir = C:\Users\fedpo\Desktop\FINAL\Informes\
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)

View File

@@ -1,6 +1,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
3fd66116ceaea5e07433507fe6494c4f357d71a3a526da0eea8f6d1df7fb86c5
=======
100fa21bf2f76b06ab70964d65200e354f5837e3
@@ -11,3 +12,6 @@ b8f7575a0ad69c743b6dc87a6ac87340793ee335
=======
ad77f22dc36643a40b80d001672cc4f6dc648e45
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
7a00a3a89d0542129fe5c35914e3e539b4b44f09
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)

View File

@@ -93,4 +93,37 @@ C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\In
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\refint\Informes.dll
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.pdb
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\ref\Informes.dll
<<<<<<< HEAD
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
C:\Users\Nacho\Desktop\FINAL\Informes\bin\Debug\net6.0\Informes.deps.json
C:\Users\Nacho\Desktop\FINAL\Informes\bin\Debug\net6.0\Informes.dll
C:\Users\Nacho\Desktop\FINAL\Informes\bin\Debug\net6.0\Informes.pdb
C:\Users\Nacho\Desktop\FINAL\Informes\bin\Debug\net6.0\Entidades.dll
C:\Users\Nacho\Desktop\FINAL\Informes\bin\Debug\net6.0\Entidades.pdb
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.csproj.AssemblyReference.cache
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.GeneratedMSBuildEditorConfig.editorconfig
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.AssemblyInfoInputs.cache
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.AssemblyInfo.cs
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.csproj.CoreCompileInputs.cache
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.csproj.Up2Date
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.dll
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\refint\Informes.dll
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.pdb
C:\Users\Nacho\Desktop\FINAL\Informes\obj\Debug\net6.0\ref\Informes.dll
C:\Users\fedpo\Desktop\FINAL\Informes\bin\Debug\net6.0\Informes.deps.json
C:\Users\fedpo\Desktop\FINAL\Informes\bin\Debug\net6.0\Informes.dll
C:\Users\fedpo\Desktop\FINAL\Informes\bin\Debug\net6.0\Informes.pdb
C:\Users\fedpo\Desktop\FINAL\Informes\bin\Debug\net6.0\Entidades.dll
C:\Users\fedpo\Desktop\FINAL\Informes\bin\Debug\net6.0\Entidades.pdb
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.csproj.AssemblyReference.cache
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.GeneratedMSBuildEditorConfig.editorconfig
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.AssemblyInfoInputs.cache
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.AssemblyInfo.cs
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.csproj.CoreCompileInputs.cache
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.csproj.CopyComplete
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.dll
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\refint\Informes.dll
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\Informes.pdb
C:\Users\fedpo\Desktop\FINAL\Informes\obj\Debug\net6.0\ref\Informes.dll
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)

View File

@@ -1,16 +1,17 @@
{
"format": 1,
"restore": {
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": {}
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {}
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
<<<<<<< HEAD
@@ -32,6 +33,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -80,13 +84,14 @@
}
}
},
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\",
<<<<<<< HEAD
@@ -105,6 +110,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -122,6 +130,7 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
@@ -136,6 +145,10 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}

View File

@@ -32,10 +32,11 @@
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
"projectName": "Informes",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\obj\\",
<<<<<<< HEAD
@@ -51,6 +52,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -68,6 +72,7 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
@@ -82,6 +87,10 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}

View File

@@ -2,6 +2,7 @@
"version": 2,
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==",
"success": true,
@@ -21,6 +22,11 @@
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"dgSpecHash": "2CEPFq1aFcIXpBNXKJ0FYOgrgWTNW9/4khhso/sBmLj3P4gKEyjLHCUpPCPGpCybn7OaowLBWRaR35Uqo6RHKQ==",
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"expectedPackageFiles": [],
"logs": []
}