Skip to content

Commit

Permalink
- Updated Rock.Client codegen'd
Browse files Browse the repository at this point in the history
  • Loading branch information
MikeDPeterson committed Sep 29, 2018
1 parent e224883 commit 59a6092
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 157 deletions.
132 changes: 0 additions & 132 deletions Rock.Client/CodeGenerated/AssetStorageSystem.cs

This file was deleted.

41 changes: 18 additions & 23 deletions Rock.Client/Properties/AssemblyInfo.cs
@@ -1,36 +1,31 @@
using System.Reflection;
using System.Runtime.CompilerServices;
// <copyright>
// Copyright by the Spark Development Network
//
// Licensed under the Rock Community License (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.rockrms.com/license
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
//
using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Rock.Client")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Rock.Client")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("91a89159-6d2c-4474-9c4b-6c0ce791dad5")]

// 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("91a89159-6d2c-4474-9c4b-6c0ce791dad5")]
3 changes: 2 additions & 1 deletion Rock.Client/Rock.Client.Models.projitems
Expand Up @@ -28,7 +28,7 @@
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\AnalyticsSourceFamilyHistorical.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\AnalyticsSourceFinancialTransaction.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\AnalyticsSourcePersonHistorical.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\AssetStorageSystem.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\AssetStorageProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\Attendance.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\AttendanceCode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\AttendanceOccurrence.cs" />
Expand Down Expand Up @@ -194,6 +194,7 @@
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\Schedule.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\ScheduleCategoryExclusion.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\ServiceJob.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\ServiceJobHistory.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\ServiceLog.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\SignalType.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CodeGenerated\SignatureDocument.cs" />
Expand Down
6 changes: 5 additions & 1 deletion Rock.Client/Rock.Client.csproj
Expand Up @@ -37,6 +37,9 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Rock.Version\AssemblySharedInfo.cs">
<Link>AssemblySharedInfo.cs</Link>
</Compile>
<Compile Include="CodeGenerated\AnalyticsDimAttendanceLocation.cs" />
<Compile Include="CodeGenerated\AnalyticsDimCampus.cs" />
<Compile Include="CodeGenerated\AnalyticsDimFamilyCurrent.cs" />
Expand All @@ -54,7 +57,7 @@
<Compile Include="CodeGenerated\AnalyticsSourceFamilyHistorical.cs" />
<Compile Include="CodeGenerated\AnalyticsSourceFinancialTransaction.cs" />
<Compile Include="CodeGenerated\AnalyticsSourcePersonHistorical.cs" />
<Compile Include="CodeGenerated\AssetStorageSystem.cs" />
<Compile Include="CodeGenerated\AssetStorageProvider.cs" />
<Compile Include="CodeGenerated\Attendance.cs" />
<Compile Include="CodeGenerated\AttendanceCode.cs" />
<Compile Include="CodeGenerated\AttendanceOccurrence.cs" />
Expand Down Expand Up @@ -220,6 +223,7 @@
<Compile Include="CodeGenerated\Schedule.cs" />
<Compile Include="CodeGenerated\ScheduleCategoryExclusion.cs" />
<Compile Include="CodeGenerated\ServiceJob.cs" />
<Compile Include="CodeGenerated\ServiceJobHistory.cs" />
<Compile Include="CodeGenerated\ServiceLog.cs" />
<Compile Include="CodeGenerated\SignalType.cs" />
<Compile Include="CodeGenerated\SignatureDocument.cs" />
Expand Down
4 changes: 4 additions & 0 deletions Rock.CodeGeneration/App.config
Expand Up @@ -23,6 +23,10 @@
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
Expand Down

0 comments on commit 59a6092

Please sign in to comment.