Skip to content

Commit 1c83dd5

Browse files
SreejithpinSreejithpin
committed
Bulk operations8 (#2502)
* Bulk operations6 (#2) * BulkInsert1 draft * Bulk insert changes * deleted old test * updates * Update ODataResourceSetWrapper.cs * updates * Updated addressing comments * updates * updates updates * Updates * Updates * Minor updates * comments * updates * update publicapi for core * Address comments * Cleanup and additional tests Cleanup and additional tests * Updated code * BulkInsert1 draft * Bulk insert changes * deleted old test * updates * updates * Updated addressing comments * updates * updates updates * Updates * Updates * Minor updates * updates * Address comments * Cleanup and additional tests Cleanup and additional tests * DataAnnotationException updates * comments * small updates * updates * small update * updates * Updates * Update DeltaSetOfT.cs * Updates with Patch * updates * updates * Update WebHostTestFixture.cs * updates * Update DeltaOfTStructuralType.cs * Updates * Updates for serializer etc * Update WebHostTestFixture.cs * updates * updates * updates * Bulk Operations Updates * Review comments addressed * Updates * updated for deltaentity * Update Microsoft.AspNet.OData.Test.csproj * Update Microsoft.AspNet.OData.PublicApi.bsl * update public api * test fix * Update EdmStructuredObject.cs * Update EdmStructuredObject.cs * Update BulkInsertTest.cs * update * public api * review comments * Review comments updates * smalll update * updates * updates * updates
1 parent 8f76b8e commit 1c83dd5

File tree

86 files changed

+7009
-466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+7009
-466
lines changed

‎samples/AspNetODataSample.Web/AspNetODataSample.Web.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,13 @@
9696
</Reference>
9797
<Reference Include="Microsoft.Spatial, Version=7.8.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9898
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.9.0\lib\net45\Microsoft.Spatial.dll</HintPath>
99-
<Private>True</Private>
99+
<HintPath>..\..\sln\packages\Microsoft.Spatial.7.8.2\lib\net45\Microsoft.Spatial.dll</HintPath>
100+
</Reference>
101+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
102+
<HintPath>..\..\sln\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
103+
</Reference>
104+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
105+
<HintPath>..\..\sln\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
100106
</Reference>
101107
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
102108
<HintPath>..\..\sln\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>

‎samples/AspNetODataSample.Web/Web.config‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,88 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
For more information on how to configure your ASP.NET application, please visit
44
http://go.microsoft.com/fwlink/?LinkId=301879
55
-->
66
<configuration>
7-
<configSections>
8-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
9-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
10-
</configSections>
11-
<appSettings></appSettings>
12-
<system.web>
13-
<compilation debug="true" targetFramework="4.6.1" />
14-
<httpRuntime targetFramework="4.6.1" />
15-
<httpModules>
16-
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" />
17-
</httpModules>
18-
</system.web>
19-
<system.webServer>
20-
<handlers>
21-
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
22-
<remove name="OPTIONSVerbHandler" />
23-
<remove name="TRACEVerbHandler" />
24-
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
25-
</handlers>
26-
<validation validateIntegratedModeConfiguration="false" />
27-
<modules>
28-
<remove name="ApplicationInsightsWebTracking" />
29-
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" preCondition="managedHandler" />
30-
</modules>
31-
</system.webServer>
32-
<runtime>
33-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
34-
<dependentAssembly>
35-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
36-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
37-
</dependentAssembly>
38-
<dependentAssembly>
39-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
40-
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
41-
</dependentAssembly>
42-
<dependentAssembly>
43-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
44-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
45-
</dependentAssembly>
46-
<dependentAssembly>
47-
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
48-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
49-
</dependentAssembly>
50-
<dependentAssembly>
51-
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
52-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
53-
</dependentAssembly>
54-
<dependentAssembly>
55-
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
56-
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
57-
</dependentAssembly>
58-
<dependentAssembly>
59-
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
60-
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
61-
</dependentAssembly>
62-
<dependentAssembly>
63-
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
64-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
65-
</dependentAssembly>
66-
<dependentAssembly>
67-
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
68-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
69-
</dependentAssembly>
70-
</assemblyBinding>
71-
</runtime>
72-
<system.codedom>
73-
<compilers>
74-
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
75-
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
76-
</compilers>
77-
</system.codedom>
78-
<entityFramework>
79-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
80-
<parameters>
81-
<parameter value="mssqllocaldb" />
82-
</parameters>
83-
</defaultConnectionFactory>
84-
<providers>
85-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
86-
</providers>
87-
</entityFramework>
7+
<configSections>
8+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
9+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
10+
</configSections>
11+
<appSettings></appSettings>
12+
<system.web>
13+
<compilation debug="true" targetFramework="4.6.1" />
14+
<httpRuntime targetFramework="4.6.1" />
15+
<httpModules>
16+
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" />
17+
</httpModules>
18+
</system.web>
19+
<system.webServer>
20+
<handlers>
21+
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
22+
<remove name="OPTIONSVerbHandler" />
23+
<remove name="TRACEVerbHandler" />
24+
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
25+
</handlers>
26+
<validation validateIntegratedModeConfiguration="false" />
27+
<modules>
28+
<remove name="ApplicationInsightsWebTracking" />
29+
<add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" preCondition="managedHandler" />
30+
</modules>
31+
</system.webServer>
32+
<runtime>
33+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
34+
<dependentAssembly>
35+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
36+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
37+
</dependentAssembly>
38+
<dependentAssembly>
39+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
40+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
41+
</dependentAssembly>
42+
<dependentAssembly>
43+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
44+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
45+
</dependentAssembly>
46+
<dependentAssembly>
47+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
48+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
49+
</dependentAssembly>
50+
<dependentAssembly>
51+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
52+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
53+
</dependentAssembly>
54+
<dependentAssembly>
55+
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
56+
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
57+
</dependentAssembly>
58+
<dependentAssembly>
59+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
60+
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
61+
</dependentAssembly>
62+
<dependentAssembly>
63+
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
64+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
65+
</dependentAssembly>
66+
<dependentAssembly>
67+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
68+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
69+
</dependentAssembly>
70+
</assemblyBinding>
71+
</runtime>
72+
<system.codedom>
73+
<compilers>
74+
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
75+
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
76+
</compilers>
77+
</system.codedom>
78+
<entityFramework>
79+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
80+
<parameters>
81+
<parameter value="mssqllocaldb" />
82+
</parameters>
83+
</defaultConnectionFactory>
84+
<providers>
85+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
86+
</providers>
87+
</entityFramework>
8888
</configuration>

‎src/Microsoft.AspNet.OData.Shared/Common/Error.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ internal static ArgumentNullException PropertyNull()
9999
/// Creates an <see cref="ArgumentException"/> with a default message.
100100
/// </summary>
101101
/// <returns>The logged <see cref="Exception"/>.</returns>
102+
[SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly")]
102103
internal static ArgumentException PropertyNullOrWhiteSpace()
103104
{
104105
return new ArgumentException(CommonWebApiResources.PropertyNullOrWhiteSpace, "value");

‎src/Microsoft.AspNet.OData.Shared/Common/SRResources.Designer.cs‎

Lines changed: 66 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Microsoft.AspNet.OData.Shared/Common/SRResources.resx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -985,4 +985,22 @@
985985
<data name="InstanceAnnotationPropertyNotEmpty" xml:space="preserve">
986986
<value>InstanceAnnotation Property name cannot be null or empty.</value>
987987
</data>
988+
<data name="ResourcesShouldbePresent" xml:space="preserve">
989+
<value>ResourceSetWrapper should have ResourceWrappers in it</value>
990+
</data>
991+
<data name="ResourceSetWrapperSupported" xml:space="preserve">
992+
<value>Can only add ResourceWrapper to ResourceSetWrapper</value>
993+
</data>
994+
<data name="ChangedObjectTypeMismatch" xml:space="preserve">
995+
<value>Cannot use Changed Object of type '{0}' on an entity of type '{1}'.</value>
996+
</data>
997+
<data name="DataModificationException" xml:space="preserve">
998+
<value>Core.DataModificationException</value>
999+
</data>
1000+
<data name="ContentID" xml:space="preserve">
1001+
<value>Core.ContentID</value>
1002+
</data>
1003+
<data name="DeltaLinkNotSupported" xml:space="preserve">
1004+
<value>DeltaLinks are not supported</value>
1005+
</data>
9881006
</root>

0 commit comments

Comments
 (0)