Skip to content

Commit f36517f

Browse files
nul800sebastiaannul800sebastiaan
committed
attempt to homoginize azure.core library
1 parent 69d007b commit f36517f

File tree

6 files changed

+60
-51
lines changed

6 files changed

+60
-51
lines changed

‎OurUmbraco.Site/OurUmbraco.Site.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
6767
<HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
6868
</Reference>
69-
<Reference Include="Azure.Core, Version=1.19.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
70-
<HintPath>..\packages\Azure.Core.1.19.0\lib\net461\Azure.Core.dll</HintPath>
69+
<Reference Include="Azure.Core, Version=1.21.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
70+
<HintPath>..\packages\Azure.Core.1.21.0\lib\net461\Azure.Core.dll</HintPath>
7171
</Reference>
7272
<Reference Include="businesslogic, Version=1.0.7706.20575, Culture=neutral, processorArchitecture=MSIL">
7373
<HintPath>..\packages\UmbracoCms.Core.7.15.7\lib\net452\businesslogic.dll</HintPath>

‎OurUmbraco.Site/packages.config‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="AspNetMvc" version="3.0.20105.1" targetFramework="net48" />
55
<package id="Autofac" version="3.5.2" targetFramework="net48" />
66
<package id="AutoMapper" version="3.3.1" targetFramework="net48" />
7-
<package id="Azure.Core" version="1.19.0" targetFramework="net48" />
7+
<package id="Azure.Core" version="1.21.0" targetFramework="net48" />
88
<package id="ClientDependency" version="1.9.9" targetFramework="net48" />
99
<package id="ClientDependency-Mvc" version="1.8.0.0" targetFramework="net48" />
1010
<package id="ClientDependency-Mvc5" version="1.9.3" targetFramework="net48" />
@@ -15,35 +15,13 @@
1515
<package id="GraphQL.Client.Abstractions" version="4.0.2" targetFramework="net48" />
1616
<package id="GraphQL.Client.Abstractions.Websocket" version="4.0.2" targetFramework="net48" />
1717
<package id="GraphQL.Common" version="1.0.3" targetFramework="net48" />
18-
<package id="GraphQL-Parser" version="7.2.0" targetFramework="net48" />
1918
<package id="GraphQL.Primitives" version="4.0.2" targetFramework="net48" />
19+
<package id="GraphQL-Parser" version="7.2.0" targetFramework="net48" />
2020
<package id="HtmlAgilityPack" version="1.8.8" targetFramework="net48" />
2121
<package id="HtmlSanitizer" version="4.0.185" targetFramework="net48" />
2222
<package id="ImageProcessor" version="2.7.0.100" targetFramework="net48" />
2323
<package id="ImageProcessor.Web" version="4.10.0.100" targetFramework="net48" />
2424
<package id="ImageProcessor.Web.Config" version="2.5.0.100" targetFramework="net48" />
25-
<package id="Microsoft.Azure.Cosmos" version="3.26.1" targetFramework="net48" />
26-
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net48" />
27-
<package id="Skybrud.Social.Mastodon" version="1.0.0-alpha002" targetFramework="net48" />
28-
<package id="Skybrud.Umbraco.Redirects" version="1.0.2" targetFramework="net48" />
29-
<package id="Skybrud.WebApi.Json" version="1.0.4" targetFramework="net48" />
30-
<package id="System.Memory.Data" version="1.0.2" targetFramework="net48" />
31-
<package id="System.Text.Json" version="4.6.0" targetFramework="net48" />
32-
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
33-
<package id="System.Configuration.ConfigurationManager" version="4.7.0" targetFramework="net48" />
34-
<package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net48" />
35-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net48" />
36-
<package id="System.Collections.Immutable" version="1.7.0" targetFramework="net48" />
37-
<package id="Microsoft.Bcl.HashCode" version="1.1.0" targetFramework="net48" />
38-
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net48" />
39-
<package id="System.Memory" version="4.5.4" targetFramework="net48" />
40-
<package id="System.Net.WebSockets.Client.Managed" version="1.0.22" targetFramework="net48" />
41-
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
42-
<package id="System.Reactive" version="4.3.2" targetFramework="net48" />
43-
<package id="System.Security.AccessControl" version="4.7.0" targetFramework="net48" />
44-
<package id="System.Security.Permissions" version="4.7.0" targetFramework="net48" />
45-
<package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net48" />
46-
<package id="System.Text.Encodings.Web" version="4.7.2" targetFramework="net48" />
4725
<package id="jQuery" version="1.6.4" targetFramework="net48" />
4826
<package id="jQuery.Validation" version="1.8.0.1" targetFramework="net48" />
4927
<package id="jQuery.Validation.Unobtrusive" version="2.0.20710.0" targetFramework="net48" />
@@ -73,9 +51,12 @@
7351
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
7452
<package id="Microsoft.AspNet.WebPages.Data" version="3.2.3" targetFramework="net48" />
7553
<package id="Microsoft.AspNet.WebPages.WebData" version="3.2.3" targetFramework="net48" />
54+
<package id="Microsoft.Azure.Cosmos" version="3.26.1" targetFramework="net48" />
7655
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net48" />
7756
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net48" />
57+
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net48" />
7858
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net48" />
59+
<package id="Microsoft.Bcl.HashCode" version="1.1.0" targetFramework="net48" />
7960
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0" targetFramework="net48" />
8061
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0" targetFramework="net48" />
8162
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" targetFramework="net48" />
@@ -105,17 +86,36 @@
10586
<package id="Skybrud.Essentials.Http" version="1.1.4" targetFramework="net48" />
10687
<package id="Skybrud.Social.Core" version="1.0.11" targetFramework="net48" />
10788
<package id="Skybrud.Social.GitHub" version="1.0.0-beta005" targetFramework="net48" />
89+
<package id="Skybrud.Social.Mastodon" version="1.0.0-alpha002" targetFramework="net48" />
10890
<package id="Skybrud.Social.Meetup" version="1.0.0-beta005" targetFramework="net48" />
10991
<package id="Skybrud.Social.Twitter" version="1.0.0-beta006" targetFramework="net48" />
11092
<package id="Skybrud.SyntaxHighlighter" version="1.0.4" targetFramework="net48" />
11193
<package id="Skybrud.SyntaxHighlighter.Markdig" version="1.0.0-beta003" targetFramework="net48" />
94+
<package id="Skybrud.Umbraco.Redirects" version="1.0.2" targetFramework="net48" />
95+
<package id="Skybrud.WebApi.Json" version="1.0.4" targetFramework="net48" />
11296
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
97+
<package id="System.Collections.Immutable" version="1.7.0" targetFramework="net48" />
98+
<package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net48" />
99+
<package id="System.Configuration.ConfigurationManager" version="4.7.0" targetFramework="net48" />
100+
<package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net48" />
113101
<package id="System.Drawing.Common" version="4.5.0" targetFramework="net48" />
102+
<package id="System.Memory" version="4.5.4" targetFramework="net48" />
103+
<package id="System.Memory.Data" version="1.0.2" targetFramework="net48" />
104+
<package id="System.Net.WebSockets.Client.Managed" version="1.0.22" targetFramework="net48" />
105+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
106+
<package id="System.Reactive" version="4.3.2" targetFramework="net48" />
114107
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net48" />
115108
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net48" />
116109
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net48" />
117110
<package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net48" />
111+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net48" />
112+
<package id="System.Security.AccessControl" version="4.7.0" targetFramework="net48" />
113+
<package id="System.Security.Permissions" version="4.7.0" targetFramework="net48" />
114+
<package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net48" />
115+
<package id="System.Text.Encodings.Web" version="4.7.2" targetFramework="net48" />
116+
<package id="System.Text.Json" version="4.6.0" targetFramework="net48" />
118117
<package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net48" />
118+
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
119119
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
120120
<package id="TweetMoaSharp" version="6.0.2" targetFramework="net48" />
121121
<package id="Umbraco.ModelsBuilder" version="3.0.10" targetFramework="net48" />

