dotnet · commonsensesoftware · Oct 26, 2018 · Oct 25, 2018 · Oct 25, 2018 · Oct 25, 2018
diff --git a/build/file-version.targets b/build/file-version.targets
@@ -7,7 +7,7 @@
     <MajorAndMinorVersion>$(AssemblyVersion.Split(`.`)[0]).$(AssemblyVersion.Split(`.`)[1])</MajorAndMinorVersion>
     <DaylightSavingTime>$([System.DateTime]::Now.IsDaylightSavingTime())</DaylightSavingTime>
     <FileBuildNumber>$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse("1/1/2000"))).ToString("%d"))</FileBuildNumber>
-    <FileBuildRevision Condition=" '$(DaylightSavingTime)'=='True' " >$([System.Convert]::ToInt32($([MSBuild]::Divide($([System.DateTime]::Now.TimeOfDay.Subtract($([System.TimeSpan]::FromHours(1.0))).TotalSeconds),2))))</FileBuildRevision>
+    <FileBuildRevision Condition=" '$(DaylightSavingTime)'=='True' " >$([System.Convert]::ToInt32($([MSBuild]::Divide($([System.DateTime]::Now.Subtract($([System.TimeSpan]::FromHours(1.0))).TimeOfDay.TotalSeconds),2))))</FileBuildRevision>
     <FileBuildRevision Condition=" '$(DaylightSavingTime)'=='False' " >$([System.Convert]::ToInt32($([MSBuild]::Divide($([System.DateTime]::Now.TimeOfDay.TotalSeconds),2))))</FileBuildRevision>
     <FileVersion>$(MajorAndMinorVersion).$(FileBuildNumber).$(FileBuildRevision)</FileVersion>
   </PropertyGroup>

diff --git a/samples/webapi/AdvancedODataWebApiSample/Startup.cs b/samples/webapi/AdvancedODataWebApiSample/Startup.cs
@@ -2,12 +2,14 @@
 
 namespace Microsoft.Examples
 {
-    using Configuration;
     using global::Owin;
+    using Microsoft.AspNet.OData;
     using Microsoft.AspNet.OData.Batch;
     using Microsoft.AspNet.OData.Builder;
     using Microsoft.AspNet.OData.Routing;
+    using Microsoft.Examples.Configuration;
     using Microsoft.OData;
+    using Microsoft.OData.UriParser;
     using Microsoft.Web.Http.Versioning;
     using System.Web.Http;
     using static Microsoft.OData.ODataUrlKeyDelimiter;
@@ -33,7 +35,6 @@ public void Configuration( IAppBuilder appBuilder )
 
             var modelBuilder = new VersionedODataModelBuilder( configuration )
             {
-                ModelBuilderFactory = () => new ODataConventionModelBuilder().EnableLowerCamelCase(),
                 ModelConfigurations =
                 {
                     new PersonModelConfiguration(),
@@ -43,14 +44,15 @@ public void Configuration( IAppBuilder appBuilder )
             var models = modelBuilder.GetEdmModels();
             var batchHandler = new DefaultODataBatchHandler( httpServer );
 
-            configuration.MapVersionedODataRoutes( "odata", "api", models, OnConfigureContainer, batchHandler );
+            configuration.MapVersionedODataRoutes( "odata", "api", models, ConfigureContainer, batchHandler );
             configuration.Routes.MapHttpRoute( "orders", "api/{controller}/{id}", new { id = Optional } );
             appBuilder.UseWebApi( httpServer );
         }
 
-        static void OnConfigureContainer( IContainerBuilder builder )
+        static void ConfigureContainer( IContainerBuilder builder )
         {
-            builder.AddService( Singleton, typeof( IODataPathHandler ), sp => new DefaultODataPathHandler() { UrlKeyDelimiter = Parentheses } );
+            builder.AddService<IODataPathHandler>( Singleton, sp => new DefaultODataPathHandler() { UrlKeyDelimiter = Parentheses } );
+            builder.AddService<ODataUriResolver>( Singleton, sp => new UnqualifiedCallAndEnumPrefixFreeResolver() { EnableCaseInsensitive = true } );
         }
     }
 }
