diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 9d50a25e..c02bd02f 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,122 +1,120 @@
 <Project>
-	<!-- Folder layout -->
-	<PropertyGroup>
-		<IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance'))">true</IsBenchmarkProject>
-		<IsTestProject Condition="$(MSBuildProjectName.ToLower().Contains('.tests.'))">true</IsTestProject>
-		<IsTestAssetProject Condition="$(RepoRelativeProjectDir.ToLower().Contains('testassets'))">true</IsTestAssetProject>
-		<IsSampleProject Condition="$(MSBuildProjectName.ToLower().Contains('.samples.'))">true</IsSampleProject>
-		<IsTemplateProject Condition="$(MSBuildProjectName.ToLower().Contains('.templates.'))">true</IsTemplateProject>
-		<IsTemplatePackageProject Condition="$(MSBuildProjectName.ToLower().Contains('.templates.package'))">true</IsTemplatePackageProject>
-		<IsNetCore Condition=" '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">true</IsNetCore>
-		<IsPrimaryProject Condition=" '$(IsBenchmarkProject)' != 'true' And '$(IsTestProject)' != 'true' And '$(IsTestAssetProject)' != 'true' And '$(IsSampleProject)' != 'true' ">true</IsPrimaryProject>
-
-		<IncludeSource>false</IncludeSource>
-		<IncludeSymbols>true</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<PublishRepositoryUrl>true</PublishRepositoryUrl>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-
-		<SignAssembly>true</SignAssembly>
-		<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)restier.snk</AssemblyOriginatorKeyFile>
-		<StrongNamePublicKey>PublicKey=0024000004800000940000000602000000240000525341310004000001000100f1fcc0061e7ed7476808f86fdecd6a9585915f329fc6312d08331c971da86230330e42ed8ffbd528c523fa023d92c3db1123b5d044b3aad9e04fd3877ffca8e4ba836a740ec3074f0fcbef770ff14d2fa1b5a8403ab16f398ac14998bd011c35505b6bc555326037a7ab7dcca118000a19a5475377358e9dea38df76452b01c9</StrongNamePublicKey>
-
-		<LangVersion>preview</LangVersion>
-		<Configurations>Debug;Release;NoWebApps</Configurations>
-
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)'=='Release'">
-		<DefineConstants>TRACE;RELEASE</DefineConstants>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)'=='Debug'">
-		<DefineConstants>DEBUG;TRACE</DefineConstants>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<Product>Microsoft Restier</Product>
-		<Authors>Microsoft</Authors>
-		<Company>Microsoft Corporation</Company>
-		<RpmPackageVendor>.NET Foundation</RpmPackageVendor>
-		<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-		<NeutralLanguage>en-US</NeutralLanguage>
-		<PackageLicenseUrl>https://raw.githubusercontent.com/OData/RESTier/master/License.txt</PackageLicenseUrl>
-		<!-- The SPDX name for the source license. See https://spdx.org/licenses/. -->
-		<PackageLicenseType>MIT</PackageLicenseType>
-		<!--
+  <!-- Folder layout -->
+  <PropertyGroup>
+    <IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance'))">true</IsBenchmarkProject>
+    <IsTestProject Condition="$(MSBuildProjectName.ToLower().Contains('.tests.'))">true</IsTestProject>
+    <IsTestAssetProject Condition="$(RepoRelativeProjectDir.ToLower().Contains('testassets'))">true</IsTestAssetProject>
+    <IsSampleProject Condition="$(MSBuildProjectName.ToLower().Contains('.samples.'))">true</IsSampleProject>
+	<IsTemplateProject Condition="$(MSBuildProjectName.ToLower().Contains('.templates.'))">true</IsTemplateProject>
+	<IsTemplatePackageProject Condition="$(MSBuildProjectName.ToLower().Contains('.templates.package'))">true</IsTemplatePackageProject>
+	<IsNetCore Condition=" '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">true</IsNetCore>
+    <IsPrimaryProject Condition=" '$(IsBenchmarkProject)' != 'true' And '$(IsTestProject)' != 'true' And '$(IsTestAssetProject)' != 'true' And '$(IsSampleProject)' != 'true' ">true</IsPrimaryProject>
+
+    <IncludeSource>false</IncludeSource>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)restier.snk</AssemblyOriginatorKeyFile>
+    <StrongNamePublicKey>PublicKey=0024000004800000940000000602000000240000525341310004000001000100f1fcc0061e7ed7476808f86fdecd6a9585915f329fc6312d08331c971da86230330e42ed8ffbd528c523fa023d92c3db1123b5d044b3aad9e04fd3877ffca8e4ba836a740ec3074f0fcbef770ff14d2fa1b5a8403ab16f398ac14998bd011c35505b6bc555326037a7ab7dcca118000a19a5475377358e9dea38df76452b01c9</StrongNamePublicKey>
+
+    <LangVersion>preview</LangVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <DefineConstants>TRACE;RELEASE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Product>Microsoft Restier</Product>
+    <Authors>Microsoft</Authors>
+    <Company>Microsoft Corporation</Company>
+    <RpmPackageVendor>.NET Foundation</RpmPackageVendor>
+    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/OData/RESTier/master/License.txt</PackageLicenseUrl>
+    <!-- The SPDX name for the source license. See https://spdx.org/licenses/. -->
+    <PackageLicenseType>MIT</PackageLicenseType>
+    <!--
       Suppress a warning about upcoming deprecation of PackageLicenseUrl. When embedding licenses are supported,
       replace PackageLicenseUrl with PackageLicenseExpression.
     -->
