Skip to content

Commit ce058f6

Browse files
authored
Add net461 TFM to netstandard2.0 projects (#25094)
* Add net461 TFM to netstandard2.0 projects * Fix a couple of errors * Fix some errors * Get rid of Sockets reference * Respond to feedback * net461 -> property * Fixup clientSample * Remove net461 from analyzers/razor * Remove net461 from test projects * Feedback * Add net461 test configs * Remove some incompatible test configs * Fix test
1 parent a54c5ba commit ce058f6

File tree

74 files changed

+130
-86
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+130
-86
lines changed

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090

9191
<!-- Also update the DefaultNetCoreTargetFramework defined at src/Razor/test/testassets/Directory.Build.props -->
9292
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
93+
<DefaultNetFxTargetFramework>net461</DefaultNetFxTargetFramework>
9394
</PropertyGroup>
9495

9596
<!-- Warnings and errors -->

eng/Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ and are generated based on the last package release.
6969
<LatestPackageReference Include="System.IO.Pipelines" />
7070
<LatestPackageReference Include="System.Net.Http" />
7171
<LatestPackageReference Include="System.Net.Http.Json" />
72+
<LatestPackageReference Include="System.Net.Sockets" />
7273
<LatestPackageReference Include="System.Reflection.Metadata" />
7374
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" />
7475
<LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />

eng/Versions.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@
203203
<SystemCodeDomPackageVersion>4.4.0</SystemCodeDomPackageVersion>
204204
<SystemCommandlineExperimentalPackageVersion>0.3.0-alpha.19317.1</SystemCommandlineExperimentalPackageVersion>
205205
<SystemComponentModelPackageVersion>4.3.0</SystemComponentModelPackageVersion>
206-
<SystemNetHttpPackageVersion>4.3.2</SystemNetHttpPackageVersion>
206+
<SystemNetHttpPackageVersion>4.3.4</SystemNetHttpPackageVersion>
207+
<SystemNetSocketsPackageVersion>4.3.0</SystemNetSocketsPackageVersion>
207208
<SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
208209
<SystemThreadingTasksExtensionsPackageVersion>4.5.3</SystemThreadingTasksExtensionsPackageVersion>
209210
<SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>

src/Configuration.KeyPerFile/src/Microsoft.Extensions.Configuration.KeyPerFile.csproj

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

33
<PropertyGroup>
44
<Description>Configuration provider that uses files in a directory for Microsoft.Extensions.Configuration.</Description>
5-
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks>$(DefaultNetFxTargetFramework);netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
66
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks>
77
<IsAspNetCoreApp>true</IsAspNetCoreApp>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>

src/Configuration.KeyPerFile/test/Microsoft.Extensions.Configuration.KeyPerFile.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Commonly used types:
66
Microsoft.AspNetCore.DataProtection.IDataProtectionProvider
77
Microsoft.AspNetCore.DataProtection.IDataProtector</Description>
8-
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
8+
<TargetFrameworks>$(DefaultNetFxTargetFramework);netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
99
<IsAspNetCoreApp>true</IsAspNetCoreApp>
1010
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1111
<PackageTags>aspnetcore;dataprotection</PackageTags>

src/DataProtection/Abstractions/test/Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
4+
<TargetFrameworks>$(DefaultNetFxTargetFramework);$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj

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

33
<PropertyGroup>
44
<Description>Infrastructure for ASP.NET Core cryptographic packages. Applications and libraries should not reference this package directly.</Description>
5-
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks>$(DefaultNetFxTargetFramework);netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
66
<IsAspNetCoreApp>true</IsAspNetCoreApp>
77
<NoWarn>$(NoWarn);CS1591</NoWarn>
88
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

src/DataProtection/Cryptography.Internal/test/Microsoft.AspNetCore.Cryptography.Internal.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
4+
<TargetFrameworks>$(DefaultNetFxTargetFramework);$(DefaultNetCoreTargetFramework)</TargetFrameworks>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
</PropertyGroup>
77

src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj

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

33
<PropertyGroup>
44
<Description>ASP.NET Core utilities for key derivation.</Description>
5-
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
5+
<TargetFrameworks>$(DefaultNetFxTargetFramework);netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
66
<IsAspNetCoreApp>true</IsAspNetCoreApp>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>

0 commit comments

Comments
 (0)