Skip to content

Commit 5533a3b

Browse files
committed
build: Update target frameworks to net48 from net47
1 parent c90b083 commit 5533a3b

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

Yubico.Core/src/Yubico.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License. -->
1919
<RootNamespace></RootNamespace>
2020

2121
<!-- Multi-target build -->
22-
<TargetFrameworks>netstandard2.0;netstandard2.1;net47</TargetFrameworks>
22+
<TargetFrameworks>netstandard2.0;netstandard2.1;net48</TargetFrameworks>
2323
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2424

2525
<!-- Suppressed warnings-->

Yubico.Core/src/Yubico/Core/Devices/Hid/WindowsHidDevice.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private void ResolveIdsFromInstancePath(string instancePath)
7676
// 012345678901234567890123456789
7777
// ^--- ^---
7878

79-
// Disable string comparison warning for this method as it needs to compile for both net47, netstandard 2.0 and 2.1
79+
// Disable string comparison warning for this method as it needs to compile for both net48, netstandard 2.0 and 2.1
8080
#pragma warning disable CA1862
8181
if (instancePath.ToUpperInvariant().Contains("VID") && instancePath.ToUpperInvariant().Contains("HID"))
8282
#pragma warning restore CA1862

Yubico.Core/src/Yubico/PlatformInterop/Libraries.Net47.cs renamed to Yubico.Core/src/Yubico/PlatformInterop/Libraries.Net48.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#if NET47
15+
#if NET48
1616

1717
using System;
1818
using System.IO;
@@ -48,15 +48,15 @@ internal static partial class Libraries
4848
/// </exception>
4949
/// <remarks>
5050
/// This method must be called before any P/Invoke calls are made.
51-
/// The implementation details are handled in Libraries.Net47.cs.
51+
/// The implementation details are handled in Libraries.Net48.cs.
5252
/// </remarks>
53-
public static void EnsureInitialized() => Net47Implementation.Initialize();
53+
public static void EnsureInitialized() => Net48Implementation.Initialize();
5454

5555
/// <summary>
5656
/// Encapsulates the .NET Framework 4.7 specific implementation details for native library management.
5757
/// This nested class handles the dynamic loading of architecture-specific (x86/x64) native libraries.
5858
/// </summary>
59-
private static class Net47Implementation
59+
private static class Net48Implementation
6060
{
6161
// Handle to the loaded native library
6262
private static UnmanagedDynamicLibrary? _nativeShims;

Yubico.Core/src/Yubico/PlatformInterop/Libraries.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// As long as we have the Libraries.Net47.cs class which holds the opposite preprocessor directive check,
15+
// As long as we have the Libraries.Net48.cs class which holds the opposite preprocessor directive check,
1616
// this check is required - as having both at the same time is not possible.
17-
#if !NET47
17+
#if !NET48
1818

1919
namespace Yubico.PlatformInterop
2020
{

Yubico.YubiKey/src/Yubico.YubiKey.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License. -->
2020
As of 2020, netstandard2.0 allows us to reach the widest audience while providing a large
2121
enough set of the .NET library to be productive.
2222
-->
23-
<TargetFrameworks>netstandard2.0;netstandard2.1;net47</TargetFrameworks>
23+
<TargetFrameworks>netstandard2.0;netstandard2.1;net48</TargetFrameworks>
2424

2525
<RootNamespace></RootNamespace>
2626

@@ -130,8 +130,8 @@ limitations under the License. -->
130130

131131
</ItemGroup>
132132

133-
<!-- This is in order to use the HttpUtility.ParseQueryString in .NET47 -->
134-
<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
133+
<!-- This is in order to use the HttpUtility.ParseQueryString in .net48 -->
134+
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
135135
<Reference Include="System.Web" />
136136
</ItemGroup>
137137

0 commit comments

Comments
 (0)