From 328dae1059118469fa6e0745b85c6700a44c3fa7 Mon Sep 17 00:00:00 2001
From: ryannewington <ryan@lithiumblue.com>
Date: Sat, 9 Jul 2016 11:09:10 +1000
Subject: [PATCH 1/2] Adds initial support for getting and saving localized
 resources

---
 .../GetTests.cs                               |  20 +
 .../UnitTestHelper.cs                         |   6 +
 .../Lithnet.ResourceManagement.Client.csproj  |   2 +-
 .../ResourceManagementClient.cs               | 542 ++++++++++++++++--
 .../ResourceObject.cs                         |  37 +-
 .../Schema/AttributeNames.cs                  |   5 +
 .../ServiceImplementation/MessageComposer.cs  |  53 +-
 .../ServiceImplementation/ResourceClient.cs   |  42 +-
 .../ServiceImplementation/SearchClient.cs     |  19 +-
 .../SearchResultPager.cs                      |   8 +-
 10 files changed, 626 insertions(+), 108 deletions(-)

diff --git a/src/Lithnet.ResourceManagement.Client.UnitTests/GetTests.cs b/src/Lithnet.ResourceManagement.Client.UnitTests/GetTests.cs
index e3288b5..76110dd 100644
--- a/src/Lithnet.ResourceManagement.Client.UnitTests/GetTests.cs
+++ b/src/Lithnet.ResourceManagement.Client.UnitTests/GetTests.cs
@@ -12,6 +12,26 @@ namespace Lithnet.ResourceManagement.Client.UnitTests
     [TestClass]
     public class GetTests
     {
+        [TestMethod]
+        public void TestLocale()
+        {
+            ResourceManagementClient client = new ResourceManagementClient();
+
+            try
+            {
+                //ResourceObject resource = client.GetResourceByKey("AttributeTypeDescription", "Name", "DisplayName", UnitTestHelper.TestCulture);
+
+                ResourceObject resource = client.GetResource("7dcc83b6-8be7-4717-a1ac-62b0b1b7ce29", UnitTestHelper.TestCulture);
+                Assert.AreEqual(UnitTestHelper.TestCulture, resource.Locale);
+                //Nome visualizzato
+            }
+            finally
+            {
+
+            }
+        }
+
+
         [TestMethod]
         public void GetObjectByIDWithAllAttributes()
         {
diff --git a/src/Lithnet.ResourceManagement.Client.UnitTests/UnitTestHelper.cs b/src/Lithnet.ResourceManagement.Client.UnitTests/UnitTestHelper.cs
index fd0eae7..de008e7 100644
--- a/src/Lithnet.ResourceManagement.Client.UnitTests/UnitTestHelper.cs
+++ b/src/Lithnet.ResourceManagement.Client.UnitTests/UnitTestHelper.cs
@@ -5,6 +5,7 @@
 using Lithnet.ResourceManagement.Client;
 using Microsoft.ResourceManagement.WebServices;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Globalization;
 
 namespace Lithnet.ResourceManagement.Client.UnitTests
 {
@@ -12,6 +13,9 @@ public static class UnitTestHelper
     {
         internal static ResourceManagementClient client = new ResourceManagementClient();
 
+        internal const string TestLocale = "it-IT";
+        internal static CultureInfo TestCulture = new CultureInfo(UnitTestHelper.TestLocale);
+
         public static string TestDataString1 = "testString1";
         public static string TestDataString2 = "testString2";
         public static string TestDataString3 = "testString3";
@@ -84,6 +88,8 @@ public static class UnitTestHelper
         internal const string AttributeBinaryMV = "ut_mvbinary";
         internal const string AttributeBooleanSV = "ut_svboolean";
 
+        
+
         static UnitTestHelper()
         {
             UnitTestHelper.PrepareRMSForUnitTests();
diff --git a/src/Lithnet.ResourceManagement.Client/Lithnet.ResourceManagement.Client.csproj b/src/Lithnet.ResourceManagement.Client/Lithnet.ResourceManagement.Client.csproj
index b87d1ca..f1c5d47 100644
--- a/src/Lithnet.ResourceManagement.Client/Lithnet.ResourceManagement.Client.csproj
+++ b/src/Lithnet.ResourceManagement.Client/Lithnet.ResourceManagement.Client.csproj
@@ -209,7 +209,7 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>d:\NuGet\NuGet.exe pack $(ProjectPath) -Exclude **\*.xml</PostBuildEvent>
+    <PostBuildEvent>d:\NuGet\NuGet.exe pack $(ProjectPath) -OutputDirectory D:\nuget\packages -Exclude **\*.xml</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Lithnet.ResourceManagement.Client/ResourceManagementClient.cs b/src/Lithnet.ResourceManagement.Client/ResourceManagementClient.cs
index b10030a..bab239e 100644
--- a/src/Lithnet.ResourceManagement.Client/ResourceManagementClient.cs
+++ b/src/Lithnet.ResourceManagement.Client/ResourceManagementClient.cs
@@ -42,7 +42,7 @@ public class ResourceManagementClient
         /// The local instance of the Search proxy
         /// </summary>
         private SearchClient searchClient;
-        
+
         /// <summary>
         /// The binding used to connect to the resource management service
         /// </summary>
@@ -376,7 +376,7 @@ public void DeleteResource(string id)
         /// <param name="resources">The resources to update</param>
         public void SaveResources(params ResourceObject[] resources)
         {
-            this.SaveResources(resources);
+            this.SaveResources(resources, null);
         }
 
         /// <summary>
@@ -384,6 +384,16 @@ public void SaveResources(params ResourceObject[] resources)
         /// </summary>
         /// <param name="resources">The collection of resources to update</param>
         public void SaveResources(IEnumerable<ResourceObject> resources)
+        {
+            this.SaveResources(resources, null);
+        }
+
+        /// <summary>
+        /// Saves the specified resources in the resource management service. Updates and Adds are committed as a single composite operation.
+        /// </summary>
+        /// <param name="resources">The collection of resources to update</param>
+        /// <param name="locale">The localization culture to use when saving the object</param>
+        public void SaveResources(IEnumerable<ResourceObject> resources, CultureInfo locale)
         {
             IEnumerable<ResourceObject> resourceObjects = resources as IList<ResourceObject> ?? resources.ToList();
 
@@ -410,7 +420,7 @@ public void SaveResources(IEnumerable<ResourceObject> resources)
 
             if (objectsToUpdate.Count > 0)
             {
-                this.resourceClient.Put(objectsToUpdate);
+                this.resourceClient.Put(objectsToUpdate, locale);
 
                 foreach (ResourceObject resource in objectsToUpdate)
                 {
@@ -428,7 +438,7 @@ public void SaveResources(IEnumerable<ResourceObject> resources)
         /// <param name="resources">The resources to save</param>
         public void SaveResourcesParallel(IEnumerable<ResourceObject> resources)
         {
-            this.SaveResourcesParallel(resources, 0);
+            this.SaveResourcesParallel(resources, 0, null);
 
         }
 
@@ -441,6 +451,20 @@ public void SaveResourcesParallel(IEnumerable<ResourceObject> resources)
         /// <param name="maxDegreeOfParallelism">The maximum number of threads to use for the operation</param>
         /// <param name="resources">The resources to save</param>
         public void SaveResourcesParallel(IEnumerable<ResourceObject> resources, int maxDegreeOfParallelism)
+        {
+            this.SaveResourcesParallel(resources, maxDegreeOfParallelism, null);
+        }
+
+        /// <summary>
+        /// Saves the specified resources in the resource management service. Each update is performed on its own thread
+        /// </summary>
+        /// <remarks>
+        /// This method will reorder the operations to perform creates first, followed by updates and finally deletes
+        /// </remarks>
+        /// <param name="maxDegreeOfParallelism">The maximum number of threads to use for the operation</param>
+        /// <param name="locale">The localization culture to use when saving the object</param>
+        /// <param name="resources">The resources to save</param>
+        public void SaveResourcesParallel(IEnumerable<ResourceObject> resources, int maxDegreeOfParallelism, CultureInfo locale)
         {
             ConcurrentQueue<ResourceObject> createResources = new ConcurrentQueue<ResourceObject>(resources.Where(t => t.ModificationType == OperationType.Create));
             ConcurrentQueue<ResourceObject> updateResources = new ConcurrentQueue<ResourceObject>(resources.Where(t => t.ModificationType == OperationType.Update));
@@ -454,17 +478,17 @@ public void SaveResourcesParallel(IEnumerable<ResourceObject> resources, int max
 
             Parallel.ForEach(createResources, op, (resource =>
             {
-                this.SaveResource(resource);
+                this.SaveResource(resource, locale);
             }));
 
             Parallel.ForEach(updateResources, op, (resource =>
             {
-                this.SaveResource(resource);
+                this.SaveResource(resource, locale);
             }));
 
             Parallel.ForEach(deleteResources, op, (resource =>
             {
-                this.SaveResource(resource);
+                this.SaveResource(resource, locale);
             }));
         }
 
@@ -473,6 +497,16 @@ public void SaveResourcesParallel(IEnumerable<ResourceObject> resources, int max
         /// </summary>
         /// <param name="resource">The resource to save</param>
         public void SaveResource(ResourceObject resource)
+        {
+            this.SaveResource(resource, null);
+        }
+
+        /// <summary>
+        /// Saves the specified resource in the resource management service
+        /// </summary>
+        /// <param name="resource">The resource to save</param>
+        /// <param name="locale">The localization culture to use when saving the object</param>
+        public void SaveResource(ResourceObject resource, CultureInfo locale)
         {
             switch (resource.ModificationType)
             {
@@ -484,7 +518,7 @@ public void SaveResource(ResourceObject resource)
                     break;
 
                 case OperationType.Update:
-                    this.PutResource(resource);
+                    this.PutResource(resource, locale);
                     resource.CommitChanges();
                     break;
 
@@ -495,7 +529,6 @@ public void SaveResource(ResourceObject resource)
                 default:
                     break;
             }
-
         }
 
         /// <summary>
@@ -540,7 +573,18 @@ public ResourceObject CreateResourceTemplateForUpdate(string objectType, UniqueI
         /// </example>
         public ResourceObject GetResource(Guid id)
         {
-            return this.GetResource(new UniqueIdentifier(id), null);
+            return this.GetResource(new UniqueIdentifier(id), null, null);
+        }
+
+        /// <summary>
+        /// Gets a resource from the resource management service, retrieving all attributes for the resource
+        /// </summary>
+        /// <param name="id">The ID of the resource to get</param>
+        /// <param name="locale">The culture to use to request a localized version of the object</param>
+        /// <returns>The resource represented by the specified ID</returns>
+        public ResourceObject GetResource(Guid id, CultureInfo locale)
+        {
+            return this.GetResource(new UniqueIdentifier(id), null, locale);
         }
 
         /// <summary>
@@ -558,6 +602,19 @@ public ResourceObject GetResource(Guid id, IEnumerable<string> attributesToGet)
             return this.GetResource(new UniqueIdentifier(id), attributesToGet);
         }
 
+
+        /// <summary>
+        /// Gets a resource from the resource management service, retrieving only a specified set of attributes for the resource
+        /// </summary>
+        /// <param name="id">The ID of the resource to get</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="locale">The culture to use to request a localized version of the object</param>
+        /// <returns>The resource represented by the specified ID</returns>
+        public ResourceObject GetResource(Guid id, IEnumerable<string> attributesToGet, CultureInfo locale)
+        {
+            return this.GetResource(new UniqueIdentifier(id), attributesToGet, locale);
+        }
+
         /// <summary>
         /// Gets a resource from the resource management service, retrieving all attributes for the resource
         /// </summary>
@@ -569,7 +626,18 @@ public ResourceObject GetResource(Guid id, IEnumerable<string> attributesToGet)
         /// </example>
         public ResourceObject GetResource(string id)
         {
-            return this.GetResource(new UniqueIdentifier(id), null);
+            return this.GetResource(new UniqueIdentifier(id), null, null);
+        }
+
+        /// <summary>
+        /// Gets a resource from the resource management service, retrieving all attributes for the resource
+        /// </summary>
+        /// <param name="id">The ID of the resource to get as a GUID in string format</param>
+        /// <param name="locale">The culture to use to request a localized version of the object</param>
+        /// <returns>The resource represented by the specified ID</returns>
+        public ResourceObject GetResource(string id, CultureInfo locale)
+        {
+            return this.GetResource(new UniqueIdentifier(id), null, locale);
         }
 
         /// <summary>
@@ -587,6 +655,18 @@ public ResourceObject GetResource(string id, IEnumerable<string> attributesToGet
             return this.GetResource(new UniqueIdentifier(id), attributesToGet);
         }
 
+        /// <summary>
+        /// Gets a resource from the resource management service, retrieving only a specified set of attributes for the resource
+        /// </summary>
+        /// <param name="id">The ID of the resource to get as a GUID in string format</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="locale">The culture to use to request a localized version of the object</param>
+        /// <returns>The resource represented by the specified ID</returns>
+        public ResourceObject GetResource(string id, IEnumerable<string> attributesToGet, CultureInfo locale)
+        {
+            return this.GetResource(new UniqueIdentifier(id), attributesToGet, locale);
+        }
+
         /// <summary>
         /// Gets a resource from the resource management service, retrieving all attributes for the resource
         /// </summary>
@@ -598,7 +678,18 @@ public ResourceObject GetResource(string id, IEnumerable<string> attributesToGet
         /// </example>
         public ResourceObject GetResource(UniqueIdentifier id)
         {
-            return this.resourceClient.Get(id);
+            return this.resourceClient.Get(id, null, null);
+        }
+
+        /// <summary>
+        /// Gets a resource from the resource management service, retrieving all attributes for the resource
+        /// </summary>
+        /// <param name="id">The ID of the resource to get</param>
+        /// <param name="locale">The culture to use to request a localized version of the object</param>
+        /// <returns>The resource represented by the specified ID</returns>
+        public ResourceObject GetResource(UniqueIdentifier id, CultureInfo locale)
+        {
+            return this.resourceClient.Get(id, null, locale);
         }
 
         /// <summary>
@@ -613,7 +704,7 @@ public ResourceObject GetResource(UniqueIdentifier id)
         /// </example>
         public ResourceObject GetResource(UniqueIdentifier id, IEnumerable<string> attributesToGet)
         {
-            return this.resourceClient.Get(id, attributesToGet);
+            return this.resourceClient.Get(id, attributesToGet, null);
         }
 
         /// <summary>
@@ -621,7 +712,7 @@ public ResourceObject GetResource(UniqueIdentifier id, IEnumerable<string> attri
         /// </summary>
         /// <param name="id">The ID of the resource to get</param>
         /// <param name="attributesToGet">The list of attributes to retrieve</param>
-        /// <param name="locale">The locale to submit with the get request</param>
+        /// <param name="locale">The culture to use to request a localized version of the object</param>
         /// <returns>The resource represented by the specified ID</returns>
         /// <example>
         /// The following example shows how to get an object from a reference value
@@ -632,7 +723,6 @@ public ResourceObject GetResource(UniqueIdentifier id, IEnumerable<string> attri
             return this.resourceClient.Get(id, attributesToGet, locale);
         }
 
-
         /// <summary>
         /// Gets a resource from the resource management service using a unique attribute and value combination, retrieving all attributes for the resource
         /// </summary>
@@ -647,7 +737,25 @@ public ResourceObject GetResource(UniqueIdentifier id, IEnumerable<string> attri
         /// </example>
         public ResourceObject GetResourceByKey(string objectType, string attributeName, object value)
         {
-            return this.GetResourceByKey(objectType, attributeName, value, null);
+            return this.GetResourceByKey(objectType, attributeName, value, null, null);
+        }
+
+        /// <summary>
+        /// Gets a resource from the resource management service using a unique attribute and value combination, retrieving all attributes for the resource
+        /// </summary>
+        /// <param name="objectType">The type of object to retrieve</param>
+        /// <param name="attributeName">The name of the attribute used as the key</param>
+        /// <param name="value">The value of the attribute</param>
+        /// <param name="locale">The culture to use to request a localized version of the object</param>
+        /// <returns>A resource that matches the specified criteria, or null of no object was found</returns>
+        /// <exception cref="TooManyResultsException">The method will throw this exception when more that one match was found for the specified criteria</exception>
+        /// <example>
+        /// The following example shows how get a user by its AccountName attribute
+        /// <code language="cs" title="Example" source="..\Lithnet.ResourceManagement.Client.Help.Examples\ResourceManagementClient_GetResourceByKeyExamples.cs" region="GetResourceByKey(String, String, String)"/>
+        /// </example>
+        public ResourceObject GetResourceByKey(string objectType, string attributeName, object value, CultureInfo locale)
+        {
+            return this.GetResourceByKey(objectType, attributeName, value, null, locale);
         }
 
         /// <summary>
@@ -671,6 +779,28 @@ public ResourceObject GetResourceByKey(string objectType, string attributeName,
             return this.GetResourceByKey(objectType, values, attributesToGet);
         }
 
+        /// <summary>
+        /// Gets a resource from the resource management service using a unique attribute and value combination, retrieving the specified attributes for the resource
+        /// </summary>
+        /// <param name="objectType">The type of object to retrieve</param>
+        /// <param name="attributeName">The name of the attribute used as the key</param>
+        /// <param name="value">The value of the attribute</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="locale">The culture to use to request a localized version of the object</param>
+        /// <returns>A resource that matches the specified criteria, or null of no object was found</returns>
+        /// <exception cref="TooManyResultsException">The method will throw this exception when more that one match was found for the specified criteria</exception>
+        /// <example>
+        /// The following example shows how get a user by its AccountName attribute
+        /// <code language="cs" title="Example" source="..\Lithnet.ResourceManagement.Client.Help.Examples\ResourceManagementClient_GetResourceByKeyExamples.cs" region="GetResourceByKey(String, String, String)"/>
+        /// </example>
+        public ResourceObject GetResourceByKey(string objectType, string attributeName, object value, IEnumerable<string> attributesToGet, CultureInfo locale)
+        {
+            Dictionary<string, object> values = new Dictionary<string, object>();
+            values.Add(attributeName, value);
+
+            return this.GetResourceByKey(objectType, values, attributesToGet, locale);
+        }
+
         /// <summary>
         /// Gets a resource from the resource management service using a set of unique attribute and value combinations, retrieving all attributes for the resource
         /// </summary>
@@ -700,6 +830,24 @@ public ResourceObject GetResourceByKey(string objectType, Dictionary<string, obj
         /// <code language="cs" title="Example" source="..\Lithnet.ResourceManagement.Client.Help.Examples\ResourceManagementClient_GetResourceByKeyExamples.cs" region="GetResourceByKey(String, Dictionary{String, String})"/>
         /// </example>
         public ResourceObject GetResourceByKey(string objectType, Dictionary<string, object> attributeValuePairs, IEnumerable<string> attributesToGet)
+        {
+            return this.GetResourceByKey(objectType, attributeValuePairs, attributesToGet, null);
+        }
+
+        /// <summary>
+        /// Gets a resource from the resource management service using a set of unique attribute and value combinations, retrieving the specified attributes for the resource
+        /// </summary>
+        /// <param name="objectType">The type of object to retrieve</param>
+        /// <param name="attributeValuePairs">A list of attribute value pairs that make this object unique</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="locale">The culture to use to request a localized version of the object</param>
+        /// <returns>A resource that matches the specified criteria, or null of no object was found</returns>
+        /// <exception cref="TooManyResultsException">The method will throw this exception when more that one match was found for the specified criteria</exception>
+        /// <example>
+        /// The following example shows how get a user by using the AccountName and Domain pair of anchor attributes
+        /// <code language="cs" title="Example" source="..\Lithnet.ResourceManagement.Client.Help.Examples\ResourceManagementClient_GetResourceByKeyExamples.cs" region="GetResourceByKey(String, Dictionary{String, String})"/>
+        /// </example>
+        public ResourceObject GetResourceByKey(string objectType, Dictionary<string, object> attributeValuePairs, IEnumerable<string> attributesToGet, CultureInfo locale)
         {
             string filter = XPathFilterBuilder.CreateFilter(objectType, attributeValuePairs, ComparisonOperator.Equals, GroupOperator.And);
 
@@ -708,7 +856,7 @@ public ResourceObject GetResourceByKey(string objectType, Dictionary<string, obj
                 attributesToGet = ResourceManagementSchema.GetObjectType(objectType).Attributes.Select(t => t.SystemName);
             }
 
-            ISearchResultCollection results = this.searchClient.EnumerateSync(filter, 1, attributesToGet, null);
+            ISearchResultCollection results = this.searchClient.EnumerateSync(filter, 1, attributesToGet, null, locale);
 
             if (results.Count == 0)
             {
@@ -732,7 +880,19 @@ public ResourceObject GetResourceByKey(string objectType, Dictionary<string, obj
         /// <returns>A collection of matching resource objects</returns>
         public ISearchResultCollection GetResources(string filter)
         {
-            return this.searchClient.EnumerateSync(filter, -1, null, null);
+            return this.searchClient.EnumerateSync(filter, -1, null, null, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, synchronously, using the default page size
+        /// WARNING: Due to the way that the resource management client processes unconstrained XPath queries, this function can cause excessive load on the underlying database. If the object type or attributes are known, use the overload of this function that supports specifying the attributes to get
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResources(string filter, CultureInfo locale)
+        {
+            return this.searchClient.EnumerateSync(filter, -1, null, null, locale);
         }
 
         /// <summary>
@@ -743,7 +903,19 @@ public ISearchResultCollection GetResources(string filter)
         /// <returns>A collection of matching resource objects</returns>
         public ISearchResultCollection GetResources(string filter, IEnumerable<string> attributesToGet)
         {
-            return this.searchClient.EnumerateSync(filter, -1, attributesToGet, null);
+            return this.searchClient.EnumerateSync(filter, -1, attributesToGet, null, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, synchronously, using the default page size, and retrieving the specified attributes
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResources(string filter, IEnumerable<string> attributesToGet, CultureInfo locale)
+        {
+            return this.searchClient.EnumerateSync(filter, -1, attributesToGet, null, locale);
         }
 
         /// <summary>
@@ -762,7 +934,7 @@ public ISearchResultCollection GetResources(string filter, IEnumerable<string> a
             }
 
             SortingAttribute attribute = new SortingAttribute(sortAttribute, sortAscending);
-            return this.searchClient.EnumerateSync(filter, -1, attributesToGet, new SortingAttribute[] { attribute });
+            return this.searchClient.EnumerateSync(filter, -1, attributesToGet, new SortingAttribute[] { attribute }, null);
         }
 
         /// <summary>
@@ -779,7 +951,25 @@ public ISearchResultCollection GetResources(string filter, IEnumerable<string> a
                 throw new ArgumentNullException("sortAttributes");
             }
 
-            return this.searchClient.EnumerateSync(filter, -1, attributesToGet, sortAttributes);
+            return this.searchClient.EnumerateSync(filter, -1, attributesToGet, sortAttributes, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, synchronously, using the specified page size, and retrieving the specified attributes
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="sortAttributes">A collection of attribute names and sort directions to order the results with</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResources(string filter, IEnumerable<string> attributesToGet, IEnumerable<SortingAttribute> sortAttributes, CultureInfo locale)
+        {
+            if (sortAttributes == null)
+            {
+                throw new ArgumentNullException("sortAttributes");
+            }
+
+            return this.searchClient.EnumerateSync(filter, -1, attributesToGet, sortAttributes, locale);
         }
 
         /// <summary>
@@ -791,7 +981,7 @@ public ISearchResultCollection GetResources(string filter, IEnumerable<string> a
         /// <returns>A collection of matching resource objects</returns>
         public ISearchResultCollection GetResources(string filter, int pageSize)
         {
-            return this.searchClient.EnumerateSync(filter, pageSize, null, null);
+            return this.searchClient.EnumerateSync(filter, pageSize, null, null, null);
         }
 
         /// <summary>
@@ -803,7 +993,20 @@ public ISearchResultCollection GetResources(string filter, int pageSize)
         /// <returns>A collection of matching resource objects</returns>
         public ISearchResultCollection GetResources(string filter, int pageSize, IEnumerable<string> attributesToGet)
         {
-            return this.searchClient.EnumerateSync(filter, pageSize, attributesToGet, null);
+            return this.searchClient.EnumerateSync(filter, pageSize, attributesToGet, null, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, synchronously, using the specified page size, and retrieving the specified attributes
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="pageSize">The number of results to request from the server at a time</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResources(string filter, int pageSize, IEnumerable<string> attributesToGet, CultureInfo locale)
+        {
+            return this.searchClient.EnumerateSync(filter, pageSize, attributesToGet, null, locale);
         }
 
         /// <summary>
@@ -823,7 +1026,7 @@ public ISearchResultCollection GetResources(string filter, int pageSize, IEnumer
             }
 
             SortingAttribute attribute = new SortingAttribute(sortAttribute, sortAscending);
-            return this.searchClient.EnumerateSync(filter, pageSize, attributesToGet, new SortingAttribute[] { attribute });
+            return this.searchClient.EnumerateSync(filter, pageSize, attributesToGet, new SortingAttribute[] { attribute }, null);
         }
 
         /// <summary>
@@ -932,7 +1135,26 @@ public ISearchResultCollection GetResources(string filter, int pageSize, IEnumer
                 throw new ArgumentNullException("sortAttributes");
             }
 
-            return this.searchClient.EnumerateSync(filter, pageSize, attributesToGet, sortAttributes);
+            return this.searchClient.EnumerateSync(filter, pageSize, attributesToGet, sortAttributes, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, synchronously, using the specified page size, and retrieving the specified attributes
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="pageSize">The number of results to request from the server at a time</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="sortAttributes">A collection of attribute names and sort directions to order the results with</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResources(string filter, int pageSize, IEnumerable<string> attributesToGet, IEnumerable<SortingAttribute> sortAttributes, CultureInfo locale)
+        {
+            if (sortAttributes == null)
+            {
+                throw new ArgumentNullException("sortAttributes");
+            }
+
+            return this.searchClient.EnumerateSync(filter, pageSize, attributesToGet, sortAttributes, locale);
         }
 
         /// <summary>
@@ -943,7 +1165,19 @@ public ISearchResultCollection GetResources(string filter, int pageSize, IEnumer
         /// <returns>A collection of matching resource objects</returns>
         public ISearchResultCollection GetResourcesAsync(string filter)
         {
-            return this.searchClient.EnumerateAsync(filter, -1, null, null, null);
+            return this.searchClient.EnumerateAsync(filter, -1, null, null, null, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the default page size
+        /// WARNING: Due to the way that the resource management client processes unconstrained XPath queries, this function can cause excessive load on the underlying database. If the object type or attributes are known, use the overload of this function that supports specifying the attributes to get
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResourcesAsync(string filter, CultureInfo locale)
+        {
+            return this.searchClient.EnumerateAsync(filter, -1, null, null, locale, null);
         }
 
         /// <summary>
@@ -954,9 +1188,22 @@ public ISearchResultCollection GetResourcesAsync(string filter)
         /// <returns>A collection of matching resource objects</returns>
         public ISearchResultCollection GetResourcesAsync(string filter, IEnumerable<string> attributesToGet)
         {
-            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, null, null);
+            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, null, null, null);
         }
 
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the default page size, and retrieving the specified attributes
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResourcesAsync(string filter, IEnumerable<string> attributesToGet, CultureInfo locale)
+        {
+            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, null, locale, null);
+        }
+
+
         /// <summary>
         /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the specified page size, and retrieving the specified attributes
         /// </summary>
@@ -973,7 +1220,7 @@ public ISearchResultCollection GetResourcesAsync(string filter, IEnumerable<stri
             }
 
             SortingAttribute attribute = new SortingAttribute(sortAttribute, sortAscending);
-            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, new SortingAttribute[] { attribute }, null);
+            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, new SortingAttribute[] { attribute }, null, null);
         }
 
         /// <summary>
@@ -990,7 +1237,25 @@ public ISearchResultCollection GetResourcesAsync(string filter, IEnumerable<stri
                 throw new ArgumentNullException("sortAttributes");
             }
 
-            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, sortAttributes, null);
+            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, sortAttributes, null, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the specified page size, and retrieving the specified attributes
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="sortAttributes">A collection of attribute names and sort directions to order the results with</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResourcesAsync(string filter, IEnumerable<string> attributesToGet, IEnumerable<SortingAttribute> sortAttributes, CultureInfo locale)
+        {
+            if (sortAttributes == null)
+            {
+                throw new ArgumentNullException("sortAttributes");
+            }
+
+            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, sortAttributes, locale, null);
         }
 
         /// <summary>
@@ -1002,7 +1267,20 @@ public ISearchResultCollection GetResourcesAsync(string filter, IEnumerable<stri
         /// <returns>A collection of matching resource objects</returns>
         public ISearchResultCollection GetResourcesAsync(string filter, int pageSize)
         {
-            return this.searchClient.EnumerateAsync(filter, pageSize, null, null, null);
+            return this.searchClient.EnumerateAsync(filter, pageSize, null, null, null, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the specified page size
+        /// WARNING: Due to the way that the resource management client processes unconstrained XPath queries, this function can cause excessive load on the underlying database. If the object type or attributes are known, use the overload of this function that supports specifying the attributes to get
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="pageSize">The number of results to request from the server at a time</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, CultureInfo locale)
+        {
+            return this.searchClient.EnumerateAsync(filter, pageSize, null, null, locale, null);
         }
 
         /// <summary>
@@ -1014,7 +1292,20 @@ public ISearchResultCollection GetResourcesAsync(string filter, int pageSize)
         /// <returns>A collection of matching resource objects</returns>
         public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, IEnumerable<string> attributesToGet)
         {
-            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, null, null);
+            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, null, null, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the specified page size, and retrieving the specified attributes
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="pageSize">The number of results to request from the server at a time</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, IEnumerable<string> attributesToGet, CultureInfo locale)
+        {
+            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, null, locale, null);
         }
 
         /// <summary>
@@ -1034,7 +1325,7 @@ public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, IE
             }
 
             SortingAttribute attribute = new SortingAttribute(sortAttribute, sortAscending);
-            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, new SortingAttribute[] { attribute }, null);
+            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, new SortingAttribute[] { attribute }, null, null);
         }
 
         /// <summary>
@@ -1052,7 +1343,26 @@ public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, IE
                 throw new ArgumentNullException("sortAttributes");
             }
 
-            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, sortAttributes, null);
+            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, sortAttributes, null, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the specified page size, and retrieving the specified attributes
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="pageSize">The number of results to request from the server at a time</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="sortAttributes">A collection of attribute names and sort directions to order the results with</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, IEnumerable<string> attributesToGet, IEnumerable<SortingAttribute> sortAttributes, CultureInfo locale)
+        {
+            if (sortAttributes == null)
+            {
+                throw new ArgumentNullException("sortAttributes");
+            }
+
+            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, sortAttributes, locale, null);
         }
 
         /// <summary>
@@ -1064,7 +1374,20 @@ public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, IE
         /// <returns>A collection of matching resource objects</returns>
         public ISearchResultCollection GetResourcesAsync(string filter, CancellationTokenSource cancellationToken)
         {
-            return this.searchClient.EnumerateAsync(filter, -1, null, null, cancellationToken);
+            return this.searchClient.EnumerateAsync(filter, -1, null, null, null, cancellationToken);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the default page size
+        /// WARNING: Due to the way that the resource management client processes unconstrained XPath queries, this function can cause excessive load on the underlying database. If the object type or attributes are known, use the overload of this function that supports specifying the attributes to get
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <param name="cancellationToken">A cancellation object that can be used to terminate the search</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResourcesAsync(string filter, CultureInfo locale, CancellationTokenSource cancellationToken)
+        {
+            return this.searchClient.EnumerateAsync(filter, -1, null, null, locale, cancellationToken);
         }
 
         /// <summary>
@@ -1076,7 +1399,20 @@ public ISearchResultCollection GetResourcesAsync(string filter, CancellationToke
         /// <returns>A collection of matching resource objects</returns>
         public ISearchResultCollection GetResourcesAsync(string filter, IEnumerable<string> attributesToGet, CancellationTokenSource cancellationToken)
         {
-            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, null, cancellationToken);
+            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, null, null, cancellationToken);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the default page size, and retrieving the specified attributes
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <param name="cancellationToken">A cancellation object that can be used to terminate the search</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResourcesAsync(string filter, IEnumerable<string> attributesToGet, CultureInfo locale, CancellationTokenSource cancellationToken)
+        {
+            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, null, locale, cancellationToken);
         }
 
         /// <summary>
@@ -1096,7 +1432,7 @@ public ISearchResultCollection GetResourcesAsync(string filter, IEnumerable<stri
             }
 
             SortingAttribute attribute = new SortingAttribute(sortAttribute, sortAscending);
-            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, new SortingAttribute[] { attribute }, cancellationToken);
+            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, new SortingAttribute[] { attribute }, null, cancellationToken);
         }
 
         /// <summary>
@@ -1114,7 +1450,26 @@ public ISearchResultCollection GetResourcesAsync(string filter, IEnumerable<stri
                 throw new ArgumentNullException("sortAttributes");
             }
 
-            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, sortAttributes, cancellationToken);
+            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, sortAttributes, null, cancellationToken);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the specified page size, and retrieving the specified attributes
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="sortAttributes">A collection of attribute names and sort directions to order the results with</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <param name="cancellationToken">A cancellation object that can be used to terminate the search</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResourcesAsync(string filter, IEnumerable<string> attributesToGet, IEnumerable<SortingAttribute> sortAttributes, CultureInfo locale, CancellationTokenSource cancellationToken)
+        {
+            if (sortAttributes == null)
+            {
+                throw new ArgumentNullException("sortAttributes");
+            }
+
+            return this.searchClient.EnumerateAsync(filter, -1, attributesToGet, sortAttributes, locale, cancellationToken);
         }
 
         /// <summary>
@@ -1127,7 +1482,21 @@ public ISearchResultCollection GetResourcesAsync(string filter, IEnumerable<stri
         /// <returns>A collection of matching resource objects</returns>
         public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, CancellationTokenSource cancellationToken)
         {
-            return this.searchClient.EnumerateAsync(filter, pageSize, null, null, cancellationToken);
+            return this.searchClient.EnumerateAsync(filter, pageSize, null, null, null, cancellationToken);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the specified page size
+        /// WARNING: Due to the way that the resource management client processes unconstrained XPath queries, this function can cause excessive load on the underlying database. If the object type or attributes are known, use the overload of this function that supports specifying the attributes to get
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="pageSize">The number of results to request from the server at a time</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <param name="cancellationToken">A cancellation object that can be used to terminate the search</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, CultureInfo locale, CancellationTokenSource cancellationToken)
+        {
+            return this.searchClient.EnumerateAsync(filter, pageSize, null, null, locale, cancellationToken);
         }
 
         /// <summary>
@@ -1140,7 +1509,21 @@ public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, Ca
         /// <returns>A collection of matching resource objects</returns>
         public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, IEnumerable<string> attributesToGet, CancellationTokenSource cancellationToken)
         {
-            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, null, cancellationToken);
+            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, null, null, cancellationToken);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the specified page size, and retrieving the specified attributes
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="pageSize">The number of results to request from the server at a time</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <param name="cancellationToken">A cancellation object that can be used to terminate the search</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, IEnumerable<string> attributesToGet, CultureInfo locale, CancellationTokenSource cancellationToken)
+        {
+            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, null, locale, cancellationToken);
         }
 
         /// <summary>
@@ -1161,7 +1544,7 @@ public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, IE
             }
 
             SortingAttribute attribute = new SortingAttribute(sortAttribute, sortAscending);
