Add support for .NET 8 (#337)

tbragaf · web-flow · commit 7da38be3451f · 2024-05-15T17:26:58.000+01:00
* Add support for net 8

* Fix sample apps target framework

* Try multiple targets

* Raise version

* Add suffix to target frameworks

* revert sufix changes

* Tentative of adding suffixes

* Tentative of adding suffixes

* Review code

* Fix windows version

* revert

* Fix

* tentative fix tests
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <DotnetVersion>net6.0</DotnetVersion>
+    <DefaultTargetDotnetVersion>net8.0</DefaultTargetDotnetVersion>
+    <TargetDotnetVersions>net6.0;$(DefaultTargetDotnetVersion)</TargetDotnetVersions>
     <Platforms>x64;ARM64</Platforms>
     <AvaloniaVersion>0.10.17</AvaloniaVersion>
-    <CefGlueVersion>120.6099.1</CefGlueVersion>
+    <CefGlueVersion>120.6099.3</CefGlueVersion>
   </PropertyGroup>
 
   <PropertyGroup>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
-    <Version>2.121.1</Version>
+    <Version>2.121.2</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>
-    <TargetFramework>$(DotnetVersion)</TargetFramework>
+    <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
     <RollForward>LatestMajor</RollForward>
     <Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport</Configurations>
     <RuntimeIdentifiers>osx-x64;win-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
diff --git a/SampleWebView.Avalonia/bundle-osx-arm64.sh b/SampleWebView.Avalonia/bundle-osx-arm64.sh
@@ -2,6 +2,6 @@
 
 dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-arm64 -p:Platform=ARM64
 
-TARGETAPP=bin/ARM64/Debug/net6.0/osx-arm64/publish/SampleWebView.app/Contents/MacOS
+TARGETAPP=bin/ARM64/Debug/net8.0/osx-arm64/publish/SampleWebView.app/Contents/MacOS
 chmod +x "$TARGETAPP/CefGlueBrowserProcess/Xilium.CefGlue.BrowserProcess"
 chmod +x "$TARGETAPP/SampleWebView.Avalonia"
diff --git a/SampleWebView.Avalonia/bundle-osx-x64.sh b/SampleWebView.Avalonia/bundle-osx-x64.sh
@@ -2,6 +2,6 @@
 
 dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -p:Platform=x64
 
-TARGETAPP=bin/x64/Debug/net6.0/osx-x64/publish/SampleWebView.app/Contents/MacOS
+TARGETAPP=bin/x64/Debug/net8.0/osx-x64/publish/SampleWebView.app/Contents/MacOS
 chmod +x "$TARGETAPP/CefGlueBrowserProcess/Xilium.CefGlue.BrowserProcess"
 chmod +x "$TARGETAPP/SampleWebView.Avalonia"
diff --git a/WebViewControl.Avalonia/WebViewControl.Avalonia.csproj b/WebViewControl.Avalonia/WebViewControl.Avalonia.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(DotnetVersion)</TargetFramework>
+    <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
     <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>$(DotnetVersion)-windows</TargetFramework>
+    <TargetFramework>$(DefaultTargetDotnetVersion)-windows</TargetFramework>
     <AssemblyTitle>WebViewControl WPF</AssemblyTitle>
     <Description>WebViewControl for WPF powered by CefGlue</Description>
     <Configuration></Configuration>
diff --git a/tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj b/tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj
@@ -1,7 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>$(DotnetVersion)</TargetFramework>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
         <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,7 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>$(DotnetVersion)</TargetFramework>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
         <OutputPath>$(MSBuildProjectDirectory)\bin\</OutputPath>
         <RootNamespace>TestResourceAssembly</RootNamespace>
         <AssemblyVersion>2.0.0.0</AssemblyVersion>
diff --git a/tests/Tests.WebView/Tests.WebView.csproj b/tests/Tests.WebView/Tests.WebView.csproj
@@ -1,8 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(DotnetVersion)</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
     <OutputPath>$(MSBuildProjectDirectory)\bin\</OutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <PlatformTarget>$(Platform)</PlatformTarget>
