Skip to content

Commit 31d5d64

Browse files
Single net8 target (#350)
* Single net 8 target * Upgrade cefglue * Increase timeout * Raise version * Added UseWPF property --------- Co-authored-by: alvesmiguel1 <[email protected]>
1 parent 5c2f0ae commit 31d5d64

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

Directory.Build.props

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<DefaultTargetDotnetVersion>net8.0</DefaultTargetDotnetVersion>
5-
<TargetDotnetVersions>net6.0;$(DefaultTargetDotnetVersion)</TargetDotnetVersions>
4+
<TargetDotnetVersion>net8.0</TargetDotnetVersion>
65
<Platforms>x64;ARM64</Platforms>
76
<AvaloniaVersion>11.0.10</AvaloniaVersion>
8-
<CefGlueVersion>120.6099.204</CefGlueVersion>
7+
<CefGlueVersion>120.6099.205</CefGlueVersion>
98
</PropertyGroup>
109

1110
<PropertyGroup>
1211
<AssemblyVersion>2.0.0.0</AssemblyVersion>
1312
<FileVersion>2.0.0.0</FileVersion>
14-
<Version>3.120.4</Version>
13+
<Version>3.120.5</Version>
1514
<Authors>OutSystems</Authors>
1615
<Product>WebViewControl</Product>
1716
<Copyright>Copyright © OutSystems 2023</Copyright>

SampleWebView.Avalonia/SampleWebView.Avalonia.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
5+
<TargetFramework>$(TargetDotnetVersion)</TargetFramework>
66
<RollForward>LatestMajor</RollForward>
77
<Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport</Configurations>
88
<RuntimeIdentifiers>osx-x64;win-x64;osx-arm64;win-arm64</RuntimeIdentifiers>

WebViewControl.Avalonia/WebViewControl.Avalonia.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
4+
<TargetFramework>$(TargetDotnetVersion)</TargetFramework>
55
<RootNamespace>WebViewControl</RootNamespace>
66
<AssemblyTitle>WebViewControl Avalonia</AssemblyTitle>
77
<Description>WebViewControl for Avalonia powered by CefGlue</Description>

WebViewControl/WebViewControl.csproj

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>$(DefaultTargetDotnetVersion)-windows</TargetFramework>
4+
<TargetFramework>$(TargetDotnetVersion)-windows</TargetFramework>
55
<AssemblyTitle>WebViewControl WPF</AssemblyTitle>
66
<Description>WebViewControl for WPF powered by CefGlue</Description>
77
<Configuration></Configuration>
@@ -12,6 +12,7 @@
1212
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1313
<PackageId>WebViewControl-WPF$(PackageSuffix)</PackageId>
1414
<Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF;ReleaseAvaloniaRemoteDebugSupport</Configurations>
15+
<UseWPF>true</UseWPF>
1516
</PropertyGroup>
1617

1718
<PropertyGroup Condition="'$(Configuration)' == 'ReleaseWPF'">

tests/TestResourceAssembly.V1.0.0.0/TestResourceAssembly.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
3+
<TargetFramework>$(TargetDotnetVersion)</TargetFramework>
44
<OutputPath>$(MSBuildProjectDirectory)\bin\</OutputPath>
55
<RootNamespace>TestResourceAssembly</RootNamespace>
66
<AssemblyVersion>1.0.0.0</AssemblyVersion>

tests/TestResourceAssembly.V2.0.0.0/TestResourceAssembly.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
3+
<TargetFramework>$(TargetDotnetVersion)</TargetFramework>
44
<OutputPath>$(MSBuildProjectDirectory)\bin\</OutputPath>
55
<RootNamespace>TestResourceAssembly</RootNamespace>
66
<AssemblyVersion>2.0.0.0</AssemblyVersion>
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using NUnit.Framework;
22

33
#if !DEBUG
4-
[assembly: Timeout(10000)]
4+
[assembly: Timeout(60000)]
55
#endif

tests/Tests.WebView/Tests.WebView.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
4+
<TargetFramework>$(TargetDotnetVersion)</TargetFramework>
55
<OutputPath>$(MSBuildProjectDirectory)\bin\</OutputPath>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
77
<PlatformTarget>$(Platform)</PlatformTarget>

0 commit comments

Comments
 (0)