Enable v4.01 requests

src/Microsoft.OData.Client/ALinq/ExpressionWriter.cs

@@ -75,7 +75,7 @@ private ExpressionWriter(DataServiceContext context, bool inPath)
             this.builder = new StringBuilder();
             this.expressionStack = new Stack<Expression>();
             this.expressionStack.Push(null);
-            this.uriVersion = Util.ODataVersion4;
+            this.uriVersion = context.MaxProtocolVersionAsVersion;
             this.scopeCount = 0;
             this.writingFunctionsInQuery = false;
         }

src/Microsoft.OData.Client/ALinq/ProjectionAnalyzer.cs

@@ -229,7 +229,10 @@ private static void Analyze(MemberInitExpression mie, SelectExpandPathBuilder pb
         /// <param name="context">Context of expression to analyze.</param>
         private static void AnalyzeResourceExpression(LambdaExpression lambda, ResourceExpression resource, DataServiceContext context)
         {
-            SelectExpandPathBuilder pb = new SelectExpandPathBuilder();
+            SelectExpandPathBuilder pb = new SelectExpandPathBuilder()
+            {
+                UriVersion = context.MaxProtocolVersionAsVersion
+            };
             ProjectionAnalyzer.Analyze(lambda, pb, context);
             resource.Projection = new ProjectionQueryOptionExpression(lambda.Body.Type, lambda, pb.ProjectionPaths.ToList());
             resource.ExpandPaths = pb.ExpandPaths.Union(resource.ExpandPaths, StringComparer.Ordinal).ToList();

src/Microsoft.OData.Client/ALinq/ResourceBinder.cs

@@ -1712,7 +1712,7 @@ internal static bool MatchPropertyAccess(Expression e, DataServiceContext contex
             {
                 instance = null;
                 propertyPath = null;
-                uriVersion = Util.ODataVersion4;
+                uriVersion = context.MaxProtocolVersionAsVersion;
 
                 MemberExpression me = StripTo<MemberExpression>(e);
                 member = me;
@@ -1774,7 +1774,7 @@ internal static bool MatchPropertyAccess(Expression e, DataServiceContext contex
             {
                 instance = null;
                 propertyPath = null;
-                uriVersion = Util.ODataVersion4;
+                uriVersion = context.MaxProtocolVersionAsVersion;
 
                 MemberExpression me = StripTo<MemberExpression>(e);
                 member = me;
@@ -2946,7 +2946,7 @@ internal static void DisallowExpressionEndWithTypeAs(Expression exp, string meth
             internal static void ValidateExpandPath(Expression input, DataServiceContext context, out string expandPath, out Version uriVersion)
             {
                 expandPath = null;
-                uriVersion = Util.ODataVersion4;
+                uriVersion = context.MaxProtocolVersionAsVersion;
                 LambdaExpression le;
                 if (PatternRules.MatchSingleArgumentLambda(input, out le))
                 {

src/Microsoft.OData.Client/ALinq/SelectExpandPathBuilder.cs

@@ -75,7 +75,6 @@ internal class SelectExpandPathBuilder
         public SelectExpandPathBuilder()
         {
             firstSegmentInNewPath = true;
-            this.uriVersion = Util.ODataVersion4;
         }
 
         /// <summary>
@@ -107,7 +106,11 @@ public Version UriVersion
         {
             get
             {
-                return this.uriVersion;
+                return this.uriVersion ?? Util.ODataVersion4;
+            }
+            set
+            {
+                this.uriVersion = value;
             }
         }
 

src/Microsoft.OData.Client/ALinq/UriWriter.cs

@@ -51,7 +51,7 @@ private UriWriter(DataServiceContext context)
         {
             Debug.Assert(context != null, "context != null");
             this.context = context;
-            this.uriVersion = Util.ODataVersion4;
+            this.uriVersion = context.MaxProtocolVersionAsVersion;
         }
 
         /// <summary>

src/Microsoft.OData.Client/BaseSaveResult.cs

@@ -905,7 +905,7 @@ protected ODataRequestMessageWrapper CreateRequest(LinkDescriptor binding)
 
             HeaderCollection headers = new HeaderCollection();
 
-            headers.SetRequestVersion(Util.ODataVersion4, this.RequestInfo.MaxProtocolVersionAsVersion);
+            headers.SetRequestVersion(this.RequestInfo.MaxProtocolVersionAsVersion, this.RequestInfo.MaxProtocolVersionAsVersion);
             this.RequestInfo.Format.SetRequestAcceptHeader(headers);
 
             // if (EntityStates.Deleted || (EntityState.Modifed && null == TargetResource))
@@ -936,7 +936,8 @@ protected ODataRequestMessageWrapper CreateRequest(EntityDescriptor entityDescri
 
             ClientEdmModel model = this.RequestInfo.Model;
             ClientTypeAnnotation clientType = model.GetClientTypeAnnotation(model.GetOrCreateEdmType(entityDescriptor.Entity.GetType()));
-            Version requestVersion = DetermineRequestVersion(clientType);
+            //Version requestVersion = DetermineRequestVersion(clientType);
+            Version requestVersion = this.RequestInfo.MaxProtocolVersionAsVersion;
             string httpMethod = this.GetHttpMethod(state, ref requestVersion);
 
             HeaderCollection headers = new HeaderCollection();

src/Microsoft.OData.Client/BatchSaveResult.cs

@@ -298,7 +298,7 @@ private ODataRequestMessageWrapper CreateBatchRequest()
         {
             Uri requestUri = UriUtil.CreateUri(this.RequestInfo.BaseUriResolver.GetBaseUriWithSlash(), UriUtil.CreateUri("$batch", UriKind.Relative));
             HeaderCollection headers = new HeaderCollection();
-            headers.SetRequestVersion(Util.ODataVersion4, this.RequestInfo.MaxProtocolVersionAsVersion);
+            headers.SetRequestVersion(this.RequestInfo.MaxProtocolVersionAsVersion, this.RequestInfo.MaxProtocolVersionAsVersion);
             if (useJsonBatch)
             {
                 headers.SetHeader(XmlConstants.HttpContentType, CreateApplicationJsonContentType());

src/Microsoft.OData.Client/DataServiceClientFormat.cs

@@ -326,8 +326,8 @@ private void SetRequestContentTypeHeader(HeaderCollection headers, string mediaT
         {
             if (mediaType == MimeApplicationJsonODataLight)
             {
-                // set the request version to 4.0
-                headers.SetRequestVersion(Util.ODataVersion4, this.context.MaxProtocolVersionAsVersion);
+                // set the request version to 4.0 or 4.01 depending on what is set in tha DataServiceContext.
+                headers.SetRequestVersion(this.context.MaxProtocolVersionAsVersion, this.context.MaxProtocolVersionAsVersion);
             }
 
             headers.SetHeaderIfUnset(XmlConstants.HttpContentType, mediaType);

src/Microsoft.OData.Client/DataServiceContext.cs

@@ -3648,7 +3648,7 @@ private LoadPropertyResult CreateLoadPropertyRequest(object entity, string prope
                 }
             }
 
-            requestVersion = Util.ODataVersion4;
+            requestVersion = this.MaxProtocolVersionAsVersion;
 
             HeaderCollection headers = new HeaderCollection();
 
@@ -3812,7 +3812,7 @@ private GetReadStreamResult CreateGetReadStreamResult(
             }
             else
             {
-                version = Util.ODataVersion4;
+                version = this.MaxProtocolVersionAsVersion;
                 if (!entityDescriptor.TryGetNamedStreamInfo(name, out streamDescriptor))
                 {
                     throw new ArgumentException(Strings.Context_EntityDoesNotContainNamedStream(name), nameof(name));

src/Microsoft.OData.Client/DataServiceRequest.cs

@@ -195,7 +195,7 @@ internal TElement GetValue<TElement>(DataServiceContext context, Func<QueryResul
             Version requestVersion = queryComponents.Version;
             if (requestVersion == null)
             {
-                requestVersion = Util.ODataVersion4;
+                requestVersion = context.MaxProtocolVersionAsVersion;
             }
 
             Uri requestUri = queryComponents.Uri;

src/Microsoft.OData.Client/SaveResult.cs

@@ -609,7 +609,7 @@ private ODataRequestMessageWrapper CheckAndProcessMediaEntryPost(EntityDescripto
                 mediaRequest = this.CreateMediaResourceRequest(
                     entityDescriptor.GetResourceUri(this.RequestInfo.BaseUriResolver, false /*queryLink*/),
                     XmlConstants.HttpMethodPost,
-                    Util.ODataVersion4,
+                    this.RequestInfo.MaxProtocolVersionAsVersion,
                     type.MediaDataMember == null, // sendChunked
                     true, // applyResponsePreference
                     headers,
@@ -623,7 +623,7 @@ private ODataRequestMessageWrapper CheckAndProcessMediaEntryPost(EntityDescripto
                 mediaRequest = this.CreateMediaResourceRequest(
                     entityDescriptor.GetResourceUri(this.RequestInfo.BaseUriResolver, false /*queryLink*/),
                     XmlConstants.HttpMethodPost,
-                    Util.ODataVersion4,
+                    this.RequestInfo.MaxProtocolVersionAsVersion,
                     type.MediaDataMember == null, // sendChunked
                     true, // applyResponsePreference
                     headers,
@@ -667,7 +667,7 @@ private ODataRequestMessageWrapper CheckAndProcessMediaEntryPut(EntityDescriptor
             return this.CreateMediaResourceRequest(
                 requestUri,
                 XmlConstants.HttpMethodPut,
-                Util.ODataVersion4,
+                this.RequestInfo.MaxProtocolVersionAsVersion,
                 true, // sendChunked
                 false, // applyResponsePreference
                 headers,
@@ -925,7 +925,7 @@ private ODataRequestMessageWrapper CreateNamedStreamRequest(StreamDescriptor nam
             ODataRequestMessageWrapper mediaRequestMessage = this.CreateMediaResourceRequest(
                 requestUri,
                 XmlConstants.HttpMethodPut,
-                Util.ODataVersion4,
+                this.RequestInfo.MaxProtocolVersionAsVersion,
                 true, // sendChunked
                 false, // applyResponsePreference
                 headers,

src/Microsoft.OData.Client/Util.cs

@@ -86,6 +86,8 @@ internal static Version GetVersionFromMaxProtocolVersion(ODataProtocolVersion ma
             {
                 case ODataProtocolVersion.V4:
                     return Util.ODataVersion4;
+                case ODataProtocolVersion.V401:
+                    return Util.ODataVersion401;
                 default:
                     Debug.Assert(false, "Unexpected max protocol version values.");
                     return Util.ODataVersion4;
@@ -231,6 +233,8 @@ internal static ODataProtocolVersion CheckEnumerationValue(ODataProtocolVersion
             {
                 case ODataProtocolVersion.V4:
                     return value;
+                case ODataProtocolVersion.V401:
+                    return value;
                 default:
                     throw Error.ArgumentOutOfRange(parameterName);
             }

test/FunctionalTests/Tests/DataServices/UnitTests/Client.TDD.Tests/Tests/DataServiceContextTests.cs

@@ -263,6 +263,14 @@ public void SaveChangesWithBatchWithIndependentOperationsAndContinueOnErrorShoul
             test.ShouldThrow<ArgumentOutOfRangeException>().WithMessage("options", ComparisonMode.Substring);
         }
 #endif
+        [Fact]
+        public void DataServiceContextCanInitializev401WithoutException()
+        {
+            DataServiceContext dsContext = null;
+            Action test = () => dsContext = new DataServiceContext(new Uri("http://base.org/"), ODataProtocolVersion.V401);
+            test.ShouldNotThrow();
+            dsContext.MaxProtocolVersion.ShouldBeEquivalentTo(ODataProtocolVersion.V401);
+        }
 
         [Fact]
         public void DataServiceContextDoesNotRestrictBaseUriScheme()

test/FunctionalTests/Tests/DataServices/UnitTests/ClientUnitTests/PublicPlaces.vb

@@ -321,7 +321,7 @@ Partial Public Class ClientModule
                 New MaxProtocolVersionTestCase() {
                     New MaxProtocolVersionTestCase() With {.MaxProtocolVersion = ODataProtocolVersion.V4},
                     New MaxProtocolVersionTestCase() With {.MaxProtocolVersion = CType(-1, ODataProtocolVersion), .ExpectedExceptionMessage = "Specified argument was out of the range of valid values." & vbCrLf & "Parameter name: maxProtocolVersion"},
-                    New MaxProtocolVersionTestCase() With {.MaxProtocolVersion = CType(ODataProtocolVersion.V4 + 1, ODataProtocolVersion), .ExpectedExceptionMessage = "Specified argument was out of the range of valid values." & vbCrLf & "Parameter name: maxProtocolVersion"}
+                    New MaxProtocolVersionTestCase() With {.MaxProtocolVersion = CType(ODataProtocolVersion.V4 + 1, ODataProtocolVersion)}
                 },
                 Sub(testCase)
                     Dim context = New DataServiceContext(New Uri("http://host/service"))