diff --git a/samples/webapi/BasicODataWebApiSample/Startup.cs b/samples/webapi/BasicODataWebApiSample/Startup.cs
@@ -2,11 +2,17 @@
 
 namespace Microsoft.Examples
 {
-    using Configuration;
     using global::Owin;
+    using Microsoft.AspNet.OData;
     using Microsoft.AspNet.OData.Batch;
     using Microsoft.AspNet.OData.Builder;
+    using Microsoft.AspNet.OData.Routing;
+    using Microsoft.Examples.Configuration;
+    using Microsoft.OData;
+    using Microsoft.OData.UriParser;
     using System.Web.Http;
+    using static Microsoft.OData.ODataUrlKeyDelimiter;
+    using static Microsoft.OData.ServiceLifetime;
 
     public class Startup
     {
@@ -20,7 +26,6 @@ public void Configuration( IAppBuilder appBuilder )
 
             var modelBuilder = new VersionedODataModelBuilder( configuration )
             {
-                ModelBuilderFactory = () => new ODataConventionModelBuilder().EnableLowerCamelCase(),
                 ModelConfigurations =
                 {
                     new PersonModelConfiguration(),
@@ -30,9 +35,15 @@ public void Configuration( IAppBuilder appBuilder )
             var models = modelBuilder.GetEdmModels();
             var batchHandler = new DefaultODataBatchHandler( httpServer );
 
-            configuration.MapVersionedODataRoutes( "odata", "api", models, batchHandler );
-            configuration.MapVersionedODataRoutes( "odata-bypath", "v{apiVersion}", models );
+            configuration.MapVersionedODataRoutes( "odata", "api", models, ConfigureContainer, batchHandler );
+            configuration.MapVersionedODataRoutes( "odata-bypath", "v{apiVersion}", models, ConfigureContainer );
             appBuilder.UseWebApi( httpServer );
         }
+
+        static void ConfigureContainer( IContainerBuilder builder )
+        {
+            builder.AddService<IODataPathHandler>( Singleton, sp => new DefaultODataPathHandler() { UrlKeyDelimiter = Parentheses } );
+            builder.AddService<ODataUriResolver>( Singleton, sp => new UnqualifiedCallAndEnumPrefixFreeResolver() { EnableCaseInsensitive = true } );
+        }
     }
 }
diff --git a/samples/webapi/ConventionsODataWebApiSample/Startup.cs b/samples/webapi/ConventionsODataWebApiSample/Startup.cs
@@ -2,13 +2,19 @@
 
 namespace Microsoft.Examples
 {
-    using Configuration;
-    using Controllers;
     using global::Owin;
+    using Microsoft.AspNet.OData;
     using Microsoft.AspNet.OData.Batch;
     using Microsoft.AspNet.OData.Builder;
+    using Microsoft.AspNet.OData.Routing;
+    using Microsoft.Examples.Configuration;
+    using Microsoft.Examples.Controllers;
+    using Microsoft.OData;
+    using Microsoft.OData.UriParser;
     using Microsoft.Web.Http.Versioning.Conventions;
     using System.Web.Http;
+    using static Microsoft.OData.ODataUrlKeyDelimiter;
+    using static Microsoft.OData.ServiceLifetime;
 
     public class Startup
     {
@@ -38,7 +44,6 @@ public void Configuration( IAppBuilder appBuilder )
 
             var modelBuilder = new VersionedODataModelBuilder( configuration )
             {
-                ModelBuilderFactory = () => new ODataConventionModelBuilder().EnableLowerCamelCase(),
                 ModelConfigurations =
                 {
                     new PersonModelConfiguration(),
@@ -48,9 +53,15 @@ public void Configuration( IAppBuilder appBuilder )
             var models = modelBuilder.GetEdmModels();
             var batchHandler = new DefaultODataBatchHandler( httpServer );
 
-            configuration.MapVersionedODataRoutes( "odata", "api", models, batchHandler );
-            configuration.MapVersionedODataRoutes( "odata-bypath", "v{apiVersion}", models );
+            configuration.MapVersionedODataRoutes( "odata", "api", models, ConfigureContainer, batchHandler );
+            configuration.MapVersionedODataRoutes( "odata-bypath", "v{apiVersion}", models, ConfigureContainer );
             appBuilder.UseWebApi( httpServer );
         }
+
+        static void ConfigureContainer( IContainerBuilder builder )
+        {
+            builder.AddService<IODataPathHandler>( Singleton, sp => new DefaultODataPathHandler() { UrlKeyDelimiter = Parentheses } );
+            builder.AddService<ODataUriResolver>( Singleton, sp => new UnqualifiedCallAndEnumPrefixFreeResolver() { EnableCaseInsensitive = true } );
+        }
     }
 }
diff --git a/samples/webapi/SwaggerODataWebApiSample/Configuration/OrderModelConfiguration.cs b/samples/webapi/SwaggerODataWebApiSample/Configuration/OrderModelConfiguration.cs
@@ -30,12 +30,12 @@ public void Apply( ODataModelBuilder builder, ApiVersion apiVersion )
 
             if ( apiVersion >= ApiVersions.V1 )
             {
-                // order.Collection.Function( "MostExpensive" ).ReturnsFromEntitySet<Order>( "Orders" );
+                order.Collection.Function( "MostExpensive" ).ReturnsFromEntitySet<Order>( "Orders" );
             }
 
             if ( apiVersion >= ApiVersions.V2 )
             {
-                //order.Action( "Rate" ).Parameter<int>( "rating" );
+                order.Action( "Rate" ).Parameter<int>( "rating" );
             }
         }
     }

