[Infra] Adding .net6.0 support to the packages (microsoft#3086)

* [Infra] Adding .net6.0 support to the packages * [Infra] Update AppVetor image to Visual Studio 2022 * [Infra] Update PR build script * [Infra] restore projects one by one * [Infra] Removing the NuGet.Config for the PR build * [Infra] MSBuild * [Infra] Restore * [Infra] fixing PR pipeline * [Infra] Nuget 5.8 * [Infra] msbuild * [Infra] typo in TargetFramework * [Infra] back to nuget.exe * [Infra] upgrade nuget.exe to 6.x * [Infra] returning the build back * [Infra] echo nuget version * -[Infra] fixing typo in validation project * [Infra] fixing JAVA path * [Infra] typo fix * [Infra] fix cd * [Infra] clean ups * [Infra] removing net6 from validationTool project * [Infra] change ValidationTool to net6.0 only * [Infra] upgrade to python 3.11 with fixing the failing tests * [Infra] clean-up
marmikreal · Apr 3, 2023 · 3802de2 · 3802de2
1 parent 665ad11
commit 3802de2
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 20 deletions.
diff --git a/.NET/Build.CI.cmd b/.NET/Build.CI.cmd
@@ -53,7 +53,7 @@ IF %ERRORLEVEL% NEQ 0 (
 
 ECHO.
 ECHO # Restoring NuGet dependencies
-CALL "buildtools\nuget" restore
+CALL !MSBuild! Microsoft.Recognizers.Text.sln /t:Restore
 
 set configuration=Release
 ECHO.

diff --git a/.NET/Microsoft.Recognizers.Definitions/Microsoft.Recognizers.Definitions.csproj b/.NET/Microsoft.Recognizers.Definitions/Microsoft.Recognizers.Definitions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net462;net6.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <!-- Disable GenerateAssemblyInfo to use the existing AssemblyInfo.cs -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/.NET/Microsoft.Recognizers.Text.Choice/Microsoft.Recognizers.Text.Choice.csproj b/.NET/Microsoft.Recognizers.Text.Choice/Microsoft.Recognizers.Text.Choice.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net462;net6.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <!-- Disable GenerateAssemblyInfo to use the existing AssemblyInfo.cs -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/...rosoft.Recognizers.Text.DataDrivenTests/Microsoft.Recognizers.Text.DataDrivenTests.csproj b/...rosoft.Recognizers.Text.DataDrivenTests/Microsoft.Recognizers.Text.DataDrivenTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>9</LangVersion>
     <IsPackable>false</IsPackable>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>

diff --git a/...ext.DataTypes.DataDrivenTests/Microsoft.Recognizers.Text.DataTypes.DataDrivenTests.csproj b/...ext.DataTypes.DataDrivenTests/Microsoft.Recognizers.Text.DataTypes.DataDrivenTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <IsPackable>false</IsPackable>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>

diff --git a/...ext.DataTypes.TimexExpression/Microsoft.Recognizers.Text.DataTypes.TimexExpression.csproj b/...ext.DataTypes.TimexExpression/Microsoft.Recognizers.Text.DataTypes.TimexExpression.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net462;net6.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <!-- Disable GenerateAssemblyInfo to use the existing AssemblyInfo.cs -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/.NET/Microsoft.Recognizers.Text.DateTime/Microsoft.Recognizers.Text.DateTime.csproj b/.NET/Microsoft.Recognizers.Text.DateTime/Microsoft.Recognizers.Text.DateTime.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net462;net6.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <!-- Disable GenerateAssemblyInfo to use the existing AssemblyInfo.cs -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/.NET/Microsoft.Recognizers.Text.Number/Arabic/Parsers/ArabicNumberParserConfiguration.cs b/.NET/Microsoft.Recognizers.Text.Number/Arabic/Parsers/ArabicNumberParserConfiguration.cs
@@ -30,6 +30,8 @@ public ArabicNumberParserConfiguration(INumberOptionsConfiguration config)
             }
 
             this.CultureInfo = new CultureInfo(culture);
+            this.CultureInfo.NumberFormat.NegativeSign = "-";
+            this.CultureInfo.NumberFormat.NumberDecimalSeparator = ".";
 
             this.IsCompoundNumberLanguage = NumbersDefinitions.CompoundNumberLanguage;
             this.IsMultiDecimalSeparatorCulture = NumbersDefinitions.MultiDecimalSeparatorCulture;

diff --git a/.NET/Microsoft.Recognizers.Text.Number/Microsoft.Recognizers.Text.Number.csproj b/.NET/Microsoft.Recognizers.Text.Number/Microsoft.Recognizers.Text.Number.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net462;net6.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <!-- Disable GenerateAssemblyInfo to use the existing AssemblyInfo.cs -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/.NET/Microsoft.Recognizers.Text.Number/Swedish/Parsers/SwedishNumberParserConfiguration.cs b/.NET/Microsoft.Recognizers.Text.Number/Swedish/Parsers/SwedishNumberParserConfiguration.cs
@@ -22,6 +22,7 @@ public SwedishNumberParserConfiguration(INumberOptionsConfiguration config)
             this.Config = config;
             this.LanguageMarker = NumbersDefinitions.LangMarker;
             this.CultureInfo = new CultureInfo(config.Culture);
+            this.CultureInfo.NumberFormat.NegativeSign = "-";
 
             this.IsCompoundNumberLanguage = NumbersDefinitions.CompoundNumberLanguage;
             this.IsMultiDecimalSeparatorCulture = NumbersDefinitions.MultiDecimalSeparatorCulture;

diff --git a/...icrosoft.Recognizers.Text.NumberWithUnit/Microsoft.Recognizers.Text.NumberWithUnit.csproj b/...icrosoft.Recognizers.Text.NumberWithUnit/Microsoft.Recognizers.Text.NumberWithUnit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net462;net6.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <!-- Disable GenerateAssemblyInfo to use the existing AssemblyInfo.cs -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/.NET/Microsoft.Recognizers.Text.Sequence/Microsoft.Recognizers.Text.Sequence.csproj b/.NET/Microsoft.Recognizers.Text.Sequence/Microsoft.Recognizers.Text.Sequence.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net462;net6.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <!-- Disable GenerateAssemblyInfo to use the existing AssemblyInfo.cs -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/.NET/Microsoft.Recognizers.Text/Microsoft.Recognizers.Text.csproj b/.NET/Microsoft.Recognizers.Text/Microsoft.Recognizers.Text.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net462;net6.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <!-- Disable GenerateAssemblyInfo to use the existing AssemblyInfo.cs -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/.NET/Samples/SimpleConsole/SimpleConsole.csproj b/.NET/Samples/SimpleConsole/SimpleConsole.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>9</LangVersion>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <CodeAnalysisRuleSet>../../Recognizers-Text.ruleset</CodeAnalysisRuleSet>

diff --git a/Python/libraries/datatypes-timex-expression/datatypes_timex_expression/timex_helpers.py b/Python/libraries/datatypes-timex-expression/datatypes_timex_expression/timex_helpers.py
@@ -164,9 +164,9 @@ def timex_datetime_add(start, duration):
     @staticmethod
     def date_from_timex(timex):
         return date(
-            timex.year if timex.year is not None else 2001,
-            timex.month if timex.month is not None else 1,
-            timex.day_of_month if timex.day_of_month is not None else 1
+            int(timex.year) if timex.year is not None else 2001,
+            int(timex.month) if timex.month is not None else 1,
+            int(timex.day_of_month) if timex.day_of_month is not None else 1
         )
 
     @staticmethod

diff --git a/Tools/src/ValidationTool/ValidationTool.csproj b/Tools/src/ValidationTool/ValidationTool.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>9</LangVersion>
   </PropertyGroup>
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,11 +1,11 @@
 # AppVeyor build configuration for JavaScript project
 version: 1.0.{build}
 
-image: Visual Studio 2019
+image: Visual Studio 2022
 environment:
   nodejs_version: "14.17.6"
-  PYTHON: "C:\\Python36-x64"
-  JAVA_HOME: "C:\\Program Files\\Java\\jdk11"
+  PYTHON: "C:\\Python311-x64"
+  JAVA_HOME: "C:\\Program Files (x86)\\Java\\jdk1.8.0"
 platform: Any CPU
 configuration: Release
 
@@ -54,7 +54,7 @@ build_script:
     cd ..\java\
     
     build.ci.cmd
-    
+        
 test:
 
 test_script: