Skip to content

Commit 9e90544

Browse files
JeavonJeavon
committed
Update Azure to 1.19 - hopefully fixes Umbraco package install
1 parent 72cc7c4 commit 9e90544

File tree

11 files changed

+42
-42
lines changed

11 files changed

+42
-42
lines changed

‎build/UmbracoFileSystemProviders.Azure.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<dependencies>
1919
<dependency id="UmbracoCms.Core" version="0.0.0" />
2020
<dependency id="UmbracoCms.Web" version="0.0.0" />
21-
<dependency id="Azure.Storage.Blobs" version="12.9.1" />
22-
<dependency id="Azure.Storage.Common" version="12.8.0" />
23-
<dependency id="Azure.Core" version="1.18.0" />
21+
<dependency id="Azure.Storage.Blobs" version="12.10.0" />
22+
<dependency id="Azure.Storage.Common" version="12.9.0" />
23+
<dependency id="Azure.Core" version="1.19.0" />
2424
</dependencies>
2525
</metadata>
2626
</package>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</dependentAssembly>
99
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Azure.Core')">
1010
</dependentAssembly>
11-
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Text.Encodings.Web')">
11+
<dependentAssembly xdt:Transform="Remove" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Text.Encodings.Web')">
1212
</dependentAssembly>
1313

1414
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Data.OData')">
@@ -21,12 +21,12 @@
2121
</dependentAssembly>
2222
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Azure.Core')">
2323
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
24-
<bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" xdt:Transform="SetAttributes" />
24+
<bindingRedirect oldVersion="0.0.0.0-1.19.0.0" newVersion="1.19.0.0" xdt:Transform="SetAttributes" />
25+
</dependentAssembly>
26+
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Text.Encodings.Web')">
27+
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
28+
<bindingRedirect oldVersion="0.0.0.0-4.0.5.1" newVersion="4.0.5.1" xdt:Transform="SetAttributes" />
2529
</dependentAssembly>
26-
<dependentAssembly xdt:Transform="InsertIfMissing" xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Text.Encodings.Web')">
27-
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
28-
<bindingRedirect oldVersion="0.0.0.0-4.0.5.1" newVersion="4.0.5.1" xdt:Transform="SetAttributes" />
29-
</dependentAssembly>
3030
</assemblyBinding>
3131
</runtime>
3232
</configuration>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5555
</PropertyGroup>
5656
<ItemGroup>
57-
<Reference Include="Azure.Core, Version=1.18.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
58-
<HintPath>..\packages\Azure.Core.1.18.0\lib\net461\Azure.Core.dll</HintPath>
57+
<Reference Include="Azure.Core, Version=1.19.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
58+
<HintPath>..\packages\Azure.Core.1.19.0\lib\net461\Azure.Core.dll</HintPath>
5959
</Reference>
60-
<Reference Include="Azure.Storage.Blobs, Version=12.9.1.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Azure.Storage.Blobs.12.9.1\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
60+
<Reference Include="Azure.Storage.Blobs, Version=12.10.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
61+
<HintPath>..\packages\Azure.Storage.Blobs.12.10.0\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Azure.Storage.Common, Version=12.8.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Azure.Storage.Common.12.8.0\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
63+
<Reference Include="Azure.Storage.Common, Version=12.9.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Azure.Storage.Common.12.9.0\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
6565
</Reference>
6666
<Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
6767
<HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@
9696
</dependentAssembly>
9797
<dependentAssembly>
9898
<assemblyIdentity name="Azure.Storage.Common" publicKeyToken="92742159e12e44c8" culture="neutral" />
99-
<bindingRedirect oldVersion="0.0.0.0-12.7.2.0" newVersion="12.7.2.0" />
99+
<bindingRedirect oldVersion="0.0.0.0-12.9.0.0" newVersion="12.9.0.0" />
100100
</dependentAssembly>
101101
<dependentAssembly>
102102
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
103-
<bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" />
103+
<bindingRedirect oldVersion="0.0.0.0-1.19.0.0" newVersion="1.19.0.0" />
104104
</dependentAssembly>
105105
<dependentAssembly>
106106
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Azure.Core" version="1.18.0" targetFramework="net472" />
4-
<package id="Azure.Storage.Blobs" version="12.9.1" targetFramework="net472" />
5-
<package id="Azure.Storage.Common" version="12.8.0" targetFramework="net472" />
3+
<package id="Azure.Core" version="1.19.0" targetFramework="net472" />
4+
<package id="Azure.Storage.Blobs" version="12.10.0" targetFramework="net472" />
5+
<package id="Azure.Storage.Common" version="12.9.0" targetFramework="net472" />
66
<package id="ClientDependency" version="1.9.7" targetFramework="net472" />
77
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
88
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5757
</PropertyGroup>
5858
<ItemGroup>
59-
<Reference Include="Azure.Core, Version=1.18.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
60-
<HintPath>..\packages\Azure.Core.1.18.0\lib\net461\Azure.Core.dll</HintPath>
59+
<Reference Include="Azure.Core, Version=1.19.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Azure.Core.1.19.0\lib\net461\Azure.Core.dll</HintPath>
6161
</Reference>
62-
<Reference Include="Azure.Storage.Blobs, Version=12.9.1.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Azure.Storage.Blobs.12.9.1\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
62+
<Reference Include="Azure.Storage.Blobs, Version=12.10.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Azure.Storage.Blobs.12.10.0\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
6464
</Reference>
65-
<Reference Include="Azure.Storage.Common, Version=12.8.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Azure.Storage.Common.12.8.0\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
65+
<Reference Include="Azure.Storage.Common, Version=12.9.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Azure.Storage.Common.12.9.0\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
6767
</Reference>
6868
<Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
6969
<HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,11 @@
128128
</dependentAssembly>
129129
<dependentAssembly>
130130
<assemblyIdentity name="Azure.Storage.Common" publicKeyToken="92742159e12e44c8" culture="neutral" />
131-
<bindingRedirect oldVersion="0.0.0.0-12.7.2.0" newVersion="12.7.2.0" />
131+
<bindingRedirect oldVersion="0.0.0.0-12.9.0.0" newVersion="12.9.0.0" />
132132
</dependentAssembly>
133133
<dependentAssembly>
134134
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
135-
<bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" />
135+
<bindingRedirect oldVersion="0.0.0.0-1.19.0.0" newVersion="1.19.0.0" />
136136
</dependentAssembly>
137137
<dependentAssembly>
138138
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Azure.Core" version="1.18.0" targetFramework="net472" />
4-
<package id="Azure.Storage.Blobs" version="12.9.1" targetFramework="net472" />
5-
<package id="Azure.Storage.Common" version="12.8.0" targetFramework="net472" />
3+
<package id="Azure.Core" version="1.19.0" targetFramework="net472" />
4+
<package id="Azure.Storage.Blobs" version="12.10.0" targetFramework="net472" />
5+
<package id="Azure.Storage.Common" version="12.9.0" targetFramework="net472" />
66
<package id="ClientDependency" version="1.9.7" targetFramework="net472" />
77
<package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
88
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5757
</PropertyGroup>
5858
<ItemGroup>
59-
<Reference Include="Azure.Core, Version=1.18.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
60-
<HintPath>..\packages\Azure.Core.1.18.0\lib\net461\Azure.Core.dll</HintPath>
59+
<Reference Include="Azure.Core, Version=1.19.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Azure.Core.1.19.0\lib\net461\Azure.Core.dll</HintPath>
6161
</Reference>
62-
<Reference Include="Azure.Storage.Blobs, Version=12.9.1.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Azure.Storage.Blobs.12.9.1\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
62+
<Reference Include="Azure.Storage.Blobs, Version=12.10.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
63+
<HintPath>..\packages\Azure.Storage.Blobs.12.10.0\lib\netstandard2.0\Azure.Storage.Blobs.dll</HintPath>
6464
</Reference>
65-
<Reference Include="Azure.Storage.Common, Version=12.8.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
66-
<HintPath>..\packages\Azure.Storage.Common.12.8.0\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
65+
<Reference Include="Azure.Storage.Common, Version=12.9.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Azure.Storage.Common.12.9.0\lib\netstandard2.0\Azure.Storage.Common.dll</HintPath>
6767
</Reference>
6868
<Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
6969
<HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>

‎src/UmbracoFileSystemProviders.Azure/app.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@
8888
</dependentAssembly>
8989
<dependentAssembly>
9090
<assemblyIdentity name="Azure.Storage.Common" publicKeyToken="92742159e12e44c8" culture="neutral" />
91-
<bindingRedirect oldVersion="0.0.0.0-12.7.2.0" newVersion="12.7.2.0" />
91+
<bindingRedirect oldVersion="0.0.0.0-12.9.0.0" newVersion="12.9.0.0" />
9292
</dependentAssembly>
9393
<dependentAssembly>
9494
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
95-
<bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" />
95+
<bindingRedirect oldVersion="0.0.0.0-1.19.0.0" newVersion="1.19.0.0" />
9696
</dependentAssembly>
9797
<dependentAssembly>
9898
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

0 commit comments

Comments
 (0)