-		<NoWarn>$(NoWarn);NU5125</NoWarn>
-		<!-- Suppress warnings about using SemVer 2.0. -->
-		<NoWarn>$(NoWarn);NU5105</NoWarn>
-
-		<!-- Contact email address for NuGet packages and Linux installers. -->
-		<MaintainerEmail>odata@nimbleapps.cloud</MaintainerEmail>
-
-		<PackageIcon>dotnet-logo.png</PackageIcon>
-		<PackageProjectUrl>https://restier.readthedocs.io/en/latest/</PackageProjectUrl>
-		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-		<PackageTags>odata;wcf data services;</PackageTags>
-		<Serviceable>true</Serviceable>
-
-		<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
-		<RepositoryUrl>https://github.com/OData/RESTier.git</RepositoryUrl>
-		<RepositoryType>git</RepositoryType>
-	</PropertyGroup>
-
-	<!-- Compilation options -->
-	<PropertyGroup>
-		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-		<ImplicitUsings>disable</ImplicitUsings>
-		<Nullable>disable</Nullable>
-
-		<!-- Instructs the compiler to use SHA256 instead of SHA1 when adding file hashes to PDBs. -->
-		<ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
-
-		<!-- Fixes a common error in targets implementing a NoBuild mode. -->
-		<BuildProjectReferences Condition=" '$(NoBuild)' == 'true' ">false</BuildProjectReferences>
-
-		<!-- Suppress warnings about uninstantiated classes. -->
-		<NoWarn>$(NoWarn);CA1812;CS1570</NoWarn>
-	</PropertyGroup>
-
-	<PropertyGroup Condition=" $(IsTestProject) == 'true' ">
-		<NoWarn>$(NoWarn);CA1001;CA1031;CA1062;CA1301;CA1303;AC1307;CA1707;CA1716;CA1801;CA1806;CA1819;CA1822;CA1825;CA2000;CA2007;CA2227;CA2234</NoWarn>
-	</PropertyGroup>
-
-	<PropertyGroup Condition=" $(IsSampleProject) == 'true' ">
-		<NoWarn>$(NoWarn);CA1001;CA1707;CA1716;CA1801;CA1822</NoWarn>
-	</PropertyGroup>
-
-	<PropertyGroup Condition=" '$(IsPrimaryProject)' == 'true' ">
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)</DocumentationFile>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<StandardTestTfms>netcoreapp3.1;net472</StandardTestTfms>
-	</PropertyGroup>
-
-	<ItemGroup Condition=" $(IsTestProject) != 'true' and $(IsSampleProject) != 'true'">
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="All" />
-
-		<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
-			<_Parameter1>$(AssemblyName.Replace("Microsoft.Restier.", "Microsoft.Restier.Tests.")), $(StrongNamePublicKey)</_Parameter1>
-		</AssemblyAttribute>
-	</ItemGroup>
-
-	<ItemGroup Condition=" $(IsTestProject) == 'true' and $(IsSampleProject) != 'true'">
-		<PackageReference Include="FluentAssertions" Version="6.*" PrivateAssets="All" />
-		<PackageReference Include="FluentAssertions.Analyzers" Version="0.*" PrivateAssets="All" />
-		<PackageReference Include="MSTest.TestAdapter" Version="2.*" />
-		<PackageReference Include="MSTest.TestFramework" Version="2.*" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<None Include="$(MSBuildThisFileDirectory)dotnet-logo.png" Pack="true" PackagePath="\" Condition="'$(IsTestProject)' != 'true'" />
-	</ItemGroup>
+    <NoWarn>$(NoWarn);NU5125</NoWarn>
+    <!-- Suppress warnings about using SemVer 2.0. -->
+    <NoWarn>$(NoWarn);NU5105</NoWarn>
+
+    <!-- Contact email address for NuGet packages and Linux installers. -->
+    <MaintainerEmail>odata@nimbleapps.cloud</MaintainerEmail>
+
+    <PackageIcon>dotnet-logo.png</PackageIcon>
+    <PackageProjectUrl>https://restier.readthedocs.io/en/latest/</PackageProjectUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <PackageTags>odata;wcf data services;</PackageTags>
+    <Serviceable>true</Serviceable>
+
+    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
+    <RepositoryUrl>https://github.com/OData/RESTier.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
+
+  <!-- Compilation options -->
+  <PropertyGroup>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+	<ImplicitUsings>disable</ImplicitUsings>
+	<Nullable>disable</Nullable>
+
+    <!-- Instructs the compiler to use SHA256 instead of SHA1 when adding file hashes to PDBs. -->
+    <ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
+
+    <!-- Fixes a common error in targets implementing a NoBuild mode. -->
+    <BuildProjectReferences Condition=" '$(NoBuild)' == 'true' ">false</BuildProjectReferences>
+
+    <!-- Suppress warnings about uninstantiated classes. -->
+    <NoWarn>$(NoWarn);CA1812;CS1570</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" $(IsTestProject) == 'true' ">
+    <NoWarn>$(NoWarn);CA1001;CA1031;CA1062;CA1301;CA1303;AC1307;CA1707;CA1716;CA1801;CA1806;CA1819;CA1822;CA1825;CA2000;CA2007;CA2227;CA2234</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" $(IsSampleProject) == 'true' ">
+    <NoWarn>$(NoWarn);CA1001;CA1707;CA1716;CA1801;CA1822</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(IsPrimaryProject)' == 'true' ">
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <StandardTestTfms>netcoreapp3.1;net472</StandardTestTfms>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" $(IsTestProject) != 'true' and $(IsSampleProject) != 'true'">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="All" />
+
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>$(AssemblyName.Replace("Microsoft.Restier.", "Microsoft.Restier.Tests.")), $(StrongNamePublicKey)</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+  <ItemGroup Condition=" $(IsTestProject) == 'true' and $(IsSampleProject) != 'true'">
+    <PackageReference Include="FluentAssertions" Version="6.*" PrivateAssets="All" />
+    <PackageReference Include="FluentAssertions.Analyzers" Version="0.17.*" PrivateAssets="All" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.*" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)dotnet-logo.png" Pack="true" PackagePath="\" Condition="'$(IsTestProject)' != 'true'" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.Restier.Samples.Northwind.AspNet/Microsoft.Restier.Samples.Northwind.AspNet.csproj b/src/Microsoft.Restier.Samples.Northwind.AspNet/Microsoft.Restier.Samples.Northwind.AspNet.csproj
index 32d48f23..15524136 100644
--- a/src/Microsoft.Restier.Samples.Northwind.AspNet/Microsoft.Restier.Samples.Northwind.AspNet.csproj
+++ b/src/Microsoft.Restier.Samples.Northwind.AspNet/Microsoft.Restier.Samples.Northwind.AspNet.csproj
@@ -1,222 +1,210 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3EAB0AED-2BE2-4120-B26E-3401B86C4DC2}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Restier.Samples.Northwind.AspNet</RootNamespace>
-    <AssemblyName>Microsoft.Restier.Samples.Northwind.AspNet</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <UseIISExpress>true</UseIISExpress>
-    <Use64BitIISExpress />
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <RuntimeIdentifier>win</RuntimeIdentifier>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNet.OData" Version="7.*" />
-    <PackageReference Include="Microsoft.AspNet.WebApi" Version="5.*" />
-    <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.*" />
-    <PackageReference Include="Microsoft.OData.Core" Version="7.*" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.*" />
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.Web.DynamicData" />
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.EnterpriseServices" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_Data\Northwind.mdf" />
-    <Content Include="App_Data\Northwind_log.ldf">
-      <DependentUpon>Northwind.mdf</DependentUpon>
-    </Content>
-    <Content Include="Data\Northwind.Context.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>Northwind.Context.cs</LastGenOutput>
-      <DependentUpon>Northwind.edmx</DependentUpon>
-    </Content>
-    <Content Include="Data\Northwind.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <DependentUpon>Northwind.edmx</DependentUpon>
-      <LastGenOutput>Northwind.cs</LastGenOutput>
-    </Content>
-    <Content Include="Global.asax" />
-    <Content Include="Web.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="App_Start\WebApiConfig.cs" />
-    <Compile Include="Controllers\NorthwindApi.cs" />
-    <Compile Include="Data\Category.cs">
-      <DependentUpon>Northwind.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Customer.cs">
-      <DependentUpon>Northwind.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Data\CustomerDemographic.cs">
-      <DependentUpon>Northwind.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Employee.cs">
-      <DependentUpon>Northwind.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Northwind.Context.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Northwind.Context.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Northwind.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Northwind.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Northwind.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Northwind.edmx</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Order.cs">
-      <DependentUpon>Northwind.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Order_Detail.cs">
-      <DependentUpon>Northwind.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Product.cs">
-      <DependentUpon>Northwind.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Region.cs">
-      <DependentUpon>Northwind.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Shipper.cs">
-      <DependentUpon>Northwind.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Supplier.cs">
-      <DependentUpon>Northwind.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Data\Territory.cs">
-      <DependentUpon>Northwind.tt</DependentUpon>
-    </Compile>
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EntityDeploy Include="Data\Northwind.edmx">
-      <Generator>EntityModelCodeGenerator</Generator>
-      <LastGenOutput>Northwind.Designer.cs</LastGenOutput>
-    </EntityDeploy>
-    <Content Include="Data\Northwind.edmx.diagram">
-      <DependentUpon>Northwind.edmx</DependentUpon>
-    </Content>
-    <None Include="Web.Debug.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </None>
-    <None Include="Web.Release.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Restier.AspNet\Microsoft.Restier.AspNet.csproj">
-      <Project>{8ecf4e97-1816-44ad-ad63-6acf287ed520}</Project>
-      <Name>Microsoft.Restier.AspNet</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Restier.Core\Microsoft.Restier.Core.csproj">
-      <Project>{300b769a-3513-49d0-a035-7db965c8d2a4}</Project>
-      <Name>Microsoft.Restier.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Restier.EntityFramework\Microsoft.Restier.EntityFramework.csproj">
-      <Project>{0E373B2A-2ED2-4566-A275-6BE81CFFE00B}</Project>
-      <Name>Microsoft.Restier.EntityFramework</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NoWebApps|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE;RELEASE</DefineConstants>
-    <Optimize>true</Optimize>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <NoWarn>;NU5125;NU5105;CA1812;CS1570;CA1001;CA1707;CA1716;CA1801;CA1822</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <LangVersion>11.0</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>True</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>60605</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:60605/</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+	<PropertyGroup>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<ProductVersion>
+		</ProductVersion>
+		<SchemaVersion>2.0</SchemaVersion>
+		<ProjectGuid>{3EAB0AED-2BE2-4120-B26E-3401B86C4DC2}</ProjectGuid>
+		<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+		<OutputType>Library</OutputType>
+		<AppDesignerFolder>Properties</AppDesignerFolder>
+		<RootNamespace>Microsoft.Restier.Samples.Northwind.AspNet</RootNamespace>
+		<AssemblyName>Microsoft.Restier.Samples.Northwind.AspNet</AssemblyName>
+		<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+		<UseIISExpress>true</UseIISExpress>
+		<Use64BitIISExpress />
+		<IISExpressSSLPort />
+		<IISExpressAnonymousAuthentication />
+		<IISExpressWindowsAuthentication />
+		<IISExpressUseClassicPipelineMode />
+		<UseGlobalApplicationHostFile />
+		<NuGetPackageImportStamp>
+		</NuGetPackageImportStamp>
+		<RuntimeIdentifier>win</RuntimeIdentifier>
+		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNet.OData" Version="7.*" />
+		<PackageReference Include="Microsoft.AspNet.WebApi" Version="5.*" />
+		<PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.*" />
+		<PackageReference Include="Microsoft.OData.Core" Version="7.*" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.*" />
+	</ItemGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>full</DebugType>
+		<Optimize>false</Optimize>
+		<OutputPath>bin\</OutputPath>
+		<DefineConstants>DEBUG;TRACE</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>pdbonly</DebugType>
+		<Optimize>true</Optimize>
+		<OutputPath>bin\</OutputPath>
+		<DefineConstants>TRACE</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+	</PropertyGroup>
+	<ItemGroup>
+		<Reference Include="Microsoft.CSharp" />
+		<Reference Include="System.Net.Http" />
+		<Reference Include="System.Runtime.Serialization" />
+		<Reference Include="System.Security" />
+		<Reference Include="System.Web.DynamicData" />
+		<Reference Include="System.Web.Entity" />
+		<Reference Include="System.Web.ApplicationServices" />
+		<Reference Include="System.ComponentModel.DataAnnotations" />
+		<Reference Include="System" />
+		<Reference Include="System.Data" />
+		<Reference Include="System.Core" />
+		<Reference Include="System.Data.DataSetExtensions" />
+		<Reference Include="System.Web.Extensions" />
+		<Reference Include="System.Xml.Linq" />
+		<Reference Include="System.Drawing" />
+		<Reference Include="System.Web" />
+		<Reference Include="System.Xml" />
+		<Reference Include="System.Configuration" />
+		<Reference Include="System.Web.Services" />
+		<Reference Include="System.EnterpriseServices" />
+	</ItemGroup>
+	<ItemGroup>
+		<Content Include="App_Data\Northwind.mdf" />
+		<Content Include="App_Data\Northwind_log.ldf">
+			<DependentUpon>Northwind.mdf</DependentUpon>
+		</Content>
+		<Content Include="Data\Northwind.Context.tt">
+			<Generator>TextTemplatingFileGenerator</Generator>
+			<LastGenOutput>Northwind.Context.cs</LastGenOutput>
+			<DependentUpon>Northwind.edmx</DependentUpon>
+		</Content>
+		<Content Include="Data\Northwind.tt">
+			<Generator>TextTemplatingFileGenerator</Generator>
+			<DependentUpon>Northwind.edmx</DependentUpon>
+			<LastGenOutput>Northwind.cs</LastGenOutput>
+		</Content>
+		<Content Include="Global.asax" />
+		<Content Include="Web.config" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Include="App_Start\WebApiConfig.cs" />
+		<Compile Include="Controllers\NorthwindApi.cs" />
+		<Compile Include="Data\Category.cs">
+			<DependentUpon>Northwind.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Data\Customer.cs">
+			<DependentUpon>Northwind.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Data\CustomerDemographic.cs">
+			<DependentUpon>Northwind.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Data\Employee.cs">
+			<DependentUpon>Northwind.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Data\Northwind.Context.cs">
+			<AutoGen>True</AutoGen>
+			<DesignTime>True</DesignTime>
+			<DependentUpon>Northwind.Context.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Data\Northwind.cs">
+			<AutoGen>True</AutoGen>
+			<DesignTime>True</DesignTime>
+			<DependentUpon>Northwind.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Data\Northwind.Designer.cs">
+			<AutoGen>True</AutoGen>
+			<DesignTime>True</DesignTime>
+			<DependentUpon>Northwind.edmx</DependentUpon>
+		</Compile>
+		<Compile Include="Data\Order.cs">
+			<DependentUpon>Northwind.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Data\Order_Detail.cs">
+			<DependentUpon>Northwind.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Data\Product.cs">
+			<DependentUpon>Northwind.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Data\Region.cs">
+			<DependentUpon>Northwind.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Data\Shipper.cs">
+			<DependentUpon>Northwind.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Data\Supplier.cs">
+			<DependentUpon>Northwind.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Data\Territory.cs">
+			<DependentUpon>Northwind.tt</DependentUpon>
+		</Compile>
+		<Compile Include="Global.asax.cs">
+			<DependentUpon>Global.asax</DependentUpon>
+		</Compile>
+		<Compile Include="Properties\AssemblyInfo.cs" />
+	</ItemGroup>
+	<ItemGroup>
+		<EntityDeploy Include="Data\Northwind.edmx">
+			<Generator>EntityModelCodeGenerator</Generator>
+			<LastGenOutput>Northwind.Designer.cs</LastGenOutput>
+		</EntityDeploy>
+		<Content Include="Data\Northwind.edmx.diagram">
+			<DependentUpon>Northwind.edmx</DependentUpon>
+		</Content>
+		<None Include="Web.Debug.config">
+			<DependentUpon>Web.config</DependentUpon>
+		</None>
+		<None Include="Web.Release.config">
+			<DependentUpon>Web.config</DependentUpon>
+		</None>
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Microsoft.Restier.AspNet\Microsoft.Restier.AspNet.csproj">
+			<Project>{8ecf4e97-1816-44ad-ad63-6acf287ed520}</Project>
+			<Name>Microsoft.Restier.AspNet</Name>
+		</ProjectReference>
+		<ProjectReference Include="..\Microsoft.Restier.Core\Microsoft.Restier.Core.csproj">
+			<Project>{300b769a-3513-49d0-a035-7db965c8d2a4}</Project>
+			<Name>Microsoft.Restier.Core</Name>
+		</ProjectReference>
+		<ProjectReference Include="..\Microsoft.Restier.EntityFramework\Microsoft.Restier.EntityFramework.csproj">
+			<Project>{0E373B2A-2ED2-4566-A275-6BE81CFFE00B}</Project>
+			<Name>Microsoft.Restier.EntityFramework</Name>
+		</ProjectReference>
+	</ItemGroup>
+	<ItemGroup />
+	<ItemGroup>
+		<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+	</ItemGroup>
+	<PropertyGroup>
+		<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+		<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+	</PropertyGroup>
+	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+	<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+	<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+	<ProjectExtensions>
+		<VisualStudio>
+			<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+				<WebProjectProperties>
+					<UseIIS>True</UseIIS>
+					<AutoAssignPort>True</AutoAssignPort>
+					<DevelopmentServerPort>60605</DevelopmentServerPort>
+					<DevelopmentServerVPath>/</DevelopmentServerVPath>
+					<IISUrl>http://localhost:60605/</IISUrl>
+					<NTLMAuthentication>False</NTLMAuthentication>
+					<UseCustomServer>False</UseCustomServer>
+					<CustomServerUrl>
+					</CustomServerUrl>
+					<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+				</WebProjectProperties>
+			</FlavorProperties>
+		</VisualStudio>
+	</ProjectExtensions>
+	<!-- 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.
   <Target Name="BeforeBuild">
   </Target>