-            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, new SortingAttribute[] { attribute }, cancellationToken);
+            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, new SortingAttribute[] { attribute }, null, cancellationToken);
         }
 
         /// <summary>
@@ -1180,7 +1563,27 @@ public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, IE
                 throw new ArgumentNullException("sortAttributes");
             }
 
-            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, sortAttributes, cancellationToken);
+            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, sortAttributes, null, cancellationToken);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, retrieving all results asynchronously on a separate thread, using the specified page size, and retrieving the specified attributes
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="pageSize">The number of results to request from the server at a time</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="sortAttributes">A collection of attribute names and sort directions to order the results with</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <param name="cancellationToken">A cancellation object that can be used to terminate the search</param>
+        /// <returns>A collection of matching resource objects</returns>
+        public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, IEnumerable<string> attributesToGet, IEnumerable<SortingAttribute> sortAttributes, CultureInfo locale, CancellationTokenSource cancellationToken)
+        {
+            if (sortAttributes == null)
+            {
+                throw new ArgumentNullException("sortAttributes");
+            }
+
+            return this.searchClient.EnumerateAsync(filter, pageSize, attributesToGet, sortAttributes, locale, cancellationToken);
         }
 
         /// <summary>
@@ -1191,7 +1594,19 @@ public ISearchResultCollection GetResourcesAsync(string filter, int pageSize, IE
         /// <returns>An object that can be used to navigate through the search results</returns>
         public SearchResultPager GetResourcesPaged(string filter, int pageSize)
         {
-            return this.searchClient.EnumeratePaged(filter, pageSize, null, null);
+            return this.searchClient.EnumeratePaged(filter, pageSize, null, null, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, using a SearchResultPager to navigate through the result set
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="pageSize">The number of results to request from the server at a time</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>An object that can be used to navigate through the search results</returns>
+        public SearchResultPager GetResourcesPaged(string filter, int pageSize, CultureInfo locale)
+        {
+            return this.searchClient.EnumeratePaged(filter, pageSize, null, null, locale);
         }
 
         /// <summary>
@@ -1203,7 +1618,20 @@ public SearchResultPager GetResourcesPaged(string filter, int pageSize)
         /// <returns>An object that can be used to navigate through the search results</returns>
         public SearchResultPager GetResourcesPaged(string filter, int pageSize, IEnumerable<string> attributesToGet)
         {
-            return this.searchClient.EnumeratePaged(filter, pageSize, attributesToGet, null);
+            return this.searchClient.EnumeratePaged(filter, pageSize, attributesToGet, null, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, using a SearchResultPager to navigate through the result set
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="pageSize">The number of results to request from the server at a time</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>An object that can be used to navigate through the search results</returns>
+        public SearchResultPager GetResourcesPaged(string filter, int pageSize, IEnumerable<string> attributesToGet, CultureInfo locale)
+        {
+            return this.searchClient.EnumeratePaged(filter, pageSize, attributesToGet, null, locale);
         }
 
         /// <summary>
@@ -1216,7 +1644,21 @@ public SearchResultPager GetResourcesPaged(string filter, int pageSize, IEnumera
         /// <returns>An object that can be used to navigate through the search results</returns>
         public SearchResultPager GetResourcesPaged(string filter, int pageSize, IEnumerable<string> attributesToGet, IEnumerable<SortingAttribute> sortAttributes)
         {
-            return this.searchClient.EnumeratePaged(filter, pageSize, attributesToGet, sortAttributes);
+            return this.searchClient.EnumeratePaged(filter, pageSize, attributesToGet, sortAttributes, null);
+        }
+
+        /// <summary>
+        /// Uses the specified XPath filter to find matching objects in the resource management service, using a SearchResultPager to navigate through the result set
+        /// </summary>
+        /// <param name="filter">The XPath filter defining the search criteria</param>
+        /// <param name="pageSize">The number of results to request from the server at a time</param>
+        /// <param name="attributesToGet">The list of attributes to retrieve</param>
+        /// <param name="sortAttributes">A collection of attribute names and sort directions to order the results with</param>
+        /// <param name="locale">The culture to use to request a localized version of the objects</param>
+        /// <returns>An object that can be used to navigate through the search results</returns>
+        public SearchResultPager GetResourcesPaged(string filter, int pageSize, IEnumerable<string> attributesToGet, IEnumerable<SortingAttribute> sortAttributes, CultureInfo locale)
+        {
+            return this.searchClient.EnumeratePaged(filter, pageSize, attributesToGet, sortAttributes, locale);
         }
 
         /// <summary>
@@ -1236,7 +1678,7 @@ public SearchResultPager GetResourcesPaged(string filter, int pageSize, IEnumera
             }
 
             SortingAttribute attribute = new SortingAttribute(sortAttribute, sortAscending);
-            return this.searchClient.EnumeratePaged(filter, pageSize, attributesToGet, new SortingAttribute[] { attribute });
+            return this.searchClient.EnumeratePaged(filter, pageSize, attributesToGet, new SortingAttribute[] { attribute }, null);
         }
 
         /// <summary>
@@ -1246,7 +1688,7 @@ public SearchResultPager GetResourcesPaged(string filter, int pageSize, IEnumera
         /// <returns>The number of resources that match the specified criteria</returns>
         public int GetResourceCount(string filter)
         {
-            ISearchResultCollection result = this.searchClient.EnumerateSync(filter, 0, new List<string>(), null);
+            ISearchResultCollection result = this.searchClient.EnumerateSync(filter, 0, new List<string>(), null, null);
             return result.Count;
         }
 
@@ -1278,14 +1720,14 @@ internal void CreateResources(IEnumerable<ResourceObject> resources)
             this.resourceFactoryClient.Create(resources);
         }
 
-
         /// <summary>
         /// Submits a resource template to the resource management service for update
         /// </summary>
         /// <param name="resource">The resource to update</param>
-        internal void PutResource(ResourceObject resource)
+        /// <param name="locale">The culture to use when saving a localized version of the object</param>
+        internal void PutResource(ResourceObject resource, CultureInfo locale)
         {
-            this.resourceClient.Put(resource);
+            this.resourceClient.Put(resource, locale);
         }
 
         /// <summary>
@@ -1345,7 +1787,7 @@ private ResourceFactoryClient CreateApprovalClient(EndpointAddress endpoint)
             {
                 client.ClientCredentials.Windows.ClientCredential = this.creds;
             }
-            
+
 #pragma warning disable 0618
             client.ClientCredentials.Windows.AllowNtlm = this.resourceFactoryClient.ClientCredentials.Windows.AllowNtlm;
 #pragma warning restore 0618
diff --git a/src/Lithnet.ResourceManagement.Client/ResourceObject.cs b/src/Lithnet.ResourceManagement.Client/ResourceObject.cs
index ae36f39..d292826 100644
--- a/src/Lithnet.ResourceManagement.Client/ResourceObject.cs
+++ b/src/Lithnet.ResourceManagement.Client/ResourceObject.cs
@@ -11,6 +11,7 @@
 using System.Runtime.Serialization;
 using System.Collections.ObjectModel;
 using Lithnet.ResourceManagement.Client;
+using System.Globalization;
 
 namespace Lithnet.ResourceManagement.Client
 {
@@ -25,7 +26,7 @@ public class ResourceObject : ISerializable
         /// The client object used to pass save, update, and create operations to
         /// </summary>
         private ResourceManagementClient client;
-        
+
         /// <summary>
         /// The internal representation of attributes of the object
         /// </summary>
@@ -78,6 +79,11 @@ public string ObjectTypeName
         /// </summary>
         public ObjectTypeDefinition ObjectType { get; private set; }
 
+        /// <summary>
+        /// Gets the localization culture of this object
+        /// </summary>
+        public CultureInfo Locale { get; private set; }
+
         /// <summary>
         /// Gets the collection of attributes and values associated with this object
         /// </summary>
@@ -115,7 +121,7 @@ public UniqueIdentifier ObjectID
                     }
 
                     return newId;
-                    
+
                 }
             }
         }
@@ -143,11 +149,12 @@ public string DisplayName
         /// </summary>
         /// <param name="opType">The type of modification to set on the object</param>
         /// <param name="client">The client used for further operations on this object</param>
-        private ResourceObject(OperationType opType, ResourceManagementClient client)
+        private ResourceObject(OperationType opType, ResourceManagementClient client, CultureInfo locale)
         {
             this.ModificationType = opType;
             this.attributes = new AttributeValueCollection();
             this.client = client;
+            this.Locale = locale;
         }
 
         /// <summary>
@@ -166,7 +173,7 @@ protected ResourceObject(SerializationInfo info, StreamingContext context)
         /// <param name="type">The object type that this object will represent</param>
         /// <param name="client">The client used for further operations on this object</param>
         internal ResourceObject(string type, ResourceManagementClient client)
-            : this(OperationType.Create, client)
+            : this(OperationType.Create, client, null)
         {
             if (!ResourceManagementSchema.ObjectTypes.ContainsKey(type))
             {
@@ -188,7 +195,7 @@ internal ResourceObject(string type, ResourceManagementClient client)
         /// <param name="id">The ID of the object</param>
         /// <param name="client">The client used for further operations on this object</param>
         internal ResourceObject(string type, UniqueIdentifier id, ResourceManagementClient client)
-            : this(OperationType.Update, client)
+            : this(OperationType.Update, client, null)
         {
             if (!ResourceManagementSchema.ObjectTypes.ContainsKey(type))
             {
@@ -208,8 +215,8 @@ internal ResourceObject(string type, UniqueIdentifier id, ResourceManagementClie
         /// </summary>
         /// <param name="objectElements">An enumeration of XmlElements that make up a partial response</param>
         /// <param name="client">The client used for further operations on this object</param>
-        internal ResourceObject(IEnumerable<XmlElement> objectElements, ResourceManagementClient client)
-            : this(OperationType.Update, client)
+        internal ResourceObject(IEnumerable<XmlElement> objectElements, ResourceManagementClient client, CultureInfo locale)
+            : this(OperationType.Update, client, locale)
         {
             this.PopulateResourceFromPartialResponse(objectElements);
         }
@@ -219,8 +226,8 @@ internal ResourceObject(IEnumerable<XmlElement> objectElements, ResourceManageme
         /// </summary>
         /// <param name="reader">An XmlDictionaryReader containing the full object definition</param>
         /// <param name="client">The client used for further operations on this object</param>
-        internal ResourceObject(XmlDictionaryReader reader, ResourceManagementClient client)
-            : this(OperationType.Update, client)
+        internal ResourceObject(XmlDictionaryReader reader, ResourceManagementClient client, CultureInfo locale)
+            : this(OperationType.Update, client, locale)
         {
             this.PopulateResourceFromFullObject(reader);
         }
@@ -230,8 +237,8 @@ internal ResourceObject(XmlDictionaryReader reader, ResourceManagementClient cli
         /// </summary>
         /// <param name="element">An XmlElement containing definition of the object from a set of fragments obtained from an enumeration response</param>
         /// <param name="client">The client used for further operations on this object</param>
-        internal ResourceObject(XmlElement element, ResourceManagementClient client)
-            : this(OperationType.Update, client)
+        internal ResourceObject(XmlElement element, ResourceManagementClient client, CultureInfo locale)
+            : this(OperationType.Update, client, locale)
         {
             this.PopulateResourceFromFragment(element);
         }
@@ -301,7 +308,7 @@ public void Save()
                     break;
 
                 case OperationType.Update:
-                    this.Client.PutResource(this);
+                    this.Client.PutResource(this, this.Locale);
                     break;
 
                 case OperationType.Delete:
@@ -534,6 +541,11 @@ private void SetInitialAttributeValues(Dictionary<string, List<string>> values)
                     {
                         this.attributes.Add(d.SystemName, new AttributeValue(d, kvp.Value.First()));
                     }
+
+                    if (d.SystemName == AttributeNames.Locale)
+                    {
+                        this.Locale = new CultureInfo(kvp.Value.First());
+                    }
                 }
             }
 
@@ -688,7 +700,6 @@ private void DeserializeObject(SerializationInfo info)
 
             foreach (SerializationEntry entry in info)
             {
-
                 IEnumerable<string> entryValues = entry.Value as IEnumerable<string>;
 
                 if (entryValues != null)
diff --git a/src/Lithnet.ResourceManagement.Client/Schema/AttributeNames.cs b/src/Lithnet.ResourceManagement.Client/Schema/AttributeNames.cs
index 2bbb86e..ed9f85b 100644
--- a/src/Lithnet.ResourceManagement.Client/Schema/AttributeNames.cs
+++ b/src/Lithnet.ResourceManagement.Client/Schema/AttributeNames.cs
@@ -152,6 +152,11 @@ public static class AttributeNames
         /// The WorkflowInstance attribute
         /// </summary>
         public const string WorkflowInstance = "WorkflowInstance";
+
+        /// <summary>
+        /// The Locale attribute
+        /// </summary>
+        public const string Locale = "Locale";
     }
 }
 
diff --git a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/MessageComposer.cs b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/MessageComposer.cs
index d4c3776..bddfc04 100644
--- a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/MessageComposer.cs
+++ b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/MessageComposer.cs
@@ -6,6 +6,7 @@
 using Microsoft.ResourceManagement.WebServices;
 using Microsoft.ResourceManagement.WebServices.IdentityManagementOperation;
 using Microsoft.ResourceManagement.WebServices.WSEnumeration;
+using Microsoft.ResourceManagement.WebServices.WSResourceManagement;
 
 namespace Lithnet.ResourceManagement.Client.ResourceManagementService
 {
@@ -19,7 +20,7 @@ internal static class MessageComposer
 
         internal static Message CreateGetMessage(UniqueIdentifier id)
         {
-            return CreateGetMessage(id, null, CultureInfo.InvariantCulture);
+            return CreateGetMessage(id, null, null);
         }
 
         internal static Message CreateGetMessage(UniqueIdentifier id, IEnumerable<string> attributes, CultureInfo locale)
@@ -30,7 +31,7 @@ internal static Message CreateGetMessage(UniqueIdentifier id, IEnumerable<string
             {
                 op = new Get();
                 op.Dialect = Namespaces.RMIdentityAttributeType;
-                op.Expressions = MessageComposer.AddMandatoryAttributes(attributes).ToArray();
+                op.Expressions = MessageComposer.AddMandatoryAttributes(attributes, locale).ToArray();
             }
 
             Message message;
@@ -45,7 +46,11 @@ internal static Message CreateGetMessage(UniqueIdentifier id, IEnumerable<string
                 message.AddHeader(Namespaces.IdMDirectoryAccess, HeaderConstants.IdentityManagementOperation, null, true);
             }
 
-            message.AddHeader("Locale", locale ?? CultureInfo.InvariantCulture);
+            if (locale != null)
+            {
+                message.AddHeader(AttributeNames.Locale, locale);
+            }
+
             message.AddHeader(HeaderConstants.ResourceReferenceProperty, id.ToString());
 
             return message;
@@ -118,7 +123,7 @@ internal static Message CreateCreateMessage(IEnumerable<ResourceObject> resource
             return message;
         }
 
-        internal static Message CreatePutMessage(ResourceObject resource)
+        internal static Message CreatePutMessage(ResourceObject resource, CultureInfo locale)
         {
             Put op = new Put();
 
@@ -136,10 +141,15 @@ internal static Message CreatePutMessage(ResourceObject resource)
             message.AddHeader(Namespaces.IdMDirectoryAccess, HeaderConstants.IdentityManagementOperation, null, true);
             message.AddHeader(HeaderConstants.ResourceReferenceProperty, resource.ObjectID.ToString());
 
+            if (locale != null || resource.Locale != null)
+            {
+                message.AddHeader(AttributeNames.Locale, locale ?? resource.Locale);
+            }
+
             return message;
         }
 
-        internal static Message CreatePutMessage(IEnumerable<ResourceObject> resources)
+        internal static Message CreatePutMessage(IEnumerable<ResourceObject> resources, CultureInfo locale)
         {
             int count = resources.Count();
             if (count == 0)
@@ -148,15 +158,22 @@ internal static Message CreatePutMessage(IEnumerable<ResourceObject> resources)
             }
             else if (count == 1)
             {
-                return MessageComposer.CreatePutMessage(resources.First());
+                return MessageComposer.CreatePutMessage(resources.First(), locale);
             }
 
             Put op = new Put();
 
             op.Dialect = Namespaces.RMIdentityAttributeType;
             List<PutFragmentType> fragments = new List<PutFragmentType>();
+            CultureInfo lastCulture = resources.First().Locale;
+
             foreach (ResourceObject resource in resources)
             {
+                if (lastCulture != resource.Locale)
+                {
+                    throw new NotSupportedException();
+                }
+
                 foreach (PutFragmentType fragment in resource.GetPutFragements())
                 {
                     fragment.TargetIdentifier = resource.ObjectID.Value;
@@ -177,6 +194,11 @@ internal static Message CreatePutMessage(IEnumerable<ResourceObject> resources)
             message.AddHeader(Namespaces.ResourceManagement, HeaderConstants.CompositeTypeOperation, null);
             message.AddHeader(HeaderConstants.ResourceReferenceProperty, resources.Select(t => t.ObjectID.ToString()).ToCommaSeparatedString());
 
+            if (locale != null)
+            {
+                message.AddHeader(AttributeNames.Locale, locale);
+            }
+
             return message;
         }
 
@@ -218,7 +240,7 @@ internal static Message CreateDeleteMessage(IEnumerable<UniqueIdentifier> ids)
             return message;
         }
 
-        internal static Message CreateEnumerateMessage(string filter, int pageSize, IEnumerable<string> attributes, IEnumerable<SortingAttribute> sortingAttributes)
+        internal static Message CreateEnumerateMessage(string filter, int pageSize, IEnumerable<string> attributes, IEnumerable<SortingAttribute> sortingAttributes, CultureInfo locale)
         {
             Enumerate request = new Enumerate();
             request.Filter = new FilterType(filter);
@@ -226,7 +248,7 @@ internal static Message CreateEnumerateMessage(string filter, int pageSize, IEnu
 
             if (attributes != null)
             {
-                request.Selection = MessageComposer.AddMandatoryAttributes(attributes).ToArray();
+                request.Selection = MessageComposer.AddMandatoryAttributes(attributes, locale).ToArray();
             }
 
             if (sortingAttributes != null && sortingAttributes.Any())
@@ -236,6 +258,12 @@ internal static Message CreateEnumerateMessage(string filter, int pageSize, IEnu
                 request.Sorting.SortingAttributes = sortingAttributes.ToArray();
             }
 
+            if (locale != null)
+            {
+                request.LocalePreferences = new LocalePreferenceType[1];
+                request.LocalePreferences[0] = new LocalePreferenceType(locale, 1);
+            }
+
             Message requestMessage = Message.CreateMessage(MessageVersion.Default, Namespaces.Enumerate, new SerializerBodyWriter(request));
             requestMessage.AddHeader(Namespaces.ResourceManagement, "IncludeCount", null);
 
@@ -263,11 +291,11 @@ internal static Message CreateApprovalMessage(UniqueIdentifier workflowID, Appro
         {
             Message message = Message.CreateMessage(MessageVersion.Default, Namespaces.Create, new SerializerBodyWriter(response));
             message.Headers.Add(new ContextHeader(workflowID.Value));
-            
+
             return message;
         }
 
-        private static IEnumerable<string> AddMandatoryAttributes(IEnumerable<string> attributes)
+        private static IEnumerable<string> AddMandatoryAttributes(IEnumerable<string> attributes, CultureInfo locale)
         {
             HashSet<string> set = new HashSet<string>();
 
@@ -281,6 +309,11 @@ private static IEnumerable<string> AddMandatoryAttributes(IEnumerable<string> at
                 set.Add(item);
             }
 
+            if (locale != null)
+            {
+                set.Add(AttributeNames.Locale);
+            }
+
             return set;
         }
 
diff --git a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/ResourceClient.cs b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/ResourceClient.cs
index e304e6e..3a9f5ad 100644
--- a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/ResourceClient.cs
+++ b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/ResourceClient.cs
@@ -20,14 +20,14 @@ public void Initialize(ResourceManagementClient client)
             this.client = client;
         }
 
-        public void Put(ResourceObject resource)
+        public void Put(ResourceObject resource, CultureInfo locale)
         {
             if (resource == null)
             {
                 throw new ArgumentNullException("resource");
             }
 
-            using (Message message = MessageComposer.CreatePutMessage(resource))
+            using (Message message = MessageComposer.CreatePutMessage(resource, locale))
             {
                 if (message == null)
                 {
@@ -41,14 +41,24 @@ public void Put(ResourceObject resource)
             }
         }
 
-        public void Put(IEnumerable<ResourceObject> resources)
+        public void Put(IEnumerable<ResourceObject> resources, CultureInfo locale)
         {
             if (resources == null)
             {
                 throw new ArgumentNullException("resources");
             }
 
-            using (Message message = MessageComposer.CreatePutMessage(resources))
+            if (resources.Any(t => t.Locale != null && t.Locale != locale))
+            {
+                foreach (ResourceObject resource in resources)
+                {
+                    this.Put(resource, locale);
+                }
+
+                return;
+            }
+
+            using (Message message = MessageComposer.CreatePutMessage(resources, locale))
             {
                 if (message == null)
                 {
@@ -68,8 +78,9 @@ public ResourceObject Get(UniqueIdentifier id, IEnumerable<string> attributes, C
             {
                 throw new ArgumentNullException("id");
             }
-            bool partialResponse = attributes != null;
 
+            bool partialResponse = attributes != null;
+            
             GetResponse r = new GetResponse();
 
             using (Message message = MessageComposer.CreateGetMessage(id, attributes, locale))
@@ -81,12 +92,12 @@ public ResourceObject Get(UniqueIdentifier id, IEnumerable<string> attributes, C
                     if (partialResponse)
                     {
                         GetResponse response = responseMessage.DeserializeMessageWithPayload<GetResponse>();
-                        return new ResourceObject(response.Results.OfType<XmlElement>(), this.client);
+                        return new ResourceObject(response.Results.OfType<XmlElement>(), this.client, locale);
                     }
                     else
                     {
                         XmlDictionaryReader fullObject = responseMessage.GetReaderAtBodyContents();
-                        return new ResourceObject(fullObject, this.client);
+                        return new ResourceObject(fullObject, this.client, locale);
                     }
                 }
             }
@@ -129,21 +140,6 @@ public void Delete(UniqueIdentifier id)
             }
         }
 
-        internal ResourceObject Get(UniqueIdentifier id)
-        {
-            return this.Get(id, null, null);
-        }
-
-        internal ResourceObject Get(UniqueIdentifier id, CultureInfo locale)
-        {
-            return this.Get(id, null, locale);
-        }
-
-        internal ResourceObject Get(UniqueIdentifier id, IEnumerable<string> attributesToGet)
-        {
-            return this.Get(id, attributesToGet, null);
-        }
-
         internal XmlDictionaryReader GetFullObjectForUpdate(ResourceObject resource)
         {
             if (resource == null)
@@ -153,7 +149,7 @@ internal XmlDictionaryReader GetFullObjectForUpdate(ResourceObject resource)
 
             GetResponse r = new GetResponse();
 
-            using (Message message = MessageComposer.CreateGetMessage(resource.ObjectID))
+            using (Message message = MessageComposer.CreateGetMessage(resource.ObjectID, null, resource.Locale))
             {
                 using (Message responseMessage = this.Invoke((c) => c.Get(message)))
                 {
diff --git a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/SearchClient.cs b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/SearchClient.cs
index 1cb675e..35ac875 100644
--- a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/SearchClient.cs
+++ b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/SearchClient.cs
@@ -6,6 +6,7 @@
 using System.Threading;
 using Microsoft.ResourceManagement.WebServices.WSEnumeration;
 using System.Xml;
+using System.Globalization;
 
 namespace Lithnet.ResourceManagement.Client.ResourceManagementService
 {
@@ -21,35 +22,35 @@ public void Initialize(ResourceManagementClient client)
             this.client = client;
         }
 
-        public ISearchResultCollection EnumerateAsync(string filter, int pageSize, IEnumerable<string> attributesToReturn, IEnumerable<SortingAttribute> sortingAttributes, CancellationTokenSource cancellationToken)
+        public ISearchResultCollection EnumerateAsync(string filter, int pageSize, IEnumerable<string> attributesToReturn, IEnumerable<SortingAttribute> sortingAttributes, CultureInfo locale, CancellationTokenSource cancellationToken)
         {
-            return new SearchResultCollectionAsync(this.EnumeratePaged(filter, pageSize, attributesToReturn, sortingAttributes), cancellationToken);
+            return new SearchResultCollectionAsync(this.EnumeratePaged(filter, pageSize, attributesToReturn, sortingAttributes, locale), cancellationToken);
         }
 
-        public ISearchResultCollection EnumerateSync(string filter, int pageSize, IEnumerable<string> attributesToReturn, IEnumerable<SortingAttribute> sortingAttributes)
+        public ISearchResultCollection EnumerateSync(string filter, int pageSize, IEnumerable<string> attributesToReturn, IEnumerable<SortingAttribute> sortingAttributes, CultureInfo locale)
         {
-            return new SearchResultCollection(this.EnumeratePaged(filter, pageSize, attributesToReturn, sortingAttributes));
+            return new SearchResultCollection(this.EnumeratePaged(filter, pageSize, attributesToReturn, sortingAttributes, locale));
         }
 
-        public SearchResultPager EnumeratePaged(string filter, int pageSize, IEnumerable<string> attributesToReturn, IEnumerable<SortingAttribute> sortingAttributes)
+        public SearchResultPager EnumeratePaged(string filter, int pageSize, IEnumerable<string> attributesToReturn, IEnumerable<SortingAttribute> sortingAttributes, CultureInfo locale)
         {
             if (pageSize < 0)
             {
                 pageSize = DefaultPageSize;
             }
 
-            var response = this.Enumerate(filter, 0, attributesToReturn, sortingAttributes);
-            return new SearchResultPager(response, pageSize, this, this.client);
+            var response = this.Enumerate(filter, 0, attributesToReturn, sortingAttributes, locale);
+            return new SearchResultPager(response, pageSize, this, this.client, locale);
         }
        
-        private EnumerateResponse Enumerate(string filter, int pageSize, IEnumerable<string> attributesToReturn, IEnumerable<SortingAttribute> sortingAttributes)
+        private EnumerateResponse Enumerate(string filter, int pageSize, IEnumerable<string> attributesToReturn, IEnumerable<SortingAttribute> sortingAttributes, CultureInfo locale)
         {
             if (pageSize < 0)
             {
                 pageSize = DefaultPageSize;
             }
 
-            using (Message requestMessage = MessageComposer.CreateEnumerateMessage(filter, pageSize, attributesToReturn, sortingAttributes))
+            using (Message requestMessage = MessageComposer.CreateEnumerateMessage(filter, pageSize, attributesToReturn, sortingAttributes, locale))
             {
                 using (Message responseMessage = this.Invoke((c) => c.Enumerate(requestMessage)))
                 {
diff --git a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/SearchResultPager.cs b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/SearchResultPager.cs
index 8e725c0..fd05a53 100644
--- a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/SearchResultPager.cs
+++ b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/SearchResultPager.cs
@@ -6,6 +6,7 @@
 using Lithnet.ResourceManagement.Client.ResourceManagementService;
 using Microsoft.ResourceManagement.WebServices.WSEnumeration;
 using Microsoft.ResourceManagement.WebServices.WSResourceManagement;
+using System.Globalization;
 
 namespace Lithnet.ResourceManagement.Client
 {
@@ -14,6 +15,8 @@ namespace Lithnet.ResourceManagement.Client
     /// </summary>
     public class SearchResultPager 
     {
+        private CultureInfo locale;
+
         /// <summary>
         /// The enumeration context object provided by the Resource Management Service
         /// </summary>
@@ -77,7 +80,7 @@ public int CurrentIndex
         /// <param name="pageSize">The page size used in the search operation</param>
         /// <param name="searchClient">The client proxy used for performing the search</param>
         /// <param name="client">The client used to convert response data into ResourceObjects</param>
-        internal SearchResultPager(EnumerateResponse response, int pageSize, SearchClient searchClient, ResourceManagementClient client)
+        internal SearchResultPager(EnumerateResponse response, int pageSize, SearchClient searchClient, ResourceManagementClient client, CultureInfo locale)
         {
             if (response == null)
             {
@@ -96,6 +99,7 @@ internal SearchResultPager(EnumerateResponse response, int pageSize, SearchClien
 
             this.TotalCount = Convert.ToInt32(response.EnumerationDetail.Count);
             this.client = client;
+            this.locale = locale;
             this.context = response.EnumerationContext;
             this.context.CurrentIndex = 0;
             this.PageSize = pageSize;
@@ -113,7 +117,7 @@ private IEnumerable<ResourceObject> EnumerateResultSet(ItemListType items)
             {
                 foreach (XmlElement item in items.Any.OfType<XmlElement>())
                 {
-                    yield return new ResourceObject(item, this.client);
+                    yield return new ResourceObject(item, this.client, this.locale);
                 }
             }
         }

From 5e34c2269248ff7b46b024ee22182e2fb3437aee Mon Sep 17 00:00:00 2001
From: ryannewington <ryan@lithiumblue.com>
Date: Sat, 23 Jul 2016 09:46:08 +1000
Subject: [PATCH 2/2] Removes support for composite saves of localized
 resources

---
 ...urceManagement.Client.Help.Examples.csproj |  5 ++---
 .../GetTests.cs                               | 20 -------------------
 ...ResourceManagement.Client.UnitTests.csproj |  3 +--
 .../ResourceManagementClient.cs               | 19 +++++++-----------
 .../ResourceObject.cs                         |  4 ++++
 .../ServiceImplementation/MessageComposer.cs  | 15 ++------------
 .../ServiceImplementation/ResourceClient.cs   | 16 +++------------
 .../SearchResultPager.cs                      |  1 +
 8 files changed, 20 insertions(+), 63 deletions(-)

diff --git a/src/Lithnet.ResourceManagement.Client.Help.Examples/Lithnet.ResourceManagement.Client.Help.Examples.csproj b/src/Lithnet.ResourceManagement.Client.Help.Examples/Lithnet.ResourceManagement.Client.Help.Examples.csproj
index 5feb133..d3a4f9b 100644
--- a/src/Lithnet.ResourceManagement.Client.Help.Examples/Lithnet.ResourceManagement.Client.Help.Examples.csproj
+++ b/src/Lithnet.ResourceManagement.Client.Help.Examples/Lithnet.ResourceManagement.Client.Help.Examples.csproj
@@ -32,9 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.ResourceManagement, Version=4.1.3634.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\Microsoft.ResourceManagement.dll</HintPath>
+    <Reference Include="Microsoft.ResourceManagement">
+      <HintPath>..\Lithnet.ResourceManagement.Client\bin\Release (nuget)\Microsoft.ResourceManagement.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/src/Lithnet.ResourceManagement.Client.UnitTests/GetTests.cs b/src/Lithnet.ResourceManagement.Client.UnitTests/GetTests.cs
index 76110dd..e3288b5 100644
--- a/src/Lithnet.ResourceManagement.Client.UnitTests/GetTests.cs
+++ b/src/Lithnet.ResourceManagement.Client.UnitTests/GetTests.cs
@@ -12,26 +12,6 @@ namespace Lithnet.ResourceManagement.Client.UnitTests
     [TestClass]
     public class GetTests
     {
-        [TestMethod]
-        public void TestLocale()
-        {
-            ResourceManagementClient client = new ResourceManagementClient();
-
-            try
-            {
-                //ResourceObject resource = client.GetResourceByKey("AttributeTypeDescription", "Name", "DisplayName", UnitTestHelper.TestCulture);
-
-                ResourceObject resource = client.GetResource("7dcc83b6-8be7-4717-a1ac-62b0b1b7ce29", UnitTestHelper.TestCulture);
-                Assert.AreEqual(UnitTestHelper.TestCulture, resource.Locale);
-                //Nome visualizzato
-            }
-            finally
-            {
-
-            }
-        }
-
-
         [TestMethod]
         public void GetObjectByIDWithAllAttributes()
         {
diff --git a/src/Lithnet.ResourceManagement.Client.UnitTests/Lithnet.ResourceManagement.Client.UnitTests.csproj b/src/Lithnet.ResourceManagement.Client.UnitTests/Lithnet.ResourceManagement.Client.UnitTests.csproj
index 6815717..b69a49b 100644
--- a/src/Lithnet.ResourceManagement.Client.UnitTests/Lithnet.ResourceManagement.Client.UnitTests.csproj
+++ b/src/Lithnet.ResourceManagement.Client.UnitTests/Lithnet.ResourceManagement.Client.UnitTests.csproj
@@ -49,8 +49,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.ResourceManagement">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\lib\Microsoft.ResourceManagement.dll</HintPath>
+      <HintPath>..\Lithnet.ResourceManagement.Client\bin\Release (nuget)\Microsoft.ResourceManagement.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
diff --git a/src/Lithnet.ResourceManagement.Client/ResourceManagementClient.cs b/src/Lithnet.ResourceManagement.Client/ResourceManagementClient.cs
index bab239e..782506a 100644
--- a/src/Lithnet.ResourceManagement.Client/ResourceManagementClient.cs
+++ b/src/Lithnet.ResourceManagement.Client/ResourceManagementClient.cs
@@ -376,7 +376,7 @@ public void DeleteResource(string id)
         /// <param name="resources">The resources to update</param>
         public void SaveResources(params ResourceObject[] resources)
         {
-            this.SaveResources(resources, null);
+            this.SaveResources(resources);
         }
 
         /// <summary>
@@ -385,17 +385,12 @@ public void SaveResources(params ResourceObject[] resources)
         /// <param name="resources">The collection of resources to update</param>
         public void SaveResources(IEnumerable<ResourceObject> resources)
         {
-            this.SaveResources(resources, null);
-        }
+            IList<ResourceObject> resourceObjects = resources as IList<ResourceObject> ?? resources.ToList();
 
-        /// <summary>
-        /// Saves the specified resources in the resource management service. Updates and Adds are committed as a single composite operation.
-        /// </summary>
-        /// <param name="resources">The collection of resources to update</param>
-        /// <param name="locale">The localization culture to use when saving the object</param>
-        public void SaveResources(IEnumerable<ResourceObject> resources, CultureInfo locale)
-        {
-            IEnumerable<ResourceObject> resourceObjects = resources as IList<ResourceObject> ?? resources.ToList();
+            if (resourceObjects.Any(t => t.Locale != null))
+            {
+                throw new InvalidOperationException("Cannot perform a composite save on a localized resource");
+            }
 
             List<ResourceObject> objectsToCreate = resourceObjects.Where(t => t.ModificationType == OperationType.Create).ToList();
             if (objectsToCreate.Count > 0)
@@ -420,7 +415,7 @@ public void SaveResources(IEnumerable<ResourceObject> resources, CultureInfo loc
 
             if (objectsToUpdate.Count > 0)
             {
-                this.resourceClient.Put(objectsToUpdate, locale);
+                this.resourceClient.Put(objectsToUpdate);
 
                 foreach (ResourceObject resource in objectsToUpdate)
                 {
diff --git a/src/Lithnet.ResourceManagement.Client/ResourceObject.cs b/src/Lithnet.ResourceManagement.Client/ResourceObject.cs
index d292826..19a6187 100644
--- a/src/Lithnet.ResourceManagement.Client/ResourceObject.cs
+++ b/src/Lithnet.ResourceManagement.Client/ResourceObject.cs
@@ -149,6 +149,7 @@ public string DisplayName
         /// </summary>
         /// <param name="opType">The type of modification to set on the object</param>
         /// <param name="client">The client used for further operations on this object</param>
+        /// <param name="locale">The localization culture that this object is represented as</param>
         private ResourceObject(OperationType opType, ResourceManagementClient client, CultureInfo locale)
         {
             this.ModificationType = opType;
@@ -215,6 +216,7 @@ internal ResourceObject(string type, UniqueIdentifier id, ResourceManagementClie
         /// </summary>
         /// <param name="objectElements">An enumeration of XmlElements that make up a partial response</param>
         /// <param name="client">The client used for further operations on this object</param>
+        /// <param name="locale">The localization culture that this object is represented as</param>
         internal ResourceObject(IEnumerable<XmlElement> objectElements, ResourceManagementClient client, CultureInfo locale)
             : this(OperationType.Update, client, locale)
         {
@@ -226,6 +228,7 @@ internal ResourceObject(IEnumerable<XmlElement> objectElements, ResourceManageme
         /// </summary>
         /// <param name="reader">An XmlDictionaryReader containing the full object definition</param>
         /// <param name="client">The client used for further operations on this object</param>
+        /// <param name="locale">The localization culture that this object is represented as</param>
         internal ResourceObject(XmlDictionaryReader reader, ResourceManagementClient client, CultureInfo locale)
             : this(OperationType.Update, client, locale)
         {
@@ -237,6 +240,7 @@ internal ResourceObject(XmlDictionaryReader reader, ResourceManagementClient cli
         /// </summary>
         /// <param name="element">An XmlElement containing definition of the object from a set of fragments obtained from an enumeration response</param>
         /// <param name="client">The client used for further operations on this object</param>
+        /// <param name="locale">The localization culture that this object is represented as</param>
         internal ResourceObject(XmlElement element, ResourceManagementClient client, CultureInfo locale)
             : this(OperationType.Update, client, locale)
         {
diff --git a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/MessageComposer.cs b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/MessageComposer.cs
index bddfc04..d150c5e 100644
--- a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/MessageComposer.cs
+++ b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/MessageComposer.cs
@@ -149,7 +149,7 @@ internal static Message CreatePutMessage(ResourceObject resource, CultureInfo lo
             return message;
         }
 
-        internal static Message CreatePutMessage(IEnumerable<ResourceObject> resources, CultureInfo locale)
+        internal static Message CreatePutMessage(IEnumerable<ResourceObject> resources)
         {
             int count = resources.Count();
             if (count == 0)
@@ -158,22 +158,16 @@ internal static Message CreatePutMessage(IEnumerable<ResourceObject> resources,
             }
             else if (count == 1)
             {
-                return MessageComposer.CreatePutMessage(resources.First(), locale);
+                return MessageComposer.CreatePutMessage(resources.First(), null);
             }
 
             Put op = new Put();
 
             op.Dialect = Namespaces.RMIdentityAttributeType;
             List<PutFragmentType> fragments = new List<PutFragmentType>();
-            CultureInfo lastCulture = resources.First().Locale;
 
             foreach (ResourceObject resource in resources)
             {
-                if (lastCulture != resource.Locale)
-                {
-                    throw new NotSupportedException();
-                }
-
                 foreach (PutFragmentType fragment in resource.GetPutFragements())
                 {
                     fragment.TargetIdentifier = resource.ObjectID.Value;
@@ -194,11 +188,6 @@ internal static Message CreatePutMessage(IEnumerable<ResourceObject> resources,
             message.AddHeader(Namespaces.ResourceManagement, HeaderConstants.CompositeTypeOperation, null);
             message.AddHeader(HeaderConstants.ResourceReferenceProperty, resources.Select(t => t.ObjectID.ToString()).ToCommaSeparatedString());
 
-            if (locale != null)
-            {
-                message.AddHeader(AttributeNames.Locale, locale);
-            }
-
             return message;
         }
 
diff --git a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/ResourceClient.cs b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/ResourceClient.cs
index 3a9f5ad..42b84da 100644
--- a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/ResourceClient.cs
+++ b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/ResourceClient.cs
@@ -41,24 +41,14 @@ public void Put(ResourceObject resource, CultureInfo locale)
             }
         }
 
-        public void Put(IEnumerable<ResourceObject> resources, CultureInfo locale)
+        public void Put(IEnumerable<ResourceObject> resources)
         {
             if (resources == null)
             {
                 throw new ArgumentNullException("resources");
             }
-
-            if (resources.Any(t => t.Locale != null && t.Locale != locale))
-            {
-                foreach (ResourceObject resource in resources)
-                {
-                    this.Put(resource, locale);
-                }
-
-                return;
-            }
-
-            using (Message message = MessageComposer.CreatePutMessage(resources, locale))
+           
+            using (Message message = MessageComposer.CreatePutMessage(resources))
             {
                 if (message == null)
                 {
diff --git a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/SearchResultPager.cs b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/SearchResultPager.cs
index fd05a53..3f11cfe 100644
--- a/src/Lithnet.ResourceManagement.Client/ServiceImplementation/SearchResultPager.cs
+++ b/src/Lithnet.ResourceManagement.Client/ServiceImplementation/SearchResultPager.cs
@@ -80,6 +80,7 @@ public int CurrentIndex
         /// <param name="pageSize">The page size used in the search operation</param>
         /// <param name="searchClient">The client proxy used for performing the search</param>
         /// <param name="client">The client used to convert response data into ResourceObjects</param>
+        /// <param name="locale">The localization culture that the search results are represented as</param>
         internal SearchResultPager(EnumerateResponse response, int pageSize, SearchClient searchClient, ResourceManagementClient client, CultureInfo locale)
         {
             if (response == null)