Skip to content

Commit 175a8ae

Browse files
JeavonJeavon
committed
Minor update to OData package
1 parent beba6f9 commit 175a8ae

File tree

9 files changed

+40
-42
lines changed

9 files changed

+40
-42
lines changed

‎build/package.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<dependency id="Microsoft.Azure.Storage.Blob" version="10.0.3" />
2222
<dependency id="Microsoft.Azure.ConfigurationManager" version="4.0.0" />
2323
<dependency id="Microsoft.Azure.KeyVault.Core" version="3.0.3" />
24-
<dependency id="Microsoft.Data.Services.Client" version="5.8.3" />
24+
<dependency id="Microsoft.Data.Services.Client" version="5.8.4" />
2525
</dependencies>
2626
</metadata>
2727
</package>

‎build/transforms/umbpak-web.config.install.xdt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
1818
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" xdt:Transform="SetAttributes" />
19+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" xdt:Transform="SetAttributes" />
2020
</dependentAssembly>
2121
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
2222
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
23-
<bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" xdt:Transform="SetAttributes" />
23+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" xdt:Transform="SetAttributes" />
2424
</dependentAssembly>
2525
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
2626
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27-
<bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" xdt:Transform="SetAttributes" />
27+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" xdt:Transform="SetAttributes" />
2828
</dependentAssembly>
2929
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
3030
<assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />

‎build/transforms/umbpak-web.config.uninstall.xdt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.WindowsAzure.Storage')">
6-
</dependentAssembly>
75
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
86
</dependentAssembly>
97
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">

‎src/UmbracoFileSystemProviders.Azure.Installer/UmbracoFileSystemProviders.Azure.Installer.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@
129129
<Reference Include="Microsoft.Azure.Storage.Common, Version=10.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130130
<HintPath>..\packages\Microsoft.Azure.Storage.Common.10.0.3\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
131131
</Reference>
132-
<Reference Include="Microsoft.Data.Edm, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133-
<HintPath>..\packages\Microsoft.Data.Edm.5.8.3\lib\net40\Microsoft.Data.Edm.dll</HintPath>
132+
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133+
<HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
134134
</Reference>
135-
<Reference Include="Microsoft.Data.OData, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
136-
<HintPath>..\packages\Microsoft.Data.OData.5.8.3\lib\net40\Microsoft.Data.OData.dll</HintPath>
135+
<Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
136+
<HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
137137
</Reference>
138-
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
139-
<HintPath>..\packages\Microsoft.Data.Services.Client.5.8.3\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
138+
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
139+
<HintPath>..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
140140
</Reference>
141141
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
142142
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
@@ -247,8 +247,8 @@
247247
<Reference Include="System.Runtime.Caching" />
248248
<Reference Include="System.Runtime.Serialization" />
249249
<Reference Include="System.Security" />
250-
<Reference Include="System.Spatial, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
251-
<HintPath>..\packages\System.Spatial.5.8.3\lib\net40\System.Spatial.dll</HintPath>
250+
<Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
251+
<HintPath>..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll</HintPath>
252252
</Reference>
253253
<Reference Include="System.Threading.Tasks" />
254254
<Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/UmbracoFileSystemProviders.Azure.Installer/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
<package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
3333
<package id="Microsoft.Azure.Storage.Blob" version="10.0.3" targetFramework="net472" />
3434
<package id="Microsoft.Azure.Storage.Common" version="10.0.3" targetFramework="net472" />
35-
<package id="Microsoft.Data.Edm" version="5.8.3" targetFramework="net45" />
36-
<package id="Microsoft.Data.OData" version="5.8.3" targetFramework="net45" />
37-
<package id="Microsoft.Data.Services.Client" version="5.8.3" targetFramework="net45" />
35+
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
36+
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
37+
<package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />
3838
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
3939
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
4040
<package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
@@ -69,7 +69,7 @@
6969
<package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net45" />
7070
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net45" />
7171
<package id="System.Net.Requests" version="4.0.11" targetFramework="net45" />
72-
<package id="System.Spatial" version="5.8.3" targetFramework="net45" />
72+
<package id="System.Spatial" version="5.8.4" targetFramework="net472" />
7373
<package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
7474
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
7575
<package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />

