apacheGH-36815: [C#]: Enable net472 tests under Windows (apache#36818)

### What changes are included in this PR? The primary C# test project is updated to run for .NET 4.7.2 only on Windows platforms. ### Are these changes tested? Yes. * Closes: apache#36815 Authored-by: Curt Hagenlocher <[email protected]> Signed-off-by: Curt Hagenlocher <[email protected]>
loicalleyne · Nov 13, 2023 · 8a6a4ab · 8a6a4ab
1 parent b198fb9
commit 8a6a4ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/csharp/src/Apache.Arrow/Types/Time32Type.cs b/csharp/src/Apache.Arrow/Types/Time32Type.cs
@@ -18,7 +18,7 @@ namespace Apache.Arrow.Types
 {
     public sealed class Time32Type : TimeType
     {
-        public static readonly Time32Type Default = Millisecond;
+        public static Time32Type Default => Millisecond;
 
         public override ArrowTypeId TypeId => ArrowTypeId.Time32;
         public override string Name => "time32";

diff --git a/csharp/src/Apache.Arrow/Types/Time64Type.cs b/csharp/src/Apache.Arrow/Types/Time64Type.cs
@@ -18,7 +18,7 @@ namespace Apache.Arrow.Types
 {
     public sealed class Time64Type : TimeType
     {
-        public static readonly Time64Type Default = Nanosecond;
+        public static Time64Type Default => Nanosecond;
 
         public override ArrowTypeId TypeId => ArrowTypeId.Time64;
         public override string Name => "time64";

diff --git a/csharp/test/Apache.Arrow.Tests/Apache.Arrow.Tests.csproj b/csharp/test/Apache.Arrow.Tests/Apache.Arrow.Tests.csproj
@@ -2,13 +2,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
-    <!-- TODO: CI can't run with net472 on non-Windows platforms
-    <TargetFrameworks>net7.0;net472</TargetFrameworks>
-    -->
+    <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(IsWindows)'=='true'">
+    <TargetFrameworks>net7.0;net472</TargetFrameworks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(IsWindows)'!='true'">
+    <TargetFrameworks>net7.0</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="xunit" Version="2.5.2" />