Skip to content

Commit 376af58

Browse files
Merge branch 'master' into before-after-events-error-improvement
2 parents 6f619e8 + e77b2e8 commit 376af58

File tree

411 files changed

+24411
-4572
lines changed

Some content is hidden

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

411 files changed

+24411
-4572
lines changed

.github/workflows/Build.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ jobs:
4545
dotnet-version: '6.0.x'
4646
include-prerelease: false
4747

48+
- name: Install .NET 8
49+
uses: actions/setup-dotnet@v3
50+
with:
51+
dotnet-version: '8.0.100'
52+
4853
- name: Calculate environment variables
4954
id: buildVariables
5055
run: |
@@ -185,14 +190,14 @@ jobs:
185190
$PushToAzureArgs += "--skip-duplicate"
186191
}
187192
188-
dotnet $PushToAzureArgs
193+
dotnet $PushToAzureArgs || exit 1
189194
$pushedToAzure += 1
190195
191196
if (!$IsPrerelease) {
192-
dotnet $PushToGitHubArgs
197+
dotnet $PushToGitHubArgs || exit 1
193198
$pushedToGitHub += 1
194199
195-
dotnet $PushToNugetArgs
200+
dotnet $PushToNugetArgs || exit 1
196201
$pushedToNuget += 1
197202
}
198203

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ jobs:
3232
uses: actions/setup-dotnet@v2
3333
with:
3434
dotnet-version: '6.0.x'
35+
36+
- name: Install .NET 8
37+
uses: actions/setup-dotnet@v3
38+
with:
39+
dotnet-version: '8.x'
40+
include-prerelease: true
3541

3642
- name: Restore packages
3743
run: dotnet restore $Env:SolutionFile
Lines changed: 18 additions & 0 deletions
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
Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
# ******** NOTE ********
12+
13+
name: "CodeQL"
14+
15+
on:
16+
push:
17+
branches: [ master, beta*, release-* ]
18+
pull_request:
19+
# The branches below must be a subset of the branches above
20+
branches: [ master ]
21+
schedule:
22+
- cron: '28 9 * * 6'
23+
24+
jobs:
25+
analyze:
26+
name: Analyze
27+
runs-on: windows-latest
28+
29+
env:
30+
Configuration: Release
31+
SolutionFile: dotnet\CodeqlSolution.sln
32+
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
language: [ 'csharp' ]
37+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
38+
# Learn more...
39+
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
40+
41+
steps:
42+
43+
- name: Checkout repository
44+
uses: actions/checkout@v3
45+
46+
# Initializes the CodeQL tools for scanning.
47+
- name: Initialize CodeQL
48+
uses: github/codeql-action/init@v2
49+
with:
50+
debug: true
51+
languages: ${{ matrix.language }}
52+
53+
- name: Install .NET 6
54+
uses: actions/setup-dotnet@v3
55+
with:
56+
dotnet-version: '6.0.x'
57+
58+
- name: Install .NET 8
59+
uses: actions/setup-dotnet@v3
60+
with:
61+
dotnet-version: '8.0.100'
62+
63+
- name: Create temporary solution
64+
run: |
65+
$TempSolution = "CodeqlSolution"
66+
dotnet new sln --name $TempSolution --output dotnet --force
67+
dotnet msbuild dotnet\DotNetStandardClasses.sln /t:DumpProjects -p:DumpSolutionName=$TempSolution /m:1 -p:DumpSolutionTargetFrameworkDefault=net6
68+
69+
- name: Build temporary solution
70+
run: dotnet build dotnet\CodeqlSolution.sln --framework net6.0
71+
72+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
73+
# If this step fails, then you should remove it and run the build manually (see below)
74+
#- name: Autobuild
75+
# uses: github/codeql-action/autobuild@v2
76+
77+
# ℹ️ Command-line programs to run using the OS shell.
78+
# 📚 https://git.io/JvXDl
79+
80+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
81+
# and modify them (or add more) to build your code if your project
82+
# uses a compiled language
83+
84+
#- run: |
85+
# make bootstrap
86+
# make release
87+
88+
- name: Perform CodeQL Analysis
89+
uses: github/codeql-action/analyze@v2
90+
with:
91+
category: "/language:${{matrix.language}}"

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,22 @@ jobs:
2727
with:
2828
repository: ''
2929

