Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build for TargetFramework 8.0 #822

Merged
merged 34 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2845033
Build for TargetFramework 7.0
claudiamurialdo May 29, 2023
4bdb560
Merge branch 'master' into dotnet7
claudiamurialdo May 29, 2023
c0d21a0
Install .NET7 for Build.yml and External-Storage-Tests.yml
claudiamurialdo May 29, 2023
0743bfe
Fix packaging error for duplicated content files.
claudiamurialdo May 30, 2023
bdfd2a0
Continue building Azure Functions only for .NET 6.0.
claudiamurialdo May 30, 2023
5d72499
Retarget Net7 to Net8.
claudiamurialdo Jun 27, 2023
4e7377a
Update requirements.
claudiamurialdo Jun 27, 2023
6801414
Include NET8 SDK on github workflow.
claudiamurialdo Jun 27, 2023
403e473
Fix error SYSLIB0051 Exception.Exception(SerializationInfo, Streaming…
claudiamurialdo Jun 27, 2023
a1f5fb6
Fix error SYSLIB0051 Exception.Exception(SerializationInfo, Streaming…
claudiamurialdo Jun 27, 2023
0991d35
Update dotnet version for the Fortify scan.
claudiamurialdo Jun 27, 2023
4dbc43e
Prepare project for multi target build.
claudiamurialdo Jun 27, 2023
39b60d3
Fix preview version of dotnet 8 in fortify scan.
claudiamurialdo Jun 28, 2023
5bd64f4
Change msbuild build tool by dotnet msbuild.
claudiamurialdo Jun 28, 2023
6eec0b4
Upgrade msbuild version.
claudiamurialdo Jun 28, 2023
2a20e46
Specify a preview version in global.json to allow building with 8.0 p…
claudiamurialdo Jun 28, 2023
b4eaea5
Upgrade msbuild for fortify-net-framework.yml
claudiamurialdo Jun 28, 2023
40300b4
Add Jayrock for net8.0
claudiamurialdo Jul 1, 2023
6a76003
Add jayrock lib for net8.0
claudiamurialdo Jul 1, 2023
890f557
Temporary include jayrock library for .NET8 package.
claudiamurialdo Jul 4, 2023
13148fa
Fix Startup warning: The WebRootPath was not found.
claudiamurialdo Aug 24, 2023
29a64a8
Merge branch 'master' into dotnet7
claudiamurialdo Aug 24, 2023
8e2aab5
Set the .NET version to 8 RC1 for packages
claudiamurialdo Oct 12, 2023
4f8a230
Merge branch 'master' into dotnet7
claudiamurialdo Oct 12, 2023
30d3c92
Fix version of RC1.
claudiamurialdo Oct 12, 2023
70428db
Merge branch 'dotnet7' of https://github.com/genexuslabs/DotNetClasse…
claudiamurialdo Oct 12, 2023
93527a1
Fix version. Remove Warning Unexpected input(s) 'include-prerelease'
claudiamurialdo Oct 12, 2023
7063703
Add the target framework 'net8.0' to projects that haven't been confi…
claudiamurialdo Oct 17, 2023
1844f8b
Add NET 8 support for Azure functions
sjuarezgx Oct 18, 2023
9a05bd5
Remove the target framework 6.0 from AzureFunctionsTest.csproj since …
claudiamurialdo Oct 18, 2023
c5081f8
Remove hardcoded GeneXus.Deploy.AzureFunctions.Handlers.runtimeconfig…
claudiamurialdo Oct 18, 2023
4f8670d
Remove the target framework 6.0 from AzureFunctionsTest.csproj since …
claudiamurialdo Oct 18, 2023
47d631b
Upgrade PackageHealthTest to test for net8.
claudiamurialdo Oct 31, 2023
7639911
Merge branch 'master' into dotnet7
claudiamurialdo Nov 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ jobs:
dotnet-version: '6.0.x'
include-prerelease: false

- name: Install .NET 8
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.100-rc.1.23455.8'

- name: Calculate environment variables
id: buildVariables
run: |
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/External-Storage-Tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ jobs:
uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.x'

- name: Install .NET 8
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.x'
include-prerelease: true

- name: Restore packages
run: dotnet restore $Env:SolutionFile
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/fortify-net-framework.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,22 @@ jobs:
with:
repository: ''

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.1
with:
vs-prerelease: true

# Java 8 required by ScanCentral Client and FoD Uploader(Univeral CI Tool)
- name: Setup Java
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1
- name: Install .NET 8
uses: actions/setup-dotnet@v3
with:
vs-version: 10.0
dotnet-version: '8.0.100-preview.3.23178.7'

- name: Create temporal solution
run: |
$fortifysolution = "FortifySolution"
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/fortify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,22 @@ jobs:
with:
repository: ''

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.1
with:
vs-prerelease: true

# Java 8 required by ScanCentral Client and FoD Uploader(Univeral CI Tool)
- name: Setup Java
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1
- name: Install .NET 8
uses: actions/setup-dotnet@v3
with:
vs-version: 10.0
dotnet-version: '8.0.100-preview.3.23178.7'

- name: Create temporal solution
run: |
$fortifysolution = "FortifySolution"
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/veracode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ jobs:
dotnet-version: '6.0.x'
include-prerelease: false

- name: Install .NET 8
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.x'
include-prerelease: true

- name: Build
run: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ This repository contains projects for .NET and .NET Framework. It is organized a
# How to build

## Requirements
- Visual Studio 2022
- .NET 6
- Visual Studio 2022 (17.6.1 if using .NET 8 up to preview 3 or 17.7 if using .NET 8 last preview).
- .NET 6 & .NET 8
- .NET Framework 4.7 DevPack

# Instructions
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
<RootNamespace>GeneXus.Data.NTier</RootNamespace>
<AssemblyName>GeneXus.Data.DynService.Core</AssemblyName>
<NoWarn>CA1812</NoWarn>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
<RootNamespace>GeneXus.Data.NTier</RootNamespace>
<AssemblyName>GeneXus.Data.DynService.DynamoDB</AssemblyName>
<SignAssembly>false</SignAssembly>
Expand Down
4 changes: 3 additions & 1 deletion dotnet/src/dotnetcommon/GxCryptography/EncryptionProvider.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography;
using System.IO;
Expand Down Expand Up @@ -58,7 +58,9 @@ public NativeSymmetricEncryption(string algorithm, int keySize)
_symAlg = Aes.Create();
break;
default:
#pragma warning disable SYSLIB0045 // Type or member is obsolete
_symAlg = SymmetricAlgorithm.Create(algorithm);
#pragma warning restore SYSLIB0045 // Type or member is obsolete
break;
}
if (_symAlg != null)
Expand Down
4 changes: 2 additions & 2 deletions dotnet/src/dotnetcommon/GxCryptography/GxCryptography.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
<RootNamespace>GxCryptography</RootNamespace>
<NoWarn>618;1607;1698;SYSLIB0021;SYSLIB0027;SYSLIB0028;SYSLIB0023</NoWarn>
<NoWarn>618;1607;1698;SYSLIB0021;SYSLIB0027;SYSLIB0028;SYSLIB0023;SYSLIB0022</NoWarn>
<AssemblyName>GxCryptography</AssemblyName>
<PackageTags>Data Access</PackageTags>
<PackageId>GeneXus.Cryptography</PackageId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
<RootNamespace>GxCryptographyCommon</RootNamespace>
<NoWarn>618;1607;1698</NoWarn>
<AssemblyName>GxCryptographyCommon</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcommon/GxEncrypt/GxEncrypt.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
<RootNamespace>GeneXus.Encryption</RootNamespace>
<AssemblyName>GxEncrypt</AssemblyName>
<PackageTags>Encrypt64 Decrypt64</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<RootNamespace>GeneXus.Data.NTier</RootNamespace>
<AssemblyName>GeneXus.Data.DynService.CosmosDB</AssemblyName>
<SignAssembly>false</SignAssembly>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>DynService OData</PackageTags>
<PackageId>GeneXus.DynService.OData.Core</PackageId>
Expand Down
18 changes: 11 additions & 7 deletions dotnet/src/dotnetcore/GxClasses.Web/GxClasses.Web.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<DefineConstants>NETCORE;</DefineConstants>
<PackageTags>GXGeolocation GXHttpServices WebSocket</PackageTags>
<PackageId>GeneXus.Classes.Web.Core</PackageId>
Expand Down Expand Up @@ -44,11 +44,15 @@
<Folder Include="Notifications\WebSocket\" />
<Folder Include="View\UserControls\" />
</ItemGroup>
<ItemGroup>
<Reference Include="Jayrock-JSON">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\libs\Jayrock.dll</HintPath>
</Reference>
</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>
</Reference>
</ItemGroup>

</Project>
31 changes: 23 additions & 8 deletions dotnet/src/dotnetcore/GxClasses/GxClasses.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;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>
Expand Down Expand Up @@ -188,11 +189,25 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<Reference Include="Jayrock-JSON">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\libs\Jayrock.dll</HintPath>
</Reference>
</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>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<PackageTags>DataInitialization</PackageTags>
<PackageId>GeneXus.DataInitialization.Core</PackageId>
Expand All @@ -19,11 +19,11 @@
<Target Name="CustomContentTarget">
<ItemGroup>
<TfmSpecificPackageFile Include="$(OutputPath)\$(MSBuildProjectName).deps.json">
<PackagePath>contentFiles/any/any</PackagePath>
<PackagePath>contentFiles/any/$(TargetFramework)</PackagePath>
<PackageCopyToOutput>true</PackageCopyToOutput>
</TfmSpecificPackageFile>
<TfmSpecificPackageFile Include="$(OutputPath)\$(MSBuildProjectName).runtimeconfig.json">
<PackagePath>contentFiles/any/any</PackagePath>
<PackagePath>contentFiles/any/$(TargetFramework)</PackagePath>
<PackageCopyToOutput>true</PackageCopyToOutput>
</TfmSpecificPackageFile>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxExcel/GxExcel.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<DefineConstants>NETCORE</DefineConstants>
<AssemblyName>GxExcelI</AssemblyName>
<PackageTags>EPPlus Lite</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxMail/GxMail.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<NoWarn>1701;1702;NU1701;CS0618</NoWarn>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>SMTP Exchange POP3</PackageTags>
Expand Down
23 changes: 14 additions & 9 deletions dotnet/src/dotnetcore/GxMaps/GxMaps.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<NoWarn>1701;1702;NU1701</NoWarn>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>Maps</PackageTags>
Expand All @@ -11,12 +11,17 @@
<Compile Include="..\..\dotnetframework\GxMaps\MapFunctions.cs" Link="MapFunctions.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\GxClasses\GxClasses.csproj" />
<Reference Include="Jayrock-JSON">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\libs\Jayrock.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\GxClasses\GxClasses.csproj" />
<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>
</Reference>
</ItemGroup>


</Project>
</Project>
13 changes: 9 additions & 4 deletions dotnet/src/dotnetcore/GxNetCoreStartup/GxNetCoreStartup.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<PackageTags>GxNetCoreStartup</PackageTags>
<PackageId>GeneXus.NetCoreStartup</PackageId>
<GxGenerateDepsFile>true</GxGenerateDepsFile>
Expand Down Expand Up @@ -34,20 +34,25 @@
<ProjectReference Include="..\GxClasses\GxClasses.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="Jayrock-JSON">
<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>
</Reference>
</ItemGroup>


<Target Name="CustomContentTarget">
<ItemGroup>
<TfmSpecificPackageFile Include="$(OutputPath)\$(MSBuildProjectName).deps.json">
<PackagePath>contentFiles/any/any</PackagePath>
<PackagePath>contentFiles/any/$(TargetFramework)</PackagePath>
<PackageCopyToOutput>true</PackageCopyToOutput>
</TfmSpecificPackageFile>
<TfmSpecificPackageFile Include="$(OutputPath)\$(MSBuildProjectName).runtimeconfig.json">
<PackagePath>contentFiles/any/any</PackagePath>
<PackagePath>contentFiles/any/$(TargetFramework)</PackagePath>
<PackageCopyToOutput>true</PackageCopyToOutput>
</TfmSpecificPackageFile>
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions dotnet/src/dotnetcore/GxNetCoreStartup/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ static IWebHost BuildWebHostPort(string[] args, string port, string schema)
return WebHost.CreateDefaultBuilder(args)
.UseUrls($"{schema}://*:{port}")
.UseStartup<Startup>()
.UseWebRoot(Startup.LocalPath)
.UseContentRoot(Startup.LocalPath)
.Build();
}
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxOffice/GxOffice.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<DefineConstants>NETCORE</DefineConstants>
<AssemblyName>Genexus.Office</AssemblyName>
<RootNamespace>GxOffice</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxPdfReportsCS/GxPdfReportsCS.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<NoWarn>1701;1702;NU1701</NoWarn>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>Itext PDF Report</PackageTags>
Expand Down
Loading
Loading