Skip to content

Commit 695b9b0

Browse files
JeavonJeavon
committed
Removed some more legacy packages
1 parent 1ebf3f9 commit 695b9b0

File tree

8 files changed

+2
-51
lines changed

8 files changed

+2
-51
lines changed

‎build/UmbracoFileSystemProviders.Azure.Media.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<!-- Umbraco specific -->
8989
<!-- Newtonsoft.Json Excluded for now as Umbraco requires different major versions -->
9090
<CoreBinFiles Include="$(CoreProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.dll" />
91-
<UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.Edm.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Data.OData.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Blobs.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Storage.Common.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Azure.Core.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Spatial.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Memory.Data.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Text.Encodings.Web.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Text.Json.dll" />
91+
<UmbracoOtherBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Microsoft.Web.XmlTransform.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Memory.Data.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Text.Encodings.Web.dll;$(CoreProjectDir)\bin\$(BuildConfig)\System.Text.Json.dll" />
9292
<InstallerBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.Installer.dll" />
9393
<UmbracoInstallerFiles Include="$(InstallerProjectDir)\Configurator\**\*.*"/>
9494
<UmbracoInstallerLogo Include="$(MSBuildProjectDirectory)\assets\logo\azure-logo-32.png"/>

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,11 @@
22
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing">
5-
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
6-
</dependentAssembly>
7-
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
8-
</dependentAssembly>
95
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Azure.Core')">
106
</dependentAssembly>
117
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Text.Encodings.Web')">
128
</dependentAssembly>
13-
14-
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
15-
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
16-
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" xdt:Transform="SetAttributes" />
17-
</dependentAssembly>
18-
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
19-
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
20-
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" xdt:Transform="SetAttributes" />
21-
</dependentAssembly>
22-
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Azure.Core')">
9+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Azure.Core')">
2310
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
2411
<bindingRedirect oldVersion="0.0.0.0-1.19.0.0" newVersion="1.19.0.0" xdt:Transform="SetAttributes" />
2512
</dependentAssembly>

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,6 @@
122122
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
123123
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
124124
</Reference>
125-
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
126-
<HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
127-
</Reference>
128-
<Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
129-
<HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
130-
</Reference>
131125
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
132126
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
133127
</Reference>
@@ -250,9 +244,6 @@
250244
</Reference>
251245
<Reference Include="System.Runtime.Serialization" />
252246
<Reference Include="System.Security" />
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>
255-
</Reference>
256247
<Reference Include="System.Text.Encodings.Web, Version=4.0.5.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
257248
<HintPath>..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll</HintPath>
258249
</Reference>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
3232
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
3333
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
34-
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
35-
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
3634
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
3735
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
3836
<package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
@@ -71,7 +69,6 @@
7169
<package id="System.Net.Requests" version="4.0.11" targetFramework="net45" />
7270
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
7371
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net472" />
74-
<package id="System.Spatial" version="5.8.4" targetFramework="net472" />
7572
<package id="System.Text.Encodings.Web" version="4.7.2" targetFramework="net472" />
7673
<package id="System.Text.Json" version="4.6.0" targetFramework="net472" />
7774
<package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@
123123
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
124124
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
125125
</Reference>
126-
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127-
<HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
128-
</Reference>
129-
<Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130-
<HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
131-
</Reference>
132126
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
133127
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
134128
</Reference>
@@ -254,9 +248,6 @@
254248
</Reference>
255249
<Reference Include="System.Runtime.Serialization" />
256250
<Reference Include="System.Security" />
257-
<Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
258-
<HintPath>..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll</HintPath>
259-
</Reference>
260251
<Reference Include="System.Text.Encodings.Web, Version=4.0.5.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
261252
<HintPath>..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll</HintPath>
262253
</Reference>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
3131
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
3232
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
33-
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
34-
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
3533
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
3634
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
3735
<package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
@@ -72,7 +70,6 @@
7270
<package id="System.Net.Requests" version="4.0.11" targetFramework="net45" />
7371
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
7472
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net472" />
75-
<package id="System.Spatial" version="5.8.4" targetFramework="net472" />
7673
<package id="System.Text.Encodings.Web" version="4.7.2" targetFramework="net472" />
7774
<package id="System.Text.Json" version="4.6.0" targetFramework="net472" />
7875
<package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@
123123
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
124124
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
125125
</Reference>
126-
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127-
<HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
128-
</Reference>
129-
<Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
130-
<HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
131-
</Reference>
132126
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
133127
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
134128
</Reference>
@@ -248,9 +242,6 @@
248242
</Reference>
249243
<Reference Include="System.Runtime.Serialization" />
250244
<Reference Include="System.Security" />
251-
<Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
252-
<HintPath>..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll</HintPath>
253-
</Reference>
254245
<Reference Include="System.Text.Encodings.Web, Version=4.0.5.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
255246
<HintPath>..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll</HintPath>
256247
</Reference>

‎src/UmbracoFileSystemProviders.Azure/packages.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
3131
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
3232
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
33-
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
34-
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
3533
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
3634
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
3735
<package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
@@ -69,7 +67,6 @@
6967
<package id="System.Net.Requests" version="4.0.11" targetFramework="net45" />
7068
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
7169
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net472" />
72-
<package id="System.Spatial" version="5.8.4" targetFramework="net472" />
7370
<package id="System.Text.Encodings.Web" version="4.7.2" targetFramework="net472" />
7471
<package id="System.Text.Json" version="4.6.0" targetFramework="net472" />
7572
<package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />

0 commit comments

Comments
 (0)