‎OurUmbraco.Site/web.vsts.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,6 +1067,10 @@
10671067
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
10681068
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
10691069
</dependentAssembly>
1070+
<dependentAssembly>
1071+
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
1072+
<bindingRedirect oldVersion="0.0.0.0-1.21.0.0" newVersion="1.21.0.0" />
1073+
</dependentAssembly>
10701074
</assemblyBinding>
10711075
</runtime>
10721076

‎OurUmbraco/OurUmbraco.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
4848
<HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
4949
</Reference>
50-
<Reference Include="Azure.Core, Version=1.19.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Azure.Core.1.19.0\lib\net461\Azure.Core.dll</HintPath>
50+
<Reference Include="Azure.Core, Version=1.21.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Azure.Core.1.21.0\lib\net461\Azure.Core.dll</HintPath>
5252
</Reference>
5353
<Reference Include="Bayeux, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
5454
<HintPath>..\packages\Bayeux.0.1.0-preview0003\lib\netstandard1.1\Bayeux.dll</HintPath>
@@ -459,6 +459,7 @@
459459
<Private>True</Private>
460460
<Private>True</Private>
461461
</Reference>
462+
<Reference Include="System.Runtime.Caching" />
462463
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
463464
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
464465
</Reference>

‎OurUmbraco/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@
139139
<assemblyIdentity name="umbraco" publicKeyToken="null" culture="neutral" />
140140
<bindingRedirect oldVersion="0.0.0.0-1.0.7706.20577" newVersion="1.0.7706.20577" />
141141
</dependentAssembly>
142+
<dependentAssembly>
143+
<assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
144+
<bindingRedirect oldVersion="0.0.0.0-1.21.0.0" newVersion="1.21.0.0" />
145+
</dependentAssembly>
142146
</assemblyBinding>
143147
</runtime>
144148
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup><system.data>

0 commit comments

Comments
 (0)