Fix warnings

opentap · Apr 19, 2024 · 4a8c10b · 4a8c10b
1 parent 22a4578
commit 4a8c10b
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -178,7 +178,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
       - name: Build
         run: dotnet publish -c Release OpenTAP.sln
       - name: Copy Debug Package 
@@ -205,6 +205,10 @@ jobs:
       - name: Fix tags
         if: startsWith(github.ref, 'refs/tags/v')
         run: git fetch -f origin ${{ github.ref }}:${{ github.ref }} # Fixes an issue with actions/checkout@v4. See https://github.com/actions/checkout/issues/290
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
       - name: Nuget Cache
         uses: actions/cache@v4
         id: cache
@@ -256,7 +260,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
       - name: Build
         run: dotnet publish -c Release OpenTAP.sln
       - name: Copy Debug Package 
@@ -371,7 +375,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
       - name: Download binaries
         uses: actions/download-artifact@v4
         with:
@@ -401,7 +405,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
       - name: Download binaries
         uses: actions/download-artifact@v4
         with:
@@ -568,7 +572,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
       - name: Update Version
         run: |
           Set-Content .\templates\Templates.csproj (Get-Content .\templates\Templates.csproj).Replace("`$(GitVersion)", "${{needs.GetVersion.outputs.LongVersion}}")

diff --git a/Engine/IPictureDataProvider.cs b/Engine/IPictureDataProvider.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace OpenTap
@@ -64,7 +65,9 @@ public async Task<Stream> GetStream(IPicture picture)
             var source = normalizeSource(picture.Source);
             if (Uri.TryCreate(source, UriKind.Absolute, out var uri))
             {
+#pragma warning disable SYSLIB0014
                 var req = WebRequest.Create(uri);
+#pragma warning restore SYSLIB0014
                 var response = await req.GetResponseAsync();
                 return response.GetResponseStream();
             }

diff --git a/Engine/ParameterCollection.cs b/Engine/ParameterCollection.cs
@@ -22,6 +22,6 @@ public ParameterCollection(IParameter[] list) : base(list)
 
         }
 
-        internal static readonly ParameterCollection Empty = new ParameterCollection(Array.Empty<IParameter>());
+        internal new static readonly ParameterCollection Empty = new ParameterCollection(Array.Empty<IParameter>());
     }
 }
diff --git a/Engine/PluginManager.cs b/Engine/PluginManager.cs
@@ -594,10 +594,7 @@ Assembly loadFrom(string loadFilename)
                 {
                     try
                     {
-                        if (!reflectionOnly)
-                            return Assembly.LoadFrom(loadFilename);
-                        else
-                            return Assembly.ReflectionOnlyLoadFrom(loadFilename);
+                        return Assembly.LoadFrom(loadFilename);
                     }
                     catch(Exception ex)
                     {

diff --git a/Engine/ScpiInstrument.cs b/Engine/ScpiInstrument.cs
@@ -77,7 +77,6 @@ private static void RaiseError2(int error)
                 throw new VISAException(0, error);
         }
 
-        [System.Runtime.ExceptionServices.HandleProcessCorruptedStateExceptions] // Required by .NET to catch AccessViolationException.
         internal static int GetResourceManager()
         {
             try

diff --git a/Engine/VisaDeviceDiscovery.cs b/Engine/VisaDeviceDiscovery.cs
@@ -139,7 +139,6 @@ public bool CanDetect(DeviceAddressAttribute DeviceAddress)
         static bool visa_tried_load;
 
 
-        [System.Runtime.ExceptionServices.HandleProcessCorruptedStateExceptions] // Required by .NET to catch AccessViolationException.
         internal static int GetResourceManager()
         {
             try

diff --git a/Engine/VisaLibraryLoader.cs b/Engine/VisaLibraryLoader.cs
@@ -92,7 +92,6 @@ static T GetSymbol<T>(IntPtr s)
             return Marshal.GetDelegateForFunctionPointer<T>(s);
         }
         static TraceSource staticLog = OpenTap.Log.CreateSource("VisaLibraryLoader");
-        [System.Runtime.ExceptionServices.HandleProcessCorruptedStateExceptions] // Required by .NET to catch AccessViolationException.
         private void Load()
         {
             try

diff --git a/Shared/SubProcessHost.cs b/Shared/SubProcessHost.cs
@@ -6,6 +6,7 @@
 using System.IO.Pipes;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.Versioning;
 using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
@@ -27,7 +28,7 @@ class SubProcessHost
 
         public static bool IsAdmin()
         {
-            if (OperatingSystem.Current == OperatingSystem.Windows)
+            if (System.OperatingSystem.IsWindows())
             {
                 using (WindowsIdentity identity = WindowsIdentity.GetCurrent())
                 {