Skip to content

Commit 0c4ea8d

Browse files
tanushahande2003tanushahravirk91NadeemJazmawe
authored
Update to .NET 10, package versions, and minor UI tweaks (#4435)
* Update to .NET 10, package versions, and minor UI tweaks Upgraded all projects from .NET 8.0 to .NET 10.0. Updated System.Text.Json to 10.0.2 and System.Drawing.Common to 10.0.2. Added Microsoft.IdentityModel.JsonWebTokens and Microsoft.IdentityModel.Tokens (8.15.0) to support JWT features. Bumped protobuf-net packages to 3.2.56. Improved XAML grid layout in DataSourceExportToExcelPage.xaml and added DesignerSerializationVisibility attributes in SnippingTool.cs. No functional logic changes. * upgrade dotnet version to 10 * push supported dotnet version for Github actions * Fix Dotnet version on Test stage * Fix CLI TestsGithub * Fix Test Dotnet Framework of Github with new version of dotnet * nuget packages updation * Downgrade EPPlus and Excel Interop, update dependencies Downgraded EPPlus to 6.0.4 and Microsoft.Office.Interop.Excel to 15.0.4795.1001 across multiple projects for compatibility. Removed Microsoft.IdentityModel.* and System.IdentityModel.Tokens.Jwt from core projects, and removed SixLabors.ImageSharp from GingerCoreNET. Reformatted System.Globalization entry in GingerCore. These changes address dependency and compatibility issues. --------- Co-authored-by: tanushah <tanushah@amdocs.com> Co-authored-by: Ravi Kumar <41137863+ravirk91@users.noreply.github.com> Co-authored-by: Nadeem Jazmawe <nadeemj@amdocs.com>
1 parent f124c1d commit 0c4ea8d

35 files changed

Lines changed: 246 additions & 197 deletions

File tree

‎.github/workflows/Build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ jobs:
9393
# ------------------------------------------------------------------------------------------------------
9494
# Install .Net core SDK 8.0.100
9595
# ------------------------------------------------------------------------------------------------------
96-
- name: 'Install .NET 8'
96+
- name: 'Install .NET 10'
9797
uses: actions/setup-dotnet@v3
9898
with:
99-
dotnet-version: 8.0.100
99+
dotnet-version: 10.0.103
100100
# ------------------------------------------------------------------------------------------------------
101101
# Install Mono - for Ubuntu as pre-requisite for building Ginger
102102
# ------------------------------------------------------------------------------------------------------

‎.github/workflows/Release.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ jobs:
2424
2525
- name: Make Ginger macOS Runtime file executable
2626
run: |
27-
find ./Ginger/GingerRuntime/bin/Release/net8.0/osx-x64/selenium-manager -type f -print0 | xargs -0 chmod +x
27+
find ./Ginger/GingerRuntime/bin/Release/net10.0/osx-x64/selenium-manager -type f -print0 | xargs -0 chmod +x
2828
2929
- uses: sibiraj-s/action-archiver@v1
3030
with:
31-
path: './Ginger/GingerRuntime/bin/Release/net8.0/osx-x64'
31+
path: './Ginger/GingerRuntime/bin/Release/net10.0/osx-x64'
3232
format: tar
3333
gzip: true
3434
output: ./Runtime/GingerRuntime_MacOS.tar.gz
@@ -72,11 +72,11 @@ jobs:
7272
- name: Make Ginger Runtime file executable
7373
run: |
7474
ls -altr
75-
find ./Ginger/GingerRuntime/bin/Release/net8.0/linux-x64/selenium-manager -type f -print0 | xargs -0 chmod +x
75+
find ./Ginger/GingerRuntime/bin/Release/net10.0/linux-x64/selenium-manager -type f -print0 | xargs -0 chmod +x
7676
7777
- uses: sibiraj-s/action-archiver@v1
7878
with:
79-
path: './Ginger/GingerRuntime/bin/Release/net8.0/linux-x64'
79+
path: './Ginger/GingerRuntime/bin/Release/net10.0/linux-x64'
8080
format: tar
8181
gzip: true
8282
output: ./Runtime/GingerRuntime_Linux.tar.gz
@@ -124,13 +124,13 @@ jobs:
124124
true
125125

126126
- name: 'delete Help\Library'
127-
run: rmdir /s /q Ginger\Ginger\bin\Release\net8.0-windows10.0.17763.0\Help\Library
127+
run: rmdir /s /q Ginger\Ginger\bin\Release\net10.0-windows10.0.17763.0\Help\Library
128128
shell: cmd
129129

130130
- name: 'add help Library'
131131
shell: cmd
132132
run: |
133-
cd Ginger\Ginger\bin\Release\net8.0-windows10.0.17763.0\Help
133+
cd Ginger\Ginger\bin\Release\net10.0-windows10.0.17763.0\Help
134134
git clone https://github.com/Ginger-Automation/Ginger-Web-Help.git
135135
move Ginger-Web-Help\docs .
136136
rename docs Library
@@ -206,7 +206,7 @@ jobs:
206206
- name: Create Signed Directory for dll
207207
if: ${{ github.event.inputs.SSLCert != 'No' }}
208208
run: |
209-
mkdir -p D:\a\Ginger\Ginger\Ginger\Ginger\bin\Release\net8.0-windows10.0.17763.0\dist
209+
mkdir -p D:\a\Ginger\Ginger\Ginger\Ginger\bin\Release\net10.0-windows10.0.17763.0\dist
210210
shell: cmd
211211

212212
- name: Signing using Signtool dll
@@ -216,6 +216,7 @@ jobs:
216216
#recursive: true
217217
#if {% ${{ folder }}='Ginger'%}
218218
run: |
219+
dir "D:\a\Ginger\Ginger\Ginger\Ginger\bin\Release\"
219220
copy D:\a\Ginger\Ginger\Ginger\Ginger\bin\Release\net8.0-windows10.0.17763.0\GingerCore.dll D:\a\Ginger\Ginger\Ginger\Ginger\bin\Release\net8.0-windows10.0.17763.0\dist\GingerCore.dll
220221
copy D:\a\Ginger\Ginger\Ginger\Ginger\bin\Release\net8.0-windows10.0.17763.0\Ginger.dll D:\a\Ginger\Ginger\Ginger\Ginger\bin\Release\net8.0-windows10.0.17763.0\dist\Ginger.dll
221222
copy D:\a\Ginger\Ginger\Ginger\Ginger\bin\Release\net8.0-windows10.0.17763.0\Ginger.ExecuterService.Contracts.dll D:\a\Ginger\Ginger\Ginger\Ginger\bin\Release\net8.0-windows10.0.17763.0\dist\Ginger.ExecuterService.Contracts.dll

‎.github/workflows/Test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ jobs:
5353

5454

5555
# ------------------------------------------------------------------------------------------------------
56-
# Install .Net core SDK 8.0.100
56+
# Install .Net core SDK 10.0.103
5757
# ------------------------------------------------------------------------------------------------------
5858
- name: Setup .NET
5959
uses: actions/setup-dotnet@v3
6060
with:
61-
dotnet-version: 8.0.100
61+
dotnet-version: 10.0.103
6262
# ------------------------------------------------------------------------------------------------------
6363
# Install Mono - for Ubuntu as pre-requisite for building Ginger
6464
# ------------------------------------------------------------------------------------------------------

‎CLITests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Write-Host "-------------------------------------------------------------"
22
Write-Host "- Run CLI Tests -"
33
Write-Host "-------------------------------------------------------------"
44

5-
cd /home/vsts/work/1/s/Ginger/GingerRuntime/bin/Release/net8.0/publish/
5+
cd /home/vsts/work/1/s/Ginger/GingerRuntime/bin/Release/net10.0/publish/
66

77

88
Write-Host "******************************************************************************************************************************"

‎CLITestsGithub.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ echo "-------------------------------------------------------------"
22
echo "- Run CLI Tests -"
33
echo "-------------------------------------------------------------"
44

5-
cd /home/runner/work/Ginger/Ginger/Ginger/GingerRuntime/bin/Release/net8.0/publish/
5+
cd /home/runner/work/Ginger/Ginger/Ginger/GingerRuntime/bin/Release/net10.0/publish/
66

77
pwd
88
ls -alt

‎CLITestsGithub.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ echo "-------------------------------------------------------------"
22
echo "- Run CLI Tests -"
33
echo "-------------------------------------------------------------"
44

5-
cd /home/runner/work/Ginger/Ginger/Ginger/GingerRuntime/bin/Release/net8.0/linux-x64/publish/
5+
cd /home/runner/work/Ginger/Ginger/Ginger/GingerRuntime/bin/Release/net10.0/linux-x64/publish/
66
pwd
77
ls -alt
88

Extensions/DotnetDependencies/aspnetcore-runtime-8.0.22-win-x64.exe renamed to Extensions/DotnetDependencies/aspnetcore-runtime-10.0.3-win-x64.exe

10.1 MB
Binary file not shown.

Extensions/DotnetDependencies/windowsdesktop-runtime-8.0.22-win-x64.exe renamed to Extensions/DotnetDependencies/windowsdesktop-runtime-10.0.3-win-x64.exe

55.8 MB
Binary file not shown.

‎Ginger/Ginger/DataSource/DataSourceExportToExcelPage.xaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,20 @@
4343
<Ginger:ucGrid x:Name="xColumnListGrid" MaxHeight="250" AutomationProperties.AutomationId="ColumnListGrid AID" ShowTitle="Collapsed" ShowAdd="Collapsed" Width="500" HorizontalAlignment="Left" ShowClearAll="Collapsed" ShowUpDown="Collapsed" ShowRefresh="Collapsed" ShowEdit="Collapsed" ShowDelete="Collapsed" />
4444

4545
<CheckBox x:Name="xExportWhereChkBox" Content="Filter Record Based On Where Clause :" Click="xExportWhereChkBox_Click" Margin="0,20,0,5" FontWeight="Medium"/>
46-
46+
4747

4848
<Grid Name ="WhereGrid" Background="{StaticResource $BackgroundColor_White}">
4949
<Grid.Resources>
5050
<DataTemplate x:Key="ValueExpressionButton">
5151
<Button x:Name="GridVEButton" Content="..." Click="GridVEButton_Click" Style="{DynamicResource DataGridCellButtonStyle}"/>
5252
</DataTemplate>
5353
</Grid.Resources>
54-
<Grid.ColumnDefinitions/>
55-
<Grid.RowDefinitions/>
54+
<Grid.ColumnDefinitions>
55+
<ColumnDefinition Width="*"/>
56+
</Grid.ColumnDefinitions>
57+
<Grid.RowDefinitions>
58+
<RowDefinition Height="*"/>
59+
</Grid.RowDefinitions>
5660
<Ginger:ucGrid Grid.Row="0" x:Name="xGrdExportCondition" Height="190" Title="Where Condition(s)" Visibility="Collapsed" ShowUpDown="Collapsed"></Ginger:ucGrid>
5761
</Grid>
5862
</StackPanel>

‎Ginger/Ginger/Ginger.csproj‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
5+
<TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<Nullable>enable</Nullable>
88
<UseWPF>true</UseWPF>
@@ -734,26 +734,28 @@
734734
</ItemGroup>
735735

736736
<ItemGroup>
737-
<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
737+
<PackageReference Include="AvalonEdit" Version="6.3.1.120" />
738738
<PackageReference Include="CommandLineParser" Version="2.9.1" />
739-
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.1" />
739+
<PackageReference Include="DocumentFormat.OpenXml" Version="3.4.1" />
740740
<PackageReference Include="EPPlus" Version="6.0.4" />
741741
<PackageReference Include="FontAwesome6.Fonts" Version="2.5.1" />
742742
<PackageReference Include="FontAwesome6.Svg" Version="2.5.1" />
743743
<PackageReference Include="Gherkin" Version="5.1.0" />
744744
<PackageReference Include="Ginger.AccountReport.Contracts" Version="2025.4.0" />
745745
<PackageReference Include="Ginger.ExecuterService.Contracts" Version="2025.4.2.1" />
746-
<PackageReference Include="HtmlAgilityPack" Version="1.11.58" />
746+
<PackageReference Include="HtmlAgilityPack" Version="1.12.4" />
747747
<PackageReference Include="IdentityModel" Version="7.0.0" />
748748
<PackageReference Include="LiteDB" Version="5.0.21" />
749-
<PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.7" />
749+
<PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.8" />
750750
<PackageReference Include="log4net" Version="2.0.15" />
751-
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.0" />
752-
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
751+
<PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.10.2" />
752+
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="10.3.0" />
753+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.15.0" />
754+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.15.0" />
753755
<PackageReference Include="Microsoft.NETCore.App" Version="2.1.30" />
754756
<PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1001" />
755-
<PackageReference Include="Microsoft.VisualStudio.Services.MemberEntitlementManagement.WebApi" Version="16.205.1" />
756-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
757+
<PackageReference Include="Microsoft.VisualStudio.Services.MemberEntitlementManagement.WebApi" Version="19.225.2" />
758+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3719.77" />
757759
<PackageReference Include="Mono.Posix" Version="7.1.0-final.1.21458.1" />
758760
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
759761
<PackageReference Include="NSwag.Core.Yaml" Version="12.0.9" />
@@ -762,16 +764,17 @@
762764
<PackageReference Include="Selenium.WebDriver.IEDriver" Version="4.14.0" />
763765
<PackageReference Include="sharpadbclient" Version="2.3.23" />
764766
<PackageReference Include="Syncfusion.Shared.WPF" Version="20.1.0.55" />
765-
<PackageReference Include="System.Data.OleDb" Version="8.0.0" />
767+
<PackageReference Include="System.Data.OleDb" Version="10.0.3" />
766768
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
767-
<PackageReference Include="System.Drawing.Common" Version="9.0.5" />
769+
<PackageReference Include="System.Drawing.Common" Version="10.0.2" />
768770
<PackageReference Include="System.Formats.Asn1" Version="9.0.1" />
771+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
769772
<PackageReference Include="System.IO.Packaging" Version="9.0.1" />
770773
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.1" />
771-
<PackageReference Include="System.Management" Version="8.0.0" />
772-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.1" />
773-
<PackageReference Include="System.Text.Json" Version="9.0.1" />
774-
<PackageReference Include="System.Web.Services.Description" Version="8.0.0" />
774+
<PackageReference Include="System.Management" Version="10.0.3" />
775+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.3" />
776+
<PackageReference Include="System.Text.Json" Version="10.0.2" />
777+
<PackageReference Include="System.Web.Services.Description" Version="8.1.2" />
775778
<PackageReference Include="System.Windows.Forms.DataVisualization" Version="1.0.0-prerelease.20110.1" />
776779
<PackageReference Include="TWP.Selenium.Axe.Html" Version="0.0.1" />
777780
<PackageReference Include="UIAComWrapperNetstandard" Version="1.0.1">

0 commit comments

Comments
 (0)