fede/Final_Das
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Hecho Irepositorio y borrado codigo viejo de repositorios. Además configuré entity framework

Browse Source
This commit is contained in:
fedpo
2024-08-12 16:48:54 -03:00
parent 01d975c47f
commit b7177439ef
75 changed files with 9512 additions and 17769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Entidades/obj/Debug/net6.0/Entidades.AssemblyInfo.cs
View File

@@ -1,10 +1,6 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
<<<<<<< HEAD
=======
// Runtime Version:4.0.30319.42000
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -17,22 +13,10 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Entidades")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+04e6a0b9bb4746be80e8ddf020dfc5f1212f5ce4")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")]
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cefd645974788c21dbd8ecb38aaa78d8ac04dd4b")]
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d11016fe50f731cc9fc7ccc12e78610c74ea7248")]
[assembly: System.Reflection.AssemblyProductAttribute("Entidades")]
[assembly: System.Reflection.AssemblyTitleAttribute("Entidades")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// Generated by the MSBuild WriteCodeFragment class.
// Generado por la clase WriteCodeFragment de MSBuild.

14
Entidades/obj/Debug/net6.0/Entidades.AssemblyInfoInputs.cache
View File

@@ -1,13 +1 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
c9fd7d1da15719a344d19280a9e21a8dc924eb19882884c600d67b0cd9fae973
=======
390fb09e0b78446d2aeb62456ecd394479e4203d8ba487fbe31e39283ec058af
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
a687cba9ed7450e5c700a51cb95b1f9a0a0edc042a19f86ad94db189023a05ac
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
1589bc3738d4d92e8df1687e356ae3d2c87cb333
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
3b03da26f28f96f0323fa94148a70c2466afcf8504bb48681ee28c0bd3312ab4

40
Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -8,46 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Entidades
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Entidades/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Entidades\
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Entidades\
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
=======
build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Entidades\
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Entidades\
>>>>>>> c493033 (cosas que faltaban)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Entidades\
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Entidades\
>>>>>>> 3925b59 (cambios nacho)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\Entidades\
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
=======
build_property.ProjectDir = C:\Users\fedpo\Desktop\final actual\Entidades\
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
=======
build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Entidades\
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actua2l\Final actual\Entidades\
>>>>>>> 88e614d (god)

150
Entidades/obj/Entidades.csproj.nuget.dgspec.json
View File

@@ -1,19 +1,6 @@
{
"format": 1,
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {}
},
"projects": {
@@ -25,135 +12,20 @@
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
"packagesPath": "/home/fede/.nuget/packages/",
"outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/",
=======
"C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {}
=======
"C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {}
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {}
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
=======
"C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": {}
>>>>>>> c493033 (cosas que faltaban)
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {}
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {}
>>>>>>> 3925b59 (cambios nacho)
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {}
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
=======
"C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\Entidades.csproj": {}
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
=======
=======
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {}
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
=======
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {}
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {}
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
},
"projects": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
<<<<<<< HEAD
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\",
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
"outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\",
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
=======
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj",
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj",
>>>>>>> c493033 (cosas que faltaban)
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
>>>>>>> 3925b59 (cambios nacho)
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
=======
"projectPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\Entidades.csproj",
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
=======
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj",
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
<<<<<<< HEAD
=======
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.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)
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"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",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
],
"originalTargetFrameworks": [
"net6.0"
"net8.0"
],
"sources": {
<<<<<<< HEAD
=======
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
"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": {}
}
},
@@ -164,8 +36,8 @@
}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"net8.0": {
"targetAlias": "net8.0",
"imports": [
"net461",
"net462",
@@ -180,11 +52,7 @@
"downloadDependencies": [
{
"name": "Microsoft.AspNetCore.App.Ref",
"version": "[6.0.31, 6.0.31]"
},
{
"name": "Microsoft.NETCore.App.Ref",
"version": "[6.0.31, 6.0.31]"
"version": "[8.0.6, 8.0.6]"
}
],
"frameworkReferences": {
@@ -192,11 +60,7 @@
"privateAssets": "all"
}
},
<<<<<<< HEAD
"runtimeIdentifierGraphPath": "/var/run/host/usr/share/dotnet/sdk/8.0.106/RuntimeIdentifierGraph.json"
=======
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
"runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.106/PortableRuntimeIdentifierGraph.json"
}
}
}

12
Entidades/obj/Entidades.csproj.nuget.g.props
View File

@@ -4,22 +4,12 @@
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<<<<<<< HEAD
<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.9.1</NuGetToolVersion>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.8.1</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="/home/fede/.nuget/packages/" />
=======
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\fedpo\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\fedpo\.nuget\packages\" />
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
</ItemGroup>
</Project>

116
Entidades/obj/project.assets.json
View File

