Skip to content

Commit

Permalink
Merge branch 'feature/sdk12' into main-version-3
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeavon committed Aug 31, 2021
2 parents 290d3bc + cea6621 commit 2770050
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 87 deletions.
2 changes: 1 addition & 1 deletion build/UmbracoFileSystemProviders.Azure.Media.proj
Expand Up @@ -88,7 +88,7 @@
<!-- Umbraco specific -->
<!-- Newtonsoft.Json Excluded for now as Umbraco requires different major versions -->
<CoreBinFiles Include="$(CoreProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.dll" />
<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)\Microsoft.Data.Services.Client.dll;$(CoreProjectDir)\bin\$(BuildConfig)\Microsoft.Azure.ConfigurationManager.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)\Microsoft.Azure.KeyVault.Core.dll" />
<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" />
<InstallerBinFiles Include="$(InstallerProjectDir)\bin\$(BuildConfig)\Our.Umbraco.FileSystemProviders.Azure.Installer.dll" />
<UmbracoInstallerFiles Include="$(InstallerProjectDir)\Configurator\**\*.*"/>
<UmbracoInstallerLogo Include="$(MSBuildProjectDirectory)\assets\logo\azure-logo-32.png"/>
Expand Down
9 changes: 3 additions & 6 deletions build/UmbracoFileSystemProviders.Azure.nuspec
Expand Up @@ -18,12 +18,9 @@
<dependencies>
<dependency id="UmbracoCms.Core" version="0.0.0" />
<dependency id="UmbracoCms.Web" version="0.0.0" />
<dependency id="Azure.Storage.Blobs" version="12.8.3" />
<dependency id="Azure.Storage.Common" version="12.7.2" />
<dependency id="Azure.Core" version="1.14.0" />
<dependency id="Microsoft.Azure.ConfigurationManager" version="4.0.0" />
<dependency id="Microsoft.Azure.KeyVault.Core" version="3.0.3" />
<dependency id="Microsoft.Data.Services.Client" version="5.8.4" />
<dependency id="Azure.Storage.Blobs" version="12.9.1" />
<dependency id="Azure.Storage.Common" version="12.8.0" />
<dependency id="Azure.Core" version="1.18.0" />
</dependencies>
</metadata>
</package>
10 changes: 0 additions & 10 deletions build/transforms/umbpak-web.config.install.xdt
Expand Up @@ -2,19 +2,13 @@
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing">
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
</dependentAssembly>
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
</dependentAssembly>
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
</dependentAssembly>
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
</dependentAssembly>

