From 25a27169146ea6f7ccca8149ec6b484b31d42389 Mon Sep 17 00:00:00 2001
From: Hovsep Mkrtchyan <hovsepm@microsoft.com>
Date: Tue, 24 May 2016 10:32:08 -0700
Subject: [PATCH] Removed dnxcore50 from generated code.

---
 AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs   | 4 ++--
 .../AzureBodyDuration/Models/ErrorException.cs              | 6 +++---
 .../AzureCompositeModelClient/Models/ErrorException.cs      | 6 +++---
 .../AzureParameterGrouping/Models/ErrorException.cs         | 6 +++---
 .../AcceptanceTests/AzureReport/Models/ErrorException.cs    | 6 +++---
 .../AcceptanceTests/AzureResource/Models/ErrorException.cs  | 6 +++---
 .../AcceptanceTests/AzureSpecials/Models/ErrorException.cs  | 6 +++---
 .../AcceptanceTests/CustomBaseUri/Models/ErrorException.cs  | 6 +++---
 .../SubscriptionIdApiVersion/Models/ErrorException.cs       | 6 +++---
 .../AcceptanceTests/BodyArray/Models/ErrorException.cs      | 6 +++---
 .../AcceptanceTests/BodyBoolean/Models/ErrorException.cs    | 6 +++---
 .../AcceptanceTests/BodyByte/Models/ErrorException.cs       | 6 +++---
 .../AcceptanceTests/BodyComplex/Models/ErrorException.cs    | 6 +++---
 .../AcceptanceTests/BodyDate/Models/ErrorException.cs       | 6 +++---
 .../AcceptanceTests/BodyDateTime/Models/ErrorException.cs   | 6 +++---
 .../BodyDateTimeRfc1123/Models/ErrorException.cs            | 6 +++---
 .../AcceptanceTests/BodyDictionary/Models/ErrorException.cs | 6 +++---
 .../AcceptanceTests/BodyDuration/Models/ErrorException.cs   | 6 +++---
 .../AcceptanceTests/BodyFile/Models/ErrorException.cs       | 6 +++---
 .../AcceptanceTests/BodyFormData/Models/ErrorException.cs   | 6 +++---
 .../AcceptanceTests/BodyInteger/Models/ErrorException.cs    | 6 +++---
 .../AcceptanceTests/BodyNumber/Models/ErrorException.cs     | 6 +++---
 .../AcceptanceTests/BodyString/Models/ErrorException.cs     | 6 +++---
 .../CompositeBoolIntClient/Models/ErrorException.cs         | 6 +++---
 .../AcceptanceTests/CustomBaseUri/Models/ErrorException.cs  | 6 +++---
 .../CustomBaseUriMoreOptions/Models/ErrorException.cs       | 6 +++---
 .../AcceptanceTests/Header/Models/ErrorException.cs         | 6 +++---
 .../Expected/AcceptanceTests/Http/Models/ErrorException.cs  | 6 +++---
 .../Expected/AcceptanceTests/Http/Models/MyException.cs     | 6 +++---
 .../ModelFlattening/Models/ErrorException.cs                | 6 +++---
 .../AcceptanceTests/Report/Models/ErrorException.cs         | 6 +++---
 .../RequiredOptional/Models/ErrorException.cs               | 6 +++---
 .../Expected/AcceptanceTests/Url/Models/ErrorException.cs   | 6 +++---
 .../AcceptanceTests/Validation/Models/ErrorException.cs     | 6 +++---
 .../Expected/DateTimeOffset/Models/ErrorException.cs        | 6 +++---
 .../Expected/Mirror.Polymorphic/Models/Error2Exception.cs   | 6 +++---
 .../Expected/Mirror.Primitives/Models/ErrorException.cs     | 6 +++---
 .../Expected/Mirror.RecursiveTypes/Models/ErrorException.cs | 6 +++---
 .../Expected/Mirror.Sequences/Models/ErrorModelException.cs | 6 +++---
 .../CSharp/CSharp/Templates/ExceptionTemplate.cshtml        | 6 +++---
 .../UserTokenProvider.cs                                    | 2 +-
 41 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs b/AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs
