Skip to content

Commit

Permalink
fix merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
Vincent He committed May 20, 2016
1 parent a0ef33a commit eb83733
Show file tree
Hide file tree
Showing 30 changed files with 149 additions and 149 deletions.
2 changes: 1 addition & 1 deletion RESTier.msbuild
View file
Expand Up @@ -34,7 +34,7 @@
</ItemGroup>

<Target Name="DownloadNuGet" Condition=" '$(NotDownloadNuget)' != 'true' ">
<DownloadNuGet Condition="" OutputFileName="$(NuGetExe)" MinimumVersion="2.7.0" />
<DownloadNuGet Condition="" OutputFileName="$(NuGetExe)" MinimumVersion="3.4.0" />
</Target>

<Target Name="RestorePackages" DependsOnTargets="DownloadNuGet">
Expand Down
3 changes: 1 addition & 2 deletions ...soft.Restier.Provider.EntityFramework7/Microsoft.Restier.Provider.EntityFramework7.csproj
View file
Expand Up @@ -102,10 +102,9 @@
<Compile Include="..\Microsoft.Restier.Provider.EntityFramework\Model\ModelMapper.cs">
<Link>Model.Shared\ModelMapper.cs</Link>
</Compile>
<Compile Include="..\Microsoft.Restier.EntityFramework\Model\ModelProducer.cs">
<Compile Include="..\Microsoft.Restier.Provider.EntityFramework\Model\ModelProducer.cs">
<Link>Model.Shared\ModelProducer.cs</Link>
</Compile>
<Compile Include="..\Microsoft.Restier.EntityFramework\Query\QueryExecutor.cs">
<Compile Include="..\Microsoft.Restier.Provider.EntityFramework\Query\QueryExecutor.cs">
<Link>Query.Shared\QueryExecutor.cs</Link>
</Compile>
Expand Down
8 changes: 8 additions & 0 deletions test/Microsoft.Restier.TestCommon/Microsoft.Restier.TestCommon.csproj
View file
Expand Up @@ -74,6 +74,14 @@
<Project>{f1beab8d-82d4-4bbb-a5c6-ba0e6872e508}</Project>
<Name>Microsoft.Restier.Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Microsoft.Restier.Provider.EntityFramework\Microsoft.Restier.Provider.EntityFramework.csproj">
<Project>{f7ec910e-17ce-4579-84c5-36d3777b3218}</Project>
<Name>Microsoft.Restier.Provider.EntityFramework</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Microsoft.Restier.Publisher.OData\Microsoft.Restier.Publisher.OData.csproj">
<Project>{186f667e-54e5-4b57-9998-21d74cb77c24}</Project>
<Name>Microsoft.Restier.Publisher.OData</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.Restier.TestCommon/PublicApiTests.cs
View file
Expand Up @@ -18,8 +18,8 @@ public void PublicApiTest()
string[] assemblyList =
{
"Microsoft.Restier.Core.dll",
"Microsoft.Restier.EntityFramework.dll",
"Microsoft.Restier.WebApi.dll",
"Microsoft.Restier.Provider.EntityFramework.dll",
"Microsoft.Restier.Publisher.OData.dll",
};

using (var fs = new FileStream(OutputFileName, FileMode.Create))
Expand Down
7 changes: 3 additions & 4 deletions ...vice.Sample.Northwind.EF7.Tests/Microsoft.OData.Service.Sample.Northwind.EF7.Tests.csproj
View file
Expand Up @@ -216,6 +216,9 @@
</None>
</ItemGroup>
<ItemGroup>
<Content Include="..\Microsoft.OData.Service.Sample.Northwind.EF7\App_Data\instnwdb.sql">
<Link>App_Data\instnwdb.sql</Link>
</Content>
<Content Include="..\Microsoft.OData.Service.Sample.Northwind.Tests\Baselines\TestBatch.txt">
<Link>Baselines\TestBatch.txt</Link>
</Content>
Expand Down Expand Up @@ -249,10 +252,6 @@
<Content Include="..\Microsoft.OData.Service.Sample.Northwind.Tests\Baselines\TestPutProductReturnContent.txt">
<Link>Baselines\TestPutProductReturnContent.txt</Link>
</Content>
<Content Include="..\Microsoft.Restier.Samples.Northwind.EF7\App_Data\instnwdb.sql">
<Link>App_Data\instnwdb.sql</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup />
<Choose>
Expand Down
1 change: 1 addition & 0 deletions test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.EF7/Global.asax.cs
View file
Expand Up @@ -3,6 +3,7 @@