diff --git a/src/RESTier.sln b/src/RESTier.sln
index 1ecef4c2..176fb7e8 100644
--- a/src/RESTier.sln
+++ b/src/RESTier.sln
@@ -75,123 +75,93 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Restier.Tests.EntityFrameworkCore", "Microsoft.Restier.Tests.EntityFrameworkCore\Microsoft.Restier.Tests.EntityFrameworkCore.csproj", "{2DB7E862-69AE-43E2-9EC4-C1491E8BA28F}"
 EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		Microsoft.Restier.EntityFramework.Shared\Microsoft.Restier.EntityFramework.Shared.projitems*{0e373b2a-2ed2-4566-a275-6be81cffe00b}*SharedItemsImports = 5
+		Microsoft.Restier.AspNet.Shared\Microsoft.Restier.AspNet.Shared.projitems*{802c856e-1709-45b3-844b-f9c7996e6e52}*SharedItemsImports = 5
+		Microsoft.Restier.EntityFramework.Shared\Microsoft.Restier.EntityFramework.Shared.projitems*{83ad7aa8-9ed8-4b9f-966a-73ce9cae51c6}*SharedItemsImports = 13
+		Microsoft.Restier.AspNet.Shared\Microsoft.Restier.AspNet.Shared.projitems*{8ecf4e97-1816-44ad-ad63-6acf287ed520}*SharedItemsImports = 5
+		Microsoft.Restier.AspNet.Shared\Microsoft.Restier.AspNet.Shared.projitems*{8f4e985b-f5c9-4a03-a1a4-4cb8494b8188}*SharedItemsImports = 13
+		Microsoft.Restier.EntityFramework.Shared\Microsoft.Restier.EntityFramework.Shared.projitems*{99059346-006c-4f99-9c9b-52dbb8493e80}*SharedItemsImports = 5
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		NoWebApps|Any CPU = NoWebApps|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{300B769A-3513-49D0-A035-7DB965C8D2A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{300B769A-3513-49D0-A035-7DB965C8D2A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{300B769A-3513-49D0-A035-7DB965C8D2A4}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{300B769A-3513-49D0-A035-7DB965C8D2A4}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{300B769A-3513-49D0-A035-7DB965C8D2A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{300B769A-3513-49D0-A035-7DB965C8D2A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8ECF4E97-1816-44AD-AD63-6ACF287ED520}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8ECF4E97-1816-44AD-AD63-6ACF287ED520}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8ECF4E97-1816-44AD-AD63-6ACF287ED520}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{8ECF4E97-1816-44AD-AD63-6ACF287ED520}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{8ECF4E97-1816-44AD-AD63-6ACF287ED520}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8ECF4E97-1816-44AD-AD63-6ACF287ED520}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0E373B2A-2ED2-4566-A275-6BE81CFFE00B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0E373B2A-2ED2-4566-A275-6BE81CFFE00B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E373B2A-2ED2-4566-A275-6BE81CFFE00B}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{0E373B2A-2ED2-4566-A275-6BE81CFFE00B}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{0E373B2A-2ED2-4566-A275-6BE81CFFE00B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0E373B2A-2ED2-4566-A275-6BE81CFFE00B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{16DBAD48-C935-4BF1-BC4A-925031AEA0FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{16DBAD48-C935-4BF1-BC4A-925031AEA0FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16DBAD48-C935-4BF1-BC4A-925031AEA0FA}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{16DBAD48-C935-4BF1-BC4A-925031AEA0FA}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{16DBAD48-C935-4BF1-BC4A-925031AEA0FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16DBAD48-C935-4BF1-BC4A-925031AEA0FA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EB7010EC-4AD2-4CEB-8757-46447FEC80C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EB7010EC-4AD2-4CEB-8757-46447FEC80C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB7010EC-4AD2-4CEB-8757-46447FEC80C7}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{EB7010EC-4AD2-4CEB-8757-46447FEC80C7}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{EB7010EC-4AD2-4CEB-8757-46447FEC80C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB7010EC-4AD2-4CEB-8757-46447FEC80C7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD305A0A-5680-4C38-9917-84233F35DE3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD305A0A-5680-4C38-9917-84233F35DE3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD305A0A-5680-4C38-9917-84233F35DE3F}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{FD305A0A-5680-4C38-9917-84233F35DE3F}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{FD305A0A-5680-4C38-9917-84233F35DE3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD305A0A-5680-4C38-9917-84233F35DE3F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3EAB0AED-2BE2-4120-B26E-3401B86C4DC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3EAB0AED-2BE2-4120-B26E-3401B86C4DC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3EAB0AED-2BE2-4120-B26E-3401B86C4DC2}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
 		{3EAB0AED-2BE2-4120-B26E-3401B86C4DC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3EAB0AED-2BE2-4120-B26E-3401B86C4DC2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B75D79EE-D5C0-4E1B-82CB-9505880A2730}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B75D79EE-D5C0-4E1B-82CB-9505880A2730}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B75D79EE-D5C0-4E1B-82CB-9505880A2730}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{B75D79EE-D5C0-4E1B-82CB-9505880A2730}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{B75D79EE-D5C0-4E1B-82CB-9505880A2730}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B75D79EE-D5C0-4E1B-82CB-9505880A2730}.Release|Any CPU.Build.0 = Release|Any CPU
 		{14E2BD0E-30C7-472E-9EFE-AA7A63505493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{14E2BD0E-30C7-472E-9EFE-AA7A63505493}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14E2BD0E-30C7-472E-9EFE-AA7A63505493}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{14E2BD0E-30C7-472E-9EFE-AA7A63505493}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{14E2BD0E-30C7-472E-9EFE-AA7A63505493}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14E2BD0E-30C7-472E-9EFE-AA7A63505493}.Release|Any CPU.Build.0 = Release|Any CPU
 		{589F129E-4EF8-41D3-A07F-4D20714BF29F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{589F129E-4EF8-41D3-A07F-4D20714BF29F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{589F129E-4EF8-41D3-A07F-4D20714BF29F}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{589F129E-4EF8-41D3-A07F-4D20714BF29F}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{589F129E-4EF8-41D3-A07F-4D20714BF29F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{589F129E-4EF8-41D3-A07F-4D20714BF29F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{99059346-006C-4F99-9C9B-52DBB8493E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{99059346-006C-4F99-9C9B-52DBB8493E80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99059346-006C-4F99-9C9B-52DBB8493E80}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{99059346-006C-4F99-9C9B-52DBB8493E80}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{99059346-006C-4F99-9C9B-52DBB8493E80}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{99059346-006C-4F99-9C9B-52DBB8493E80}.Release|Any CPU.Build.0 = Release|Any CPU
 		{802C856E-1709-45B3-844B-F9C7996E6E52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{802C856E-1709-45B3-844B-F9C7996E6E52}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{802C856E-1709-45B3-844B-F9C7996E6E52}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{802C856E-1709-45B3-844B-F9C7996E6E52}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{802C856E-1709-45B3-844B-F9C7996E6E52}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{802C856E-1709-45B3-844B-F9C7996E6E52}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1ECDB4A3-3B37-458E-B1D1-DBED2BB4FF93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1ECDB4A3-3B37-458E-B1D1-DBED2BB4FF93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1ECDB4A3-3B37-458E-B1D1-DBED2BB4FF93}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{1ECDB4A3-3B37-458E-B1D1-DBED2BB4FF93}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{1ECDB4A3-3B37-458E-B1D1-DBED2BB4FF93}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1ECDB4A3-3B37-458E-B1D1-DBED2BB4FF93}.Release|Any CPU.Build.0 = Release|Any CPU
 		{76913B40-7AD6-4781-9C6F-11E5C00C7842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{76913B40-7AD6-4781-9C6F-11E5C00C7842}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76913B40-7AD6-4781-9C6F-11E5C00C7842}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{76913B40-7AD6-4781-9C6F-11E5C00C7842}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{76913B40-7AD6-4781-9C6F-11E5C00C7842}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76913B40-7AD6-4781-9C6F-11E5C00C7842}.Release|Any CPU.Build.0 = Release|Any CPU
 		{32955242-D7DA-4D32-94AA-6B63AA04BE30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{32955242-D7DA-4D32-94AA-6B63AA04BE30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32955242-D7DA-4D32-94AA-6B63AA04BE30}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{32955242-D7DA-4D32-94AA-6B63AA04BE30}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{32955242-D7DA-4D32-94AA-6B63AA04BE30}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{32955242-D7DA-4D32-94AA-6B63AA04BE30}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6BAA65B7-79FD-4AFE-8EB8-F3A0CB3A7578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6BAA65B7-79FD-4AFE-8EB8-F3A0CB3A7578}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BAA65B7-79FD-4AFE-8EB8-F3A0CB3A7578}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{6BAA65B7-79FD-4AFE-8EB8-F3A0CB3A7578}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{6BAA65B7-79FD-4AFE-8EB8-F3A0CB3A7578}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6BAA65B7-79FD-4AFE-8EB8-F3A0CB3A7578}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4ED74763-33E0-432A-B009-1423F7FC03CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4ED74763-33E0-432A-B009-1423F7FC03CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ED74763-33E0-432A-B009-1423F7FC03CF}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{4ED74763-33E0-432A-B009-1423F7FC03CF}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{4ED74763-33E0-432A-B009-1423F7FC03CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4ED74763-33E0-432A-B009-1423F7FC03CF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{42646361-1D62-4AB7-9735-009EB2DD0F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42646361-1D62-4AB7-9735-009EB2DD0F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42646361-1D62-4AB7-9735-009EB2DD0F38}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{42646361-1D62-4AB7-9735-009EB2DD0F38}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{42646361-1D62-4AB7-9735-009EB2DD0F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42646361-1D62-4AB7-9735-009EB2DD0F38}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2DB7E862-69AE-43E2-9EC4-C1491E8BA28F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2DB7E862-69AE-43E2-9EC4-C1491E8BA28F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DB7E862-69AE-43E2-9EC4-C1491E8BA28F}.NoWebApps|Any CPU.ActiveCfg = NoWebApps|Any CPU
