projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c6edd8d)
Remove netfx config from System.Net.Http.Unit.Tests
authorStephen Toub <stoub@microsoft.com>
Mon, 9 Oct 2017 18:52:33 +0000 (14:52 -0400)
committerStephen Toub <stoub@microsoft.com>
Mon, 9 Oct 2017 18:52:33 +0000 (14:52 -0400)
Commit migrated from https://github.com/dotnet/corefx/commit/91ec984d64908b3ab312bef6f6fa599f5ea1cee7

src/libraries/System.Net.Http/tests/UnitTests/Configurations.props patch | blob | history
src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj patch | blob | history

diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Configurations.props b/src/libraries/System.Net.Http/tests/UnitTests/Configurations.props
index 9c9469d..d8cfd38 100644 (file)
--- a/src/libraries/System.Net.Http/tests/UnitTests/Configurations.props
+++ b/src/libraries/System.Net.Http/tests/UnitTests/Configurations.props
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <BuildConfigurations>
       netcoreapp;
-      netfx;
       uap-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
index 14a9f08..2cea1bc 100644 (file)
--- a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
+++ b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj
@@ -5,14 +5,11 @@
     <ProjectGuid>{5F9C3C9F-652E-461E-B2D6-85D264F5A733}</ProjectGuid>
     <StringResourcesPath>../../src/Resources/Strings.resx</StringResourcesPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NoWarn Condition="'$(TargetGroup)' == 'netfx' Or '$(TargetGroup)' == 'uap'">$(NoWarn);0436</NoWarn>
-    <DefineConstants Condition="'$(TargetGroup)' == 'netfx'">$(DefineConstants);NET46</DefineConstants>
+    <NoWarn Condition="'$(TargetGroup)' == 'uap'">$(NoWarn);0436</NoWarn>
     <DefineConstants Condition="'$(TargetGroup)' == 'uap'">$(DefineConstants);uap</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Release|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
   <!-- Do not reference these assemblies from the TargetingPack since we are building part of the source code for tests. -->
Domain: Dotnet / Core;