Skip to content

Commit 9147709

Browse files
kylehenningkylehenning
committed
- Fixed compiler warnings and code generation.
1 parent d670af0 commit 9147709

15 files changed

Lines changed: 458 additions & 36 deletions

File tree

‎Rock.CodeGeneration/Rock.CodeGeneration.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
<Version>1.4.0</Version>
239239
</PackageReference>
240240
<PackageReference Include="System.Memory">
241-
<Version>4.5.5</Version>
241+
<Version>4.6.3</Version>
242242
</PackageReference>
243243
<PackageReference Include="System.Memory.Data">
244244
<Version>8.0.1</Version>
@@ -317,7 +317,7 @@
317317
<None Include="README.md" />
318318
</ItemGroup>
319319
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
320-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
320+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
321321
Other similar extension points exist, see Microsoft.Common.targets.
322322
<Target Name="BeforeBuild">
323323
</Target>

‎Rock.JavaScript.Obsidian/Framework/Enums/Communication/Chat/chatAttachmentType.ts‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated by the Rock.CodeGeneration project
4+
// Changes to this file will be lost when the code is regenerated.
5+
// </auto-generated>
6+
//------------------------------------------------------------------------------
7+
// <copyright>
8+
// Copyright by the Spark Development Network
9+
//
10+
// Licensed under the Rock Community License (the "License");
11+
// you may not use this file except in compliance with the License.
12+
// You may obtain a copy of the License at
13+
//
14+
// http://www.rockrms.com/license
15+
//
16+
// Unless required by applicable law or agreed to in writing, software
17+
// distributed under the License is distributed on an "AS IS" BASIS,
18+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
19+
// See the License for the specific language governing permissions and
20+
// limitations under the License.
21+
// </copyright>
22+
//
23+
24+
/** The type of attachment being sent in a chat message. */
25+
export const ChatAttachmentType = {
26+
/** Image Attachment. */
27+
Image: 0,
28+
29+
/** File Attachment. */
30+
File: 1,
31+
32+
/** Audio Attachment. */
33+
Audio: 2,
34+
35+
/** Video Attachment. */
36+
Video: 3
37+
} as const;
38+
39+
/** The type of attachment being sent in a chat message. */
40+
export const ChatAttachmentTypeDescription: Record<number, string> = {
41+
0: "image",
42+
43+
1: "file",
44+
45+
2: "audio",
46+
47+
3: "video"
48+
};
49+
50+
/** The type of attachment being sent in a chat message. */
51+
export type ChatAttachmentType = typeof ChatAttachmentType[keyof typeof ChatAttachmentType];

‎Rock.JavaScript.Obsidian/Framework/SystemGuids/person.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,9 @@ export const Person = {
2626
AnonymousVisitor: "7EBC167B-512D-4683-9D80-98B6BB02E1B9",
2727
/** The Guid of the 'Giver Anonymous' person that ships with core */
2828
GiverAnonymous: "802235DC-3CA5-94B0-4326-AACE71180F48",
29+
/**
30+
* The guid of the 'System Sender' person that ships with core. This is used as the 'from' person when sending
31+
* automated communications.
32+
*/
33+
SystemSender: "817E7C25-6CB1-4ED0-B224-FF3C4DA0B716",
2934
};

