añadida ¿Reactividad? a que se elija entre percedero o no
This commit is contained in:
@@ -9,7 +9,11 @@ build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = Informes
|
||||
<<<<<<< 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)
|
||||
|
||||
@@ -1 +1,5 @@
|
||||
<<<<<<< HEAD
|
||||
3fd66116ceaea5e07433507fe6494c4f357d71a3a526da0eea8f6d1df7fb86c5
|
||||
=======
|
||||
100fa21bf2f76b06ab70964d65200e354f5837e3
|
||||
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
|
||||
|
||||
@@ -43,6 +43,7 @@ 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
|
||||
@@ -58,3 +59,20 @@ 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
|
||||
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"format": 1,
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
@@ -13,6 +12,7 @@
|
||||
"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\\",
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": {}
|
||||
},
|
||||
@@ -26,6 +26,8 @@
|
||||
"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)
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -74,7 +76,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
@@ -83,6 +84,7 @@
|
||||
"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\\",
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": {
|
||||
"version": "1.0.0",
|
||||
@@ -93,6 +95,8 @@
|
||||
"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)
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -110,13 +114,15 @@
|
||||
"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"
|
||||
<<<<<<< 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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,12 +32,12 @@
|
||||
"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\\",
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
|
||||
"projectName": "Informes",
|
||||
@@ -45,6 +45,8 @@
|
||||
"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)
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||
@@ -62,13 +64,15 @@
|
||||
"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"
|
||||
<<<<<<< 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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"version": 2,
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==",
|
||||
"success": true,
|
||||
@@ -9,6 +10,11 @@
|
||||
"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)
|
||||
"expectedPackageFiles": [],
|
||||
"logs": []
|
||||
}
|
||||
Reference in New Issue
Block a user