Merge branch 'master' into RICT-5505-avalonia11

Author: heldergoncalves92

Directory.Build.props

@@ -1,10 +1,11 @@
 <Project>
   <PropertyGroup>
-    <DotnetVersion>net6.0</DotnetVersion>
+    <DefaultTargetDotnetVersion>net8.0</DefaultTargetDotnetVersion>
+    <TargetDotnetVersions>net6.0;$(DefaultTargetDotnetVersion)</TargetDotnetVersions>
     <Platforms>x64;ARM64</Platforms>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
-    <Version>2.120.103</Version>
+    <Version>3.120.1</Version>
     <Authors>OutSystems</Authors>
     <Product>ReactView</Product>
     <Copyright>Copyright © OutSystems 2023</Copyright>
@@ -16,8 +17,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <AvaloniaVersion>11.0.9</AvaloniaVersion>
-    <WebViewVersion>2.121.102</WebViewVersion>
+    <AvaloniaVersion>11.0.11</AvaloniaVersion>
+    <WebViewVersion>3.120.1</WebViewVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)' == '' or '$(Platform)' == 'x64'">

Directory.Packages.props

@@ -28,7 +28,7 @@
         <PackageVersion Include="WebViewControl-WPF" Version="$(WebViewVersion)" />
         <PackageVersion Include="WebViewControl-WPF-ARM64" Version="$(WebViewVersion)" />
 
-        <PackageVersion Include="ViewGenerator" Version="1.1.43" />
+        <PackageVersion Include="ViewGenerator" Version="1.2.1" />
         <PackageVersion Include="ViewGeneratorCore" Version="1.0.229" />
 
         <PackageVersion Include="NLog" Version="4.6.2" />

README.md

@@ -41,5 +41,15 @@ For now we are using the following node versions:
 
 **Note:** If you wish to upgrade the node version at use, don't forget to delete/replace any previous bindings related to the OS (`darwin-x64-72/` represents node 12.X.X's version).
 
+## Versioning
+The versioning system works as follows:
+
+`<major>.<cef_version>.<patch>`
+
+Whenever you fix a bug, please increase the patch version. \
+Whenever you bring a new feature, please increase the major version. \
+Use the minor version for the current cef version.
+
+
 # TODO
 - Improve documentation

ReactViewControl.Avalonia/ReactViewControl.Avalonia.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(DotnetVersion)</TargetFramework>
+    <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
     <RootNamespace>ReactViewControl</RootNamespace>
     <AssemblyTitle>ReactViewControl Avalonia</AssemblyTitle>
     <Description>ReactViewControl for Avalonia powered by CefGlue</Description>

ReactViewControl/ReactViewControl.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(DotnetVersion)-windows</TargetFramework>
+    <TargetFramework>$(DefaultTargetDotnetVersion)-windows</TargetFramework>
     <RootNamespace>ReactViewControl</RootNamespace>
     <AssemblyTitle>ReactViewControl WPF</AssemblyTitle>
     <Description>ReactViewControl for WPF powered by CefGlue</Description>

ReactViewResources/ReactViewResources.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(DotnetVersion)</TargetFramework>
+    <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
     <Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF</Configurations>

Sample.Avalonia/Sample.Avalonia.csproj

@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>$(DotnetVersion)</TargetFramework>
-    <RollForward>Major</RollForward>
+    <TargetFrameworks>$(TargetDotnetVersions)</TargetFrameworks>
+    <RollForward>LatestMajor</RollForward>
     <Configurations>Debug;Release;ReleaseAvalonia;ReleaseWPF</Configurations>
     <RuntimeIdentifiers>osx-x64;win-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
   </PropertyGroup>

Tests.ReactView/Tests.ReactView.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>

ViewGenerator/ViewGenerator.csproj

@@ -7,7 +7,7 @@
     <AssemblyTitle>ViewGenerator</AssemblyTitle>
     <Product>ViewGenerator</Product>
     <Description>Generates .NET View bindings from typescript</Description>
-    <Version>1.1.44</Version>
+    <Version>1.2.2</Version>
     <PackageId>ViewGenerator</PackageId>
     <PackageTags>Library</PackageTags>
 

ViewGenerator/ViewGenerator.nuspec

@@ -13,7 +13,7 @@
     <developmentDependency>true</developmentDependency>
     <dependencies>
       <dependency id="ViewGeneratorCore" version="1.0.226" />
-      <dependency id="ViewPacker" version="1.1.5" />
+      <dependency id="ViewPacker" version="1.2.0" />
     </dependencies>
   </metadata>
   <files>