Hecho Irepositorio y borrado codigo viejo de repositorios. Además configuré entity framework
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
||||
55f9793ce92bee586e65f5b38a3a7676261de34c
|
||||
d7c554bdf147478bbc3b788a6c9f2e2fbb1248125625611bcde6ae37d8fd9f9b
|
||||
|
||||
@@ -8,20 +8,6 @@ build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
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\
|
||||
>>>>>>> 88e614d (god)
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Informes\
|
||||
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
|
||||
=======
|
||||
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)
|
||||
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Informes/
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1,17 +1 @@
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
3fd66116ceaea5e07433507fe6494c4f357d71a3a526da0eea8f6d1df7fb86c5
|
||||
=======
|
||||
100fa21bf2f76b06ab70964d65200e354f5837e3
|
||||
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
|
||||
=======
|
||||
b8f7575a0ad69c743b6dc87a6ac87340793ee335
|
||||
>>>>>>> 8b80e42 (falta que se actualize numProducto y los infomes)
|
||||
=======
|
||||
ad77f22dc36643a40b80d001672cc4f6dc648e45
|
||||
>>>>>>> 855ce7c (AAAAAAAAAAA)
|
||||
=======
|
||||
7a00a3a89d0542129fe5c35914e3e539b4b44f09
|
||||
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
|
||||
831ed014d7709fa34aba4faa4c71009d42238c3bf5a4862fe42724d244fc7825
|
||||
|
||||
@@ -1,129 +1,125 @@
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\bin\Debug\net6.0\Informes.deps.json
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\bin\Debug\net6.0\Informes.dll
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\bin\Debug\net6.0\Informes.pdb
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\bin\Debug\net6.0\Entidades.dll
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\bin\Debug\net6.0\Entidades.pdb
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\Informes.csproj.AssemblyReference.cache
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\Informes.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\Informes.AssemblyInfoInputs.cache
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\Informes.AssemblyInfo.cs
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\Informes.csproj.CoreCompileInputs.cache
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\Informes.csproj.CopyComplete
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\Informes.dll
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\refint\Informes.dll
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\Informes.pdb
|
||||
C:\Users\fedpo\Downloads\final actual\final actual\Informes\obj\Debug\net6.0\ref\Informes.dll
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\bin\Debug\net6.0\Informes.deps.json
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\bin\Debug\net6.0\Informes.dll
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\bin\Debug\net6.0\Informes.pdb
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\bin\Debug\net6.0\Entidades.dll
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\bin\Debug\net6.0\Entidades.pdb
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.csproj.AssemblyReference.cache
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.AssemblyInfoInputs.cache
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.AssemblyInfo.cs
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.csproj.CoreCompileInputs.cache
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.csproj.Up2Date
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.dll
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\refint\Informes.dll
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\Informes.pdb
|
||||
C:\Users\Nacho\Desktop\Final actual\Informes\obj\Debug\net6.0\ref\Informes.dll
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\bin\Debug\net6.0\Informes.deps.json
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\bin\Debug\net6.0\Informes.dll
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\bin\Debug\net6.0\Informes.pdb
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\bin\Debug\net6.0\Entidades.dll
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\bin\Debug\net6.0\Entidades.pdb
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\Informes.csproj.AssemblyReference.cache
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\Informes.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\Informes.AssemblyInfoInputs.cache
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\Informes.AssemblyInfo.cs
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\Informes.csproj.CoreCompileInputs.cache
|
||||
C:\Users\fedpo\Downloads\final actual\Informes\obj\Debug\net6.0\Informes.csproj.CopyComplete
|
||||
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/Downloads/final actual/final actual/Informes/bin/Debug/net6.0/Informes.deps.json
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/bin/Debug/net6.0/Informes.dll
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/bin/Debug/net6.0/Informes.pdb
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/bin/Debug/net6.0/Entidades.dll
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/bin/Debug/net6.0/Entidades.pdb
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/obj/Debug/net6.0/Informes.AssemblyInfoInputs.cache
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/obj/Debug/net6.0/Informes.csproj.CopyComplete
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/obj/Debug/net6.0/Informes.dll
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/obj/Debug/net6.0/refint/Informes.dll
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/obj/Debug/net6.0/Informes.pdb
|
||||
C:/Users/fedpo/Downloads/final actual/final actual/Informes/obj/Debug/net6.0/ref/Informes.dll
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/bin/Debug/net6.0/Informes.deps.json
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/bin/Debug/net6.0/Informes.dll
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/bin/Debug/net6.0/Informes.pdb
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/bin/Debug/net6.0/Entidades.dll
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/bin/Debug/net6.0/Entidades.pdb
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/obj/Debug/net6.0/Informes.AssemblyInfoInputs.cache
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/obj/Debug/net6.0/Informes.csproj.Up2Date
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/obj/Debug/net6.0/Informes.dll
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/obj/Debug/net6.0/refint/Informes.dll
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/obj/Debug/net6.0/Informes.pdb
|
||||
C:/Users/Nacho/Desktop/Final actual/Informes/obj/Debug/net6.0/ref/Informes.dll
|
||||
C:/Users/fedpo/Downloads/final actual/Informes/bin/Debug/net6.0/Informes.deps.json
|
||||
C:/Users/fedpo/Downloads/final actual/Informes/bin/Debug/net6.0/Informes.dll
|
||||
C:/Users/fedpo/Downloads/final actual/Informes/bin/Debug/net6.0/Informes.pdb
|
||||
C:/Users/fedpo/Downloads/final actual/Informes/bin/Debug/net6.0/Entidades.dll
|
||||
C:/Users/fedpo/Downloads/final actual/Informes/bin/Debug/net6.0/Entidades.pdb
|
||||
C:/Users/fedpo/Downloads/final actual/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache
|
||||
C:/Users/fedpo/Downloads/final actual/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:/Users/fedpo/Downloads/final actual/Informes/obj/Debug/net6.0/Informes.AssemblyInfoInputs.cache
|
||||
C:/Users/fedpo/Downloads/final actual/Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs
|
||||
C:/Users/fedpo/Downloads/final actual/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache
|
||||
C:/Users/fedpo/Downloads/final actual/Informes/obj/Debug/net6.0/Informes.csproj.CopyComplete
|
||||
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
|
||||
<<<<<<< HEAD
|
||||
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
|
||||
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
|
||||
=======
|
||||
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
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
|
||||
=======
|
||||
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\bin\Debug\net6.0\Informes.deps.json
|
||||
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\bin\Debug\net6.0\Informes.dll
|
||||
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\bin\Debug\net6.0\Informes.pdb
|
||||
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\bin\Debug\net6.0\Entidades.dll
|
||||
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\bin\Debug\net6.0\Entidades.pdb
|
||||
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.csproj.AssemblyReference.cache
|
||||
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.AssemblyInfoInputs.cache
|
||||
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.AssemblyInfo.cs
|
||||
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.csproj.CoreCompileInputs.cache
|
||||
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.csproj.CopyComplete
|
||||
C:\Users\fedpo\Downloads\Final_OOP-master\final_oop\Informes\obj\Debug\net6.0\Informes.dll
|
||||
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
|
||||
C:/Users/fedpo/Downloads/Final_OOP-master/final_oop/Informes/bin/Debug/net6.0/Informes.deps.json
|
||||
C:/Users/fedpo/Downloads/Final_OOP-master/final_oop/Informes/bin/Debug/net6.0/Informes.dll
|
||||
C:/Users/fedpo/Downloads/Final_OOP-master/final_oop/Informes/bin/Debug/net6.0/Informes.pdb
|
||||
C:/Users/fedpo/Downloads/Final_OOP-master/final_oop/Informes/bin/Debug/net6.0/Entidades.dll
|
||||
C:/Users/fedpo/Downloads/Final_OOP-master/final_oop/Informes/bin/Debug/net6.0/Entidades.pdb
|
||||
C:/Users/fedpo/Downloads/Final_OOP-master/final_oop/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache
|
||||
C:/Users/fedpo/Downloads/Final_OOP-master/final_oop/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig
|
||||
C:/Users/fedpo/Downloads/Final_OOP-master/final_oop/Informes/obj/Debug/net6.0/Informes.AssemblyInfoInputs.cache
|
||||
C:/Users/fedpo/Downloads/Final_OOP-master/final_oop/Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs
|
||||
C:/Users/fedpo/Downloads/Final_OOP-master/final_oop/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache
|
||||
C:/Users/fedpo/Downloads/Final_OOP-master/final_oop/Informes/obj/Debug/net6.0/Informes.csproj.CopyComplete
|
||||
C:/Users/fedpo/Downloads/Final_OOP-master/final_oop/Informes/obj/Debug/net6.0/Informes.dll
|
||||
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
|
||||
>>>>>>> 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
|
||||
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)
|
||||
/home/fede/proyectos/Final_OOP/Informes/bin/Debug/net6.0/Informes.deps.json
|
||||
/home/fede/proyectos/Final_OOP/Informes/bin/Debug/net6.0/Informes.dll
|
||||
/home/fede/proyectos/Final_OOP/Informes/bin/Debug/net6.0/Informes.pdb
|
||||
/home/fede/proyectos/Final_OOP/Informes/bin/Debug/net6.0/Entidades.dll
|
||||
/home/fede/proyectos/Final_OOP/Informes/bin/Debug/net6.0/Entidades.pdb
|
||||
/home/fede/proyectos/Final_OOP/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache
|
||||
/home/fede/proyectos/Final_OOP/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig
|
||||
/home/fede/proyectos/Final_OOP/Informes/obj/Debug/net6.0/Informes.AssemblyInfoInputs.cache
|
||||
/home/fede/proyectos/Final_OOP/Informes/obj/Debug/net6.0/Informes.AssemblyInfo.cs
|
||||
/home/fede/proyectos/Final_OOP/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache
|
||||
/home/fede/proyectos/Final_OOP/Informes/obj/Debug/net6.0/Informes.csproj.CopyComplete
|
||||
/home/fede/proyectos/Final_OOP/Informes/obj/Debug/net6.0/Informes.dll
|
||||
/home/fede/proyectos/Final_OOP/Informes/obj/Debug/net6.0/refint/Informes.dll
|
||||
/home/fede/proyectos/Final_OOP/Informes/obj/Debug/net6.0/Informes.pdb
|
||||
/home/fede/proyectos/Final_OOP/Informes/obj/Debug/net6.0/ref/Informes.dll
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,57 +1,31 @@
|
||||
{
|
||||
"format": 1,
|
||||
"restore": {
|
||||
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {}
|
||||
"/home/fede/proyectos/Final_OOP/Informes/Informes.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
|
||||
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
|
||||
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
|
||||
"projectName": "Entidades",
|
||||
"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
|
||||
=======
|
||||
"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\\",
|
||||
>>>>>>> 88e614d (god)
|
||||
=======
|
||||
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
|
||||
=======
|
||||
"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)
|
||||
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
|
||||
"packagesPath": "/home/fede/.nuget/packages/",
|
||||
"outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/",
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
|
||||
"/home/fede/.nuget/NuGet/NuGet.Config"
|
||||
],
|
||||
"originalTargetFrameworks": [
|
||||
"net6.0"
|
||||
"net8.0"
|
||||
],
|
||||
"sources": {
|
||||
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
|
||||
"https://api.nuget.org/v3/index.json": {},
|
||||
"https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {}
|
||||
},
|
||||
"frameworks": {
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"net8.0": {
|
||||
"targetAlias": "net8.0",
|
||||
"projectReferences": {}
|
||||
}
|
||||
},
|
||||
@@ -62,8 +36,8 @@
|
||||
}
|
||||
},
|
||||
"frameworks": {
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"net8.0": {
|
||||
"targetAlias": "net8.0",
|
||||
"imports": [
|
||||
"net461",
|
||||
"net462",
|
||||
@@ -75,80 +49,46 @@
|
||||
],
|
||||
"assetTargetFallback": true,
|
||||
"warn": true,
|
||||
"downloadDependencies": [
|
||||
{
|
||||
"name": "Microsoft.AspNetCore.App.Ref",
|
||||
"version": "[8.0.6, 8.0.6]"
|
||||
}
|
||||
],
|
||||
"frameworkReferences": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"privateAssets": "all"
|
||||
}
|
||||
},
|
||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
|
||||
"runtimeIdentifierGraphPath": "/var/run/host/usr/share/dotnet/sdk/8.0.106/PortableRuntimeIdentifierGraph.json"
|
||||
}
|
||||
}
|
||||
},
|
||||
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
|
||||
"/home/fede/proyectos/Final_OOP/Informes/Informes.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
|
||||
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Informes/Informes.csproj",
|
||||
"projectName": "Informes",
|
||||
"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
|
||||
=======
|
||||
"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\\",
|
||||
>>>>>>> 88e614d (god)
|
||||
=======
|
||||
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
|
||||
=======
|
||||
"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)
|
||||
"projectPath": "/home/fede/proyectos/Final_OOP/Informes/Informes.csproj",
|
||||
"packagesPath": "/home/fede/.nuget/packages/",
|
||||
"outputPath": "/home/fede/proyectos/Final_OOP/Informes/obj/",
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
|
||||
"/home/fede/.nuget/NuGet/NuGet.Config"
|
||||
],
|
||||
"originalTargetFrameworks": [
|
||||
"net6.0"
|
||||
"net8.0"
|
||||
],
|
||||
"sources": {
|
||||
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
|
||||
"https://api.nuget.org/v3/index.json": {},
|
||||
"https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {}
|
||||
},
|
||||
"frameworks": {
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"net8.0": {
|
||||
"targetAlias": "net8.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
>>>>>>> 88e614d (god)
|
||||
=======
|
||||
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
|
||||
=======
|
||||
"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)
|
||||
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
|
||||
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -160,8 +100,8 @@
|
||||
}
|
||||
},
|
||||
"frameworks": {
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"net8.0": {
|
||||
"targetAlias": "net8.0",
|
||||
"imports": [
|
||||
"net461",
|
||||
"net462",
|
||||
@@ -173,12 +113,18 @@
|
||||
],
|
||||
"assetTargetFallback": true,
|
||||
"warn": true,
|
||||
"downloadDependencies": [
|
||||
{
|
||||
"name": "Microsoft.AspNetCore.App.Ref",
|
||||
"version": "[8.0.6, 8.0.6]"
|
||||
}
|
||||
],
|
||||
"frameworkReferences": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"privateAssets": "all"
|
||||
}
|
||||
},
|
||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
|
||||
"runtimeIdentifierGraphPath": "/var/run/host/usr/share/dotnet/sdk/8.0.106/PortableRuntimeIdentifierGraph.json"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
|
||||
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
||||
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\fedpo\.nuget\packages\</NuGetPackageFolders>
|
||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/home/fede/.nuget/packages/</NuGetPackageRoot>
|
||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/home/fede/.nuget/packages/</NuGetPackageFolders>
|
||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
|
||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.9.1</NuGetToolVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||
<SourceRoot Include="C:\Users\fedpo\.nuget\packages\" />
|
||||
<SourceRoot Include="/home/fede/.nuget/packages/" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"version": 3,
|
||||
"targets": {
|
||||
"net6.0": {
|
||||
"net8.0": {
|
||||
"Entidades/1.0.0": {
|
||||
"type": "project",
|
||||
"framework": ".NETCoreApp,Version=v6.0",
|
||||
"framework": ".NETCoreApp,Version=v8.0",
|
||||
"compile": {
|
||||
"bin/placeholder/Entidades.dll": {}
|
||||
},
|
||||
@@ -22,75 +22,38 @@
|
||||
}
|
||||
},
|
||||
"projectFileDependencyGroups": {
|
||||
"net6.0": [
|
||||
"net8.0": [
|
||||
"Entidades >= 1.0.0"
|
||||
]
|
||||
},
|
||||
"packageFolders": {
|
||||
"C:\\Users\\fedpo\\.nuget\\packages\\": {}
|
||||
"/home/fede/.nuget/packages/": {}
|
||||
},
|
||||
"project": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj",
|
||||
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Informes/Informes.csproj",
|
||||
"projectName": "Informes",
|
||||
"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
|
||||
=======
|
||||
"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\\",
|
||||
>>>>>>> 88e614d (god)
|
||||
=======
|
||||
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
|
||||
=======
|
||||
"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)
|
||||
"projectPath": "/home/fede/proyectos/Final_OOP/Informes/Informes.csproj",
|
||||
"packagesPath": "/home/fede/.nuget/packages/",
|
||||
"outputPath": "/home/fede/proyectos/Final_OOP/Informes/obj/",
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
|
||||
"/home/fede/.nuget/NuGet/NuGet.Config"
|
||||
],
|
||||
"originalTargetFrameworks": [
|
||||
"net6.0"
|
||||
"net8.0"
|
||||
],
|
||||
"sources": {
|
||||
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
|
||||
"https://api.nuget.org/v3/index.json": {},
|
||||
"https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {}
|
||||
},
|
||||
"frameworks": {
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"net8.0": {
|
||||
"targetAlias": "net8.0",
|
||||
"projectReferences": {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
|
||||
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
|
||||
>>>>>>> 88e614d (god)
|
||||
=======
|
||||
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
|
||||
=======
|
||||
"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)
|
||||
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
|
||||
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -102,8 +65,8 @@
|
||||
}
|
||||
},
|
||||
"frameworks": {
|
||||
"net6.0": {
|
||||
"targetAlias": "net6.0",
|
||||
"net8.0": {
|
||||
"targetAlias": "net8.0",
|
||||
"imports": [
|
||||
"net461",
|
||||
"net462",
|
||||
@@ -115,12 +78,18 @@
|
||||
],
|
||||
"assetTargetFallback": true,
|
||||
"warn": true,
|
||||
"downloadDependencies": [
|
||||
{
|
||||
"name": "Microsoft.AspNetCore.App.Ref",
|
||||
"version": "[8.0.6, 8.0.6]"
|
||||
}
|
||||
],
|
||||
"frameworkReferences": {
|
||||
"Microsoft.NETCore.App": {
|
||||
"privateAssets": "all"
|
||||
}
|
||||
},
|
||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
|
||||
"runtimeIdentifierGraphPath": "/var/run/host/usr/share/dotnet/sdk/8.0.106/PortableRuntimeIdentifierGraph.json"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,32 +1,10 @@
|
||||
{
|
||||
"version": 2,
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==",
|
||||
"dgSpecHash": "VQcxkTeojpjEZs3Ob4/ezVD9gt02DQ5zKeZ9oTO/gBjSNWYJTjzv1jMosaYd/ueOHtTHu4KROIbc1Kqi0jPjYg==",
|
||||
"success": true,
|
||||
"projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
|
||||
=======
|
||||
"dgSpecHash": "LNnYsLsyYVQ4fuL9pNFk9cO8Boe/+luXWUaSQqclJgBskwz1g0BEBYEIZmCiL8av7FykKX2WDu3pRy0mom6AAg==",
|
||||
"success": true,
|
||||
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
|
||||
>>>>>>> 88e614d (god)
|
||||
=======
|
||||
"dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==",
|
||||
"success": true,
|
||||
"projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
|
||||
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
|
||||
=======
|
||||
"dgSpecHash": "+fAmxvUxzXFJdL6cjwnLzpFPUy6kbZ77RHAmwP73fYrskGO9Qznx7rWzPtjjeDphCNfQ5J+s1nW7KRZF6IabWg==",
|
||||
"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": [],
|
||||
"projectFilePath": "/home/fede/proyectos/Final_OOP/Informes/Informes.csproj",
|
||||
"expectedPackageFiles": [
|
||||
"/home/fede/.nuget/packages/microsoft.aspnetcore.app.ref/8.0.6/microsoft.aspnetcore.app.ref.8.0.6.nupkg.sha512"
|
||||
],
|
||||
"logs": []
|
||||
}
|
||||
Reference in New Issue
Block a user