30+
- name: Setup MSBuild
31+
uses: microsoft/setup-msbuild@v1.1
32+
with:
33+
vs-prerelease: true
34+
3035
# Java 8 required by ScanCentral Client and FoD Uploader(Univeral CI Tool)
3136
- name: Setup Java
3237
uses: actions/setup-java@v1
3338
with:
3439
java-version: 1.8
35-
36-
- name: Setup MSBuild
37-
uses: microsoft/setup-msbuild@v1
40+
41+
- name: Install .NET 8
42+
uses: actions/setup-dotnet@v3
3843
with:
39-
vs-version: 10.0
40-
44+
dotnet-version: '8.0.100'
45+
4146
- name: Create temporal solution
4247
run: |
4348
$fortifysolution = "FortifySolution"

.github/workflows/fortify.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,22 @@ jobs:
2727
with:
2828
repository: ''
2929

30+
- name: Setup MSBuild
31+
uses: microsoft/setup-msbuild@v1.1
32+
with:
33+
vs-prerelease: true
34+
3035
# Java 8 required by ScanCentral Client and FoD Uploader(Univeral CI Tool)
3136
- name: Setup Java
3237
uses: actions/setup-java@v1
3338
with:
3439
java-version: 1.8
35-
36-
- name: Setup MSBuild
37-
uses: microsoft/setup-msbuild@v1
40+
41+
- name: Install .NET 8
42+
uses: actions/setup-dotnet@v3
3843
with:
39-
vs-version: 10.0
40-
44+
dotnet-version: '8.0.100'
45+
4146
- name: Create temporal solution
4247
run: |
4348
$fortifysolution = "FortifySolution"

.github/workflows/veracode.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ jobs:
5050
dotnet-version: '6.0.x'
5151
include-prerelease: false
5252

53+
- name: Install .NET 8
54+
uses: actions/setup-dotnet@v3
55+
with:
56+
dotnet-version: '8.x'
57+
include-prerelease: true
5358

5459
- name: Build
5560
run: |
@@ -90,7 +95,7 @@ jobs:
9095
pipeline-results-json: results.json
9196
source-base-path-1: "^.*/${{ github.event.repository.name }}/dotnet/:dotnet/"
9297

93-
- uses: github/codeql-action/upload-sarif@v1
98+
- uses: github/codeql-action/upload-sarif@v2
9499
with:
95100
# Path to SARIF file relative to the root of the repository
96101
sarif_file: veracode-results.sarif

README.md

Lines changed: 7 additions & 7 deletions
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,8 +66,8 @@ This repository contains projects for .NET and .NET Framework. It is organized a
6666
# How to build
6767

6868
## Requirements
69-
- Visual Studio 2022
70-
- .NET 6
69+
- Visual Studio 2022 (17.8 or higher).
70+
- .NET 6 & .NET 8
7171
- .NET Framework 4.7 DevPack
7272

7373
# Instructions

dotnet/Directory.Build.props

