From a4b2410294e45d2fef3ecff34164e8e931f504a2 Mon Sep 17 00:00:00 2001 From: nairdo Date: Mon, 12 Dec 2016 11:29:47 -0700 Subject: [PATCH] - Update version number for 1.6.1 patch and fix compiler warnings. --- Rock.Version/Properties/AssemblyInfo.cs | 6 +++--- Rock/Properties/AssemblyInfo.cs | 4 ++-- .../Controls/Checkin Configuration Controls/CheckinArea.cs | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Rock.Version/Properties/AssemblyInfo.cs b/Rock.Version/Properties/AssemblyInfo.cs index 06a9c4d7588..9fb904188a9 100644 --- a/Rock.Version/Properties/AssemblyInfo.cs +++ b/Rock.Version/Properties/AssemblyInfo.cs @@ -48,8 +48,8 @@ // match the correct version exactly. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion( "1.6.0.0" )] -[assembly: AssemblyFileVersion( "1.6.0.0" )] +[assembly: AssemblyVersion( "1.6.1.0" )] +[assembly: AssemblyFileVersion( "1.6.1.0" )] // This number can change for each build (and should change) so that we can correctly // identify exactly which version someone is running. This number should increment @@ -63,6 +63,6 @@ // This is the "official" product name that will be shown to people. // It's shown in the SystemInfo details and perhaps the RockUpdate page. // JICK - J(on) / (N)ick versioning system. -[assembly: AssemblyInformationalVersion( "Rock McKinley 6.0" )] +[assembly: AssemblyInformationalVersion( "Rock McKinley 6.1" )] //[assembly: AssemblyInformationalVersion( "Rock McKinley 0.7 (beta)" )] // 1.0.10 //[assembly: AssemblyInformationalVersion( "Rock McKinley 1.0" )] // 1.3.4 \ No newline at end of file diff --git a/Rock/Properties/AssemblyInfo.cs b/Rock/Properties/AssemblyInfo.cs index 75587672287..775bcea057b 100644 --- a/Rock/Properties/AssemblyInfo.cs +++ b/Rock/Properties/AssemblyInfo.cs @@ -48,7 +48,7 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: //[assembly: AssemblyVersion( "0.0.0.*" )] // I've read some things that make me think we should not do this... comments? -[assembly: AssemblyVersion( "1.6.0.0" )] -[assembly: AssemblyFileVersion( "1.6.0.0" )] +[assembly: AssemblyVersion( "1.6.1.0" )] +[assembly: AssemblyFileVersion( "1.6.1.0" )] diff --git a/Rock/Web/UI/Controls/Checkin Configuration Controls/CheckinArea.cs b/Rock/Web/UI/Controls/Checkin Configuration Controls/CheckinArea.cs index 3e26f044261..defac8fdbf9 100644 --- a/Rock/Web/UI/Controls/Checkin Configuration Controls/CheckinArea.cs +++ b/Rock/Web/UI/Controls/Checkin Configuration Controls/CheckinArea.cs @@ -226,6 +226,7 @@ public void GetGroupTypeValues( GroupType groupType ) /// Sets the type of the group. /// /// Type of the group. + /// The rock context. public void SetGroupType( GroupType groupType, RockContext rockContext ) { EnsureChildControls(); @@ -386,6 +387,7 @@ public override void RenderControl( HtmlTextWriter writer ) /// /// Creates the group type attribute controls. /// + /// Type of the group. /// The rock context. public void CreateGroupTypeAttributeControls( GroupType groupType, RockContext rockContext ) {