Merge branch 'master' into azure-identity-update

.github/workflows/Build.yml

@@ -39,12 +39,6 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET 6
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: '6.0.x'
-        include-prerelease: false
-
     - name: Install .NET 8
       uses: actions/setup-dotnet@v3
       with:
@@ -59,25 +53,21 @@ jobs:
           'master' { 
             $IsPrerelease   = $true
             $IsMaster       = $true
-
             $SHOULD_DEPLOY  = 'true'
            }
 
           'beta' { 
             $IsPrerelease   = $true
-
             $SHOULD_DEPLOY  = 'true'
            }
 
           'release-*' {
             $IsPrerelease   = $false
-
             $SHOULD_DEPLOY  = 'true'
           }
 
           default {
             $IsPrerelease   = $false
-
             $SHOULD_DEPLOY  = 'false'
           }
         }
@@ -93,7 +83,7 @@ jobs:
         $NUGET_PACKAGE_VERSION = $GetFileVersionOutput
         
         if ($IsPrerelease -eq $true) {
-          $VersionTag =  @("trunk", "stable")[$IsMaster]
+          $VersionTag =  @("beta", "preview")[$IsMaster]
           $Timestamp = (Get-Date -AsUTC).ToString("yyyyMMddHHmmss")
           $NUGET_PACKAGE_VERSION = $NUGET_PACKAGE_VERSION + "-" + $VersionTag + "." + $Timestamp
         }
@@ -210,33 +200,14 @@ jobs:
         Write-Output "Number of packages pushed to GitHub: $pushedToGitHub"
         Write-Output "Number of packages pushed to Nuget.org: $pushedToNuget"
 
-  dispatch-build:
-    name: Dispatch build result
-    needs: build
-    if: github.repository_owner == 'GeneXusLabs' && needs.build.outputs.SHOULD_DEPLOY == 'true'
-
-    runs-on: ubuntu-latest
-
+  update-genexus-dependency:
     concurrency: 
       group: build-${{ github.ref }}
       cancel-in-progress: true
-
-    steps:
-      - name: Checkout action
-        uses: actions/checkout@v3
-        with:
-            repository: genexuslabs/dispatch-build-result
-            ref: releases/v2
-            token: ${{ secrets.SECURE_TOKEN }}
-            path: ./tmp/.github/actions/dispatch-build-result
-
-      - name: Dispatch build result
-        uses: ./tmp/.github/actions/dispatch-build-result
-        with:
-          component-name: ${{ github.event.inputs.repository }}
-          branch-ref: ${{ env.GIT_REF }}
-          new-version: ${{ needs.build.outputs.NUGET_VERSION }}
-          committer: ${{ needs.build.outputs.LAST_COMMITTER }}
-          commit-message: ${{ needs.build.outputs.COMMIT_MESSAGE }}
-          token: ${{ secrets.SECURE_TOKEN }}
-
+    uses: genexuslabs/build-genexus-reusable-workflow/.github/workflows/update-genexus-dep-version.yml@main
+    needs: build
+    if: github.repository_owner == 'genexuslabs' && needs.build.outputs.SHOULD_DEPLOY == 'true'
+    with: 
+      VERSION: ${{ needs.build.outputs.NUGET_VERSION }}
+      COMMITTER: ${{ needs.build.outputs.LAST_COMMITTER }}
+    secrets: inherit

.github/workflows/External-Storage-Tests.yml

@@ -28,11 +28,6 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install .NET 6
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: '6.0.x'
-
     - name: Install .NET 8
       uses: actions/setup-dotnet@v3
       with:

.github/workflows/call-beta-bot.yml