Lines changed: 3 additions & 1 deletion
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>25</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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,26 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GxOffice", "src\dotnetcore\
243243
EndProject
244244
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "excel", "excel", "{B521FF6D-E081-4DE6-AC00-A9BE3B6439D1}"
245245
EndProject
246+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GXEventRouter", "src\dotnetcore\Providers\Messaging\GXEventRouter\GXEventRouter.csproj", "{5BBC75F0-E51A-4EBD-A628-92498D319B1D}"
247+
EndProject
248+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GXAzureEventGrid", "src\dotnetcore\Providers\Messaging\GXAzureEventGrid\GXAzureEventGrid.csproj", "{7250CDB1-95C4-4822-B01B-3CBD73324CC9}"
249+
EndProject
250+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCoreAttackMitigationTest", "test\DotNetCoreAttackMitigationTest\DotNetCoreAttackMitigationTest.csproj", "{2D615969-53E2-4B77-9A9A-75C33865CF76}"
251+
EndProject
252+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCoreChunkedTest", "test\DotNetCoreChunkedTest\DotNetCoreChunkedTest.csproj", "{5D2B1299-479F-430A-8D72-34D44FB299FD}"
253+
EndProject
254+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetPDFUnitTest", "test\DotNetPdfTest\DotNetPDFUnitTest.csproj", "{0FCFB078-5584-469F-92CC-61B0A6216D0D}"
255+
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
246266
Global
247267
GlobalSection(SolutionConfigurationPlatforms) = preSolution
248268
Debug|Any CPU = Debug|Any CPU
@@ -585,6 +605,42 @@ Global
585605
{E1CD114A-F8A5-4246-B5E3-FD27EDEC7C82}.Debug|Any CPU.Build.0 = Debug|Any CPU
586606
{E1CD114A-F8A5-4246-B5E3-FD27EDEC7C82}.Release|Any CPU.ActiveCfg = Release|Any CPU
587607
{E1CD114A-F8A5-4246-B5E3-FD27EDEC7C82}.Release|Any CPU.Build.0 = Release|Any CPU
608+
{5BBC75F0-E51A-4EBD-A628-92498D319B1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
609+
{5BBC75F0-E51A-4EBD-A628-92498D319B1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
610+
{5BBC75F0-E51A-4EBD-A628-92498D319B1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
611+
{5BBC75F0-E51A-4EBD-A628-92498D319B1D}.Release|Any CPU.Build.0 = Release|Any CPU
612+
{7250CDB1-95C4-4822-B01B-3CBD73324CC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
613+
{7250CDB1-95C4-4822-B01B-3CBD73324CC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
614+
{7250CDB1-95C4-4822-B01B-3CBD73324CC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
615+
{7250CDB1-95C4-4822-B01B-3CBD73324CC9}.Release|Any CPU.Build.0 = Release|Any CPU
616+
{2D615969-53E2-4B77-9A9A-75C33865CF76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
617+
{2D615969-53E2-4B77-9A9A-75C33865CF76}.Debug|Any CPU.Build.0 = Debug|Any CPU
618+
{2D615969-53E2-4B77-9A9A-75C33865CF76}.Release|Any CPU.ActiveCfg = Release|Any CPU
619+
{2D615969-53E2-4B77-9A9A-75C33865CF76}.Release|Any CPU.Build.0 = Release|Any CPU
620+
{5D2B1299-479F-430A-8D72-34D44FB299FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
621+
{5D2B1299-479F-430A-8D72-34D44FB299FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
622+
{5D2B1299-479F-430A-8D72-34D44FB299FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
623+
{5D2B1299-479F-430A-8D72-34D44FB299FD}.Release|Any CPU.Build.0 = Release|Any CPU
624+
{0FCFB078-5584-469F-92CC-61B0A6216D0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
625+
{0FCFB078-5584-469F-92CC-61B0A6216D0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
626+
{0FCFB078-5584-469F-92CC-61B0A6216D0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
627+
{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
588644
EndGlobalSection
589645
GlobalSection(SolutionProperties) = preSolution
590646
HideSolutionNode = FALSE
@@ -701,6 +757,16 @@ Global
701757
{BE108BE8-805D-4FCF-86BA-B2EAF581FFB2} = {F900A4AD-7249-41B4-B918-CB9E8C73747C}
702758
{E1CD114A-F8A5-4246-B5E3-FD27EDEC7C82} = {B521FF6D-E081-4DE6-AC00-A9BE3B6439D1}
703759
{B521FF6D-E081-4DE6-AC00-A9BE3B6439D1} = {2261B65E-3757-4E5B-9DCD-EAE8D1E236A3}
760+
{5BBC75F0-E51A-4EBD-A628-92498D319B1D} = {4C43F2DA-59E5-46F5-B691-195449498555}
761+
{7250CDB1-95C4-4822-B01B-3CBD73324CC9} = {30159B0F-BE61-4DB7-AC02-02851426BE4B}
762+
{2D615969-53E2-4B77-9A9A-75C33865CF76} = {1D6F1776-FF4B-46C2-9B3D-BC46CCF049DC}
763+
{5D2B1299-479F-430A-8D72-34D44FB299FD} = {1D6F1776-FF4B-46C2-9B3D-BC46CCF049DC}
764+
{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}
704770
EndGlobalSection
705771
GlobalSection(ExtensibilityGlobals) = postSolution
706772
SolutionGuid = {E18684C9-7D76-45CD-BF24-E3944B7F174C}

0 commit comments

Comments
 (0)