From ee0ec5f0e8aeb7fa6e47516a66a92fbbcf5bc94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignacio=20Jes=C3=BAs=20Diana?= Date: Sat, 24 Feb 2024 17:07:56 -0300 Subject: [PATCH] prueba --- ...00b7334d-5ba2-41d1-b3f3-0c5485543031.vsidx | Bin 0 -> 12195 bytes ...418bf01c-5421-445b-b72b-f30dcbd4547d.vsidx | Bin 3074 -> 0 bytes ...4fddcb8e-d2c8-48a2-9631-4dce2f2d2cf0.vsidx | Bin 0 -> 18258 bytes ...51d14d5f-6a2e-4be9-b0e7-730c4487242f.vsidx | Bin 2921 -> 0 bytes ...5b9f68c9-03e6-41d4-bae4-87000c09a42a.vsidx | Bin 0 -> 4684 bytes ...953dacfb-f197-43d1-a1fe-ed94d079d2f1.vsidx | Bin 0 -> 18258 bytes ...f8b96a03-f3d6-4a37-8424-558beaeeaf73.vsidx | Bin 2759 -> 0 bytes .vs/Final_OOP/v17/.suo | Bin 52224 -> 76800 bytes .vs/Final_OOP/xs/UserPrefs.xml | 30 ------------------ .../obj/Controladora.csproj.nuget.dgspec.json | 8 ++--- Controladora/obj/project.nuget.cache | 4 +-- Entidades/DetallePedido.cs | 2 +- Entidades/EnvaseTipo.cs | 2 +- Entidades/Factura.cs | 18 +++++++++++ Entidades/OrdenDeCompra.cs | 20 ++++++++++++ Entidades/PedidoDePresupuesto.cs | 30 ++++++++++++++++++ Entidades/Presupuesto.cs | 3 ++ Entidades/ProductoNoPercedero.cs | 2 +- Entidades/Remito.cs | 22 +++++++++++++ ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../obj/Debug/net6.0/Entidades.assets.cache | Bin 224 -> 224 bytes .../obj/Entidades.csproj.nuget.dgspec.json | 10 +++--- Entidades/obj/project.nuget.cache | 4 +-- Modelo/obj/Modelo.csproj.nuget.dgspec.json | 8 ++--- Modelo/obj/project.nuget.cache | 4 +-- Vista/obj/Vista.csproj.nuget.dgspec.json | 8 ++--- Vista/obj/project.nuget.cache | 4 +-- 27 files changed, 122 insertions(+), 59 deletions(-) create mode 100644 .vs/Final_OOP/FileContentIndex/00b7334d-5ba2-41d1-b3f3-0c5485543031.vsidx delete mode 100644 .vs/Final_OOP/FileContentIndex/418bf01c-5421-445b-b72b-f30dcbd4547d.vsidx create mode 100644 .vs/Final_OOP/FileContentIndex/4fddcb8e-d2c8-48a2-9631-4dce2f2d2cf0.vsidx delete mode 100644 .vs/Final_OOP/FileContentIndex/51d14d5f-6a2e-4be9-b0e7-730c4487242f.vsidx create mode 100644 .vs/Final_OOP/FileContentIndex/5b9f68c9-03e6-41d4-bae4-87000c09a42a.vsidx create mode 100644 .vs/Final_OOP/FileContentIndex/953dacfb-f197-43d1-a1fe-ed94d079d2f1.vsidx delete mode 100644 .vs/Final_OOP/FileContentIndex/f8b96a03-f3d6-4a37-8424-558beaeeaf73.vsidx delete mode 100644 .vs/Final_OOP/xs/UserPrefs.xml diff --git a/.vs/Final_OOP/FileContentIndex/00b7334d-5ba2-41d1-b3f3-0c5485543031.vsidx b/.vs/Final_OOP/FileContentIndex/00b7334d-5ba2-41d1-b3f3-0c5485543031.vsidx new file mode 100644 index 0000000000000000000000000000000000000000..c00c02aea78bf07ba3cd7ea137934dc9c25e7579 GIT binary patch literal 12195 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 literal 0 HcmV?d00001 diff --git a/.vs/Final_OOP/FileContentIndex/418bf01c-5421-445b-b72b-f30dcbd4547d.vsidx b/.vs/Final_OOP/FileContentIndex/418bf01c-5421-445b-b72b-f30dcbd4547d.vsidx deleted file mode 100644 index b3d9caccc610a963ae46c7583cf4110ad1c31d0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3074 zcmchZ>uw!25XVo;y-@CV%Kd&@Xt?);Qm;K{kBQgb+OrWvN2;PUf=X3`df)|+cpTn^ zPki7RcnIe2IQ2;tML{ZzH2d@XXFT5Zo{ghTclTs6`SU@!h+zynCI0*AJe=GmXmn^g zYMgCYHB1f9*A1<^pjxXmDb31|GFF+OoKroiXjR%!DJdqk6rX=inCI`ldu%~ng6N282UY)BjOh6Y2)5Sy7S;!TJqBojt6L^I0rQZ*-SNe9wQ zCJ-5#De4sU4fRv%EqZt&&lDmJk)oyO(J~E`n9@i*C04|izT=tFGtyndoiZKyj(D!x zc_gdkMyJ*&Yi8CA($qR@d$PW>{<8IKgSTO{i7hM3!EUOJG<7OD(vD`1f}_Dvk}l4Y zv))-5vvcGE_l@ow*Eig^v8U8q?uY1=^QzDH9(~t%%Rcn}^3LT@# zQnWf+A8m+sQ|=}P6T@a|I_wrnI$dNc&9^=@$vE@;I8S=Kg9fxs@YD}`n zyh$>7DvN9dPy4^wi4y7yi*dPobGh)_J3sC%(%vsOcXk(X_ouz(Vs`Du_Vp_v3=6vP z^R=tnS9g~SeSLemTx)igSAPBbEdTJ=sdM-3ce}qd#aD6Q_&6}e*8$?o0q-fiR|q?b zs4J~A5n~PT0dd$Wp`Xd>J`v-C1s^KD z>oB3eS9B2Z`-LAAekg>2$TtYYRtfzhaqwet7>M|M;hGS(O5{Hg2R{{ufrvjV{9Fh- zim3Y{XAcwlmqou5M8B^}zdJ$nyHNTaN7PMA-BCn-z2sL3{p+G1MdUAvgWr@o5b>oF zgNRj$LBwr|k0a`IsXGZ#Z%RFg7zYzL6Njx5dM6If3#||aLjM+l*#AMSw~<#nOz2J= z>`VSP1Y$V%V3%%P@?ZR%#o3rA?VkoUQAfEhUv6t~TS?B2xBBHUm*i1yki)uUP1NGt zpmwe$^$u#&IxRnAomNZgy0ul!)&{kG9o2`aowHUGbyOd#w$Is|$fJoEZuH1KUQuL%K!iX diff --git a/.vs/Final_OOP/FileContentIndex/4fddcb8e-d2c8-48a2-9631-4dce2f2d2cf0.vsidx b/.vs/Final_OOP/FileContentIndex/4fddcb8e-d2c8-48a2-9631-4dce2f2d2cf0.vsidx new file mode 100644 index 0000000000000000000000000000000000000000..2e2f8530883d19f51e6460648a023e4c3bcb9c45 GIT binary patch literal 18258 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 diff --git a/.vs/Final_OOP/v17/.suo b/.vs/Final_OOP/v17/.suo index 6fc62820f3c58c497357d82a70e7bd4b882028ea..fd1050b3cfde5f0d718fabbb3511ea2994fb40ff 100644 GIT binary patch delta 7523 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 delta 2130 zcmbtVZA?>V6z+R_TW+z%VyjdrAB749Zm|ezRfLO0#)m*F&M!KlQV?_>7)v%g+`7e> z{cw}s6H_y{WHH8MW}6>%Su*BmoEo#3Kw=h`{h8T*nk;51i5R6j=h7PD-@WO{J?A;+ zzVCUT_jzw4zw?oE>PgYYR7-|Yr4lgY&=yju6lK^o-xU@e<7Mv69PdW|qn(HTU?Sp) zN(gJi>{5J=TgKQ*V0>P5OkjOcpQ*hV^9D4WB4tTG$)~XjV=LMq8ZM{GL90fqLd!?X zLtCs&r3#|HYRzf{7T{Zcnk~Rvnmj`gV>6mx!K0cf#(|A1&Y3)Q=ZFuRD?vPw4`D9M z4#OPRBV-{!yMhnaIy7DA)Wh+t_lKyFuhYBFEVvx87Z}jyi_q7hkxxT|z7}o85{&R= z7}JxM$ws5zXl}yvQD1>B7lT3q;DotMQ;DAGny-&ROSuue<@~G0vLV-OYNJ+Y>5Q3P ziHRrTmgphg3ebqxOg)`J2^vJqC3;$v2qvQ88*_t(sv2;eJm58=g`#du^`Lptd}xG0 z+sXk5F5fHbJvv4U&^$yVgp6K+CZo+0z;rOD@76JVDP_xG0*vQ=s3Be~Fkjs%P@CoH zB!t9Wygn01ejc8R6D$|TojrmB;Wg>hGSUdqiUU#wcLdU24F%Lj(%J*RaJ3LBJbj^@ zlZ&uT>R@d;&vIaVS1(VrC`}q*uBcn5oD7|=GKI9ChxcChLYrFD(r(NucxG!~oQF79 zibAEkpiOkko}^|a)xi9w4js#!wleot7~k9t9(@yVTeb;wDs)1W(r!U#LIvS19RhVn zJ0e_9J%~gPj@VHvtAo0GUB;<@ZXSzX_Vicu?mOG%f8vA58gFd2gl&sGS;0hGL-D4A zQ(wJ(W~bqNWbEc0ohHirwj<TcRH$Gp7 zoVVWNGfc#jt$KFdeOoQmVFlW`z0OokA(r*wZh_ z{V3c$6L?TOkcgk}X%lpqt4QY|RJC|Hl2u-z48f9@iG8>?&ZXfI(8GM?uR2AmR70J_ zlT~_#Q$}#n=KW0|`7LnP;6OwIsV@SN*=7`%2ir2gH0gl_v7pjS;(-}`k@4WGZK5tu z4y=lmSlDKe4WfKNlKZ9H_U}iIR{q=Gb-MS8_3`PS$zT0-rboW#D zj*&rzGaQ3RKww(zWFsU3UqazP8BG6N2BQznY!GGwd1}8(dB&;=S&kYH5$*@_;pW4A z;0*M}rC1H*OB^@GEM z8-gx(-B9fY{42#DiHydmL@~H-G{H&#R^n5=cP1P6yA`A#98k_#SQhk8`JiFy^VqF2 zW>y%C8STsgMbnnW=&6;p#!5|@<^j!ncqvaqh0bq%X0H7Nh(YN#k^1abpQYW diff --git a/.vs/Final_OOP/xs/UserPrefs.xml b/.vs/Final_OOP/xs/UserPrefs.xml deleted file mode 100644 index ac2024d..0000000 --- a/.vs/Final_OOP/xs/UserPrefs.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - Vista/Vista.csproj - Controladora/Controladora.csproj - - - - - - - \ No newline at end of file diff --git a/Controladora/obj/Controladora.csproj.nuget.dgspec.json b/Controladora/obj/Controladora.csproj.nuget.dgspec.json index 5473f0f..0070a53 100644 --- a/Controladora/obj/Controladora.csproj.nuget.dgspec.json +++ b/Controladora/obj/Controladora.csproj.nuget.dgspec.json @@ -1,15 +1,15 @@ { "format": 1, "restore": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj": {} + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj": {} }, "projects": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj": { + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj", "projectName": "Controladora", - "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\obj\\", "projectStyle": "PackageReference", diff --git a/Controladora/obj/project.nuget.cache b/Controladora/obj/project.nuget.cache index 56c68c8..07acff5 100644 --- a/Controladora/obj/project.nuget.cache +++ b/Controladora/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "vHHOtMmBjQqzXm8NSpg1FnEXriZ26IA/fDBeSkAZG6VLggulaiBXf/KsOl8pSWWWG0B7MsrBnYnbQEeXJ0/Z6Q==", + "dgSpecHash": "140GQtxtriF311DaiieaDmJ7ak0iQV6xE1oZAEWCfylxdH5wonwlzBX1b52fBGkwqH0ImewKn7GUDfiemxqKiA==", "success": true, - "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", + "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Controladora\\Controladora.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Entidades/DetallePedido.cs b/Entidades/DetallePedido.cs index 1371dc0..a025a05 100644 --- a/Entidades/DetallePedido.cs +++ b/Entidades/DetallePedido.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Entidades { - internal class DetallePedido + internal class DetallePedido : Detalle { public int IdPedido { get; set; } } diff --git a/Entidades/EnvaseTipo.cs b/Entidades/EnvaseTipo.cs index 9cddb0d..242499e 100644 --- a/Entidades/EnvaseTipo.cs +++ b/Entidades/EnvaseTipo.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Entidades { - public enum TipoEnvase + public enum EnvaseTipo { Plastico, Enlatado, diff --git a/Entidades/Factura.cs b/Entidades/Factura.cs index 740e501..f8efa78 100644 --- a/Entidades/Factura.cs +++ b/Entidades/Factura.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -15,7 +16,24 @@ namespace Entidades private List detalles { get; set; } + public ReadOnlyCollection MostrarDetalles() + { + } + public void AñadirDetalle(DetalleFactura detalle) + { + + } + + public void ModificarDetalle(DetalleFactura detalle) + { + + } + + public void EliminarDetalle(DetalleFactura detalle) + { + + } } } diff --git a/Entidades/OrdenDeCompra.cs b/Entidades/OrdenDeCompra.cs index d817f19..ae2122b 100644 --- a/Entidades/OrdenDeCompra.cs +++ b/Entidades/OrdenDeCompra.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -14,5 +15,24 @@ namespace Entidades public Proveedor Proveedor { get; set; } + public ReadOnlyCollection MostrarDetalles() + { + + } + + public void AñadirDetalle(DetalleOrdenDeCompra detalle) + { + + } + + public void ModificarDetalle(DetalleOrdenDeCompra detalle) + { + + } + + public void EliminarDetalle(DetalleOrdenDeCompra detalle) + { + + } } } diff --git a/Entidades/PedidoDePresupuesto.cs b/Entidades/PedidoDePresupuesto.cs index 39ea00c..6e54a2f 100644 --- a/Entidades/PedidoDePresupuesto.cs +++ b/Entidades/PedidoDePresupuesto.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -15,5 +16,34 @@ namespace Entidades private List detallesPedidos { get; set; } public Proveedor Proveedor { get; set; } + + public void AñadirDetalle(DetallePedido detalle) + { + { + + try + { + detallesPedidos.Add(detalle); + + } + catch (Exception) + { + + throw; + } + + } + } + + public ReadOnlyCollection MostrarDetalles() + { + return detallesPedidos.AsReadOnly(); + } + + public void EliminarDetalle(DetallePedido detalle) + { + var aeliminar = detallesPedidos.Find(x => x.Id == detalle.Id); + detallesPedidos.Remove(aeliminar); + } } } diff --git a/Entidades/Presupuesto.cs b/Entidades/Presupuesto.cs index e45f711..2113169 100644 --- a/Entidades/Presupuesto.cs +++ b/Entidades/Presupuesto.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -19,5 +20,7 @@ namespace Entidades private List Detalles { get; set; } public Proveedor Proveedor { get; set; } + + } } diff --git a/Entidades/ProductoNoPercedero.cs b/Entidades/ProductoNoPercedero.cs index ccfdbbc..b7ee695 100644 --- a/Entidades/ProductoNoPercedero.cs +++ b/Entidades/ProductoNoPercedero.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Entidades { - internal class ProductoNoPercedero + public class ProductoNoPercedero { public EnvaseTipo TipoDeEnvase { get; set; } } diff --git a/Entidades/Remito.cs b/Entidades/Remito.cs index b2c5c8d..980cd21 100644 --- a/Entidades/Remito.cs +++ b/Entidades/Remito.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Linq; +using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading.Tasks; @@ -13,5 +15,25 @@ namespace Entidades private List LotesDeProductosEntregados { get; set; } public Proveedor Proveedor { get; set; } + + public ReadOnlyCollection MostrarLotes() + { + return LotesDeProductosEntregados.AsReadOnly(); + } + public bool AñadirLote(Lote lote) + { + bool ret = false; + try + { + LotesDeProductosEntregados.Add(lote); + ret= true; + } + catch (Exception) + { + + throw; + } + return ret; + } } } diff --git a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig index 7a05dbb..02b5b6b 100644 --- a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig +++ b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Entidades -build_property.ProjectDir = C:\Users\Nacho\Source\Repos\Final_OOP\Entidades\ +build_property.ProjectDir = C:\Users\Nacho\source\repos\Final_OOP\Entidades\ diff --git a/Entidades/obj/Debug/net6.0/Entidades.assets.cache b/Entidades/obj/Debug/net6.0/Entidades.assets.cache index e684dc478252859675ea64509f275d0c25f1903d..7581549a739209c9feac73e3bdea6ac35b557998 100644 GIT binary patch delta 55 zcmV-70LcH~0pI~CP)kQa3jhEBBgXOZ0FiRT+N%eOKB9lRza^^s$?<41dQUk%L|taK N+>tRKkw6HMP>_H47rOue delta 55 zcmV-70LcH~0pI~CP)kQa3jhEBWvAO(JTT&B-|l0O>l-4P)Mub)uJ>7~3{q_%QMK!s N+>tRKkw6HMP>_0v7xe%D diff --git a/Entidades/obj/Entidades.csproj.nuget.dgspec.json b/Entidades/obj/Entidades.csproj.nuget.dgspec.json index a1ba0f4..e74df4f 100644 --- a/Entidades/obj/Entidades.csproj.nuget.dgspec.json +++ b/Entidades/obj/Entidades.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": {} + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {} }, "projects": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj": { + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\obj\\", + "outputPath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Entidades\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/Entidades/obj/project.nuget.cache b/Entidades/obj/project.nuget.cache index 01aa310..3b6119c 100644 --- a/Entidades/obj/project.nuget.cache +++ b/Entidades/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "PVHbAkBavzDaKw3OCgyd9rnGdDfX8by0UmuqYuanHJ+yk6ZVoLP+E3bU6vhQ/0x1vtX0M598J9FWQPCpvqRiVA==", + "dgSpecHash": "tvasUP43wH1NBUEUPJHfWfHDb7vl/ue6UGCiCs9/RHVC8i0KjmP5A48yb1CHnF1ar9ummXM37j0MdF/dyo/7GA==", "success": true, - "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", + "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Modelo/obj/Modelo.csproj.nuget.dgspec.json b/Modelo/obj/Modelo.csproj.nuget.dgspec.json index f6f84c1..1299f42 100644 --- a/Modelo/obj/Modelo.csproj.nuget.dgspec.json +++ b/Modelo/obj/Modelo.csproj.nuget.dgspec.json @@ -1,15 +1,15 @@ { "format": 1, "restore": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": {} + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": {} }, "projects": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj": { + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj", "projectName": "Modelo", - "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\obj\\", "projectStyle": "PackageReference", diff --git a/Modelo/obj/project.nuget.cache b/Modelo/obj/project.nuget.cache index bce4f2d..77bc834 100644 --- a/Modelo/obj/project.nuget.cache +++ b/Modelo/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "gNYEMR8kZQSyK9Ju8U6QpQzGIqwlxHxK/b7OWV2CrzlkBOLJTUVCBVjcmnQpofstLURjEEzUez2fFtzN8UYA4A==", + "dgSpecHash": "yCpP6BPpuRXuofATVjtKmfhwUZrb2GPo991luvSdq/4autcaFU4YO7LtiPjZL2G6wWMNzzjcoV/PWwpAeT1Rww==", "success": true, - "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", + "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Vista/obj/Vista.csproj.nuget.dgspec.json b/Vista/obj/Vista.csproj.nuget.dgspec.json index 2de1c13..1ce4a33 100644 --- a/Vista/obj/Vista.csproj.nuget.dgspec.json +++ b/Vista/obj/Vista.csproj.nuget.dgspec.json @@ -1,15 +1,15 @@ { "format": 1, "restore": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj": {} + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Vista\\Vista.csproj": {} }, "projects": { - "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj": { + "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Vista\\Vista.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", + "projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Vista\\Vista.csproj", "projectName": "Vista", - "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", "outputPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\obj\\", "projectStyle": "PackageReference", diff --git a/Vista/obj/project.nuget.cache b/Vista/obj/project.nuget.cache index 09c7e80..2df8b22 100644 --- a/Vista/obj/project.nuget.cache +++ b/Vista/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "3DvijgwI6aIGVuwP6GmOKPJ5wb7Wv1SrZkk52PrGeifqQwNFgGXg9iYcN5nP+NtiK79D+Dnyplxj64AJXgSAqQ==", + "dgSpecHash": "sxAlnK8kqG49TG7auamL3JNePu/HJD0xU6R4+XkcFQYuUWkucBmICEdtCGCih+UlUCQHlI0zBm3UwUWPp8J1kw==", "success": true, - "projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", + "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final_OOP\\Vista\\Vista.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file