god
This commit is contained in:
@@ -8,4 +8,8 @@ build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = Informes
|
||||
<<<<<<< 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)
|
||||
|
||||
@@ -1 +1 @@
|
||||
100fa21bf2f76b06ab70964d65200e354f5837e3
|
||||
3fd66116ceaea5e07433507fe6494c4f357d71a3a526da0eea8f6d1df7fb86c5
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -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\\",
|
||||
>>>>>>> 88e614d (god)
|
||||
"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\\",
|
||||
>>>>>>> 88e614d (god)
|
||||
"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"
|
||||
>>>>>>> 88e614d (god)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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\\",
|
||||
>>>>>>> 88e614d (god)
|
||||
"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"
|
||||
>>>>>>> 88e614d (god)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
{
|
||||
"version": 2,
|
||||
<<<<<<< HEAD
|
||||
"dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==",
|
||||
"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)
|
||||
"expectedPackageFiles": [],
|
||||
"logs": []
|
||||
}
|
||||
Reference in New Issue
Block a user