Removed net6 (#190)

* Removed net6 * Fix usewpf * Increase timeout * Fixed build * Fix build take 2 --------- Co-authored-by: Miguel Alves <miguel.alves@outsystems.com>
OutSystems · Sep 4, 2024 · 1ecbc75 · 1ecbc75
1 parent 49ab9c5
commit 1ecbc75
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 18 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,11 +1,10 @@
 <Project>
   <PropertyGroup>
-    <DefaultTargetDotnetVersion>net8.0</DefaultTargetDotnetVersion>
-    <TargetDotnetVersions>net6.0;$(DefaultTargetDotnetVersion)</TargetDotnetVersions>
+    <TargetDotnetVersion>net8.0</TargetDotnetVersion>
     <Platforms>x64;ARM64</Platforms>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
-    <Version>3.120.3</Version>
+    <Version>3.120.4</Version>
     <Authors>OutSystems</Authors>
     <Product>ReactView</Product>
     <Copyright>Copyright © OutSystems 2023</Copyright>
@@ -18,7 +17,7 @@
 
   <PropertyGroup>
     <AvaloniaVersion>11.0.10</AvaloniaVersion>
-    <WebViewVersion>3.120.3</WebViewVersion>
+    <WebViewVersion>3.120.5</WebViewVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)' == '' or '$(Platform)' == 'x64'">

diff --git a/ReactViewControl.Avalonia/ReactViewControl.Avalonia.csproj b/ReactViewControl.Avalonia/ReactViewControl.Avalonia.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
+    <TargetFramework>$(TargetDotnetVersion)</TargetFramework>
     <RootNamespace>ReactViewControl</RootNamespace>
     <AssemblyTitle>ReactViewControl Avalonia</AssemblyTitle>
     <Description>ReactViewControl for Avalonia powered by CefGlue</Description>

diff --git a/ReactViewControl/ReactViewControl.csproj b/ReactViewControl/ReactViewControl.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(DefaultTargetDotnetVersion)-windows</TargetFramework>
+    <TargetFramework>$(TargetDotnetVersion)-windows</TargetFramework>
     <RootNamespace>ReactViewControl</RootNamespace>
     <AssemblyTitle>ReactViewControl WPF</AssemblyTitle>
     <Description>ReactViewControl for WPF powered by CefGlue</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>ReactViewControl-WPF$(PackageSuffix)</PackageId>
-    <UseWpf>true</UseWpf>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
     <Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF</Configurations>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'ReleaseWPF'">
@@ -27,13 +27,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-
   <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences">
     <ItemGroup>
       <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')-&gt;WithMetadataValue('IncludeInNugetPackage', 'true'))" />

diff --git a/ReactViewResources/ReactViewResources.csproj b/ReactViewResources/ReactViewResources.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
+    <TargetFramework>$(TargetDotnetVersion)</TargetFramework>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
     <Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF</Configurations>

diff --git a/Sample.Avalonia/Sample.Avalonia.csproj b/Sample.Avalonia/Sample.Avalonia.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
+    <TargetFramework>$(TargetDotnetVersion)</TargetFramework>
     <RollForward>LatestMajor</RollForward>
     <Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF</Configurations>
     <RuntimeIdentifiers>osx-x64;win-x64;osx-arm64;win-arm64</RuntimeIdentifiers>

diff --git a/Tests.ReactView/Properties/AssemblyInfo.cs b/Tests.ReactView/Properties/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 using NUnit.Framework;
 
 #if !DEBUG
-[assembly: Timeout(10000)]
+[assembly: Timeout(60000)]
 #endif
diff --git a/Tests.ReactView/Tests.ReactView.csproj b/Tests.ReactView/Tests.ReactView.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
+    <TargetFramework>$(TargetDotnetVersion)</TargetFramework>
     <OutputPath>$(MSBuildProjectDirectory)\bin\</OutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <PlatformTarget>$(Platform)</PlatformTarget>