index b458654259..4e11a1a945 100644
--- a/AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs
+++ b/AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Rest.Generator.Logging
     /// <summary>
     /// Code generation aggregate exception.
     /// </summary>
-#if !DNXCORE50
+#if !PORTABLE
     [Serializable]
 #endif
     public class CodeGenerationException : AggregateException
@@ -38,7 +38,7 @@ public CodeGenerationException(string message, Exception innerException) : base(
         {
         }
 
-#if !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Instantiates a new instance of the CodeGenerationException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/Models/ErrorException.cs
index 9842d37c70..2a54631c9f 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureBodyDuration.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/ErrorException.cs
index 58d2cd0e7c..c8518921e3 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsAzureCompositeModelClient.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ErrorException.cs
index 93d43525cd..6c0fbb42ce 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureReport/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureReport/Models/ErrorException.cs
index ebcce30a4c..b9fd0f64fd 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureReport/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureReport/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureReport.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/ErrorException.cs
index 4ba9b55b33..884ecc797e 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureResource.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/ErrorException.cs
index fdd3f42f7e..aa34c08ab8 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureSpecials.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs
index 9f069157ee..893eab1d6d 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsCustomBaseUri.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/Models/ErrorException.cs
index 826ec5d3fd..5883ef1e13 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsSubscriptionIdApiVersion.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyArray/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyArray/Models/ErrorException.cs
index b067ffb596..096a94320b 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyArray/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyArray/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyArray.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/Models/ErrorException.cs
index 15cddb927f..5ed2f7eb9e 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyBoolean.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyByte/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyByte/Models/ErrorException.cs
index e84c83b21c..27609acb8a 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyByte/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyByte/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyByte.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Models/ErrorException.cs
index f334842b9b..e82d637189 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyComplex.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Models/ErrorException.cs
index 9e379980da..2f9e6a2b9c 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyDate.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Models/ErrorException.cs
index ceeebe2fe5..bcc82cb20e 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyDateTime.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/Models/ErrorException.cs
index 7dfe1036d0..7da71e1c3c 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyDateTimeRfc1123.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDictionary/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDictionary/Models/ErrorException.cs
index 201f921d77..aaff5df04e 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDictionary/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDictionary/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyDictionary.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Models/ErrorException.cs
index 231fbad828..6d584b4429 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyDuration.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFile/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFile/Models/ErrorException.cs
index 204e3b078d..61b07afa89 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFile/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFile/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyFile.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFormData/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFormData/Models/ErrorException.cs
index 6f3755c59c..31bc239cb6 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFormData/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFormData/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyFormData.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/Models/ErrorException.cs
index 5fb0256ac6..fd595ce8e1 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyInteger.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Models/ErrorException.cs
index 3dda25b781..cc3fb0b9bc 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyNumber.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/Models/ErrorException.cs
index 7cc4ee3563..d4dd2266c4 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyString.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/Models/ErrorException.cs
index a3ca0017a6..2f72efa6e7 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsCompositeBoolIntClient.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs
index 36c220ba33..27a16617a3 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsCustomBaseUri.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/ErrorException.cs
index e3ab1c0a08..b05dfbe6d0 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsCustomBaseUriMoreOptions.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/ErrorException.cs
index c2fac7576e..33fa32c989 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsHeader.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/ErrorException.cs
index 276401c1d7..8230e0b04d 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsHttp.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/MyException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/MyException.cs
index c8e557c9ea..2b16eca18b 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/MyException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/MyException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsHttp.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with A information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class MyException : RestException
@@ -65,7 +65,7 @@ public MyException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the MyException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/ErrorException.cs
index 5d1edcbaa0..11dd520d87 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsModelFlattening.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Report/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Report/Models/ErrorException.cs
index 226d74461b..1f52945fee 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Report/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Report/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsReport.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/Models/ErrorException.cs
index fbdac38d5e..5ffc54e299 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsRequiredOptional.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/Models/ErrorException.cs
index 9c3eea8c70..d74e119828 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsUrl.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/ErrorException.cs
index 1a14ee36a3..d4233d3177 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsValidation.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/DateTimeOffset/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/DateTimeOffset/Models/ErrorException.cs
index 74a3a68a5d..82df25efe7 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/DateTimeOffset/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/DateTimeOffset/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.DateTimeOffset.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Error2Exception.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Error2Exception.cs
index 36adb6b180..02ba137439 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Error2Exception.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Error2Exception.cs
@@ -12,14 +12,14 @@ namespace Fixtures.MirrorPolymorphic.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error2 information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class Error2Exception : RestException
@@ -65,7 +65,7 @@ public Error2Exception(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the Error2Exception class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Primitives/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Primitives/Models/ErrorException.cs
index e343e02354..d0b8eed065 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Primitives/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Primitives/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.MirrorPrimitives.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.RecursiveTypes/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.RecursiveTypes/Models/ErrorException.cs
index 7dbb2d5930..b2d308e0fe 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.RecursiveTypes/Models/ErrorException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.RecursiveTypes/Models/ErrorException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.MirrorRecursiveTypes.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with Error information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorException : RestException
@@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Sequences/Models/ErrorModelException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Sequences/Models/ErrorModelException.cs
index 4d3757c688..d63ec3bc3a 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Sequences/Models/ErrorModelException.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Sequences/Models/ErrorModelException.cs
@@ -12,14 +12,14 @@ namespace Fixtures.MirrorSequences.Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 
     /// <summary>
     /// Exception thrown for an invalid response with ErrorModel information.
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class ErrorModelException : RestException
@@ -65,7 +65,7 @@ public ErrorModelException(string message, Exception innerException)
         {
         }
 
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the ErrorModelException class.
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp/Templates/ExceptionTemplate.cshtml b/AutoRest/Generators/CSharp/CSharp/Templates/ExceptionTemplate.cshtml
index 796b41d25d..38e81fe275 100644
--- a/AutoRest/Generators/CSharp/CSharp/Templates/ExceptionTemplate.cshtml
+++ b/AutoRest/Generators/CSharp/CSharp/Templates/ExceptionTemplate.cshtml
@@ -9,14 +9,14 @@ namespace @(Settings.Namespace).Models
     using System;
     using System.Net.Http;
     using System.Runtime.Serialization;
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     using System.Security.Permissions;
 #endif
 @EmptyLine
     /// <summary>
     @WrapComment("/// ", "Exception thrown for an invalid response with " + Model.Name + " information.")
     /// </summary>
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
     [Serializable]
 #endif
     public class @Model.ExceptionTypeDefinitionName : RestException
@@ -62,7 +62,7 @@ namespace @(Settings.Namespace).Models
         {
         }
 @EmptyLine
-#if !PORTABLE && !DNXCORE50
+#if !PORTABLE 
         /// <summary>
         /// Initializes a new instance of the @Model.ExceptionTypeDefinitionName class.
         /// </summary>
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/UserTokenProvider.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/UserTokenProvider.cs
index cb63d7e761..dd743ac63c 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/UserTokenProvider.cs
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/UserTokenProvider.cs
@@ -62,7 +62,7 @@ public UserTokenProvider(AuthenticationContext context, string clientId, Uri tok
             this._tokenAudience = tokenAudience.ToString();
             this._userid = userId;
         }
-// Interactive authentication is not implemented for Dnx.
+// Interactive authentication is not implemented for CoreCLR.
 #if !PORTABLE
         /// <summary>
         /// Log in to Azure active directory common tenant with user account and authentication provided by the user.  Authentication is automatically scoped to the default azure management endpoint.