@@ -0,0 +1,18 @@
+name: Call Beta Bot
+
+on:
+  # Triggers the workflow on push to beta branch or changes in a pull request to main branch
+  push:
+    branches: [ "beta" ]
+  pull_request:
+    types: [ opened, synchronize, reopened, ready_for_review, closed, labeled, unlabeled ]
+    branches: [ "master" ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  call-workflow:
+    if: github.repository_owner == 'genexuslabs'
+    uses: genexuslabs/build-genexus-reusable-workflow/.github/workflows/run-beta-bot.yml@main
+    secrets: inherit

.github/workflows/codeql-analysis.yml

@@ -50,11 +50,6 @@ jobs:
         debug: true
         languages: ${{ matrix.language }}
 
-    - name: Install .NET 6
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: '6.0.x'
-
     - name: Install .NET 8
       uses: actions/setup-dotnet@v3
       with:
@@ -64,10 +59,10 @@ jobs:
       run: |
         $TempSolution = "CodeqlSolution"
         dotnet new sln --name $TempSolution --output dotnet --force
-        dotnet msbuild dotnet\DotNetStandardClasses.sln /t:DumpProjects -p:DumpSolutionName=$TempSolution /m:1 -p:DumpSolutionTargetFrameworkDefault=net6
+        dotnet msbuild dotnet\DotNetStandardClasses.sln /t:DumpProjects -p:DumpSolutionName=$TempSolution /m:1 -p:DumpSolutionTargetFrameworkDefault=net8
 
     - name: Build temporary solution
-      run: dotnet build dotnet\CodeqlSolution.sln --framework net6.0
+      run: dotnet build dotnet\CodeqlSolution.sln --framework net8.0
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)

.github/workflows/veracode.yml

@@ -44,12 +44,6 @@ jobs:
       with:
         repository: ''
 
-    - name: Install .NET 6
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: '6.0.x'
-        include-prerelease: false
-
     - name: Install .NET 8
       uses: actions/setup-dotnet@v3
       with:

README.md

@@ -85,11 +85,11 @@ For the following steps must be executed from inside ```dotnet``` directory:
 
 It compiles the solution and copies all the .NET Framework assemblies to the folder C:\KB\CSharpModel\web\bin.
 
-- ```dotnet msbuild /p:TF=net6.0 /p:DeployDirectory=C:\KB\NetModel\web\bin DotNetStandardClasses.sln```
+- ```dotnet msbuild /p:TF=net8.0 /p:DeployDirectory=C:\KB\NetModel\web\bin DotNetStandardClasses.sln```
 
-It compiles the solution and copies all the .NET 6 assemblies to the folder C:\KB\NetModel\web\bin.
+It compiles the solution and copies all the .NET 8 assemblies to the folder C:\KB\NetModel\web\bin.
 
-- TF: target framework that will be deployed. Valid values are: `net462` (for GeneXus NET Framework generator) and `net6.0` (for GeneXus NET generator).
+- TF: target framework that will be deployed. Valid values are: `net462` (for GeneXus NET Framework generator) and `net8.0` (for GeneXus NET generator).
 - DeployDirectory: specifies the target directory to copy assemblies.
 
 

dotnet/Directory.Build.props

@@ -2,8 +2,7 @@
 	<PropertyGroup>
 		<AssemblyVersion>11.0.0.0</AssemblyVersion>
 		<MajorFileVersion>1</MajorFileVersion>
-		<MajorFileVersion Condition="$(GIT_REF.EndsWith('beta'))">$([MSBuild]::Add($(MajorFileVersion), 100))</MajorFileVersion>
-		<MinorFileVersion>31</MinorFileVersion>
+		<MinorFileVersion>32</MinorFileVersion>
 		<PatchFileVersion Condition="'$(COMMIT_NUMBER)'!=''">$(COMMIT_NUMBER)</PatchFileVersion>
 		<PatchFileVersion Condition="'$(COMMIT_NUMBER)'==''">0</PatchFileVersion>
 		<FileVersion>$(MajorFileVersion).$(MinorFileVersion).$(PatchFileVersion)</FileVersion>

dotnet/Directory.Build.targets

@@ -14,7 +14,7 @@
 
 	<PropertyGroup>
 		<DumpSolutionName>TempSolution</DumpSolutionName>
-		<DumpSolutionTargetFrameworkDefault>net6</DumpSolutionTargetFrameworkDefault>
+		<DumpSolutionTargetFrameworkDefault>net8</DumpSolutionTargetFrameworkDefault>
 	</PropertyGroup>
 
 	<Target Name="CopyAssemblies" Condition="'$(ProjectName)'!='' AND '$(TargetFramework)'=='$(TF)' AND '$(DeployDirectory)'!='' AND '$(IsPackable)'=='true'" AfterTargets="Build">
@@ -28,7 +28,7 @@
 	</Target>
 
 	<Target Name="PublishForAnalyzer">
