Merge branch 'main' into develop

AxaFrance · Jan 8, 2025 · 771fc26 · 771fc26
2 parents 699a035 + 42ea50b
commit 771fc26
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build-and-publish-PROnly.yml b/.github/workflows/build-and-publish-PROnly.yml
@@ -65,7 +65,7 @@ jobs:
       run: |
         if("${{github.base_ref}}".Contains("main")) { $suffix = "" } else { $suffix = "-preview" }
         .\.sonar\scanner\dotnet-sonarscanner begin /k:"AxaGuilDEv_webengine-dotnet" /o:"axaguildev" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
-        dotnet build "./src" --no-restore --configuration Debug -p:AssemblyVersion=1.2.${{github.run_number}} -p:Version=1.2.${{github.run_number}}$suffix 
+        dotnet build "./src" --no-restore --configuration Debug -p:AssemblyVersion=1.2.${{github.run_number}} -p:Version=1.2.${{github.run_number}}-$suffix 
         dotnet-coverage collect 'dotnet test "./src/WebEngine.Test" --filter TestCategory!=Mobile' -f xml  -o 'coverage.xml'
         .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"     
     

diff --git a/src/AxaFrance.WebEngine.ReportViewer/MainWindow.xaml b/src/AxaFrance.WebEngine.ReportViewer/MainWindow.xaml
@@ -168,7 +168,6 @@
                             <RowDefinition Height="200" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
-
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="*" />

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