‎Rock.JavaScript.Obsidian/Framework/SystemGuids/serviceJob.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ export const ServiceJob = {
195195
DataMigrations180UpdateNamelessLocations: "6C3EE640-A442-4F9C-92ED-23E353BA8509",
196196
/** The job to run Post v18.1 Data Migrations to add a new index to the FinancialBatch table. */
197197
DataMigrations181AddFinancialbatchIndex: "EA5D69D8-8ABB-42CD-A664-48F6BC5E2C7F",
198+
/** The Job to run Post v19.0 Data Migrations to swap Block. */
199+
DataMigrations190SwapObsidianBlocks: "C05C0C81-12B2-4C35-9405-C3CE09E3CE75",
198200
/**
199201
* The Post Update Data Migration Job to chop the Schedule Detail, Asset Storage Provider Detail, Page Short Link Detail, Streak Type Detail,
200202
* Following Event Type Detail, Financial Batch Detail

‎Rock.JavaScript.Obsidian/Framework/ViewModels/Blocks/BulkImport/csvImportBox.d.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,30 @@ import { ListItemBag } from "@Obsidian/ViewModels/Utility/listItemBag";
2525

2626
/** The initialization data for the Bulk Import Tool block. */
2727
export type CsvImportBox = {
28-
/** Gets or sets the Encrypted Root Folder. */
29-
rootFolder?: string | null;
30-
31-
/** Gets or sets the list of previous sources for the import. */
32-
sources?: ListItemBag[] | null;
33-
34-
/** Gets or sets the available Suffix options for this Rock instance. */
35-
suffixOptions?: string | null;
36-
3728
/** Gets or sets the available Connection Status options for this Rock instance. */
3829
connectionStatusOptions?: string | null;
3930

40-
/** Gets or sets the available Grade options for this Rock instance. */
41-
gradeOptions?: string | null;
42-
4331
/** Gets or sets the available Email Preference options for this Rock instance. */
4432
emailPreferenceOptions?: string | null;
4533

4634
/** Gets or sets the available Gender options for this Rock instance. */
4735
genderOptions?: string | null;
4836

37+
/** Gets or sets the available Grade options for this Rock instance. */
38+
gradeOptions?: string | null;
39+
4940
/** Gets or sets the available Marital Status options for this Rock instance. */
5041
maritalStatusOptions?: string | null;
5142

5243
/** Gets or sets the available Record Status options for this Rock instance. */
5344
recordStatusOptions?: string | null;
45+
46+
/** Gets or sets the Encrypted Root Folder. */
47+
rootFolder?: string | null;
48+
49+
/** Gets or sets the list of previous sources for the import. */
50+
sources?: ListItemBag[] | null;
51+
52+
/** Gets or sets the available Suffix options for this Rock instance. */
53+
suffixOptions?: string | null;
5454
};

‎Rock.JavaScript.Obsidian/Framework/ViewModels/Utility/csvImportActivityProgressStatusBag.d.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,4 @@ export type CsvImportActivityProgressStatusBag = {
3434

3535
/** The name of the task. */
3636
taskName?: string | null;
37-
38-
/** A collection of warnings the task encountered while running. */
39-
warnings?: string[] | null;
4037
};

‎Rock.ViewModels/Blocks/Mobile/MobileDeepLinkDetail/MobileDeepLinkDetailBag.cs‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1-
using System;
1+
// <copyright>
2+
// Copyright by the Spark Development Network
3+
//
4+
// Licensed under the Rock Community License (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
//
8+
// http://www.rockrms.com/license
9+
//
10+
// Unless required by applicable law or agreed to in writing, software
11+
// distributed under the License is distributed on an "AS IS" BASIS,
12+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
// </copyright>
16+
//
17+
using System;
218
using System.Collections.Generic;
319
using System.Linq;
420
using System.Text;

‎Rock/Communication/Chat/ChatHelper.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,13 +482,16 @@ internal static string GetChatChannelTypeKey( int groupTypeId )
482482
return null;
483483
}
484484

485+
486+
#pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
485487
/// <summary>
486488
/// Gets the <see cref="ChatChannel.Key"/> for the provided <paramref name="groupId"/> and <paramref name="chatChannelKey"/>.
487489
/// </summary>
488490
/// <param name="groupId">The <see cref="Group"/> identifier for which to get the <see cref="ChatChannel.Key"/>.</param>
489491
/// <param name="chatChannelKey">The <see cref="Group.ChatChannelKey"/> for which to get the <see cref="ChatChannel.Key"/>.</param>
490492
/// <returns>The <see cref="ChatChannel.Key"/>.</returns>
491493
internal static string GetChatChannelKey( int groupId, string chatChannelKey )
494+
#pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
492495
{
493496
if ( chatChannelKey.IsNotNullOrWhiteSpace() )
494497
{
@@ -1144,6 +1147,8 @@ channel type settings/permission grants.
11441147
}
11451148
}
11461149

1150+
1151+
#pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved
11471152
/// <summary>
11481153
/// Synchronizes <see cref="Group"/>s from Rock to <see cref="ChatChannel"/>s in the external chat system.
11491154
/// </summary>
@@ -1164,6 +1169,7 @@ channel type settings/permission grants.
11641169
/// </para>
11651170
/// </remarks>
11661171
internal async Task<ChatSyncCrudResult> SyncGroupsToChatProviderAsync( List<SyncGroupToChatCommand> syncCommands, RockToChatGroupSyncConfig syncConfig = null )
1172+
#pragma warning restore CS1574 // XML comment has cref attribute that could not be resolved
11671173
{
11681174
var result = new ChatSyncCrudResult();
11691175

‎Rock/Communication/Chat/Sync/SendChatChannelMessageCommand.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
//
1+
// <copyright>
2+
// Copyright by the Spark Development Network
3+
//
24
// Licensed under the Rock Community License (the "License");
35
// you may not use this file except in compliance with the License.
46
// You may obtain a copy of the License at

‎Rock/Communication/Chat/Sync/SendChatDirectMessageCommand.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
//
1+
// <copyright>
2+
// Copyright by the Spark Development Network
3+
//
24
// Licensed under the Rock Community License (the "License");
35
// you may not use this file except in compliance with the License.
46
// You may obtain a copy of the License at

0 commit comments

Comments
 (0)