Skip to content

Commit 7c276c8

Browse files
claudiamurialdoclaudiamurialdo
committed
Update NodaTime version to include the latest timezone database
Remove Tz4net library which was stopeed using and marked as deprecated in v18u4 #811 Issue:204486
1 parent 1909035 commit 7c276c8

22 files changed

+16
-6490
lines changed

‎dotnet/src/dotnetcore/GxClasses/GlobalSuppressions.cs‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// This file is used by Code Analysis to maintain SuppressMessage
1+
// This file is used by Code Analysis to maintain SuppressMessage
22
// attributes that are applied to this project.
33
// Project-level suppressions either have no target or are given
44
// a specific target and scoped to a namespace, type, member, etc.
@@ -9,28 +9,3 @@
99
[assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>", Scope = "member", Target = "~M:GeneXus.Utils.GXUtil.findRegKey(System.String)~Microsoft.Win32.RegistryKey")]
1010
[assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>", Scope = "member", Target = "~M:GeneXus.Utils.GXUtil.ReadRegKey(System.String)~System.String")]
1111
[assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>", Scope = "member", Target = "~M:GeneXus.Utils.GXUtil.WriteRegKey(System.String,System.String)~System.Int16")]
12-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.Convert(System.String,System.DateTime,System.String)~System.DateTime")]
13-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.FindNameFromAlias(System.String)~System.String")]
14-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetInstance(System.String)~TZ4Net.OlsonTimeZone")]
15-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetInstanceFromAbbreviation(System.String)~TZ4Net.OlsonTimeZone")]
16-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetInstanceFromAlias(System.String)~TZ4Net.OlsonTimeZone")]
17-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetInstanceFromMilitaryLetter(System.String)~TZ4Net.OlsonTimeZone")]
18-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetInstanceFromMilitaryName(System.String)~TZ4Net.OlsonTimeZone")]
19-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetInstanceFromRegistryWin32Name(System.String)~TZ4Net.OlsonTimeZone")]
20-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetInstanceFromWin32Id(System.String)~TZ4Net.OlsonTimeZone")]
21-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetInstanceFromWin32Name(System.String)~TZ4Net.OlsonTimeZone")]
22-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetMilitaryNameFromLetter(System.String)~System.String")]
23-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetNameFromAbbreviation(System.String)~System.String")]
24-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetNameFromAlias(System.String)~System.String")]
25-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetNameFromMilitaryLetter(System.String)~System.String")]
26-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetNameFromMilitaryName(System.String)~System.String")]
27-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetNameFromRegistryWin32Name(System.String)~System.String")]
28-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetNameFromWin32Id(System.String)~System.String")]
29-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetNameFromWin32Name(System.String)~System.String")]
30-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetUtcOffset(System.DateTime)~System.TimeSpan")]
31-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.GetWin32NameFromWin32Id(System.String)~System.String")]
32-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.IsDaylightSavingTime(System.DateTime)~System.Boolean")]
33-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.LookupName(System.String)~System.String")]
34-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.ToLocalTime(System.DateTime)~System.DateTime")]
35-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.ToUniversalTime(System.DateTime)~System.DateTime")]
36-
[assembly: SuppressMessage("Maintainability", "CA1507:Use nameof to express symbol names", Justification = "<Pending>", Scope = "member", Target = "~M:TZ4Net.OlsonTimeZone.UnicodeWin32MapValue.#ctor(System.String,System.String)")]

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

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFrameworks>net8.0</TargetFrameworks>
55
<OutputType>Library</OutputType>
6-
<DefineConstants>NETCORE;NODATIME</DefineConstants>
6+
<DefineConstants>NETCORE</DefineConstants>
77
<PackageTags>Data Access</PackageTags>
88
<PackageId>GeneXus.Classes.Core</PackageId>
99
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
@@ -113,13 +113,6 @@
113113
<Compile Include="..\..\dotnetframework\GxClasses\UserControls\UserControlFactory.cs" Link="UserControls\UserControlFactory.cs" />
114114
<Compile Include="..\..\dotnetframework\GxClasses\UserControls\UserControlFactoryImpl.cs" Link="UserControls\UserControlFactoryImpl.cs" />
115115
<Compile Include="..\..\dotnetframework\GxClasses\UserControls\UserControlGenerator.cs" Link="UserControls\UserControlGenerator.cs" />
116-
<Compile Include="..\..\dotnetframework\TZ4Net\Converters\BigEndianBitConverter.cs" Link="Timezone\Converters\BigEndianBitConverter.cs" />
117-
<Compile Include="..\..\dotnetframework\TZ4Net\Converters\EndianBinaryReader.cs" Link="Timezone\Converters\EndianBinaryReader.cs" />
118-
<Compile Include="..\..\dotnetframework\TZ4Net\Converters\EndianBitConverter.cs" Link="Timezone\Converters\EndianBitConverter.cs" />
119-
<Compile Include="..\..\dotnetframework\TZ4Net\Converters\Endianness.cs" Link="Timezone\Converters\Endianness.cs" />
120-
<Compile Include="..\..\dotnetframework\TZ4Net\Converters\LittleEndianBitConverter.cs" Link="Timezone\Converters\LittleEndianBitConverter.cs" />
121-
<Compile Include="..\..\dotnetframework\TZ4Net\OlsonTimeZone.cs" Link="Timezone\OlsonTimeZone.cs" />
122-
<Compile Include="..\..\dotnetframework\TZ4Net\ZoneInfo.cs" Link="Timezone\ZoneInfo.cs" />
123116
</ItemGroup>
124117

125118
<ItemGroup>
@@ -130,7 +123,6 @@
130123
<Folder Include="Helpers\Cryptography\Signing\Standards\" />
131124
<Folder Include="Helpers\Process\" />
132125
<Folder Include="Services\CoreWebAPI\Helpers\" />
133-
<Folder Include="Timezone\Converters\" />
134126
<Folder Include="UserControls\" />
135127
<Folder Include="Printer\" />
136128
<Folder Include="Storage\" />
@@ -139,18 +131,6 @@
139131
<Folder Include="Services\Search\" />
140132
<Folder Include="Services\Storage\" />
141133
</ItemGroup>
142-
143-
<ItemGroup>
144-
<EmbeddedResource Include="..\..\dotnetframework\TZ4Net\cldrinfo.resources" Link="Timezone\cldrinfo.resources">
145-
<LogicalName>GxClasses.cldrinfo.resources</LogicalName>
146-
</EmbeddedResource>
147-
</ItemGroup>
148-
149-
<ItemGroup>
150-
<EmbeddedResource Include="..\..\dotnetframework\TZ4Net\zoneinfo.resources" Link="Timezone\zoneinfo.resources">
151-
<LogicalName>GxClasses.zoneinfo.resources</LogicalName>
152-
</EmbeddedResource>
153-
</ItemGroup>
154134
<ItemGroup>
155135
<PackageReference Include="Experimental.System.Messaging.Signed" Version="1.0.0" />
156136
<PackageReference Include="log4net" Version="2.0.15" />
@@ -171,7 +151,7 @@
171151
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
172152
<PackageReference Include="MySqlConnector" Version="2.2.3" PrivateAssets="All" />
173153
<PackageReference Include="NetTopologySuite" Version="2.0.0" />
174-
<PackageReference Include="NodaTime" Version="3.1.9" />
154+
<PackageReference Include="NodaTime" Version="3.2.2" />
175155
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.3.1" />
176156
<PackageReference Include="Npgsql" Version="8.0.3" PrivateAssets="All" />
177157
<PackageReference Include="Sandwych.GeographicLib" Version="1.49.3" />

0 commit comments

Comments
 (0)