From 01d975c47f8dedd6dfdd51c3455dc5bac6d2696a Mon Sep 17 00:00:00 2001
From: fede <federico.nicolas.polidoro@gmail.com>
Date: Mon, 12 Aug 2024 12:39:30 -0300
Subject: [PATCH] fixes

---
 Controladora/Controladora.csproj            | 13 +------------
 Controladora/ControladoraOrdenesDeCompra.cs |  7 +++----
 Entidades/Entidades.csproj                  |  2 +-
 Informes/Informes.csproj                    |  2 +-
 Modelo/Modelo.csproj                        |  2 +-
 Vista/Vista.csproj                          |  4 ++--
 6 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/Controladora/Controladora.csproj b/Controladora/Controladora.csproj
index 744c2b9..30346b8 100644
--- a/Controladora/Controladora.csproj
+++ b/Controladora/Controladora.csproj
@@ -1,26 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-<<<<<<< HEAD
-=======
-  
-
-
->>>>>>> c493033 (cosas que faltaban)
   <ItemGroup>
     <ProjectReference Include="..\Informes\Informes.csproj" />
     <ProjectReference Include="..\Modelo\Modelo.csproj" />
     <ProjectReference Include="..\Entidades\Entidades.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Emailer" Version="1.0.0" />
-    <PackageReference Include="webhookSharp" Version="1.0.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/Controladora/ControladoraOrdenesDeCompra.cs b/Controladora/ControladoraOrdenesDeCompra.cs
index 4a25dc2..e32b82c 100644
--- a/Controladora/ControladoraOrdenesDeCompra.cs
+++ b/Controladora/ControladoraOrdenesDeCompra.cs
@@ -19,7 +19,7 @@ namespace Controladora
                 $"Fallo la carga del OrdenDeCompra {t.Id}"; 
         }
 
-<<<<<<< HEAD
+
         private bool ProductoCheck(ReadOnlyCollection<DetalleOrdenDeCompra> ldetalles)
         {
             bool ret = false;
@@ -32,10 +32,9 @@ namespace Controladora
             });
             return ret;
         }
-        override public string Eliminar(OrdenDeCompra t)
-=======
+
+
         public string Eliminar(OrdenDeCompra t)
->>>>>>> 675d86f (refactor: Cambiada la estructura de las controladoras)
         {
            if (t == null) return "El OrdenDeCompra es nulo fallo la carga";
            if (t.Id < 0) return "El Id esta mal cargado";
diff --git a/Entidades/Entidades.csproj b/Entidades/Entidades.csproj
index 132c02c..30402ac 100644
--- a/Entidades/Entidades.csproj
+++ b/Entidades/Entidades.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Informes/Informes.csproj b/Informes/Informes.csproj
index 495dfff..e0ed412 100644
--- a/Informes/Informes.csproj
+++ b/Informes/Informes.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Modelo/Modelo.csproj b/Modelo/Modelo.csproj
index 6e1702e..ebc29ac 100644
--- a/Modelo/Modelo.csproj
+++ b/Modelo/Modelo.csproj
@@ -5,7 +5,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Vista/Vista.csproj b/Vista/Vista.csproj
index ce9f3f3..48d3779 100644
--- a/Vista/Vista.csproj
+++ b/Vista/Vista.csproj
@@ -7,7 +7,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -20,4 +20,4 @@
     <ProjectReference Include="..\Informes\Informes.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>