Skip to content

Commit 0233bd4

Browse files
claudiamurialdoclaudiamurialdo
authored
Merge branch 'master' into ExtendLogAPI
2 parents 1183f88 + e77b2e8 commit 0233bd4

File tree

314 files changed

+12538
-1838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

314 files changed

+12538
-1838
lines changed

‎.github/workflows/Build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Install .NET 8
4949
uses: actions/setup-dotnet@v3
5050
with:
51-
dotnet-version: '8.0.100-rc.1.23455.8'
51+
dotnet-version: '8.0.100'
5252

5353
- name: Calculate environment variables
5454
id: buildVariables
@@ -190,14 +190,14 @@ jobs:
190190
$PushToAzureArgs += "--skip-duplicate"
191191
}
192192
193-
dotnet $PushToAzureArgs
193+
dotnet $PushToAzureArgs || exit 1
194194
$pushedToAzure += 1
195195
196196
if (!$IsPrerelease) {
197-
dotnet $PushToGitHubArgs
197+
dotnet $PushToGitHubArgs || exit 1
198198
$pushedToGitHub += 1
199199
200-
dotnet $PushToNugetArgs
200+
dotnet $PushToNugetArgs || exit 1
201201
$pushedToNuget += 1
202202
}
203203

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

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Call Beta Bot
2+
3+
on:
4+
# Triggers the workflow on push to beta branch or changes in a pull request to main branch
5+
push:
6+
branches: [ "beta" ]
7+
pull_request:
8+
types: [ opened, synchronize, reopened, ready_for_review, closed, labeled, unlabeled ]
9+
branches: [ "master" ]
10+
11+
# Allows you to run this workflow manually from the Actions tab
12+
workflow_dispatch:
13+
14+
jobs:
15+
call-workflow:
16+
if: github.repository_owner == 'genexuslabs'
17+
uses: genexuslabs/build-genexus-reusable-workflow/.github/workflows/run-beta-bot.yml@main
18+
secrets: inherit

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Install .NET 8
5959
uses: actions/setup-dotnet@v3
6060
with:
61-
dotnet-version: '8.0.100-rc.1.23455.8'
61+
dotnet-version: '8.0.100'
6262

6363
- name: Create temporary solution
6464
run: |

‎.github/workflows/fortify-net-framework.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Install .NET 8
4242
uses: actions/setup-dotnet@v3
4343
with:
44-
dotnet-version: '8.0.100-preview.3.23178.7'
44+
dotnet-version: '8.0.100'
4545

4646
- name: Create temporal solution
4747
run: |

‎.github/workflows/fortify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Install .NET 8
4242
uses: actions/setup-dotnet@v3
4343
with:
44-
dotnet-version: '8.0.100-preview.3.23178.7'
44+
dotnet-version: '8.0.100'
4545

4646
- name: Create temporal solution
4747
run: |

‎README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# GeneXus Standard Classes for .NET and .NET Framework
22
GeneXus Standard Classes for .NET and .NET Framework generators.
33