diff --git a/samples/webapi/SwaggerODataWebApiSample/Startup.cs b/samples/webapi/SwaggerODataWebApiSample/Startup.cs
@@ -3,15 +3,21 @@
 namespace Microsoft.Examples
 {
     using global::Owin;
+    using Microsoft.AspNet.OData;
     using Microsoft.AspNet.OData.Builder;
     using Microsoft.AspNet.OData.Extensions;
+    using Microsoft.AspNet.OData.Routing;
     using Microsoft.Examples.Configuration;
+    using Microsoft.OData;
+    using Microsoft.OData.UriParser;
     using Newtonsoft.Json.Serialization;
     using Swashbuckle.Application;
     using System.IO;
     using System.Reflection;
     using System.Web.Http;
     using System.Web.Http.Description;
+    using static Microsoft.OData.ODataUrlKeyDelimiter;
+    using static Microsoft.OData.ServiceLifetime;
 
     /// <summary>
     /// Represents the startup process for the application.
@@ -28,8 +34,6 @@ public void Configuration( IAppBuilder builder )
             var configuration = new HttpConfiguration();
             var httpServer = new HttpServer( configuration );
 
-            configuration.SetUrlKeyDelimiter( OData.ODataUrlKeyDelimiter.Parentheses );
-
             // reporting api versions will return the headers "api-supported-versions" and "api-deprecated-versions"
             configuration.AddApiVersioning( o => o.ReportApiVersions = true );
 
@@ -38,7 +42,6 @@ public void Configuration( IAppBuilder builder )
 
             var modelBuilder = new VersionedODataModelBuilder( configuration )
             {
-                ModelBuilderFactory = () => new ODataConventionModelBuilder().EnableLowerCamelCase(),
                 ModelConfigurations =
                 {
                     new AllConfigurations(),
@@ -51,10 +54,10 @@ public void Configuration( IAppBuilder builder )
             // TODO: while you can use both, you should choose only ONE of the following; comment, uncomment, or remove as necessary
 
             // WHEN VERSIONING BY: query string, header, or media type
-            configuration.MapVersionedODataRoutes( "odata", routePrefix, models );
+            configuration.MapVersionedODataRoutes( "odata", routePrefix, models, ConfigureContainer );
 
             // WHEN VERSIONING BY: url segment
-            //configuration.MapVersionedODataRoutes( "odata-bypath", "api/v{apiVersion}", models, ConfigureODataServices );
+            //configuration.MapVersionedODataRoutes( "odata-bypath", "api/v{apiVersion}", models, ConfigureContainer );
 
             // add the versioned IApiExplorer and capture the strongly-typed implementation (e.g. ODataApiExplorer vs IApiExplorer)
             // note: the specified format code will format the version as "'v'major[.minor][-status]"
@@ -114,5 +117,11 @@ static string XmlCommentsFilePath
                 return Path.Combine( basePath, fileName );
             }
         }
+
+        static void ConfigureContainer( IContainerBuilder builder )
+        {
+            builder.AddService<IODataPathHandler>( Singleton, sp => new DefaultODataPathHandler() { UrlKeyDelimiter = Parentheses } );
+            builder.AddService<ODataUriResolver>( Singleton, sp => new UnqualifiedCallAndEnumPrefixFreeResolver() { EnableCaseInsensitive = true } );
+        }
     }
 }
diff --git a/samples/webapi/SwaggerODataWebApiSample/SwaggerODataWebApiSample.csproj b/samples/webapi/SwaggerODataWebApiSample/SwaggerODataWebApiSample.csproj
@@ -84,9 +84,6 @@
     <Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Swashbuckle.Core.5.5.3\lib\net40\Swashbuckle.Core.dll</HintPath>
     </Reference>
