merge gigante

Vista/obj/Vista.csproj.nuget.dgspec.json

@@ -1,6 +1,7 @@
 {
   "format": 1,
   "restore": {
+<<<<<<< HEAD
     "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {}
   },
   "projects": {
@@ -12,6 +13,79 @@
         "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj",
         "packagesPath": "/home/fede/.nuget/packages/",
         "outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/",
+=======
+    "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.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\\",
+        "projectStyle": "PackageReference",
+        "configFilePaths": [
+          "C:\\Users\\Nacho\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
+        ],
+        "originalTargetFrameworks": [
+          "net6.0"
+        ],
+        "sources": {
+          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+          "https://api.nuget.org/v3/index.json": {}
+        },
+        "frameworks": {
+          "net6.0": {
+            "targetAlias": "net6.0",
+            "projectReferences": {}
+          }
+        },
+        "warningProperties": {
+          "warnAsError": [
+            "NU1605"
+          ]
+        },
+        "restoreAuditProperties": {
+          "enableAudit": "true",
+          "auditLevel": "low",
+          "auditMode": "direct"
+        }
+      },
+      "frameworks": {
+        "net6.0": {
+          "targetAlias": "net6.0",
+          "imports": [
+            "net461",
+            "net462",
+            "net47",
+            "net471",
+            "net472",
+            "net48",
+            "net481"
+          ],
+          "assetTargetFallback": true,
+          "warn": true,
+          "frameworkReferences": {
+            "Microsoft.NETCore.App": {
+              "privateAssets": "all"
+            }
+          },
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
+        }
+      }
+    },
+    "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj": {
+      "version": "1.0.0",
+      "restore": {
+        "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
+        "projectName": "Vista",
+        "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
+        "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
+        "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\obj\\",
+>>>>>>> 8ad9dc6 (faltan controladoras)
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "/home/fede/.nuget/NuGet/NuGet.Config"
@@ -24,6 +98,7 @@
           "https://fedesrv.ddns.net/git/api/packages/fede/nuget/index.json": {}
         },
         "frameworks": {
+<<<<<<< HEAD
           "net6.0": {
             "targetAlias": "net6.0",
             "projectReferences": {
@@ -108,6 +183,15 @@
           "net6.0": {
             "targetAlias": "net6.0",
             "projectReferences": {}
+=======
+          "net6.0-windows7.0": {
+            "targetAlias": "net6.0-windows",
+            "projectReferences": {
+              "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
+                "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj"
+              }
+            }
+>>>>>>> 8ad9dc6 (faltan controladoras)
           }
         },
         "warningProperties": {