4-
## Build status
5-
| Branch | Status
6-
|---|---
7-
|master|[![](https://github.com/genexuslabs/dotnetclasses/workflows/Build/badge.svg?branch=master)](https://github.com/genexuslabs/dotnetclasses/actions?query=workflow%3ABuild+branch%3Amaster)
8-
|beta|[![](https://github.com/genexuslabs/dotnetclasses/workflows/Build/badge.svg?branch=beta)](https://github.com/genexuslabs/dotnetclasses/actions?query=workflow%3ABuild+branch%3Abeta)
4+
## Repo status
5+
| Branch | Build | Security
6+
|---|---|---
7+
|master|[![](https://github.com/genexuslabs/dotnetclasses/workflows/Build/badge.svg?branch=master)](https://github.com/genexuslabs/dotnetclasses/actions?query=workflow%3ABuild+branch%3Amaster)|[![CodeQL](https://github.com/genexuslabs/DotNetClasses/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/genexuslabs/DotNetClasses/actions/workflows/codeql-analysis.yml)
8+
|beta|[![](https://github.com/genexuslabs/dotnetclasses/workflows/Build/badge.svg?branch=beta)](https://github.com/genexuslabs/dotnetclasses/actions?query=workflow%3ABuild+branch%3Abeta)|[![CodeQL](https://github.com/genexuslabs/DotNetClasses/actions/workflows/codeql-analysis.yml/badge.svg?branch=beta)](https://github.com/genexuslabs/DotNetClasses/actions/workflows/codeql-analysis.yml)
99

1010
## Modules
1111

@@ -66,7 +66,7 @@ This repository contains projects for .NET and .NET Framework. It is organized a
6666
# How to build
6767

6868
## Requirements
69-
- Visual Studio 2022 (17.6.1 if using .NET 8 up to preview 3 or 17.7 if using .NET 8 last preview).
69+
- Visual Studio 2022 (17.8 or higher).
7070
- .NET 6 & .NET 8
7171
- .NET Framework 4.7 DevPack
7272

‎dotnet/Directory.Build.props

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<AssemblyVersion>11.0.0.0</AssemblyVersion>
44
<MajorFileVersion>1</MajorFileVersion>
55
<MajorFileVersion Condition="$(GIT_REF.EndsWith('beta'))">$([MSBuild]::Add($(MajorFileVersion), 100))</MajorFileVersion>
6-
<MinorFileVersion>27</MinorFileVersion>
6+
<MinorFileVersion>31</MinorFileVersion>
77
<PatchFileVersion Condition="'$(COMMIT_NUMBER)'!=''">$(COMMIT_NUMBER)</PatchFileVersion>
88
<PatchFileVersion Condition="'$(COMMIT_NUMBER)'==''">0</PatchFileVersion>
99
<FileVersion>$(MajorFileVersion).$(MinorFileVersion).$(PatchFileVersion)</FileVersion>
@@ -29,6 +29,8 @@
2929
<NoWarn>NU5105;CS0618;CS8032;CS0618;SYSLIB0021;SYSLIB0023</NoWarn>
3030
<IsPackable>true</IsPackable>
3131
<DisableImplicitNamespaceImports>True</DisableImplicitNamespaceImports>
32+
<!--keep low and moderate vulnerabilities (NU1901;NU1902;NU1903;NU1904), high and critical vulnerabilities (NU1903 and NU1904) as warnings-->
33+
<WarningsNotAsErrors>NU1900;NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
3234
</PropertyGroup>
3335

3436
<Target Name="GetFileVersionForPackage">

‎dotnet/DotNetStandardClasses.sln

+32
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,19 @@ EndProject
250250
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCoreAttackMitigationTest", "test\DotNetCoreAttackMitigationTest\DotNetCoreAttackMitigationTest.csproj", "{2D615969-53E2-4B77-9A9A-75C33865CF76}"
251251
EndProject
252252
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCoreChunkedTest", "test\DotNetCoreChunkedTest\DotNetCoreChunkedTest.csproj", "{5D2B1299-479F-430A-8D72-34D44FB299FD}"
253+
EndProject
253254
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetPDFUnitTest", "test\DotNetPdfTest\DotNetPDFUnitTest.csproj", "{0FCFB078-5584-469F-92CC-61B0A6216D0D}"
254255
EndProject
256+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GXOtel.Diagnostics", "src\dotnetcore\Providers\OpenTelemetry\Diagnostics\GXOtel.Diagnostics\GXOtel.Diagnostics.csproj", "{A42066E8-DDB9-4767-AEFA-E6D13EFF051A}"
257+
EndProject
258+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCoreCmdTest", "test\DotNetCoreCmdTest\DotNetCoreCmdTest.csproj", "{956402BD-AC8C-426E-961B-B77B3F3EDAEB}"
259+
EndProject
260+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{46DAAFD1-FAF5-4904-8EC5-406BE04E5538}"
261+
EndProject
262+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LogTest", "test\benchmarks\LogTest\LogTest.csproj", "{A1DBDCE0-4F09-445F-A202-9B260CDD46CF}"
263+
EndProject
264+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccessTokenController_Test", "test\NativeAccessControllerTest\AccessTokenController_Test.csproj", "{A5589382-DB6F-4450-AE2B-6C6AA1643EF1}"
265+
EndProject
255266
Global
256267
GlobalSection(SolutionConfigurationPlatforms) = preSolution
257268
Debug|Any CPU = Debug|Any CPU
@@ -614,6 +625,22 @@ Global
614625
{0FCFB078-5584-469F-92CC-61B0A6216D0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
615626
{0FCFB078-5584-469F-92CC-61B0A6216D0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
616627
{0FCFB078-5584-469F-92CC-61B0A6216D0D}.Release|Any CPU.Build.0 = Release|Any CPU
628+
{A42066E8-DDB9-4767-AEFA-E6D13EFF051A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
629+
{A42066E8-DDB9-4767-AEFA-E6D13EFF051A}.Debug|Any CPU.Build.0 = Debug|Any CPU
630+
{A42066E8-DDB9-4767-AEFA-E6D13EFF051A}.Release|Any CPU.ActiveCfg = Release|Any CPU
631+
{A42066E8-DDB9-4767-AEFA-E6D13EFF051A}.Release|Any CPU.Build.0 = Release|Any CPU
632+
{956402BD-AC8C-426E-961B-B77B3F3EDAEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
633+
{956402BD-AC8C-426E-961B-B77B3F3EDAEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
634+
{956402BD-AC8C-426E-961B-B77B3F3EDAEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
635+
{956402BD-AC8C-426E-961B-B77B3F3EDAEB}.Release|Any CPU.Build.0 = Release|Any CPU
636+
{A1DBDCE0-4F09-445F-A202-9B260CDD46CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
637+
{A1DBDCE0-4F09-445F-A202-9B260CDD46CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
638+
{A1DBDCE0-4F09-445F-A202-9B260CDD46CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
639+
{A1DBDCE0-4F09-445F-A202-9B260CDD46CF}.Release|Any CPU.Build.0 = Release|Any CPU
640+
{A5589382-DB6F-4450-AE2B-6C6AA1643EF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
641+
{A5589382-DB6F-4450-AE2B-6C6AA1643EF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
642+
{A5589382-DB6F-4450-AE2B-6C6AA1643EF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
643+
{A5589382-DB6F-4450-AE2B-6C6AA1643EF1}.Release|Any CPU.Build.0 = Release|Any CPU
617644
EndGlobalSection
618645
GlobalSection(SolutionProperties) = preSolution
619646
HideSolutionNode = FALSE
@@ -735,6 +762,11 @@ Global
735762
{2D615969-53E2-4B77-9A9A-75C33865CF76} = {1D6F1776-FF4B-46C2-9B3D-BC46CCF049DC}
736763
{5D2B1299-479F-430A-8D72-34D44FB299FD} = {1D6F1776-FF4B-46C2-9B3D-BC46CCF049DC}
737764
{0FCFB078-5584-469F-92CC-61B0A6216D0D} = {1D6F1776-FF4B-46C2-9B3D-BC46CCF049DC}
765+
{A42066E8-DDB9-4767-AEFA-E6D13EFF051A} = {BBE020D4-C0FF-41A9-9EB1-D1EE12CC4BB8}
766+
{956402BD-AC8C-426E-961B-B77B3F3EDAEB} = {1D6F1776-FF4B-46C2-9B3D-BC46CCF049DC}
767+
{46DAAFD1-FAF5-4904-8EC5-406BE04E5538} = {1D6F1776-FF4B-46C2-9B3D-BC46CCF049DC}
768+
{A1DBDCE0-4F09-445F-A202-9B260CDD46CF} = {46DAAFD1-FAF5-4904-8EC5-406BE04E5538}
769+
{A5589382-DB6F-4450-AE2B-6C6AA1643EF1} = {1D6F1776-FF4B-46C2-9B3D-BC46CCF049DC}
738770
EndGlobalSection
739771
GlobalSection(ExtensibilityGlobals) = postSolution
740772
SolutionGuid = {E18684C9-7D76-45CD-BF24-E3944B7F174C}

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

+4
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,8 @@
1818
<ItemGroup Condition="'$(TargetFramework)'=='net462'">
1919
<ProjectReference Include="..\..\dotnetframework\GxClasses\GxClasses.csproj" />
2020
</ItemGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
24+
</ItemGroup>
2125
</Project>

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

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1617
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.0.103" />
1718
<ProjectReference Include="..\DynService.Core\DynService.Core.csproj" />
1819
</ItemGroup>

‎dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<PackageId>GeneXus.Encrypt</PackageId>
88
</PropertyGroup>
99
<ItemGroup Condition="'$(TargetFramework)'!='net462'">
10-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
10+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.35.0" />
1111
</ItemGroup>
1212
<ItemGroup Condition="'$(TargetFramework)'=='net462'">
13-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.5.1" />
13+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.34.0" />
1414
</ItemGroup>
1515

1616
</Project>

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Azure.Core" Version="1.35.0" />
16+
<PackageReference Include="Azure.Core" Version="1.36.0" />
1717
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.36.0" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1819
</ItemGroup>
1920

2021
<ItemGroup>

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

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<Compile Include="..\..\..\dotnetframework\DynServiceOData\DynServiceOData.cs" Link="DynServiceOData.cs" />
1313
</ItemGroup>
1414
<ItemGroup>
15+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1516
<PackageReference Include="GeneXus.Odata.Client" Version="5.2.3.8" />
1617
</ItemGroup>
1718
<ItemGroup>

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

+3-12
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
3435
</ItemGroup>
3536

3637
<ItemGroup>
@@ -44,15 +45,5 @@
4445
<Folder Include="Notifications\WebSocket\" />
4546
<Folder Include="View\UserControls\" />
4647
</ItemGroup>
47-
<ItemGroup>
48-
<Reference Include="Jayrock-JSON" Condition="'$(TargetFramework)'=='net8.0'">
49-
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\libs\net8.0\Jayrock.dll</HintPath>
51-
</Reference>
52-
<Reference Include="Jayrock-JSON" Condition="'$(TargetFramework)'=='net6.0'">
53-
<SpecificVersion>False</SpecificVersion>
54-
<HintPath>..\libs\Jayrock.dll</HintPath>
55-
</Reference>
56-
</ItemGroup>
5748

5849
</Project>

‎dotnet/src/dotnetcore/GxClasses.Web/Middleware/GXBCRestService.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ public override Task Post()
4343
bool gxinsertorupdate = IsRestParameter(INSERT_OR_UPDATE_PARAMETER);
4444

4545
GxSilentTrnSdt entity = (GxSilentTrnSdt)Activator.CreateInstance(_worker.GetType(), new Object[] { _gxContext });
46-
var entity_interface = MakeRestType(entity, false);
46+
object entity_interface = MakeRestType(entity, false);
4747
entity_interface = ReadRequestBodySDTObj(entity_interface.GetType());
4848

49-
var worker_interface = MakeRestType(_worker, false);
49+
object worker_interface = MakeRestType(_worker, false);
5050

5151
worker_interface.GetType().GetMethod("CopyFrom").Invoke(worker_interface, new object[] { entity_interface });
5252
if (gxcheck)
@@ -191,12 +191,12 @@ public override Task Put(object parameters)
191191
{
192192
bool gxcheck = IsRestParameter(CHECK_PARAMETER);
193193
GxSilentTrnSdt entity = (GxSilentTrnSdt)Activator.CreateInstance(_worker.GetType(), new Object[] { _gxContext });
194-
var entity_interface = MakeRestType(entity, false);
194+
object entity_interface = MakeRestType(entity, false);
195195
entity_interface = ReadRequestBodySDTObj(entity_interface.GetType());
196196
string entityHash = entity_interface.GetType().GetProperty("Hash").GetValue(entity_interface) as string;
197197

198198
ReflectionHelper.CallBCMethod(_worker, LOAD_METHOD, key);
199-
var worker_interface = MakeRestType(_worker, false);
199+
object worker_interface = MakeRestType(_worker, false);
200200
string currentHash = worker_interface.GetType().GetProperty("Hash").GetValue(worker_interface) as string;
201201
if (entityHash == currentHash)
202202
{
@@ -249,7 +249,7 @@ private object ReadRequestBodySDTObj(Type type)
249249
{
250250
using (var reader = new StreamReader(_httpContext.Request.Body))
251251
{
252-
var sdtData = reader.ReadToEnd();
252+
string sdtData = reader.ReadToEnd();
253253
using (MemoryStream stream = new MemoryStream(Encoding.UTF8.GetBytes(sdtData)))
254254
{
255255
DataContractJsonSerializer serializer = new DataContractJsonSerializer(type);

0 commit comments

Comments
 (0)