‎src/UmbracoFileSystemProviders.Azure.Tests/UmbracoFileSystemProviders.Azure.Tests.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@
129129
<Reference Include="Microsoft.Azure.Storage.Common, Version=10.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130130
<HintPath>..\packages\Microsoft.Azure.Storage.Common.10.0.3\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
131131
</Reference>
132-
<Reference Include="Microsoft.Data.Edm, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133-
<HintPath>..\packages\Microsoft.Data.Edm.5.8.3\lib\net40\Microsoft.Data.Edm.dll</HintPath>
132+
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133+
<HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
134134
</Reference>
135-
<Reference Include="Microsoft.Data.OData, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
136-
<HintPath>..\packages\Microsoft.Data.OData.5.8.3\lib\net40\Microsoft.Data.OData.dll</HintPath>
135+
<Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
136+
<HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
137137
</Reference>
138-
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
139-
<HintPath>..\packages\Microsoft.Data.Services.Client.5.8.3\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
138+
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
139+
<HintPath>..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
140140
</Reference>
141141
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
142142
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
@@ -250,8 +250,8 @@
250250
<Reference Include="System.Runtime.Caching" />
251251
<Reference Include="System.Runtime.Serialization" />
252252
<Reference Include="System.Security" />
253-
<Reference Include="System.Spatial, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
254-
<HintPath>..\packages\System.Spatial.5.8.3\lib\net40\System.Spatial.dll</HintPath>
253+
<Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
254+
<HintPath>..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll</HintPath>
255255
</Reference>
256256
<Reference Include="System.Threading.Tasks" />
257257
<Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/UmbracoFileSystemProviders.Azure.Tests/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
3232
<package id="Microsoft.Azure.Storage.Blob" version="10.0.3" targetFramework="net472" />
3333
<package id="Microsoft.Azure.Storage.Common" version="10.0.3" targetFramework="net472" />
34-
<package id="Microsoft.Data.Edm" version="5.8.3" targetFramework="net45" />
35-
<package id="Microsoft.Data.OData" version="5.8.3" targetFramework="net45" />
36-
<package id="Microsoft.Data.Services.Client" version="5.8.3" targetFramework="net45" />
34+
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
35+
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
36+
<package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />
3737
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
3838
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
3939
<package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
@@ -70,7 +70,7 @@
7070
<package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net45" />
7171
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net45" />
7272
<package id="System.Net.Requests" version="4.0.11" targetFramework="net45" />
73-
<package id="System.Spatial" version="5.8.3" targetFramework="net45" />
73+
<package id="System.Spatial" version="5.8.4" targetFramework="net472" />
7474
<package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
7575
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
7676
<package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />

‎src/UmbracoFileSystemProviders.Azure/UmbracoFileSystemProviders.Azure.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@
130130
<Reference Include="Microsoft.Azure.Storage.Common, Version=10.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131131
<HintPath>..\packages\Microsoft.Azure.Storage.Common.10.0.3\lib\net452\Microsoft.Azure.Storage.Common.dll</HintPath>
132132
</Reference>
133-
<Reference Include="Microsoft.Data.Edm, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134-
<HintPath>..\packages\Microsoft.Data.Edm.5.8.3\lib\net40\Microsoft.Data.Edm.dll</HintPath>
133+
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
134+
<HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
135135
</Reference>
136-
<Reference Include="Microsoft.Data.OData, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
137-
<HintPath>..\packages\Microsoft.Data.OData.5.8.3\lib\net40\Microsoft.Data.OData.dll</HintPath>
136+
<Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
137+
<HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
138138
</Reference>
139-
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
140-
<HintPath>..\packages\Microsoft.Data.Services.Client.5.8.3\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
139+
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
140+
<HintPath>..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
141141
</Reference>
142142
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
143143
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
@@ -245,8 +245,8 @@
245245
<Reference Include="System.Runtime.Caching" />
246246
<Reference Include="System.Runtime.Serialization" />
247247
<Reference Include="System.Security" />
248-
<Reference Include="System.Spatial, Version=5.8.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
249-
<HintPath>..\packages\System.Spatial.5.8.3\lib\net40\System.Spatial.dll</HintPath>
248+
<Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
249+
<HintPath>..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll</HintPath>
250250
</Reference>
251251
<Reference Include="System.Threading.Tasks" />
252252
<Reference Include="System.Threading.Tasks.Dataflow, Version=4.6.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/UmbracoFileSystemProviders.Azure/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
3232
<package id="Microsoft.Azure.Storage.Blob" version="10.0.3" targetFramework="net472" />
3333
<package id="Microsoft.Azure.Storage.Common" version="10.0.3" targetFramework="net472" />
34-
<package id="Microsoft.Data.Edm" version="5.8.3" targetFramework="net45" />
35-
<package id="Microsoft.Data.OData" version="5.8.3" targetFramework="net45" />
36-
<package id="Microsoft.Data.Services.Client" version="5.8.3" targetFramework="net45" />
34+
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
35+
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
36+
<package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />
3737
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
3838
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
3939
<package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
@@ -67,7 +67,7 @@
6767
<package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net45" />
6868
<package id="System.Linq.Queryable" version="4.0.0" targetFramework="net45" />
6969
<package id="System.Net.Requests" version="4.0.11" targetFramework="net45" />
70-
<package id="System.Spatial" version="5.8.3" targetFramework="net45" />
70+
<package id="System.Spatial" version="5.8.4" targetFramework="net472" />
7171
<package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
7272
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
7373
<package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />

0 commit comments

Comments
 (0)