Merge branch 'preview' into develop

AxaFrance · Jan 7, 2025 · 699a035 · 699a035
2 parents 9be1136 + 89d8a65
commit 699a035
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/src/AxaFrance.WebEngine.ReportViewer/AxaFrance.WebEngine.ReportViewer.csproj b/src/AxaFrance.WebEngine.ReportViewer/AxaFrance.WebEngine.ReportViewer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows;net9.0-windows</TargetFrameworks>
     <Nullable>disable</Nullable>
     <UseWPF>true</UseWPF>
     <AssemblyName>ReportViewer</AssemblyName>
@@ -43,7 +43,6 @@
     <PackageReference Include="Hummingbird.UI" Version="1.2.2772.2" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.WPF" Version="2.0.0-rc3.3" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
-
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/AxaFrance.WebEngine.ReportViewer/MainWindow.xaml b/src/AxaFrance.WebEngine.ReportViewer/MainWindow.xaml
@@ -164,7 +164,6 @@
                 </TabItem>
                 <TabItem Header="Ressources" x:Name="tabRessourceUsages" Visibility="Collapsed">
                     <Grid>
-
                         <Grid.RowDefinitions>
                             <RowDefinition Height="200" />
                             <RowDefinition Height="*" />

diff --git a/src/Samples.KeywordDriven/TestCases/TC_InsuranceQuote.cs b/src/Samples.KeywordDriven/TestCases/TC_InsuranceQuote.cs
@@ -14,7 +14,6 @@ public TC_InsuranceQuote() {
                 new AxaFrance.WebEngine.TestStep{ Action = nameof(ValidateContract)},
                 new AxaFrance.WebEngine.TestStep{ Action = nameof(Logout)},
             };
-            MeasureResourceUsage = true;
         }
     }
 }