Fix config files

Change nuspec
Flexberry · Jul 10, 2022 · b768731 · b768731
1 parent 56fe935
commit b768731
Show file tree

Hide file tree

Showing 5 changed files with 231 additions and 238 deletions.
diff --git a/NewPlatform.Flexberry.ORM.ODataService.Samples.sln b/NewPlatform.Flexberry.ORM.ODataService.Samples.sln
@@ -104,6 +104,5 @@ Global
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {611B715C-AD46-45B1-BA4E-36C8F1A1896E}
-		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35;packages\Unity.Interception.2.1.505.0\lib\NET35;packages\EnterpriseLibrary.Common.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Data.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Logging.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Logging.Database.5.0.505.0\lib\NET35
 	EndGlobalSection
 EndGlobal
diff --git a/NewPlatform.Flexberry.ORM.ODataService.nuspec b/NewPlatform.Flexberry.ORM.ODataService.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>NewPlatform.Flexberry.ORM.ODataService</id>
-    <version>6.2.0-beta09</version>
+    <version>6.3.0-alpha01</version>
     <title>Flexberry ORM ODataService</title>
     <authors>New Platform Ltd.</authors>
     <owners>New Platform Ltd.</owners>
@@ -12,37 +12,32 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>Flexberry ORM OData Service Package.</description>
     <releaseNotes>
-      Add
-      1. Support IExportStringedObjectViewService interface call for fast excel export.
-
-      Fixed
-      1. SafeLoadDetails for partial loaded detail.
-      2. Custom batch handler settings such as ODataMessageQuotas.
-      3. CallbackBeforeGet with count equals true.
-      4. Fix create detail view.
+      Changed
+      1. Upgrade `Microsoft.AspNet.OData` to `7.5.14`
+      2. Upgrade `NewPlatform.Flexberry.AspNetCore.OData` to `7.5.14`
     </releaseNotes>
-    <copyright>Copyright New Platform Ltd 2021</copyright>
+    <copyright>Copyright New Platform Ltd 2022</copyright>
     <tags>Flexberry ORM OData ODataService</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.5">
-        <dependency id="Microsoft.AspNet.OData" version="7.5.1" />
+        <dependency id="Microsoft.AspNet.OData" version="7.5.14" />
         <dependency id="Microsoft.AspNet.WebApi.Client" version="5.2.7" />
         <dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.7" />
-        <dependency id="Microsoft.OData.Core" version="7.7.2" />
-        <dependency id="Microsoft.OData.Edm" version="7.7.2" />
-        <dependency id="Microsoft.Spatial" version="7.7.2" />
+        <dependency id="Microsoft.OData.Core" version="7.10.0" />
+        <dependency id="Microsoft.OData.Edm" version="7.10.0" />
+        <dependency id="Microsoft.Spatial" version="7.10.0" />
         <dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
         <dependency id="NewPlatform.Flexberry.ORM" version="6.0.0" />
         <dependency id="Newtonsoft.Json" version="12.0.3" />
       </group>
       <group targetFramework=".NETStandard2.0">
-        <dependency id="NewPlatform.Flexberry.AspNetCore.OData" version="7.5.1" />
+        <dependency id="NewPlatform.Flexberry.AspNetCore.OData" version="7.5.14-beta01" />
         <dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
         <dependency id="NewPlatform.Flexberry.ORM" version="6.0.0" />
         <dependency id="Newtonsoft.Json" version="12.0.3" />
       </group>
       <group targetFramework=".NETCoreApp3.1">
-        <dependency id="NewPlatform.Flexberry.AspNetCore.OData" version="7.5.1" />
+        <dependency id="NewPlatform.Flexberry.AspNetCore.OData" version="7.5.14-beta01" />
         <dependency id="NewPlatform.Flexberry.LockService" version="3.0.0" />
         <dependency id="NewPlatform.Flexberry.ORM" version="6.0.0" />
         <dependency id="Newtonsoft.Json" version="12.0.3" />

diff --git a/NewPlatform.Flexberry.ORM.ODataService.sln b/NewPlatform.Flexberry.ORM.ODataService.sln
@@ -84,7 +84,6 @@ Global
 		{BFB771C3-51D8-4804-BB0F-A0B4BD7981D9} = {A94D831A-7B5D-40C6-B76B-2B8B6335DB3E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.2\lib\NET35;packages\Unity.Interception.2.1.505.0\lib\NET35;packages\EnterpriseLibrary.Common.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Data.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Logging.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Logging.Database.5.0.505.0\lib\NET35
 		SolutionGuid = {611B715C-AD46-45B1-BA4E-36C8F1A1896E}
 	EndGlobalSection
 EndGlobal
diff --git a/Samples/ODataServiceSample.AspNet/Web.config b/Samples/ODataServiceSample.AspNet/Web.config
@@ -19,7 +19,7 @@
   <system.web>
     <compilation debug="true" />
   </system.web>
-  
+
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -29,10 +29,10 @@
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.OData.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-7.10.0.0" newVersion="7.10.0.0" />
-	  </dependentAssembly>
-	  <dependentAssembly>
-		  <assemblyIdentity name="Microsoft.OData.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-		  <bindingRedirect oldVersion="0.0.0.0-7.10.0.0" newVersion="7.10.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.OData.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.10.0.0" newVersion="7.10.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Spatial" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -191,7 +191,7 @@
       </register>
     </container>
   </unity>
-<system.webServer>
+  <system.webServer>
     <handlers>
       <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
       <remove name="OPTIONSVerbHandler" />