Single net8 target (#350)

* Single net 8 target * Upgrade cefglue * Increase timeout * Raise version * Added UseWPF property --------- Co-authored-by: alvesmiguel1 <miguel.alves@outsystems.com>
OutSystems · Sep 4, 2024 · 31d5d64 · 31d5d64
1 parent 5c2f0ae
commit 31d5d64
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <DefaultTargetDotnetVersion>net8.0</DefaultTargetDotnetVersion>
-    <TargetDotnetVersions>net6.0;$(DefaultTargetDotnetVersion)</TargetDotnetVersions>
+    <TargetDotnetVersion>net8.0</TargetDotnetVersion>
     <Platforms>x64;ARM64</Platforms>
     <AvaloniaVersion>11.0.10</AvaloniaVersion>
-    <CefGlueVersion>120.6099.204</CefGlueVersion>
+    <CefGlueVersion>120.6099.205</CefGlueVersion>
   </PropertyGroup>
 
   <PropertyGroup>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
-    <Version>3.120.4</Version>
+    <Version>3.120.5</Version>
     <Authors>OutSystems</Authors>
     <Product>WebViewControl</Product>
     <Copyright>Copyright © OutSystems 2023</Copyright>

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

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

diff --git a/WebViewControl/WebViewControl.csproj b/WebViewControl/WebViewControl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(DefaultTargetDotnetVersion)-windows</TargetFramework>
+    <TargetFramework>$(TargetDotnetVersion)-windows</TargetFramework>
     <AssemblyTitle>WebViewControl WPF</AssemblyTitle>
     <Description>WebViewControl for WPF powered by CefGlue</Description>
     <Configuration></Configuration>
@@ -12,6 +12,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageId>WebViewControl-WPF$(PackageSuffix)</PackageId>
     <Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport</Configurations>
+    <UseWPF>true</UseWPF>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'ReleaseWPF'">

diff --git a/tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj b/tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
+        <TargetFramework>$(TargetDotnetVersion)</TargetFramework>
         <OutputPath>$(MSBuildProjectDirectory)\bin\</OutputPath>
         <RootNamespace>TestResourceAssembly</RootNamespace>
         <AssemblyVersion>1.0.0.0</AssemblyVersion>

diff --git a/tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj b/tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
+        <TargetFramework>$(TargetDotnetVersion)</TargetFramework>
         <OutputPath>$(MSBuildProjectDirectory)\bin\</OutputPath>
         <RootNamespace>TestResourceAssembly</RootNamespace>
         <AssemblyVersion>2.0.0.0</AssemblyVersion>

diff --git a/tests/Tests.WebView/Properties/AssemblyInfo.cs b/tests/Tests.WebView/Properties/AssemblyInfo.cs
@@ -1,5 +1,5 @@
 using NUnit.Framework;
 
 #if !DEBUG
-[assembly: Timeout(10000)]
+[assembly: Timeout(60000)]
 #endif
diff --git a/tests/Tests.WebView/Tests.WebView.csproj b/tests/Tests.WebView/Tests.WebView.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>