From 9a1e27a74012aafb4231bf5edfe4febfa981b8a6 Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Tue, 14 May 2024 12:13:30 +0100 Subject: [PATCH 01/13] Add support for net 8 --- Directory.Build.props | 3 ++- SampleWebView.Avalonia/SampleWebView.Avalonia.csproj | 2 +- SampleWebView.Avalonia/bundle-osx-arm64.sh | 2 +- SampleWebView.Avalonia/bundle-osx-x64.sh | 2 +- WebViewControl.Avalonia/WebViewControl.Avalonia.csproj | 2 +- WebViewControl/WebViewControl.csproj | 2 +- .../TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj | 2 +- .../TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj | 2 +- tests/Tests.WebView/Tests.WebView.csproj | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 776d63ff..31a573d3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,8 @@ - net6.0 + net6.0;net8.0 + net6.0-windows;net8.0-windows x64;ARM64 0.10.17 120.6099.1 diff --git a/SampleWebView.Avalonia/SampleWebView.Avalonia.csproj b/SampleWebView.Avalonia/SampleWebView.Avalonia.csproj index 5b115b3a..1460884f 100755 --- a/SampleWebView.Avalonia/SampleWebView.Avalonia.csproj +++ b/SampleWebView.Avalonia/SampleWebView.Avalonia.csproj @@ -2,7 +2,7 @@ WinExe - $(DotnetVersion) + $(TargetDotnetVersions) LatestMajor Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport osx-x64;win-x64;osx-arm64;win-arm64 diff --git a/SampleWebView.Avalonia/bundle-osx-arm64.sh b/SampleWebView.Avalonia/bundle-osx-arm64.sh index 3940decf..19b3c80f 100755 --- 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 index 4bbbc2cf..ee2e73d0 100755 --- 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 index fe464988..fc9a7e7f 100644 --- a/WebViewControl.Avalonia/WebViewControl.Avalonia.csproj +++ b/WebViewControl.Avalonia/WebViewControl.Avalonia.csproj @@ -1,7 +1,7 @@  - $(DotnetVersion) + $(TargetDotnetVersions) WebViewControl WebViewControl Avalonia WebViewControl for Avalonia powered by CefGlue diff --git a/WebViewControl/WebViewControl.csproj b/WebViewControl/WebViewControl.csproj index 04b0f68e..f1f0fc63 100644 --- a/WebViewControl/WebViewControl.csproj +++ b/WebViewControl/WebViewControl.csproj @@ -1,7 +1,7 @@  - $(DotnetVersion)-windows + $(TargetDotnetVersionsWindows) WebViewControl WPF WebViewControl for WPF powered by CefGlue diff --git a/tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj b/tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj index 14e71338..6ddc6429 100644 --- a/tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj +++ b/tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj @@ -1,6 +1,6 @@  - $(DotnetVersion) + $(TargetDotnetVersions) false $(MSBuildProjectDirectory)\bin\ TestResourceAssembly diff --git a/tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj b/tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj index 2a29238e..a0fed7fc 100644 --- a/tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj +++ b/tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj @@ -1,6 +1,6 @@  - $(DotnetVersion) + $(TargetDotnetVersions) false $(MSBuildProjectDirectory)\bin\ TestResourceAssembly diff --git a/tests/Tests.WebView/Tests.WebView.csproj b/tests/Tests.WebView/Tests.WebView.csproj index 78d7e95e..1434ca73 100644 --- a/tests/Tests.WebView/Tests.WebView.csproj +++ b/tests/Tests.WebView/Tests.WebView.csproj @@ -1,7 +1,7 @@  - $(DotnetVersion) + $(TargetDotnetVersions) false $(MSBuildProjectDirectory)\bin\ true From 558edf717a00dd5c542be83aeb80b12b1c9f1dfd Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Tue, 14 May 2024 13:34:18 +0100 Subject: [PATCH 02/13] Fix sample apps target framework --- Directory.Build.props | 1 + SampleWebView.Avalonia/SampleWebView.Avalonia.csproj | 2 +- tests/Tests.WebView/Tests.WebView.csproj | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 31a573d3..52b6a706 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,7 @@ + net8.0 net6.0;net8.0 net6.0-windows;net8.0-windows x64;ARM64 diff --git a/SampleWebView.Avalonia/SampleWebView.Avalonia.csproj b/SampleWebView.Avalonia/SampleWebView.Avalonia.csproj index 1460884f..2129c58b 100755 --- a/SampleWebView.Avalonia/SampleWebView.Avalonia.csproj +++ b/SampleWebView.Avalonia/SampleWebView.Avalonia.csproj @@ -2,7 +2,7 @@ WinExe - $(TargetDotnetVersions) + net8.0 LatestMajor Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport osx-x64;win-x64;osx-arm64;win-arm64 diff --git a/tests/Tests.WebView/Tests.WebView.csproj b/tests/Tests.WebView/Tests.WebView.csproj index 1434ca73..b6ed6989 100644 --- a/tests/Tests.WebView/Tests.WebView.csproj +++ b/tests/Tests.WebView/Tests.WebView.csproj @@ -1,7 +1,7 @@  - $(TargetDotnetVersions) + net8.0 false $(MSBuildProjectDirectory)\bin\ true From d4f148709ef203a8ea4ed65ad721d6cf93a6d5e1 Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Tue, 14 May 2024 13:40:47 +0100 Subject: [PATCH 03/13] Try multiple targets --- Directory.Build.props | 1 - SampleWebView.Avalonia/SampleWebView.Avalonia.csproj | 2 +- tests/Tests.WebView/Tests.WebView.csproj | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 52b6a706..31a573d3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,6 @@ - net8.0 net6.0;net8.0 net6.0-windows;net8.0-windows x64;ARM64 diff --git a/SampleWebView.Avalonia/SampleWebView.Avalonia.csproj b/SampleWebView.Avalonia/SampleWebView.Avalonia.csproj index 2129c58b..1460884f 100755 --- a/SampleWebView.Avalonia/SampleWebView.Avalonia.csproj +++ b/SampleWebView.Avalonia/SampleWebView.Avalonia.csproj @@ -2,7 +2,7 @@ WinExe - net8.0 + $(TargetDotnetVersions) LatestMajor Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport osx-x64;win-x64;osx-arm64;win-arm64 diff --git a/tests/Tests.WebView/Tests.WebView.csproj b/tests/Tests.WebView/Tests.WebView.csproj index b6ed6989..1434ca73 100644 --- a/tests/Tests.WebView/Tests.WebView.csproj +++ b/tests/Tests.WebView/Tests.WebView.csproj @@ -1,7 +1,7 @@  - net8.0 + $(TargetDotnetVersions) false $(MSBuildProjectDirectory)\bin\ true From fcdbf94d575211d249f82caf86e8834e5c29d281 Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Tue, 14 May 2024 14:17:59 +0100 Subject: [PATCH 04/13] Raise version --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 31a573d3..424eb0d2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,7 +11,7 @@ 2.0.0.0 2.0.0.0 - 2.121.1 + 2.121.2 OutSystems WebViewControl Copyright © OutSystems 2023 From 35af0209bc02315ec22367f6b96dab85d03fa148 Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Tue, 14 May 2024 15:53:54 +0100 Subject: [PATCH 05/13] Add suffix to target frameworks --- Directory.Build.props | 5 ++--- WebViewControl/WebViewControl.csproj | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 424eb0d2..bcc99436 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,11 +1,10 @@ - net6.0;net8.0 - net6.0-windows;net8.0-windows + net6.0$(NetVersionSuffix);net8.0$(NetVersionSuffix) x64;ARM64 0.10.17 - 120.6099.1 + 120.6099.3 diff --git a/WebViewControl/WebViewControl.csproj b/WebViewControl/WebViewControl.csproj index f1f0fc63..af7a722c 100644 --- a/WebViewControl/WebViewControl.csproj +++ b/WebViewControl/WebViewControl.csproj @@ -1,7 +1,7 @@  - $(TargetDotnetVersionsWindows) + $(TargetDotnetVersions) WebViewControl WPF WebViewControl for WPF powered by CefGlue @@ -12,6 +12,7 @@ true WebViewControl-WPF$(PackageSuffix) Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport + -windows From e9aec8be8afbae949663161a51dbecd6973c865a Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Tue, 14 May 2024 17:19:15 +0100 Subject: [PATCH 06/13] revert sufix changes --- Directory.Build.props | 3 ++- WebViewControl/WebViewControl.csproj | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index bcc99436..e8204b9e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,8 @@ - net6.0$(NetVersionSuffix);net8.0$(NetVersionSuffix) + net6.0;net8.0 + net6.0-windows;net8.0-windows x64;ARM64 0.10.17 120.6099.3 diff --git a/WebViewControl/WebViewControl.csproj b/WebViewControl/WebViewControl.csproj index af7a722c..f1f0fc63 100644 --- a/WebViewControl/WebViewControl.csproj +++ b/WebViewControl/WebViewControl.csproj @@ -1,7 +1,7 @@  - $(TargetDotnetVersions) + $(TargetDotnetVersionsWindows) WebViewControl WPF WebViewControl for WPF powered by CefGlue @@ -12,7 +12,6 @@ true WebViewControl-WPF$(PackageSuffix) Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport - -windows From cb3548667954a75feb7ffc1af1eda99b9d3036a5 Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Tue, 14 May 2024 18:03:43 +0100 Subject: [PATCH 07/13] Tentative of adding suffixes --- Directory.Build.props | 6 +++--- WebViewControl/WebViewControl.csproj | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e8204b9e..4d56fb7e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,11 +1,11 @@ - net6.0;net8.0 - net6.0-windows;net8.0-windows + + net6.0$(DotnetVersionSuffix);net8.0$(DotnetVersionSuffix) x64;ARM64 0.10.17 - 120.6099.3 + 120.6099.1 diff --git a/WebViewControl/WebViewControl.csproj b/WebViewControl/WebViewControl.csproj index f1f0fc63..b0d30551 100644 --- a/WebViewControl/WebViewControl.csproj +++ b/WebViewControl/WebViewControl.csproj @@ -1,7 +1,8 @@  - $(TargetDotnetVersionsWindows) + -windows + $(TargetDotnetVersions) WebViewControl WPF WebViewControl for WPF powered by CefGlue From e5bfb00961be7a742e3364a02973eb0070c5037e Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Tue, 14 May 2024 18:10:34 +0100 Subject: [PATCH 08/13] Tentative of adding suffixes --- Directory.Build.props | 3 +-- WebViewControl/WebViewControl.csproj | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 4d56fb7e..fef24f85 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,7 @@ - - net6.0$(DotnetVersionSuffix);net8.0$(DotnetVersionSuffix) + net6.0;net8.0 x64;ARM64 0.10.17 120.6099.1 diff --git a/WebViewControl/WebViewControl.csproj b/WebViewControl/WebViewControl.csproj index b0d30551..ceaf1879 100644 --- a/WebViewControl/WebViewControl.csproj +++ b/WebViewControl/WebViewControl.csproj @@ -1,8 +1,7 @@  - -windows - $(TargetDotnetVersions) + net6.0-windows;net8.0-windows WebViewControl WPF WebViewControl for WPF powered by CefGlue From 260876ec30961bdb404bde259b35c850494b8a75 Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Wed, 15 May 2024 10:27:38 +0100 Subject: [PATCH 09/13] Review code --- Directory.Build.props | 5 +++-- WebViewControl/WebViewControl.csproj | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index fef24f85..9955760c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,10 +1,11 @@ - net6.0;net8.0 + net8.0 + net6.0;$(DefaultTargetDotnetVersion) x64;ARM64 0.10.17 - 120.6099.1 + 120.6099.3 diff --git a/WebViewControl/WebViewControl.csproj b/WebViewControl/WebViewControl.csproj index ceaf1879..c6c9d66e 100644 --- a/WebViewControl/WebViewControl.csproj +++ b/WebViewControl/WebViewControl.csproj @@ -1,7 +1,7 @@  - net6.0-windows;net8.0-windows + $(DefaultTargetDotnetVersion)-windows WebViewControl WPF WebViewControl for WPF powered by CefGlue From 09743cb4a479243cfad41a349aad3c7807341609 Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Wed, 15 May 2024 15:04:47 +0100 Subject: [PATCH 10/13] Fix windows version --- tests/Tests.WebView/Tests.WebView.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Tests.WebView/Tests.WebView.csproj b/tests/Tests.WebView/Tests.WebView.csproj index 1434ca73..d9b9cc3e 100644 --- a/tests/Tests.WebView/Tests.WebView.csproj +++ b/tests/Tests.WebView/Tests.WebView.csproj @@ -1,7 +1,7 @@  - $(TargetDotnetVersions) + net6.0-windows;net8.0-windows false $(MSBuildProjectDirectory)\bin\ true From b9a7c3a287ffae106390339ce1a5b6ceebead223 Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Wed, 15 May 2024 15:21:29 +0100 Subject: [PATCH 11/13] revert --- tests/Tests.WebView/Tests.WebView.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Tests.WebView/Tests.WebView.csproj b/tests/Tests.WebView/Tests.WebView.csproj index d9b9cc3e..1434ca73 100644 --- a/tests/Tests.WebView/Tests.WebView.csproj +++ b/tests/Tests.WebView/Tests.WebView.csproj @@ -1,7 +1,7 @@  - net6.0-windows;net8.0-windows + $(TargetDotnetVersions) false $(MSBuildProjectDirectory)\bin\ true From 177cecda11568703cdc6cd4f7c1eff93d643dec8 Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Wed, 15 May 2024 17:12:31 +0100 Subject: [PATCH 12/13] Fix --- tests/Tests.WebView/Tests.WebView.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Tests.WebView/Tests.WebView.csproj b/tests/Tests.WebView/Tests.WebView.csproj index 1434ca73..9d1a4373 100644 --- a/tests/Tests.WebView/Tests.WebView.csproj +++ b/tests/Tests.WebView/Tests.WebView.csproj @@ -2,7 +2,6 @@ $(TargetDotnetVersions) - false $(MSBuildProjectDirectory)\bin\ true $(Platform) From 2ce0dd7a5efc2c34403675dd195c9efb6797cede Mon Sep 17 00:00:00 2001 From: Tiago Braga Fernandes Date: Wed, 15 May 2024 17:19:13 +0100 Subject: [PATCH 13/13] tentative fix tests --- tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj | 1 - tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj b/tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj index 6ddc6429..bff315ed 100644 --- a/tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj +++ b/tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj @@ -1,7 +1,6 @@  $(TargetDotnetVersions) - false $(MSBuildProjectDirectory)\bin\ TestResourceAssembly 1.0.0.0 diff --git a/tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj b/tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj index a0fed7fc..ba83d0f6 100644 --- a/tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj +++ b/tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj @@ -1,7 +1,6 @@  $(TargetDotnetVersions) - false $(MSBuildProjectDirectory)\bin\ TestResourceAssembly 2.0.0.0