-    <!--<Reference Include="Swashbuckle.OData, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a2e252c86e553959, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Swashbuckle.OData.3.2.0\lib\net452\Swashbuckle.OData.dll</HintPath>
-    </Reference>-->
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
@@ -178,7 +175,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>1874</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:1874/</IISUrl>
+          <IISUrl>http://localhost:1874/swagger</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

diff --git a/src/Common.ApiExplorer/ApiExplorerOptions.cs b/src/Common.ApiExplorer/ApiExplorerOptions.cs
@@ -53,5 +53,22 @@ public partial class ApiExplorerOptions
         /// <value>The default description for API version parameters. The default value
         /// is "The requested API version".</value>
         public string DefaultApiVersionParameterDescription { get; set; } = LocalSR.DefaultApiVersionParamDesc;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether API version parameters are added when an API is version-neutral.
+        /// </summary>
+        /// <value>True if API version parameters should be included when exploring a version-neutral API; otherwise, false.
+        /// The default value is <c>false</c>.</value>
+        /// <remarks>
+        /// <para>
+        /// A version-neutral API can accept any API version, including none at all. Setting this property to true
+        /// will enable exploring parameter descriptors for an API version that can be used to generate user input, which
+        /// may be useful for a version-neutral API that its own per-API version logic.
+        /// </para>
+        /// <para>
+        /// An API version defined using the URLsegment method is unaffected by this setting because path-based route
+        /// parameters are always required.
+        /// </para></remarks>
+        public bool AddApiVersionParametersWhenVersionNeutral { get; set; }
     }
 }
diff --git a/src/Common.OData.ApiExplorer/AspNet.OData/ClassProperty.cs b/src/Common.OData.ApiExplorer/AspNet.OData/ClassProperty.cs
@@ -11,16 +11,16 @@
 
     struct ClassProperty
     {
+        readonly Type type;
         internal readonly string Name;
-        internal readonly Type Type;
 
         internal ClassProperty( PropertyInfo clrProperty, Type propertyType )
         {
             Contract.Requires( clrProperty != null );
             Contract.Requires( propertyType != null );
 
             Name = clrProperty.Name;
-            Type = propertyType;
+            type = propertyType;
             Attributes = AttributesFromProperty( clrProperty );
         }
 
@@ -30,12 +30,36 @@ internal ClassProperty( IEnumerable<Assembly> assemblies, IEdmOperationParameter
             Contract.Requires( parameter != null );
 
             Name = parameter.Name;
-            Type = parameter.Type.Definition.GetClrType( assemblies );
+            type = parameter.Type.Definition.GetClrType( assemblies );
             Attributes = AttributesFromOperationParameter( parameter );
         }
 
         internal IEnumerable<CustomAttributeBuilder> Attributes { get; }
 
+        public override int GetHashCode() => ( Name.GetHashCode() * 397 ) ^ type.GetHashCode();
+
+        public Type GetType( Type declaringType )
+        {
+            Contract.Requires( declaringType != null );
+            Contract.Ensures( Contract.Result<Type>() != null );
+
+            if ( type == DeclaringType.Value )
+            {
+                return declaringType;
+            }
+            else if ( type.IsGenericType )
+            {
+                var typeArgs = type.GetGenericArguments();
+
+                if ( typeArgs.Length == 1 && typeArgs[0] == DeclaringType.Value )
+                {
+                    return type.GetGenericTypeDefinition().MakeGenericType( declaringType );
+                }
+            }
+
+            return type;
+        }
+
         static IEnumerable<CustomAttributeBuilder> AttributesFromProperty( PropertyInfo clrProperty )
         {
             Contract.Requires( clrProperty != null );
@@ -93,7 +117,5 @@ static IEnumerable<CustomAttributeBuilder> AttributesFromOperationParameter( IEd
 
             yield return new CustomAttributeBuilder( ctor, args );
         }
-
-        public override int GetHashCode() => ( Name.GetHashCode() * 397 ) ^ Type.GetHashCode();
     }
 }
diff --git a/src/Common.OData.ApiExplorer/AspNet.OData/DeclaringType.cs b/src/Common.OData.ApiExplorer/AspNet.OData/DeclaringType.cs
@@ -0,0 +1,9 @@
+namespace Microsoft.AspNet.OData
+{
+    using System;
+
+    struct DeclaringType
+    {
+        internal static Type Value = typeof( DeclaringType );
+    }
+}