Skip to content

Commit 7f4f6e2

Browse files
committed
build(.net): Update target frameworks from to net472 across projects
1 parent 5533a3b commit 7f4f6e2

File tree

6 files changed

+17
-18
lines changed

6 files changed

+17
-18
lines changed

Yubico.Core/src/Yubico.Core.csproj

Lines changed: 4 additions & 5 deletions
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;net48</TargetFrameworks>
22+
<TargetFrameworks>netstandard2.0;netstandard2.1;net472</TargetFrameworks>
2323
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2424

2525
<!-- Suppressed warnings-->
@@ -116,18 +116,17 @@ limitations under the License. -->
116116
<PrivateAssets>all</PrivateAssets>
117117
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
118118
</PackageReference>
119-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
120-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
119+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.6" />
120+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
121121
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
122-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
122+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.6" />
123123
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
124124
<!-- Before updating PolySharp, we should do some due dilligence on the update -->
125125
<PackageReference Include="PolySharp" Version="1.15.0" AllowUpdates="false">
126126
<PrivateAssets>all</PrivateAssets>
127127
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
128128
</PackageReference>
129129
<PackageReference Include="System.Memory" Version="4.6.3" />
130-
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
131130
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
132131
<!-- The wildcard version tag allows us to include the latest minor and pre-release versions -->
133132
<PackageReference Include="Yubico.NativeShims" Version="1.*-*" />

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 net48, netstandard 2.0 and 2.1
79+
// Disable string comparison warning for this method as it needs to compile for both net47, 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.Net48.cs renamed to Yubico.Core/src/Yubico/PlatformInterop/Libraries.Net47.cs

Lines changed: 1 addition & 1 deletion
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 NET48
15+
#if NET47
1616

1717
using System;
1818
using System.IO;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
// 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 !NET48
17+
#if !NET47
1818

1919
namespace Yubico.PlatformInterop
2020
{

Yubico.NativeShims/Yubico.NativeShims.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</description>
1313
<readme>docs/readme.md</readme>
1414
<dependencies>
15-
<group targetFramework=".NETFramework4.7" />
15+
<group targetFramework=".NETFramework4.7.2" />
1616
<group targetFramework="netstandard2.0" />
1717
</dependencies>
1818
</metadata>
@@ -32,9 +32,9 @@
3232
<file src="linux-arm64/libYubico.NativeShims.so" target="runtimes/linux-arm64/native/libYubico.NativeShims.so" />
3333

3434
<!-- Support files -->
35-
<file src="msbuild/Yubico.NativeShims.targets" target="build/net47/Yubico.NativeShims.targets" />
36-
<file src="msbuild/Yubico.NativeShims.targets" target="buildTransitive/net47/Yubico.NativeShims.targets" />
37-
<file src="msbuild/_._" target="lib/net47/_._" />
35+
<file src="msbuild/Yubico.NativeShims.targets" target="build/net472/Yubico.NativeShims.targets" />
36+
<file src="msbuild/Yubico.NativeShims.targets" target="buildTransitive/net472/Yubico.NativeShims.targets" />
37+
<file src="msbuild/_._" target="lib/net472/_._" />
3838
<file src="msbuild/_._" target="lib/netstandard20/_._" />
3939
<file src="readme.md" target="docs/" />
4040
</files>

Yubico.YubiKey/src/Yubico.YubiKey.csproj

Lines changed: 6 additions & 6 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;net48</TargetFrameworks>
23+
<TargetFrameworks>netstandard2.0;netstandard2.1;net472</TargetFrameworks>
2424

2525
<RootNamespace></RootNamespace>
2626

@@ -104,12 +104,12 @@ limitations under the License. -->
104104
</ItemGroup>
105105

106106
<ItemGroup Label="Package references specific to Yubico.YubiKey.dll">
107-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
107+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.6" />
108108
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
109109
<PrivateAssets>all</PrivateAssets>
110110
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
111111
</PackageReference>
112-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
112+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
113113
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
114114

115115
<PackageReference Include="Nullable" Version="1.3.1">
@@ -125,13 +125,13 @@ limitations under the License. -->
125125
<PackageReference Include="System.Formats.Asn1" Version="9.0.3" />
126126

127127
<!-- Remove ExcludeAssets once the package supports netcoreapp and net462 properly -->
128-
<PackageReference Include="System.Formats.Cbor" Version="7.0.0" ExcludeAssets="buildtransitive" />
128+
<PackageReference Include="System.Formats.Cbor" Version="9.0.6" ExcludeAssets="buildtransitive" />
129129
<ProjectReference Include="..\..\Yubico.Core\src\Yubico.Core.csproj" />
130130

131131
</ItemGroup>
132132

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

0 commit comments

Comments
 (0)