fixes

2024-08-12 12:39:30 -03:00
parent d11016fe50
commit 01d975c47f
6 changed files with 9 additions and 21 deletions
--- 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>
--- 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";
--- 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>
--- 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>
--- 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>
--- 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>
+</Project>