From 91b3ea45471086e17eb48ba805ce5f7fd39f9ac4 Mon Sep 17 00:00:00 2001
From: Hisham Abdullah Bin Ateya <hishamco_2007@hotmail.com>
Date: Fri, 8 May 2015 01:52:03 +0300
Subject: [PATCH 1/2] Using expression-bodies methods

---
 .../CustomRequestCultureStrategy.cs           |  5 +----
 .../IApplicationBuilderExtensions.cs          |  5 +----
 .../ResourceManagerStringLocalizer.cs         | 22 +++++--------------
 ...sourceManagerWithCultureStringLocalizer.cs |  5 +----
 4 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/src/Microsoft.AspNet.Localization/CustomRequestCultureStrategy.cs b/src/Microsoft.AspNet.Localization/CustomRequestCultureStrategy.cs
index 629862c1e5..f67804ab44 100644
--- a/src/Microsoft.AspNet.Localization/CustomRequestCultureStrategy.cs
+++ b/src/Microsoft.AspNet.Localization/CustomRequestCultureStrategy.cs
@@ -16,9 +16,6 @@ namespace Microsoft.AspNet.Localization
             _strategy = strategy;
         }
 
-        public RequestCulture DetermineRequestCulture([NotNull] HttpContext httpContext)
-        {
-            return _strategy(httpContext);
-        }
+        public RequestCulture DetermineRequestCulture([NotNull] HttpContext httpContext) => _strategy(httpContext);
     }
 }
diff --git a/src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs b/src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs
index d3d7a65077..b08c756bc9 100644
--- a/src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs
@@ -33,9 +33,6 @@ namespace Microsoft.AspNet.Builder
         /// <returns>The <see cref="IApplicationBuilder"/>.</returns>
         public static IApplicationBuilder UseRequestLocalization(
             [NotNull] this IApplicationBuilder builder,
-            [NotNull] RequestLocalizationMiddlewareOptions options)
-        {
-            return builder.UseMiddleware<RequestLocalizationMiddleware>(options);
-        }
+            [NotNull] RequestLocalizationMiddlewareOptions options) => builder.UseMiddleware<RequestLocalizationMiddleware>(options);
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.Framework.Localization/ResourceManagerStringLocalizer.cs b/src/Microsoft.Framework.Localization/ResourceManagerStringLocalizer.cs
index 526b16ab99..1db2031649 100644
--- a/src/Microsoft.Framework.Localization/ResourceManagerStringLocalizer.cs
+++ b/src/Microsoft.Framework.Localization/ResourceManagerStringLocalizer.cs
@@ -119,15 +119,9 @@ namespace Microsoft.Framework.Localization
         /// Returns an <see cref="IEnumerator{LocalizedString}"/> for all strings in the current culture.
         /// </summary>
         /// <returns>The <see cref="IEnumerator{LocalizedString}"/>.</returns>
-        public virtual IEnumerator<LocalizedString> GetEnumerator()
-        {
-            return GetEnumerator(CultureInfo.CurrentUICulture);
-        }
+        public virtual IEnumerator<LocalizedString> GetEnumerator() => GetEnumerator(CultureInfo.CurrentUICulture);
 
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
         /// <summary>
         /// Returns an <see cref="IEnumerator{LocalizedString}"/> for all strings in the specified culture.
@@ -200,11 +194,8 @@ namespace Microsoft.Framework.Localization
 
             public CultureInfo CultureInfo { get; }
 
-            public bool Equals(MissingManifestCacheKey other)
-            {
-                return string.Equals(Name, other.Name, StringComparison.Ordinal)
-                    && CultureInfo == other.CultureInfo;
-            }
+            public bool Equals(MissingManifestCacheKey other) =>
+                string.Equals(Name, other.Name, StringComparison.Ordinal) && CultureInfo == other.CultureInfo;
 
             public override bool Equals(object obj)
             {
@@ -218,10 +209,7 @@ namespace Microsoft.Framework.Localization
                 return base.Equals(obj);
             }
 
-            public override int GetHashCode()
-            {
-                return _hashCode;
-            }
+            public override int GetHashCode() => _hashCode;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.Framework.Localization/ResourceManagerWithCultureStringLocalizer.cs b/src/Microsoft.Framework.Localization/ResourceManagerWithCultureStringLocalizer.cs
index 8e9027af76..2c582c0854 100644
--- a/src/Microsoft.Framework.Localization/ResourceManagerWithCultureStringLocalizer.cs
+++ b/src/Microsoft.Framework.Localization/ResourceManagerWithCultureStringLocalizer.cs
@@ -57,9 +57,6 @@ namespace Microsoft.Framework.Localization
         }
 
         /// <inheritdoc />
-        public override IEnumerator<LocalizedString> GetEnumerator()
-        {
-            return GetEnumerator(_culture);
-        }
+        public override IEnumerator<LocalizedString> GetEnumerator() => GetEnumerator(_culture);
     }
 }
\ No newline at end of file

From 5c7d811aa68a72cd8336deb2b254198b9dfd6cce Mon Sep 17 00:00:00 2001
From: damianedwards <damian@damianedwards.com>
Date: Wed, 20 May 2015 16:22:54 -0700
Subject: [PATCH 2/2] Fix the merge

---
 .../CustomRequestCultureProvider.cs                           | 4 +---
 .../IApplicationBuilderExtensions.cs                          | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs b/src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs
index 0bbb94f42b..571a9a0e90 100644
--- a/src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs
+++ b/src/Microsoft.AspNet.Localization/CustomRequestCultureProvider.cs
@@ -26,8 +26,6 @@ namespace Microsoft.AspNet.Localization
 
         /// <inheritdoc />
         public override Task<RequestCulture> DetermineRequestCulture([NotNull] HttpContext httpContext)
-        {
-            return _provider(httpContext);
-        }
+            => _provider(httpContext);
     }
 }
diff --git a/src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs b/src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs
index afa218e30f..fbc6b08cba 100644
--- a/src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Localization/IApplicationBuilderExtensions.cs
@@ -33,6 +33,7 @@ namespace Microsoft.AspNet.Builder
         /// <returns>The <see cref="IApplicationBuilder"/>.</returns>
         public static IApplicationBuilder UseRequestLocalization(
             [NotNull] this IApplicationBuilder builder,
-            [NotNull] RequestLocalizationOptions options => builder.UseMiddleware<RequestLocalizationMiddleware>(options);
+            [NotNull] RequestLocalizationOptions options)
+            => builder.UseMiddleware<RequestLocalizationMiddleware>(options);
     }
 }
\ No newline at end of file