Skip to content

Commit 53812a0

Browse files
davidjrhdavidjrh
committed
feat: Update System.Diagnostics.DiagnosticSource to 4.7.1 and dependencies
1 parent 7887320 commit 53812a0

File tree

7 files changed

+48
-20
lines changed

7 files changed

+48
-20
lines changed

‎src/DotNetNuke.Azure.AppService/.vs/DotNetNuke.Azure.AppService.csproj.dtbcache.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"RootPath":"C:\\dev\\dnn.azureappservice\\src\\DotNetNuke.Azure.AppService","ProjectFileName":"DotNetNuke.Azure.AppService.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[],"References":[],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\dev\\dnn.azureappservice\\src\\DotNetNuke.Azure.AppService\\bin\\DotNetNuke.Azure.AppService.dll","OutputItemRelativePath":"DotNetNuke.Azure.AppService.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

‎src/DotNetNuke.Azure.AppService/AzureAppService.dnn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="AzureAppServiceAdapter" type="Library" version="01.00.01">
3+
<package name="AzureAppServiceAdapter" type="Library" version="01.00.02">
44
<friendlyName>DNN Azure App Service adapter</friendlyName>
55
<description>
66
The DNN Azure App Service adapter is an adapter for DNN Platform to adapt scheduled tasks and other DNN utilities to Azure App Service.

‎src/DotNetNuke.Azure.AppService/AzureAppServiceReleaseNotes.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<p style="margin: 0"><b>DNN Azure App Service adapter</b></p>
22
<p style="margin: 0"><a href="http://intelequia.com" target="_new">Intelequia Software Solutions</a><br /><a href="mailto:info@intelequia.com">info@intelequia.com</a></p>
33
<p style="margin: 0"><strong>About the DNN Azure App Service Adapter</strong></p>
4+
<p style="margin: 0"><b>Version 01.00.02</b></p>
5+
<p style="margin: 0">Updated System.Diagnostics.DiagnosticSource.dll to 4.7.1</p>
46
<p style="margin: 0"><b>Version 01.00.01</b></p>
57
<p style="margin: 0">Fix to handle server changes on Azure App Service to refresh the in memory collection</p>
68
<p style="margin: 0"><b>Version 01.00.00</b></p>

‎src/DotNetNuke.Azure.AppService/DotNetNuke.Azure.AppService.csproj

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,22 @@
7777
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
7878
</Reference>
7979
<Reference Include="System" />
80+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
81+
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
82+
</Reference>
8083
<Reference Include="System.Configuration" />
8184
<Reference Include="System.Core" />
82-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
83-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
85+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
86+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
8487
</Reference>
8588
<Reference Include="System.Drawing" />
8689
<Reference Include="System.IdentityModel" />
8790
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8891
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.5.2.2\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
8992
</Reference>
93+
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
94+
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
95+
</Reference>
9096
<Reference Include="System.Net.Http" />
9197
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9298
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
@@ -97,6 +103,13 @@
97103
<Reference Include="System.Net.WebSockets.Client, Version=4.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98104
<HintPath>..\packages\System.Net.WebSockets.Client.4.0.2\lib\net46\System.Net.WebSockets.Client.dll</HintPath>
99105
</Reference>
106+
<Reference Include="System.Numerics" />
107+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
108+
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
109+
</Reference>
110+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
111+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
112+
</Reference>
100113
<Reference Include="System.Runtime.Serialization" />
101114
<Reference Include="System.Runtime.Serialization.Primitives, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
102115
<HintPath>..\packages\System.Runtime.Serialization.Primitives.4.1.1\lib\net46\System.Runtime.Serialization.Primitives.dll</HintPath>

‎src/DotNetNuke.Azure.AppService/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.1.0")]
36-
[assembly: AssemblyFileVersion("1.0.1.0")]
35+
[assembly: AssemblyVersion("1.0.2.0")]
36+
[assembly: AssemblyFileVersion("1.0.2.0")]

‎src/DotNetNuke.Azure.AppService/app.config

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,39 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
7-
<bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3"/>
6+
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3" />
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
11-
<bindingRedirect oldVersion="0.0.0.0-3.17.2.31801" newVersion="3.17.2.31801"/>
10+
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-3.17.2.31801" newVersion="3.17.2.31801" />
1212
</dependentAssembly>
1313
<dependentAssembly>
14-
<assemblyIdentity name="Microsoft.Azure.EventHubs" publicKeyToken="7e34167dcc6d6d8c" culture="neutral"/>
15-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
14+
<assemblyIdentity name="Microsoft.Azure.EventHubs" publicKeyToken="7e34167dcc6d6d8c" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
1616
</dependentAssembly>
1717
<dependentAssembly>
18-
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
19-
<bindingRedirect oldVersion="0.0.0.0-3.17.2.31801" newVersion="3.17.2.31801"/>
18+
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-3.17.2.31801" newVersion="3.17.2.31801" />
2020
</dependentAssembly>
2121
<dependentAssembly>
22-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
23-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
22+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
2424
</dependentAssembly>
2525
<dependentAssembly>
26-
<assemblyIdentity name="Microsoft.Azure.Amqp" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
27-
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0"/>
26+
<assemblyIdentity name="Microsoft.Azure.Amqp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
28+
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
32+
</dependentAssembly>
33+
<dependentAssembly>
34+
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
2836
</dependentAssembly>
2937
</assemblyBinding>
3038
</runtime>
31-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
39+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>

‎src/DotNetNuke.Azure.AppService/packages.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@
1414
<package id="Microsoft.IdentityModel.Tokens" version="5.2.2" targetFramework="net461" />
1515
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net452" developmentDependency="true" />
1616
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
17-
<package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net461" />
17+
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
18+
<package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net48" />
1819
<package id="System.IdentityModel.Tokens.Jwt" version="5.2.2" targetFramework="net461" />
20+
<package id="System.Memory" version="4.5.4" targetFramework="net48" />
1921
<package id="System.Net.WebSockets" version="4.0.0" targetFramework="net461" />
2022
<package id="System.Net.WebSockets.Client" version="4.0.2" targetFramework="net461" />
23+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
24+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" />
2125
<package id="System.Runtime.Serialization.Primitives" version="4.1.1" targetFramework="net461" />
2226
<package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net461" />
2327
<package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net461" />

0 commit comments

Comments
 (0)