diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-02-12 08:40:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-12 08:40:35 +0300 |
| commit | 608267af43311b131d20e4111477ffb1109233a0 (patch) | |
| tree | 1000b765463fbaeb3f0fdd08ae380e0fb8de0669 /src/System.Security.Cryptography.Encoding | |
| parent | 41ac0d427a4e5f17b6f20cc2bef098278da01d70 (diff) | |
Cleanup netstandard ifdefs and conditions (#16072)
* Cleanup netstandard conditions in csproj files
* Cleanup netstandard17 ifdefs
* Disable failing tests
Diffstat (limited to 'src/System.Security.Cryptography.Encoding')
| -rw-r--r-- | src/System.Security.Cryptography.Encoding/tests/Oid.cs | 2 | ||||
| -rw-r--r-- | src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/System.Security.Cryptography.Encoding/tests/Oid.cs b/src/System.Security.Cryptography.Encoding/tests/Oid.cs index 476ed2ba65..60745d297a 100644 --- a/src/System.Security.Cryptography.Encoding/tests/Oid.cs +++ b/src/System.Security.Cryptography.Encoding/tests/Oid.cs @@ -16,11 +16,9 @@ namespace System.Security.Cryptography.Encoding.Tests Assert.Equal("", oid.Value); Assert.Null(oid.FriendlyName); -#if netstandard17 oid = new Oid(); Assert.Null(oid.Value); Assert.Null(oid.FriendlyName); -#endif } [Theory] diff --git a/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj b/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj index c4d0d980c3..af0e73e9d1 100644 --- a/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj +++ b/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.csproj @@ -4,7 +4,6 @@ <PropertyGroup> <ProjectGuid>{0581E9FA-D639-4B88-96D8-D092760F90B0}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <DefineConstants Condition="'$(TargetGroup)'==''">$(DefineConstants);netstandard17</DefineConstants> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> @@ -13,6 +12,7 @@ <ItemGroup> <Compile Include="AsnEncodedData.cs" /> <Compile Include="AsnEncodedDataCollectionTests.cs" /> + <Compile Include="Base64TransformsTests.cs" /> <Compile Include="DerEncoderTests.cs" /> <Compile Include="DerSequenceReaderTests.cs" /> <Compile Include="Oid.cs" /> @@ -27,8 +27,5 @@ <Link>CommonTest\System\Security\Cryptography\ByteUtils.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)'=='netstandard'"> - <Compile Include="Base64TransformsTests.cs" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file |