<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" xdt:Transform="SetAttributes" />
</dependentAssembly>
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" xdt:Transform="SetAttributes" />
Expand All @@ -23,10 +17,6 @@
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0" xdt:Transform="SetAttributes" />
</dependentAssembly>
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
<assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" xdt:Transform="SetAttributes" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
4 changes: 0 additions & 4 deletions build/transforms/umbpak-web.config.uninstall.xdt
Expand Up @@ -2,14 +2,10 @@
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Services.Client')">
</dependentAssembly>
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
</dependentAssembly>
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.Edm')">
</dependentAssembly>
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Azure.KeyVault.Core')">
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Expand Up @@ -54,14 +54,14 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Azure.Core, Version=1.14.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Core.1.14.0\lib\net461\Azure.Core.dll</HintPath>
<Reference Include="Azure.Core, Version=1.18.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Core.1.18.0\lib\net461\Azure.Core.dll</HintPath>
</Reference>
<Reference Include="Azure.Storage.Blobs, Version=12.8.3.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Storage.Blobs.12.8.3\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
<Reference Include="Azure.Storage.Blobs, Version=12.9.1.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Storage.Blobs.12.9.1\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
</Reference>
<Reference Include="Azure.Storage.Common, Version=12.7.2.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Storage.Common.12.7.2\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
<Reference Include="Azure.Storage.Common, Version=12.8.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Storage.Common.12.8.0\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
Expand Down Expand Up @@ -119,12 +119,6 @@
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.ConfigurationManager.4.0.0\lib\net452\Microsoft.Azure.ConfigurationManager.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.3.0.3\lib\net452\Microsoft.Azure.KeyVault.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
Expand All @@ -134,9 +128,6 @@
<Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
Expand Down
2 changes: 1 addition & 1 deletion src/UmbracoFileSystemProviders.Azure.Installer/app.config
Expand Up @@ -100,7 +100,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.14.0.0" newVersion="1.14.0.0" />
<bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
Expand Down
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Azure.Core" version="1.14.0" targetFramework="net472" />
<package id="Azure.Storage.Blobs" version="12.8.3" targetFramework="net472" />
<package id="Azure.Storage.Common" version="12.7.2" targetFramework="net472" />
<package id="Azure.Core" version="1.18.0" targetFramework="net472" />
<package id="Azure.Storage.Blobs" version="12.9.1" targetFramework="net472" />
<package id="Azure.Storage.Common" version="12.8.0" targetFramework="net472" />
<package id="ClientDependency" version="1.9.7" targetFramework="net472" />
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
Expand Down Expand Up @@ -30,12 +30,9 @@
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
<package id="Microsoft.Azure.ConfigurationManager" version="4.0.0" targetFramework="net472" />
<package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
<package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
<package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
Expand Down
Expand Up @@ -56,14 +56,14 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Azure.Core, Version=1.14.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Core.1.14.0\lib\net461\Azure.Core.dll</HintPath>
<Reference Include="Azure.Core, Version=1.18.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Core.1.18.0\lib\net461\Azure.Core.dll</HintPath>
</Reference>
<Reference Include="Azure.Storage.Blobs, Version=12.8.3.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Storage.Blobs.12.8.3\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
<Reference Include="Azure.Storage.Blobs, Version=12.9.1.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Storage.Blobs.12.9.1\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
</Reference>
<Reference Include="Azure.Storage.Common, Version=12.7.2.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Storage.Common.12.7.2\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
<Reference Include="Azure.Storage.Common, Version=12.8.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Storage.Common.12.8.0\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
Expand Down Expand Up @@ -120,12 +120,6 @@
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.0\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.ConfigurationManager.4.0.0\lib\net452\Microsoft.Azure.ConfigurationManager.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.3.0.3\lib\net452\Microsoft.Azure.KeyVault.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
Expand All @@ -135,9 +129,6 @@
<Reference Include="Microsoft.Data.OData, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Services.Client, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
Expand Down
2 changes: 1 addition & 1 deletion src/UmbracoFileSystemProviders.Azure.Tests/app.config
Expand Up @@ -132,7 +132,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.14.0.0" newVersion="1.14.0.0" />
<bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
Expand Down
9 changes: 3 additions & 6 deletions src/UmbracoFileSystemProviders.Azure.Tests/packages.config
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Azure.Core" version="1.14.0" targetFramework="net472" />
<package id="Azure.Storage.Blobs" version="12.8.3" targetFramework="net472" />
<package id="Azure.Storage.Common" version="12.7.2" targetFramework="net472" />
<package id="Azure.Core" version="1.18.0" targetFramework="net472" />
<package id="Azure.Storage.Blobs" version="12.9.1" targetFramework="net472" />
<package id="Azure.Storage.Common" version="12.8.0" targetFramework="net472" />
<package id="ClientDependency" version="1.9.7" targetFramework="net472" />
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
Expand All @@ -29,12 +29,9 @@
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
<package id="Microsoft.Azure.ConfigurationManager" version="4.0.0" targetFramework="net472" />
<package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net472" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net472" />
<package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net472" />
<package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net472" />
<package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net472" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.0.0" targetFramework="net472" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
<package id="Microsoft.Owin" version="4.0.1" targetFramework="net472" />
Expand Down

0 comments on commit 2770050

Please sign in to comment.