diff --git a/AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs b/AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs
index b45865425959..4e11a1a94564 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 9842d37c7008..2a54631c9f44 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 58d2cd0e7c24..c8518921e398 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 93d43525cdce..6c0fbb42ce98 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 ebcce30a4c93..b9fd0f64fd98 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 4ba9b55b334a..884ecc797e88 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 fdd3f42f7e0a..aa34c08ab823 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 9f069157ee6e..893eab1d6d2f 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 826ec5d3fdbd..5883ef1e1329 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 b067ffb59627..096a94320b52 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 15cddb927fb9..5ed2f7eb9e52 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 e84c83b21ce6..27609acb8a3a 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 f334842b9b4e..e82d637189ec 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 9e379980da3c..2f9e6a2b9cef 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 ceeebe2fe58a..bcc82cb20e9a 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 7dfe1036d053..7da71e1c3cfe 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 201f921d77ed..aaff5df04eba 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 231fbad8282a..6d584b442918 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 204e3b078d8c..61b07afa89eb 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 6f3755c59c28..31bc239cb640 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 5fb0256ac690..fd595ce8e15f 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 3dda25b7812a..cc3fb0b9bcdc 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 7cc4ee35635b..d4dd2266c40d 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 a3ca0017a6b8..2f72efa6e7e9 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 36c220ba33fd..27a16617a3bf 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 e3ab1c0a08ab..b05dfbe6d0f5 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 c2fac7576e4a..33fa32c989ed 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 276401c1d7d0..8230e0b04dbd 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 c8e557c9ea66..2b16eca18ba3 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 5d1edcbaa0f1..11dd520d87e7 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 226d74461ba8..1f52945fee29 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 fbdac38d5ed1..5ffc54e299a0 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 9c3eea8c70cc..d74e11982891 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 1a14ee36a335..d4233d317714 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 74a3a68a5d6b..82df25efe79f 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 36adb6b18060..02ba1374392c 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 e343e02354f7..d0b8eed0650a 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 7dbb2d593020..b2d308e0feba 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 4d3757c6887f..d63ec3bc3a02 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 796b41d25d1c..38e81fe27513 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 cb63d7e761bc..dd743ac63c87 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.