@@ -1,127 +1,37 @@
{
"version": 3,
"targets": {
"net6.0": {}
"net8.0": {}
},
"libraries": {},
"projectFileDependencyGroups": {
"net6.0": []
"net8.0": []
},
"packageFolders": {
<<<<<<< HEAD
"/home/fede/.nuget/packages/": {}
=======
"C:\\Users\\fedpo\\.nuget\\packages\\": {}
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
},
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
"projectName": "Entidades",
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
"packagesPath": "/home/fede/.nuget/packages/",
"outputPath": "/home/fede/proyectos/Final_OOP/Entidades/obj/",
=======
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
=======
"projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
"projectName": "Entidades",
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
<<<<<<< HEAD
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\obj\\",
>>>>>>> 8ad9dc6 (faltan controladoras)
=======
"outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\",
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
=======
"projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj",
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj",
>>>>>>> c493033 (cosas que faltaban)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
>>>>>>> 3925b59 (cambios nacho)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\Entidades.csproj",
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
=======
=======
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj",
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"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
=======
"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)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
],
"originalTargetFrameworks": [
"net6.0"
"net8.0"
],
"sources": {
<<<<<<< HEAD
=======
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
"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": {}
}
},
@@ -132,8 +42,8 @@
}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"net8.0": {
"targetAlias": "net8.0",
"imports": [
"net461",
"net462",
@@ -148,11 +58,7 @@
"downloadDependencies": [
{
"name": "Microsoft.AspNetCore.App.Ref",
"version": "[6.0.31, 6.0.31]"
},
{
"name": "Microsoft.NETCore.App.Ref",
"version": "[6.0.31, 6.0.31]"
"version": "[8.0.6, 8.0.6]"
}
],
"frameworkReferences": {
@@ -160,11 +66,7 @@
"privateAssets": "all"
}
},
<<<<<<< HEAD
"runtimeIdentifierGraphPath": "/var/run/host/usr/share/dotnet/sdk/8.0.106/RuntimeIdentifierGraph.json"
=======
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
"runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.106/PortableRuntimeIdentifierGraph.json"
}
}
}

50
Entidades/obj/project.nuget.cache
View File

@@ -1,56 +1,10 @@
{
"version": 2,
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "LSnXGupX+sIU3VjCECy137T1ThKtECGacQq+4Cfd3SDyYEpIcp26yf15qIysqN2+1Fwti7c13f3fBKmUt8i0Og==",
"dgSpecHash": "pF7yaQA3E+L3W+ZwRNtSQAG7GqcOi4pIEiNNO9jhyiDw0g0Xfcq2xKx1vmSbL4qEOj5b1bAgu2oo44sj4PduUg==",
"success": true,
"projectFilePath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
"expectedPackageFiles": [
"/home/fede/.nuget/packages/microsoft.netcore.app.ref/6.0.31/microsoft.netcore.app.ref.6.0.31.nupkg.sha512",
"/home/fede/.nuget/packages/microsoft.aspnetcore.app.ref/6.0.31/microsoft.aspnetcore.app.ref.6.0.31.nupkg.sha512"
"/home/fede/.nuget/packages/microsoft.aspnetcore.app.ref/8.0.6/microsoft.aspnetcore.app.ref.8.0.6.nupkg.sha512"
],
=======
"dgSpecHash": "tQ5wbjPjSSYF0ufyaHkTpMHeLmctkgU0DRXiByR35mv7fgnebDzFc/FQHskLw18SzYXpGgfy8W7o3/JscpL1ZA==",
=======
"dgSpecHash": "+9QsqENGYd4qIIPCnRA0BRL7UiFYXaYZJR2jVoACt5fTCzrycu1oHCxViXeMxzr+idMIyJGQ/11fIYTFVqnyPA==",
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
=======
"dgSpecHash": "HXGSmDVQyRmnk0PltQ/0YQ5GVlG0+k5yrwjE8AEym5VgLOBWNEQdRU3yZ7m5TuvHzpPyj4xzCWtK6uATLanIjg==",
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
=======
"dgSpecHash": "iQ0EifyjZh9oi0Mdt+E3sLhf14CzOUsLKHxZb9iRQ9RyPF+gexIoaaQb71/6xZGzSye9KUJ3V77rlL+eNkHOdw==",
>>>>>>> c493033 (cosas que faltaban)
=======
"dgSpecHash": "xYCKCMKm+oXscuoQamJhNB9nRxekBQBuz6IDgUB/8WpDnH3Ts7NVTClR8NJpQF10id2fDRpsOygcKaFzlcHs+w==",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"dgSpecHash": "vCw9TkU23iJeVGdgwKLwcggjjvRCnx4IVmqtdUC1cx6S4CwC+/lso1ry576JGcrpGs6Tvfs4jnEYWVDgrNS9aA==",
>>>>>>> 3925b59 (cambios nacho)
=======
"dgSpecHash": "JjmZ/x9rvI6DKcp6sqA/2XwtSHr6XeI0O0c8c5GAHxMcNMVKoIzQeSSZe+awvwhJFTb+hDsL4RbtngW8O8CFow==",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
=======
"dgSpecHash": "0rUVXBZq1S9LPfJWu2rmlksDzLY8PGK0AVV6XPjlqD/aTZOh1QA3EYG1lVjYlV+GO913V9gTFygPWTJnvX11zA==",
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
=======
"dgSpecHash": "/0GTyO6ckhdqO7zKMB1HLRdsMAWD7uaqWqeG9E3ixe4uSgyRj78n0jNxMGk/5CW97RRUL5P0Sy15/HFST15qhA==",
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj",
=======
"dgSpecHash": "yyZrwe0L3jek8Hb9mWGiP/ZygNQ47csjq6zn8hwayL/Ra+Z1+SaQtaSY1XNNXFKlY2aNH/ryXGruiZs9WqYGsg==",
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
>>>>>>> 88e614d (god)
"expectedPackageFiles": [],
>>>>>>> 8ad9dc6 (faltan controladoras)
"logs": []
}