Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for .NET 8 #337

Merged
merged 13 commits into from
May 15, 2024
Merged

Add support for .NET 8 #337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9a1e27a
Add support for net 8
tbragaf May 14, 2024
558edf7
Fix sample apps target framework
tbragaf May 14, 2024
d4f1487
Try multiple targets
tbragaf May 14, 2024
fcdbf94
Raise version
tbragaf May 14, 2024
35af020
Add suffix to target frameworks
tbragaf May 14, 2024
e9aec8b
revert sufix changes
tbragaf May 14, 2024
cb35486
Tentative of adding suffixes
tbragaf May 14, 2024
e5bfb00
Tentative of adding suffixes
tbragaf May 14, 2024
260876e
Review code
tbragaf May 15, 2024
09743cb
Fix windows version
tbragaf May 15, 2024
b9a7c3a
revert
tbragaf May 15, 2024
177cecd
Fix
tbragaf May 15, 2024
2ce0dd7
tentative fix tests
tbragaf May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<DotnetVersion>net6.0</DotnetVersion>
<TargetDotnetVersions>net6.0;net8.0</TargetDotnetVersions>
<TargetDotnetVersionsWindows>net6.0-windows;net8.0-windows</TargetDotnetVersionsWindows>
<Platforms>x64;ARM64</Platforms>
<AvaloniaVersion>0.10.17</AvaloniaVersion>
<CefGlueVersion>120.6099.1</CefGlueVersion>
Expand Down
2 changes: 1 addition & 1 deletion SampleWebView.Avalonia/SampleWebView.Avalonia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion SampleWebView.Avalonia/bundle-osx-arm64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion SampleWebView.Avalonia/bundle-osx-x64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion WebViewControl.Avalonia/WebViewControl.Avalonia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion WebViewControl/WebViewControl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(DotnetVersion)-windows</TargetFramework>
<TargetFrameworks>$(TargetDotnetVersionsWindows)</TargetFrameworks>
<AssemblyTitle>WebViewControl WPF</AssemblyTitle>
<Description>WebViewControl for WPF powered by CefGlue</Description>
<Configuration></Configuration>
Expand Down
2 changes: 1 addition & 1 deletion tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(DotnetVersion)</TargetFramework>
<TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>$(MSBuildProjectDirectory)\bin\</OutputPath>
<RootNamespace>TestResourceAssembly</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(DotnetVersion)</TargetFramework>
<TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>$(MSBuildProjectDirectory)\bin\</OutputPath>
<RootNamespace>TestResourceAssembly</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion tests/Tests.WebView/Tests.WebView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(DotnetVersion)</TargetFramework>
<TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>$(MSBuildProjectDirectory)\bin\</OutputPath>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
Expand Down
Loading