Skip to content

Commit

Permalink
Remove unused target framework net6.0 (#1078)
Browse files Browse the repository at this point in the history
* Remove unused Jayrock.dll
Move iTextAsian dependency to GxPdfReportsCS.csproj.

* Fix build error.

* MySQL and PostgreSQL drivers should not be downloaded when not necessary

* Remove unused target framework net6.0.
  • Loading branch information
claudiamurialdo authored Nov 14, 2024
1 parent 2f7131e commit e427380
Show file tree
Hide file tree
Showing 70 changed files with 86 additions and 91 deletions.
2 changes: 1 addition & 1 deletion dotnet/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
@@ -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>
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;net8.0</TargetFrameworks>
<TargetFrameworks>net462;net8.0</TargetFrameworks>
<RootNamespace>GeneXus.Data.NTier</RootNamespace>
<AssemblyName>GeneXus.Data.DynService.DynamoDB</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>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>
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;net8.0</TargetFrameworks>
<TargetFrameworks>net462;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;net8.0</TargetFrameworks>
<TargetFrameworks>net462;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>net8.0</TargetFrameworks>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>Dynservice</PackageTags>
<PackageId>GeneXus.DynService.Core.Core</PackageId>
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;net8.0</TargetFrameworks>
<TargetFrameworks>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>net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DefineConstants>NETCORE</DefineConstants>
<RootNamespace>GeneXus.Data.NTier</RootNamespace>
<AssemblyName>GeneXus.Data.DynService.DynamoDB</AssemblyName>
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;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>DynService OData</PackageTags>
<PackageId>GeneXus.DynService.OData.Core</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion 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;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DefineConstants>NETCORE;</DefineConstants>
<PackageTags>GXGeolocation GXHttpServices WebSocket</PackageTags>
<PackageId>GeneXus.Classes.Web.Core</PackageId>
Expand Down
26 changes: 3 additions & 23 deletions dotnet/src/dotnetcore/GxClasses/GxClasses.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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" />
Expand All @@ -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>
Original file line number Diff line number Diff line change
@@ -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>
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;net8.0</TargetFrameworks>
<TargetFrameworks>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;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<NoWarn>1701;1702;NU1701;CS0618</NoWarn>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>SMTP Exchange POP3</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion 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;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<NoWarn>1701;1702;NU1701</NoWarn>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>Maps</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<PackageTags>GxNetCoreStartup</PackageTags>
<PackageId>GeneXus.NetCoreStartup</PackageId>
<GxGenerateDepsFile>true</GxGenerateDepsFile>
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;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DefineConstants>NETCORE</DefineConstants>
<AssemblyName>Genexus.Office</AssemblyName>
<RootNamespace>GxOffice</RootNamespace>
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>net8.0</TargetFrameworks>
<NoWarn>1701;1702;NU1701</NoWarn>
<DefineConstants>NETCORE;ITEXT4</DefineConstants>
<AssemblyName>GxPdfReportsCS</AssemblyName>
Expand Down
20 changes: 19 additions & 1 deletion dotnet/src/dotnetcore/GxPdfReportsCS/GxPdfReportsCS.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<NoWarn>1701;1702;NU1701</NoWarn>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>Itext PDF Report</PackageTags>
<PackageId>GeneXus.PdfReportsCS.Core</PackageId>
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);CustomContentTarget</TargetsForTfmSpecificContentInPackage>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -38,4 +39,21 @@
<ItemGroup>
<ProjectReference Include="..\GxClasses\GxClasses.csproj" />
</ItemGroup>

<ItemGroup>
<Reference Include="iTextAsian" Condition="'$(TargetFramework)'=='net8.0'">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\libs\net8.0\iTextAsian.dll</HintPath>
</Reference>
</ItemGroup>

<Target Name="CustomContentTarget" Condition="'$(TargetFramework)'=='net8.0'">
<ItemGroup>
<TfmSpecificPackageFile Include="$(OutputPath)\iTextAsian.dll">
<PackagePath>lib/$(TargetFramework)</PackagePath>
<PackageCopyToOutput>true</PackageCopyToOutput>
</TfmSpecificPackageFile>
</ItemGroup>
</Target>

</Project>
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxSearch/GxSearch.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<NoWarn>1701;1702;NU1701;NU1603;CS0618</NoWarn>
<DefineConstants>NETCORE</DefineConstants>
<PackageTags>Lucene Search</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/dotnetcore/GxXsl/GxXsl.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<AssemblyName>GxXsl</AssemblyName>
<RootNamespace>GxXsl</RootNamespace>
<PackageTags>XML xsl apply</PackageTags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<AssemblyName>GeneXus.SD.Store.StoreManager</AssemblyName>
<RootNamespace>GeneXus.SD.Store</RootNamespace>
<PackageTags>StoreManager</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;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<PackageTags>Memcached</PackageTags>
<PackageId>GeneXus.Memcached.Core</PackageId>
<DefineConstants>NETCORE</DefineConstants>
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;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<PackageTags>Redis</PackageTags>
<PackageId>GeneXus.Redis.Core</PackageId>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<PackageId>GeneXus.AWS.Queue</PackageId>
<PackageTags>AWS SQS Queue Messaging</PackageTags>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<PackageId>GeneXus.Azure.EventGrid</PackageId>
<PackageTags>Azure EventGrid Messaging</PackageTags>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<PackageId>GeneXus.Azure.Queue</PackageId>
<PackageTags>Azure Queue Messaging</PackageTags>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<PackageId>GeneXus.Azure.ServiceBus</PackageId>
<PackageTags>Azure ServiceBus Messaging</PackageTags>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<PackageId>GeneXus.Message.EventRouter</PackageId>
<PackageTags>Event Bus Messaging Router</PackageTags>
<DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<PackageId>GeneXus.Message.MessageBroker</PackageId>
<PackageTags>Broker Messaging</PackageTags>
<DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
<PackageId>GeneXus.Message.Queue</PackageId>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<AssemblyName>GeneXus.OpenTelemetry</AssemblyName>
<PackageTags>OpenTelemetry GeneXus DotNet </PackageTags>
<PackageId>GeneXus.OpenTelemetry.OpenTelemetry</PackageId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DefineConstants>NETCORE;</DefineConstants>
<AppDesignerFolder>Properties</AppDesignerFolder>
<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;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DefineConstants>NETCORE;</DefineConstants>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SignAssembly>false</SignAssembly>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DefineConstants>NETCORE;</DefineConstants>
<AppDesignerFolder>Properties</AppDesignerFolder>
<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;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SignAssembly>false</SignAssembly>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
<AppDesignerFolder>Properties</AppDesignerFolder>
<SignAssembly>false</SignAssembly>
Expand Down
Loading

0 comments on commit e427380

Please sign in to comment.