-		<Exec Command="dotnet publish $(MSBuildThisFileDirectory)$(DumpSolutionName).sln --configuration Debug -o $(MSBuildThisFileDirectory)..\.out -p:Publishing=true -p:SignAssembly=false --framework net6.0"></Exec>
+		<Exec Command="dotnet publish $(MSBuildThisFileDirectory)$(DumpSolutionName).sln --configuration Debug -o $(MSBuildThisFileDirectory)..\.out -p:Publishing=true -p:SignAssembly=false --framework net8.0"></Exec>
 	</Target>
 
 </Project>

dotnet/DotNetStandardClasses.sln

@@ -263,6 +263,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogTest", "test\benchmarks\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccessTokenController_Test", "test\NativeAccessControllerTest\AccessTokenController_Test.csproj", "{A5589382-DB6F-4450-AE2B-6C6AA1643EF1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Functions", "Functions", "{E59B3248-4C26-4DB0-96CB-67437319E22B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -767,6 +769,7 @@ Global
 		{46DAAFD1-FAF5-4904-8EC5-406BE04E5538} = {1D6F1776-FF4B-46C2-9B3D-BC46CCF049DC}
 		{A1DBDCE0-4F09-445F-A202-9B260CDD46CF} = {46DAAFD1-FAF5-4904-8EC5-406BE04E5538}
 		{A5589382-DB6F-4450-AE2B-6C6AA1643EF1} = {1D6F1776-FF4B-46C2-9B3D-BC46CCF049DC}
+		{E59B3248-4C26-4DB0-96CB-67437319E22B} = {41E1D031-799F-484F-85DE-7A30AF1A6FBA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E18684C9-7D76-45CD-BF24-E3944B7F174C}

dotnet/src/dotnetcommon/DynService.Core/DynService.Core.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net462;net8.0</TargetFrameworks>
 		<RootNamespace>GeneXus.Data.NTier</RootNamespace>
 		<AssemblyName>GeneXus.Data.DynService.Core</AssemblyName>
 		<NoWarn>CA1812</NoWarn>

dotnet/src/dotnetcommon/DynService.Dynamo/DynService.DynamoDB.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net462;net8.0</TargetFrameworks>
 		<RootNamespace>GeneXus.Data.NTier</RootNamespace>
 		<AssemblyName>GeneXus.Data.DynService.DynamoDB</AssemblyName>
 		<SignAssembly>false</SignAssembly>

dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net462;net8.0</TargetFrameworks>
 		<RootNamespace>GxCryptography</RootNamespace>
 		<NoWarn>618;1607;1698;SYSLIB0021;SYSLIB0027;SYSLIB0028;SYSLIB0023;SYSLIB0022</NoWarn>
 		<AssemblyName>GxCryptography</AssemblyName>

dotnet/src/dotnetcommon/GxCryptographyCommon/GxCryptographyCommon.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net462;net8.0</TargetFrameworks>
 		<RootNamespace>GxCryptographyCommon</RootNamespace>
 		<NoWarn>618;1607;1698</NoWarn>
 		<AssemblyName>GxCryptographyCommon</AssemblyName>

dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net462;net8.0</TargetFrameworks>
 		<RootNamespace>GeneXus.Encryption</RootNamespace>
 		<AssemblyName>GxEncrypt</AssemblyName>
 		<PackageTags>Encrypt64 Decrypt64</PackageTags>

dotnet/src/dotnetcore/DynService/Core/DynService.Core.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<DefineConstants>NETCORE</DefineConstants>
 		<PackageTags>Dynservice</PackageTags>
 		<PackageId>GeneXus.DynService.Core.Core</PackageId>

dotnet/src/dotnetcore/DynService/Cosmos/DynService.CosmosDB.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<RootNamespace>GeneXus.Data.NTier</RootNamespace>
 		<AssemblyName>GeneXus.Data.DynService.CosmosDB</AssemblyName>
 		<SignAssembly>false</SignAssembly>
@@ -13,7 +13,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Azure.Core" Version="1.36.0" />
+		<PackageReference Include="Azure.Core" Version="1.42.0" />
 		<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.36.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
 	</ItemGroup>

dotnet/src/dotnetcore/DynService/Dynamo/DynService.DynamoDB.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<DefineConstants>NETCORE</DefineConstants>
 		<RootNamespace>GeneXus.Data.NTier</RootNamespace>
 		<AssemblyName>GeneXus.Data.DynService.DynamoDB</AssemblyName>

dotnet/src/dotnetcore/DynService/OData/DynServiceOData.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<DefineConstants>NETCORE</DefineConstants>
 		<PackageTags>DynService OData</PackageTags>
 		<PackageId>GeneXus.DynService.OData.Core</PackageId>

dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<DefineConstants>NETCORE;</DefineConstants>
 		<PackageTags>GXGeolocation GXHttpServices WebSocket</PackageTags>
 		<PackageId>GeneXus.Classes.Web.Core</PackageId>

dotnet/src/dotnetcore/GxClasses.Web/Middleware/HandlerFactory.cs

@@ -270,7 +270,7 @@ internal static Type GetHandlerType(string assemblyName, string className)
 			try
 			{
 
-                objType = GeneXus.Metadata.ClassLoader.FindType(assemblyName, className, null);
+                objType = GeneXus.Metadata.ClassLoader.FindType(assemblyName, className, null, false, true);
 				if (objType == null)
 
 					objType = Assembly.Load(new AssemblyName(assemblyName)).GetType(className);

dotnet/src/dotnetcore/GxClasses/GxClasses.csproj

@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<OutputType>Library</OutputType>
 		<DefineConstants>NETCORE;NODATIME</DefineConstants>
 		<PackageTags>Data Access</PackageTags>
 		<PackageId>GeneXus.Classes.Core</PackageId>
 		<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
 		<NoWarn>618;1607;1698;SYSLIB0021;SYSLIB0027;SYSLIB0028;SYSLIB0023</NoWarn>
-		<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);CustomContentTarget</TargetsForTfmSpecificContentInPackage>
 	</PropertyGroup>
 
    <ItemGroup>
@@ -165,11 +164,11 @@
 		<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" PrivateAssets="All" />
 		<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
-		<PackageReference Include="MySqlConnector" Version="2.2.3" />
+		<PackageReference Include="MySqlConnector" Version="2.2.3" PrivateAssets="All"/>
 		<PackageReference Include="NetTopologySuite" Version="2.0.0" />
 		<PackageReference Include="NodaTime" Version="3.1.9" />
 		<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.3.1" />
-		<PackageReference Include="Npgsql" Version="8.0.3" />
+		<PackageReference Include="Npgsql" Version="8.0.3"  PrivateAssets="All"/>
 		<PackageReference Include="Sandwych.GeographicLib" Version="1.49.3" />
 		<PackageReference Include="Stubble.Core" Version="1.8.4" />
 		<PackageReference Include="System.DirectoryServices" Version="4.7.0" />
@@ -189,24 +188,5 @@
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<Reference Include="Jayrock-JSON" Condition="'$(TargetFramework)'=='net8.0'">
-			<SpecificVersion>False</SpecificVersion>
-			<HintPath>..\libs\net8.0\Jayrock.dll</HintPath>
-		</Reference>
-		<Reference Include="Jayrock-JSON" Condition="'$(TargetFramework)'=='net6.0'">
-			<SpecificVersion>False</SpecificVersion>
-			<HintPath>..\libs\Jayrock.dll</HintPath>
-			<Private>True</Private>
-		</Reference>
-	</ItemGroup>
-	<Target Name="CustomContentTarget" Condition="'$(TargetFramework)'=='net8.0'">
-		<ItemGroup>
-			<TfmSpecificPackageFile Include="$(OutputPath)\Jayrock.dll">
-				<PackagePath>lib/$(TargetFramework)</PackagePath>
-				<PackageCopyToOutput>true</PackageCopyToOutput>
-			</TfmSpecificPackageFile>
-		</ItemGroup>
-	</Target>
 
 </Project>

dotnet/src/dotnetcore/GxDataInitialization/GXDataInitialization.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<PackageTags>DataInitialization</PackageTags>
 		<PackageId>GeneXus.DataInitialization.Core</PackageId>

dotnet/src/dotnetcore/GxExcel/GxExcel.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <DefineConstants>NETCORE</DefineConstants>
     <AssemblyName>GxExcelI</AssemblyName>
 	<PackageTags>EPPlus Lite</PackageTags>