Skip to content

Commit f9458e7

Browse files
author
Dan Martin
committed
Merge branch 'master' of https://github.com/MarimerLLC/csla into core3-dependency-update
2 parents 5da3b38 + fe3ea26 commit f9458e7

File tree

64 files changed

+148
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+148
-124
lines changed

‎NuGet/Definition/Csla.Channels.RabbitMq.NuSpec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Data portal channel using RabbitMQ for transport.
2323
<dependencies>
2424
<group targetFramework="netstandard2.1">
2525
<dependency id="Csla" version="[4.6.3-Beta10]" />
26-
<dependency id="RabbitMQ.Client" version="5.1.2" />
26+
<dependency id="RabbitMQ.Client" version="6.2.1" />
2727
</group>
2828
</dependencies>
2929
</metadata>

‎Source/Csla.Analyzers/Csla.Analyzers/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
[assembly: AssemblyCulture("")]
1212
[assembly: InternalsVisibleTo("Csla.Analyzers.Tests")]
1313

14-
[assembly: AssemblyVersion("5.3.1.0")]
15-
[assembly: AssemblyFileVersion("5.3.1.0")]
14+
[assembly: AssemblyVersion("5.4.0.0")]
15+
[assembly: AssemblyFileVersion("5.4.0.0")]

‎Source/Csla.AspNetCore.Mvc2.NetStandard2.0/Csla.AspNetCore.Mvc2.NetStandard2.0.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<PackageProjectUrl>https://cslanet.com</PackageProjectUrl>
1515
<RepositoryUrl>https://github.com/MarimerLLC/csla</RepositoryUrl>
1616
<RepositoryType>GitHub</RepositoryType>
17-
<AssemblyVersion>5.3.1.0</AssemblyVersion>
18-
<FileVersion>5.3.1.0</FileVersion>
17+
<AssemblyVersion>5.4.0.0</AssemblyVersion>
18+
<FileVersion>5.4.0.0</FileVersion>
1919
<SignAssembly>true</SignAssembly>
2020
<AssemblyOriginatorKeyFile>CslaKey.snk</AssemblyOriginatorKeyFile>
2121
</PropertyGroup>

‎Source/Csla.AspNetCore.NetCore3.0/Csla.AspNetCore.NetCore3.0.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<PackageProjectUrl>https://cslanet.com</PackageProjectUrl>
1515
<RepositoryUrl>https://github.com/MarimerLLC/csla</RepositoryUrl>
1616
<RepositoryType>GitHub</RepositoryType>
17-
<AssemblyVersion>5.3.1.0</AssemblyVersion>
18-
<FileVersion>5.3.1.0</FileVersion>
17+
<AssemblyVersion>5.4.0.0</AssemblyVersion>
18+
<FileVersion>5.4.0.0</FileVersion>
1919
<SignAssembly>true</SignAssembly>
2020
<AssemblyOriginatorKeyFile>..\Csla.NetStandard2.0\CslaKey.snk</AssemblyOriginatorKeyFile>
2121
</PropertyGroup>

‎Source/Csla.AspNetCore.NetCore3.1/Csla.AspNetCore.NetCore3.1.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<PackageProjectUrl>https://cslanet.com</PackageProjectUrl>
1515
<RepositoryUrl>https://github.com/MarimerLLC/csla</RepositoryUrl>
1616
<RepositoryType>GitHub</RepositoryType>
17-
<AssemblyVersion>5.3.1.0</AssemblyVersion>
18-
<FileVersion>5.3.1.0</FileVersion>
17+
<AssemblyVersion>5.4.0.0</AssemblyVersion>
18+
<FileVersion>5.4.0.0</FileVersion>
1919
<SignAssembly>true</SignAssembly>
2020
<AssemblyOriginatorKeyFile>..\Csla.NetStandard2.0\CslaKey.snk</AssemblyOriginatorKeyFile>
2121
</PropertyGroup>

‎Source/Csla.Axml.Android/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
// You can specify all the values or you can default the Build and Revision Numbers
2525
// by using the '*' as shown below:
2626
// [assembly: AssemblyVersion("1.0.*")]
27-
[assembly: AssemblyVersion("5.3.1.0")]
28-
[assembly: AssemblyFileVersion("5.3.1.0")]
27+
[assembly: AssemblyVersion("5.4.0.0")]
28+
[assembly: AssemblyFileVersion("5.4.0.0")]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.1</TargetFramework>
55
<RazorLangVersion>3.0</RazorLangVersion>
6-
<Version>5.3.1.0</Version>
6+
<Version>5.4.0.0</Version>
77
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
88
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
99
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

‎Source/Csla.Blazor.WebAssembly/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020

2121
[assembly: NeutralResourcesLanguage("en-US")]
2222

23-
[assembly: AssemblyVersion("5.3.1.0")]
24-
[assembly: AssemblyFileVersion("5.3.1.0")]
23+
[assembly: AssemblyVersion("5.4.0.0")]
24+
[assembly: AssemblyFileVersion("5.4.0.0")]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.1</TargetFramework>
55
<RazorLangVersion>3.0</RazorLangVersion>
6-
<Version>5.3.1.0</Version>
6+
<Version>5.4.0.0</Version>
77
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
88
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
99
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

‎Source/Csla.Blazor/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020

2121
[assembly: NeutralResourcesLanguage("en-US")]
2222

23-
[assembly: AssemblyVersion("5.3.1.0")]
24-
[assembly: AssemblyFileVersion("5.3.1.0")]
23+
[assembly: AssemblyVersion("5.4.0.0")]
24+
[assembly: AssemblyFileVersion("5.4.0.0")]

0 commit comments

Comments
 (0)