diff options
| author | William Godbe <wigodbe@microsoft.com> | 2020-08-28 02:05:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 02:05:40 +0300 |
| commit | ce058f639cb0fdb12ff8445200071fd83c7f80c0 (patch) | |
| tree | 40060bd0a48a7edde2a8c5ad2d1515584a78c2f6 /src/WebEncoders | |
| parent | a54c5baf7a1fbf90487f375b8dc93d55216b7944 (diff) | |
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
Diffstat (limited to 'src/WebEncoders')
| -rw-r--r-- | src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj | 4 | ||||
| -rwxr-xr-x | src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj b/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj index 920d4e2869..3ddf648cdd 100644 --- a/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj +++ b/src/WebEncoders/src/Microsoft.Extensions.WebEncoders.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <Description>Contains registration and configuration APIs to add the core framework encoders to a dependency injection container.</Description> - <TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks> + <TargetFrameworks>$(DefaultNetFxTargetFramework);netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks> <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</TargetFrameworks> <NoWarn>$(NoWarn);CS1591</NoWarn> <GenerateDocumentationFile>true</GenerateDocumentationFile> @@ -16,7 +16,7 @@ <Reference Include="Microsoft.Extensions.Options" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == '$(DefaultNetFxTargetFramework)'"> <Reference Include="System.Text.Encodings.Web" /> </ItemGroup> diff --git a/src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj b/src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj index 57884af976..628f6fa669 100755 --- a/src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj +++ b/src/WebEncoders/test/Microsoft.Extensions.WebEncoders.Tests.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFrameworks>$(DefaultNetCoreTargetFramework);net472</TargetFrameworks> + <TargetFrameworks>$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks> <Nullable>enable</Nullable> </PropertyGroup> |