From 16f697f2d57ba53dd49c010c15bfc869bfb2dc2f Mon Sep 17 00:00:00 2001 From: Ersan Bozduman Date: Wed, 29 Nov 2023 22:30:44 -0800 Subject: [PATCH 1/2] adds build required OSPlaatform calls --- FileUploader/FileUpload.cs | 3 ++- Minio.Examples/Program.cs | 3 ++- Minio.Functional.Tests/FunctionalTest.cs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/FileUploader/FileUpload.cs b/FileUploader/FileUpload.cs index 14c7c018..0a7f0d7c 100644 --- a/FileUploader/FileUpload.cs +++ b/FileUploader/FileUpload.cs @@ -32,7 +32,8 @@ public static class FileUpload { private static bool IsWindows() { - return RuntimeInformation.IsOSPlatform(OSPlatform.Windows); + return System.OSPlatform.Windows; + } private static async Task Main(string[] args) diff --git a/Minio.Examples/Program.cs b/Minio.Examples/Program.cs index 83f48702..d40b9cbc 100644 --- a/Minio.Examples/Program.cs +++ b/Minio.Examples/Program.cs @@ -282,6 +282,7 @@ await SetBucketReplication.Run(minioClient, bucketName, destBucketName, replicat File.Delete(smallFileName); File.Delete(bigFileName); - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) _ = Console.ReadLine(); + if (System.OSPlatform.Windows;) _ = Console.ReadLine(); + } } diff --git a/Minio.Functional.Tests/FunctionalTest.cs b/Minio.Functional.Tests/FunctionalTest.cs index 0024f351..f61876f4 100644 --- a/Minio.Functional.Tests/FunctionalTest.cs +++ b/Minio.Functional.Tests/FunctionalTest.cs @@ -4826,7 +4826,7 @@ internal static async Task GetObject_3_OffsetLength_Tests(IMinioClient minio) { expectedFileSize = objectSize - offsetToStartFrom; var noOfCtrlChars = 1; - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) noOfCtrlChars = 2; + if (System.OSPlatform.Windows) noOfCtrlChars = 2; expectedContent = string.Concat(line) .Substring(offsetToStartFrom, expectedFileSize - noOfCtrlChars); From 6dfc606db8bbc9bf7d5a580a3321cdf8b6e8d927 Mon Sep 17 00:00:00 2001 From: Ersan Bozduman Date: Fri, 1 Dec 2023 01:09:11 -0800 Subject: [PATCH 2/2] replaces the incorrect IsWindows() code --- FileUploader/FileUpload.cs | 4 +--- Minio.Examples/Program.cs | 4 +--- Minio.Functional.Tests/FunctionalTest.cs | 8 +++++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/FileUploader/FileUpload.cs b/FileUploader/FileUpload.cs index 0a7f0d7c..7aded910 100644 --- a/FileUploader/FileUpload.cs +++ b/FileUploader/FileUpload.cs @@ -15,7 +15,6 @@ */ using System.Net; -using System.Runtime.InteropServices; using Minio; using Minio.DataModel.Args; @@ -32,8 +31,7 @@ public static class FileUpload { private static bool IsWindows() { - return System.OSPlatform.Windows; - + return OperatingSystem.IsWindows(); } private static async Task Main(string[] args) diff --git a/Minio.Examples/Program.cs b/Minio.Examples/Program.cs index d40b9cbc..817af18d 100644 --- a/Minio.Examples/Program.cs +++ b/Minio.Examples/Program.cs @@ -17,7 +17,6 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Net; -using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Text; using Minio.DataModel; @@ -282,7 +281,6 @@ await SetBucketReplication.Run(minioClient, bucketName, destBucketName, replicat File.Delete(smallFileName); File.Delete(bigFileName); - if (System.OSPlatform.Windows;) _ = Console.ReadLine(); - + if (OperatingSystem.IsWindows()) _ = Console.ReadLine(); } } diff --git a/Minio.Functional.Tests/FunctionalTest.cs b/Minio.Functional.Tests/FunctionalTest.cs index f61876f4..423c223d 100644 --- a/Minio.Functional.Tests/FunctionalTest.cs +++ b/Minio.Functional.Tests/FunctionalTest.cs @@ -20,7 +20,6 @@ using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Net; -using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Text; using System.Text.Json; @@ -4817,7 +4816,10 @@ internal static async Task GetObject_3_OffsetLength_Tests(IMinioClient minio) #else await File.WriteAllLinesAsync(tempSource, line).ConfigureAwait(false); #endif - using (var filestream = File.Open(tempSource, FileMode.Open, FileAccess.Read, FileShare.Read)) + FileStream filestream = null; + await + using ((filestream = File.Open(tempSource, FileMode.Open, FileAccess.Read, FileShare.Read)) + .ConfigureAwait(false)) { var objectSize = (int)filestream.Length; var expectedFileSize = lengthToBeRead; @@ -4826,7 +4828,7 @@ internal static async Task GetObject_3_OffsetLength_Tests(IMinioClient minio) { expectedFileSize = objectSize - offsetToStartFrom; var noOfCtrlChars = 1; - if (System.OSPlatform.Windows) noOfCtrlChars = 2; + if (OperatingSystem.IsWindows()) noOfCtrlChars = 2; expectedContent = string.Concat(line) .Substring(offsetToStartFrom, expectedFileSize - noOfCtrlChars);