Skip to content

Commit 0f2abbd

Browse files
rockfordlhotkarockfordlhotka
authored
Merge pull request MarimerLLC#1850 from danielmartind/core3-dependency-update
Core3 dependency update
2 parents 487e0b0 + 0676e1e commit 0f2abbd

File tree

39 files changed

+298
-278
lines changed

39 files changed

+298
-278
lines changed

‎NuGet/Definition/AspNetCore MVC.NuSpec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Supports the creation of AspNetCore applications.
3030
</group>
3131
<group targetFramework="netcoreapp3.1">
3232
<dependency id="Csla" version="[4.6.3-Beta10]" />
33-
<dependency id="Microsoft.AspNetCore.Components" version="3.1.5" />
34-
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.5" />
33+
<dependency id="Microsoft.AspNetCore.Components" version="3.1.9" />
34+
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.9" />
3535
</group>
3636
</dependencies>
3737
</metadata>

‎NuGet/Definition/Core.NuSpec

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ Supports the creation of Class Library projects containing business domain class
2222
<language>en-US</language>
2323
<dependencies>
2424
<group targetFramework="net46">
25-
<dependency id="Microsoft.Extensions.Configuration" version="3.1.5" />
26-
<dependency id="Microsoft.Extensions.Configuration.Binder" version="3.1.5" />
25+
<dependency id="Microsoft.Extensions.Configuration" version="3.1.9" />
26+
<dependency id="Microsoft.Extensions.Configuration.Binder" version="3.1.9" />
2727
<dependency id="System.ComponentModel.Annotations" version="4.7.0" />
28-
<dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.5" />
29-
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.5" />
28+
<dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.9" />
29+
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.9" />
3030
</group>
3131
<group targetFramework="net45" />
3232
<group targetFramework="net40">
@@ -36,8 +36,8 @@ Supports the creation of Class Library projects containing business domain class
3636
</group>
3737
<group targetFramework="netstandard2.0">
3838
<dependency id="NETStandard.Library" version="2.0.0" />
39-
<dependency id="Microsoft.Extensions.Configuration" version="3.1.5" />
40-
<dependency id="Microsoft.Extensions.Configuration.Binder" version="3.1.5" />
39+
<dependency id="Microsoft.Extensions.Configuration" version="3.1.9" />
40+
<dependency id="Microsoft.Extensions.Configuration.Binder" version="3.1.9" />
4141
<dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" />
4242
<dependency id="System.Security.Principal" version="4.3.0" />
4343
<dependency id="System.Runtime.Serialization.Xml" version="4.3.0" />
@@ -47,8 +47,8 @@ Supports the creation of Class Library projects containing business domain class
4747
<dependency id="System.ComponentModel.Annotations" version="4.7.0" />
4848
<dependency id="System.Reflection" version="4.3.0" />
4949
<dependency id="System.Runtime.Serialization.Formatters" version="4.3.0" />
50-
<dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.5" />
51-
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.5" />
50+
<dependency id="Microsoft.Extensions.DependencyInjection" version="3.1.9" />
51+
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.9" />
5252
</group>
5353
</dependencies>
5454
</metadata>

‎NuGet/Definition/Csla.Blazor.NuSpec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ Provides UI support for Blazor.
2323
<dependencies>
2424
<group targetFramework="netstandard2.1">
2525
<dependency id="Csla" version="[4.6.3-Beta10]" />
26-
<dependency id="Microsoft.AspNetCore.Components" version="3.1.5" />
27-
<dependency id="Microsoft.AspNetCore.Components.Web" version="3.1.5" />
28-
<dependency id="Microsoft.AspNetCore.Components.Authorization" version="3.1.5" />
26+
<dependency id="Microsoft.AspNetCore.Components" version="3.1.9" />
27+
<dependency id="Microsoft.AspNetCore.Components.Web" version="3.1.9" />
28+
<dependency id="Microsoft.AspNetCore.Components.Authorization" version="3.1.9" />
2929
</group>
3030
<group targetFramework="netcoreapp3.1">
3131
<dependency id="Csla" version="[4.6.3-Beta10]" />
32-
<dependency id="Microsoft.AspNetCore.Components" version="3.1.5" />
33-
<dependency id="Microsoft.AspNetCore.Components.Web" version="3.1.5" />
34-
<dependency id="Microsoft.AspNetCore.Components.Authorization" version="3.1.5" />
32+
<dependency id="Microsoft.AspNetCore.Components" version="3.1.9" />
33+
<dependency id="Microsoft.AspNetCore.Components.Web" version="3.1.9" />
34+
<dependency id="Microsoft.AspNetCore.Components.Authorization" version="3.1.9" />
3535
</group>
3636
</dependencies>
3737
</metadata>

‎NuGet/Definition/Data EntityFrameworkCore.NuSpec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ CSLA .NET provides a home for your business logic. It is an application developm
2020
Supports the use of Entity Framework Core.
2121
</summary>
2222
<language>en-US</language>
23-
<dependencies>
23+
<dependencies>
2424
<group targetFramework="netstandard2.0">
2525
<dependency id="Csla" version="[4.6.3-Beta10]" />
2626
<dependency id="Microsoft.EntityFrameworkCore" version="2.2.6" />
2727
</group>
2828
<group targetFramework="netstandard2.1">
2929
<dependency id="Csla" version="[4.6.3-Beta10]" />
30-
<dependency id="Microsoft.EntityFrameworkCore" version="3.1.5" />
30+
<dependency id="Microsoft.EntityFrameworkCore" version="3.1.9" />
3131
</group>
3232
</dependencies>
3333
</metadata>

