diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-07-26 04:42:01 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-07-26 16:01:49 +0300 |
| commit | 98cf04084aab9bd6eef5e4e37cc92117fdac2cf0 (patch) | |
| tree | 7184eb93c2e195e48e4f2adb79a68ba80a4f80c0 /mcs/class/Microsoft.Build.Tasks | |
| parent | a8990aca6ca4e698953effee868c2abe38d7295c (diff) | |
[bcl] Remove NET_4_0 defines from class libs
NET_4_0 is always defined now, so the ifdefs are redundant.
I verified the libs are exactly the same after this change, so this is effectively a no-op.
Diffstat (limited to 'mcs/class/Microsoft.Build.Tasks')
| -rw-r--r-- | mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CodeTaskFactoryTest.cs | 2 | ||||
| -rw-r--r-- | mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CodeTaskFactoryTest.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CodeTaskFactoryTest.cs index ac5136a17a6..e665a41cebf 100644 --- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CodeTaskFactoryTest.cs +++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CodeTaskFactoryTest.cs @@ -25,7 +25,6 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_4_0 using System; using System.IO; using System.Linq; @@ -207,4 +206,3 @@ Log.LogWarning(""Color: "" + System.Drawing.Color.CornflowerBlue); } } -#endif diff --git a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs index 711bdb26afc..37f26bd7935 100644 --- a/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs +++ b/mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/CscTest.cs @@ -44,20 +44,6 @@ namespace MonoTests.Microsoft.Build.Tasks { public void ARFC (CommandLineBuilderExtension commandLine) { base.AddResponseFileCommands (commandLine); -#if !NET_4_0 - string s = commandLine.ToString (); - if (s.Length == 6) - Assert.AreEqual ("/sdk:2", s); - else - Assert.AreEqual ("/sdk:2 ", s.Substring (0, 7)); - - BindingFlags flags = BindingFlags.Instance | BindingFlags.NonPublic; - PropertyInfo pi = typeof (CommandLineBuilderExtension).GetProperty ("CommandLine", flags); - System.Text.StringBuilder sb = (System.Text.StringBuilder) pi.GetValue (commandLine, null); - sb.Length = 0; - if (s.Length > 6) - sb.Append (s.Substring (7)); -#endif } public void ACLC (CommandLineBuilderExtension commandLine) |