using System.Web;
using System.Web.Http;
using Microsoft.OData.Service.Sample.Northwind;

namespace Microsoft.Restier.Samples.Northwind
{
Expand Down
6 changes: 0 additions & 6 deletions test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/SaveTests.cs
View file
Expand Up @@ -3,19 +3,13 @@

using System.Collections.Generic;
using System.Threading.Tasks;
<<<<<<< 91b650a22a52558717a85b68a665844802887470:test/ODataEndToEnd/Microsoft.Restier.Samples.Northwind.Tests/SaveTests.cs
#if EF7
using Microsoft.EntityFrameworkCore;
#endif
=======
using Microsoft.OData.Service.Sample.Northwind.Models;
>>>>>>> Change test cases folder:test/ODataEndToEnd/Microsoft.OData.Service.Sample.Northwind.Tests/SaveTests.cs
using Microsoft.Restier.Core;
using Microsoft.Restier.Core.Submit;
using Xunit;
#if EF7
using Microsoft.Data.Entity;
#endif

namespace Microsoft.OData.Service.Sample.Northwind.Tests
{
Expand Down
3 changes: 2 additions & 1 deletion test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/BatchTests.cs
View file
Expand Up @@ -4,10 +4,11 @@
using System;
using System.Linq;
using Microsoft.OData.Client;
using Microsoft.Restier.WebApi.Test.Scenario;
using Microsoft.Restier.WebApi.Test.Services.Trippin.Models;
using Xunit;

namespace Microsoft.Restier.WebApi.Test.Scenario
namespace Microsoft.OData.Service.Sample.Tests
{
public class BatchTests : TrippinE2ETestBase
{
Expand Down
1 change: 1 addition & 0 deletions test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/HttpResponseCodeTests.cs
View file
Expand Up @@ -5,6 +5,7 @@
using System.Text;
using System.Threading.Tasks;
using Microsoft.OData.Client;
using Microsoft.OData.Service.Sample.Tests;
using Xunit;

namespace Microsoft.Restier.WebApi.Test.Scenario
Expand Down
1 change: 1 addition & 0 deletions test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/PropertyAccessTests.cs
View file
Expand Up @@ -6,6 +6,7 @@
using System.IO;
using System.Linq;
using Microsoft.OData.Client;
using Microsoft.OData.Service.Sample.Tests;
using Xunit;

namespace Microsoft.Restier.WebApi.Test.Scenario
Expand Down
93 changes: 36 additions & 57 deletions test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/ServiceReference/TrippinProxy.cs
View file
Expand Up @@ -21,7 +21,7 @@ public partial class TrippinModel : global::Microsoft.OData.Client.DataServiceCo
/// Initialize a new TrippinModel object.
/// </summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
public TrippinModel(global::System.Uri serviceRoot) :
public TrippinModel(global::System.Uri serviceRoot) :
base(serviceRoot, global::Microsoft.OData.Client.ODataProtocolVersion.V4)
{
this.ResolveName = new global::System.Func<global::System.Type, string>(this.ResolveNameFromType);
Expand Down Expand Up @@ -510,22 +510,19 @@ public partial class AirlineSingle : global::Microsoft.OData.Client.DataServiceQ
/// Initialize a new AirlineSingle object.
/// </summary>
public AirlineSingle(global::Microsoft.OData.Client.DataServiceContext context, string path)
: base(context, path)
{ }
: base(context, path) {}

/// <summary>
/// Initialize a new AirlineSingle object.
/// </summary>
public AirlineSingle(global::Microsoft.OData.Client.DataServiceContext context, string path, bool isComposable)
: base(context, path, isComposable)
{ }
: base(context, path, isComposable) {}

/// <summary>
/// Initialize a new AirlineSingle object.
/// </summary>
public AirlineSingle(global::Microsoft.OData.Client.DataServiceQuerySingle<Airline> query)
: base(query)
{ }
: base(query) {}

}
/// <summary>
Expand Down Expand Up @@ -649,22 +646,19 @@ public partial class AirportSingle : global::Microsoft.OData.Client.DataServiceQ
/// Initialize a new AirportSingle object.
/// </summary>
public AirportSingle(global::Microsoft.OData.Client.DataServiceContext context, string path)
: base(context, path)
{ }
: base(context, path) {}

/// <summary>
/// Initialize a new AirportSingle object.
/// </summary>
public AirportSingle(global::Microsoft.OData.Client.DataServiceContext context, string path, bool isComposable)
: base(context, path, isComposable)
{ }
: base(context, path, isComposable) {}

/// <summary>
/// Initialize a new AirportSingle object.
/// </summary>
public AirportSingle(global::Microsoft.OData.Client.DataServiceQuerySingle<Airport> query)
: base(query)
{ }
: base(query) {}

}
/// <summary>
Expand Down Expand Up @@ -833,22 +827,19 @@ public partial class EventSingle : global::Microsoft.OData.Client.DataServiceQue
/// Initialize a new EventSingle object.
/// </summary>
public EventSingle(global::Microsoft.OData.Client.DataServiceContext context, string path)
: base(context, path)
{ }
: base(context, path) {}

/// <summary>
/// Initialize a new EventSingle object.
/// </summary>
public EventSingle(global::Microsoft.OData.Client.DataServiceContext context, string path, bool isComposable)
: base(context, path, isComposable)
{ }
: base(context, path, isComposable) {}

/// <summary>
/// Initialize a new EventSingle object.
/// </summary>
public EventSingle(global::Microsoft.OData.Client.DataServiceQuerySingle<Event> query)
: base(query)
{ }
: base(query) {}

}
/// <summary>
Expand Down Expand Up @@ -976,22 +967,19 @@ public partial class FlightSingle : global::Microsoft.OData.Client.DataServiceQu
/// Initialize a new FlightSingle object.
/// </summary>
public FlightSingle(global::Microsoft.OData.Client.DataServiceContext context, string path)
: base(context, path)
{ }
: base(context, path) {}

/// <summary>
/// Initialize a new FlightSingle object.
/// </summary>
public FlightSingle(global::Microsoft.OData.Client.DataServiceContext context, string path, bool isComposable)
: base(context, path, isComposable)
{ }
: base(context, path, isComposable) {}

/// <summary>
/// Initialize a new FlightSingle object.
/// </summary>
public FlightSingle(global::Microsoft.OData.Client.DataServiceQuerySingle<Flight> query)
: base(query)
{ }
: base(query) {}

/// <summary>
/// There are no comments for Airline in the schema.
Expand Down Expand Up @@ -1415,22 +1403,19 @@ public partial class OrderSingle : global::Microsoft.OData.Client.DataServiceQue
/// Initialize a new OrderSingle object.
/// </summary>
public OrderSingle(global::Microsoft.OData.Client.DataServiceContext context, string path)
: base(context, path)
{ }
: base(context, path) {}

/// <summary>
/// Initialize a new OrderSingle object.
/// </summary>
public OrderSingle(global::Microsoft.OData.Client.DataServiceContext context, string path, bool isComposable)
: base(context, path, isComposable)
{ }
: base(context, path, isComposable) {}

/// <summary>
/// Initialize a new OrderSingle object.
/// </summary>
public OrderSingle(global::Microsoft.OData.Client.DataServiceQuerySingle<Order> query)
: base(query)
{ }
: base(query) {}

}
/// <summary>
Expand Down Expand Up @@ -1580,22 +1565,19 @@ public partial class PersonSingle : global::Microsoft.OData.Client.DataServiceQu
/// Initialize a new PersonSingle object.
/// </summary>
public PersonSingle(global::Microsoft.OData.Client.DataServiceContext context, string path)
: base(context, path)
{ }
: base(context, path) {}

/// <summary>
/// Initialize a new PersonSingle object.
/// </summary>
public PersonSingle(global::Microsoft.OData.Client.DataServiceContext context, string path, bool isComposable)
: base(context, path, isComposable)
{ }
: base(context, path, isComposable) {}

/// <summary>
/// Initialize a new PersonSingle object.
/// </summary>
public PersonSingle(global::Microsoft.OData.Client.DataServiceQuerySingle<Person> query)
: base(query)
{ }
: base(query) {}

/// <summary>
/// There are no comments for BestFriend in the schema.
Expand Down Expand Up @@ -1685,12 +1667,12 @@ public partial class Person : global::Microsoft.OData.Client.BaseEntityType, glo
/// <param name="birthDateTime">Initial value of BirthDateTime.</param>
/// <param name="favoriteFeature">Initial value of FavoriteFeature.</param>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
public static Person CreatePerson(int personId,
string firstName,
long concurrency,
global::Microsoft.OData.Edm.Library.Date birthDate,
global::Microsoft.OData.Edm.Library.TimeOfDay birthTime,
global::System.DateTimeOffset birthDateTime,
public static Person CreatePerson(int personId,
string firstName,
long concurrency,
global::Microsoft.OData.Edm.Library.Date birthDate,
global::Microsoft.OData.Edm.Library.TimeOfDay birthTime,
global::System.DateTimeOffset birthDateTime,
global::Microsoft.Restier.WebApi.Test.Services.Trippin.Models.Feature favoriteFeature)
{
Person person = new Person();
Expand Down Expand Up @@ -2115,7 +2097,7 @@ protected virtual void OnPropertyChanged(string property)
/// There are no comments for GetNumberOfFriends in the schema.
/// </summary>
[global::Microsoft.OData.Client.OriginalNameAttribute("GetNumberOfFriends")]
public global::Microsoft.OData.Client.DataServiceQuerySingle<int> GetNumberOfFriends()
public global::Microsoft.OData.Client.DataServiceQuerySingle<int> GetNumberOfFriends()
{
global::System.Uri requestUri;
Context.TryGetUri(this, out requestUri);
Expand All @@ -2133,22 +2115,19 @@ public partial class TripSingle : global::Microsoft.OData.Client.DataServiceQuer
/// Initialize a new TripSingle object.
/// </summary>
public TripSingle(global::Microsoft.OData.Client.DataServiceContext context, string path)
: base(context, path)
{ }
: base(context, path) {}

/// <summary>
/// Initialize a new TripSingle object.
/// </summary>
public TripSingle(global::Microsoft.OData.Client.DataServiceContext context, string path, bool isComposable)
: base(context, path, isComposable)
{ }
: base(context, path, isComposable) {}

/// <summary>
/// Initialize a new TripSingle object.
/// </summary>
public TripSingle(global::Microsoft.OData.Client.DataServiceQuerySingle<Trip> query)
: base(query)
{ }
: base(query) {}

/// <summary>
/// There are no comments for Events in the schema.
Expand Down Expand Up @@ -2216,11 +2195,11 @@ public partial class Trip : global::Microsoft.OData.Client.BaseEntityType, globa
/// <param name="endsAt">Initial value of EndsAt.</param>
/// <param name="lastUpdated">Initial value of LastUpdated.</param>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.OData.Client.Design.T4", "2.4.0")]
public static Trip CreateTrip(int tripId,
global::System.Guid shareId,
float budget,
global::System.DateTimeOffset startsAt,
global::System.DateTimeOffset endsAt,
public static Trip CreateTrip(int tripId,
global::System.Guid shareId,
float budget,
global::System.DateTimeOffset startsAt,
global::System.DateTimeOffset endsAt,
global::System.DateTimeOffset lastUpdated)
{
Trip trip = new Trip();
Expand Down Expand Up @@ -2668,12 +2647,12 @@ public static class ExtensionMethods
/// <param name="personId">The value of personId</param>
/// <param name="orderId">The value of orderId</param>
public static global::Microsoft.Restier.WebApi.Test.Services.Trippin.Models.OrderSingle ByKey(this global::Microsoft.OData.Client.DataServiceQuery<global::Microsoft.Restier.WebApi.Test.Services.Trippin.Models.Order> source,
int personId,
int personId,
int orderId)
{
global::System.Collections.Generic.Dictionary<string, object> keys = new global::System.Collections.Generic.Dictionary<string, object>
{
{ "PersonId", personId },
{ "PersonId", personId },
{ "OrderId", orderId }
};
return new global::Microsoft.Restier.WebApi.Test.Services.Trippin.Models.OrderSingle(source.Context, source.GetKeyPath(global::Microsoft.OData.Client.Serializer.GetKeyString(source.Context, keys)));
Expand Down

0 comments on commit eb83733

Please sign in to comment.