Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

close #1758 made Akka.Cluster.Tools and Akka.Cluster.Sharding use correct assembly version info and nuget dependencies #1767

Merged
merged 1 commit into from
Mar 9, 2016
Merged

close #1758 made Akka.Cluster.Tools and Akka.Cluster.Sharding use correct assembly version info and nuget dependencies #1767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,8 @@ module Nuget =
match project with
| "Akka" -> []
| "Akka.Cluster" -> ["Akka.Remote", release.NugetVersion]
| "Akka.Cluster.Sharding" -> ["Akka.Cluster.Tools", preReleaseVersion; "Akka.Persistence", preReleaseVersion]
| "Akka.Cluster.Tools" -> ["Akka.Cluster", preReleaseVersion]
| "Akka.Persistence.TestKit" -> ["Akka.Persistence", preReleaseVersion; "Akka.TestKit.Xunit2", release.NugetVersion]
| persistence when (persistence.Contains("Sql") && not (persistence.Equals("Akka.Persistence.Sql.Common"))) -> ["Akka.Persistence.Sql.Common", preReleaseVersion]
| persistence when (persistence.StartsWith("Akka.Persistence.")) -> ["Akka.Persistence", preReleaseVersion]
Expand All @@ -364,6 +366,7 @@ module Nuget =
let getProjectVersion project =
match project with
| "Akka.Cluster" -> preReleaseVersion
| cluster when cluster.StartsWith("Akka.Cluster.") -> preReleaseVersion
| persistence when persistence.StartsWith("Akka.Persistence") -> preReleaseVersion
| "Akka.Serialization.Wire" -> preReleaseVersion
| _ -> release.NugetVersion
Expand Down
3 changes: 3 additions & 0 deletions src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="ClusterSharding.cs" />
<Compile Include="ClusterShardingGuardian.cs" />
<Compile Include="ClusterShardingSettings.cs" />
Expand Down
18 changes: 1 addition & 17 deletions src/contrib/cluster/Akka.Cluster.Sharding/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
[assembly: AssemblyTitle("Akka.Cluster.Sharding")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Akka.Cluster.Sharding")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: InternalsVisibleTo("Akka.Cluster.Sharding.Tests")]

Expand All @@ -28,17 +25,4 @@
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("a05c31e8-0246-46a1-b3bc-4d6fe7a9aa49")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: Guid("a05c31e8-0246-46a1-b3bc-4d6fe7a9aa49")]
3 changes: 3 additions & 0 deletions src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Client\ClusterClient.cs" />
<Compile Include="Client\ClusterClientReceptionist.cs" />
<Compile Include="Client\ClusterClientSettings.cs" />
Expand Down
18 changes: 1 addition & 17 deletions src/contrib/cluster/Akka.Cluster.Tools/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
[assembly: AssemblyTitle("Akka.Cluster.Tools")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Akka.Cluster.Tools")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: InternalsVisibleTo("Akka.Cluster.Tools.Tests")]

Expand All @@ -28,17 +25,4 @@
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("5cf8a8be-b634-473f-bb01-eba878746bd4")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: Guid("5cf8a8be-b634-473f-bb01-eba878746bd4")]
2 changes: 1 addition & 1 deletion src/core/Akka.FSharp/Properties/AssemblyInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ open System.Runtime.InteropServices
[<assembly: AssemblyTitleAttribute("Akka.FSharp")>]
[<assembly: AssemblyProductAttribute("Akka.NET")>]
[<assembly: AssemblyDescriptionAttribute("Akka.NET is a port of the popular Java/Scala framework Akka to .NET")>]
[<assembly: AssemblyCopyrightAttribute("Copyright © 2013-2015 Akka.NET Team")>]
[<assembly: AssemblyCopyrightAttribute("Copyright © 2013-2016 Akka.NET Team")>]
[<assembly: AssemblyCompanyAttribute("Akka.NET Team")>]
[<assembly: ComVisibleAttribute(false)>]
[<assembly: CLSCompliantAttribute(true)>]
Expand Down