‎Source/Csla.Blazor.Test/Csla.Blazor.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.5" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.5" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.5" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.9" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.9" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.9" />
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
2020
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
2121
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />

‎Source/Csla.Blazor/Csla.Blazor.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
</PropertyGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.5" />
35-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.5" />
36-
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.5" />
34+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.9" />
35+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.9" />
36+
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.9" />
3737
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
3838
<PrivateAssets>all</PrivateAssets>
3939
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎Source/Csla.Data.EF4.Net4.6/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
1717
<dependentAssembly>
1818
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
19+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
2020
</dependentAssembly>
2121
<dependentAssembly>
2222
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

‎Source/Csla.Data.EF4.Test/app.config

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
1919
<dependentAssembly>
2020
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
21-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
21+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
2222
</dependentAssembly>
2323
<dependentAssembly>
2424
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -38,11 +38,11 @@
3838
</dependentAssembly>
3939
<dependentAssembly>
4040
<assemblyIdentity name="Microsoft.Extensions.FileProviders.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
41-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
41+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
4242
</dependentAssembly>
4343
<dependentAssembly>
4444
<assemblyIdentity name="Microsoft.Extensions.Configuration" publicKeyToken="adb9793829ddae60" culture="neutral" />
45-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
45+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
4646
</dependentAssembly>
4747
<dependentAssembly>
4848
<assemblyIdentity name="Microsoft.Extensions.FileProviders.Physical" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -54,7 +54,7 @@
5454
</dependentAssembly>
5555
<dependentAssembly>
5656
<assemblyIdentity name="Microsoft.Extensions.Configuration.Json" publicKeyToken="adb9793829ddae60" culture="neutral" />
57-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
57+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
5858
</dependentAssembly>
5959
<dependentAssembly>
6060
<assemblyIdentity name="Microsoft.Extensions.FileSystemGlobbing" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -66,39 +66,39 @@
6666
</dependentAssembly>
6767
<dependentAssembly>
6868
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
69-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
69+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
7070
</dependentAssembly>
7171
<dependentAssembly>
7272
<assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
7373
<bindingRedirect oldVersion="0.0.0.0-3.1.4.0" newVersion="3.1.4.0" />
7474
</dependentAssembly>
7575
<dependentAssembly>
7676
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
77-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
77+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
7878
</dependentAssembly>
7979
<dependentAssembly>
8080
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
8181
<bindingRedirect oldVersion="0.0.0.0-3.1.3.0" newVersion="3.1.3.0" />
8282
</dependentAssembly>
8383
<dependentAssembly>
8484
<assemblyIdentity name="Microsoft.Extensions.Configuration.EnvironmentVariables" publicKeyToken="adb9793829ddae60" culture="neutral" />
85-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
85+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
8686
</dependentAssembly>
8787
<dependentAssembly>
8888
<assemblyIdentity name="Microsoft.Extensions.Configuration.CommandLine" publicKeyToken="adb9793829ddae60" culture="neutral" />
89-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
89+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
9090
</dependentAssembly>
9191
<dependentAssembly>
9292
<assemblyIdentity name="Microsoft.Extensions.Configuration.UserSecrets" publicKeyToken="adb9793829ddae60" culture="neutral" />
93-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
93+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
9494
</dependentAssembly>
9595
<dependentAssembly>
9696
<assemblyIdentity name="Microsoft.Extensions.Logging.EventLog" publicKeyToken="adb9793829ddae60" culture="neutral" />
97-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
97+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
9898
</dependentAssembly>
9999
<dependentAssembly>
100100
<assemblyIdentity name="Microsoft.Extensions.Logging.Configuration" publicKeyToken="adb9793829ddae60" culture="neutral" />
101-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
101+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
102102
</dependentAssembly>
103103
<dependentAssembly>
104104
<assemblyIdentity name="Microsoft.Extensions.Logging.Console" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -110,15 +110,15 @@
110110
</dependentAssembly>
111111
<dependentAssembly>
112112
<assemblyIdentity name="Microsoft.Extensions.Logging.EventSource" publicKeyToken="adb9793829ddae60" culture="neutral" />
113-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
113+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
114114
</dependentAssembly>
115115
<dependentAssembly>
116116
<assemblyIdentity name="Microsoft.Extensions.Options.ConfigurationExtensions" publicKeyToken="adb9793829ddae60" culture="neutral" />
117-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
117+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
118118
</dependentAssembly>
119119
<dependentAssembly>
120120
<assemblyIdentity name="Microsoft.Extensions.Configuration.Binder" publicKeyToken="adb9793829ddae60" culture="neutral" />
121-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
121+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
122122
</dependentAssembly>
123123
<dependentAssembly>
124124
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

‎Source/Csla.Data.EF5.Net4.6/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
1717
<dependentAssembly>
1818
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
19+
<bindingRedirect oldVersion="0.0.0.0-3.1.9.0" newVersion="3.1.9.0" />
2020
</dependentAssembly>
2121
<dependentAssembly>
2222
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

0 commit comments

Comments
 (0)