-		{2DB7E862-69AE-43E2-9EC4-C1491E8BA28F}.NoWebApps|Any CPU.Build.0 = NoWebApps|Any CPU
 		{2DB7E862-69AE-43E2-9EC4-C1491E8BA28F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2DB7E862-69AE-43E2-9EC4-C1491E8BA28F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
@@ -230,12 +200,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5A37189C-A5E1-4871-AF65-8EBF2DA60FE3}
 	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		Microsoft.Restier.EntityFramework.Shared\Microsoft.Restier.EntityFramework.Shared.projitems*{0e373b2a-2ed2-4566-a275-6be81cffe00b}*SharedItemsImports = 5
-		Microsoft.Restier.AspNet.Shared\Microsoft.Restier.AspNet.Shared.projitems*{802c856e-1709-45b3-844b-f9c7996e6e52}*SharedItemsImports = 5
-		Microsoft.Restier.EntityFramework.Shared\Microsoft.Restier.EntityFramework.Shared.projitems*{83ad7aa8-9ed8-4b9f-966a-73ce9cae51c6}*SharedItemsImports = 13
-		Microsoft.Restier.AspNet.Shared\Microsoft.Restier.AspNet.Shared.projitems*{8ecf4e97-1816-44ad-ad63-6acf287ed520}*SharedItemsImports = 5
-		Microsoft.Restier.AspNet.Shared\Microsoft.Restier.AspNet.Shared.projitems*{8f4e985b-f5c9-4a03-a1a4-4cb8494b8188}*SharedItemsImports = 13
-		Microsoft.Restier.EntityFramework.Shared\Microsoft.Restier.EntityFramework.Shared.projitems*{99059346-006c-4f99-9c9b-52dbb8493e80}*SharedItemsImports = 5
-	EndGlobalSection
 EndGlobal