More fixes to build process

DNN-Connect · Dec 19, 2017 · 1fe8fef · 1fe8fef
1 parent da4d664
commit 1fe8fef
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 29 deletions.
diff --git a/_Installation/SQL/01.00.00.SqlDataProvider b/_Installation/SQL/01.00.00.SqlDataProvider
@@ -264,35 +264,6 @@ FROM
  LEFT JOIN {databaseOwner}{objectQualifier}Connect_ApiBrowser_Documentations docs ON docs.DocumentationId=c.DocumentationId
 GO
 
-IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}vw_Connect_ApiBrowser_Documentations'))
-DROP VIEW {databaseOwner}{objectQualifier}vw_Connect_ApiBrowser_Documentations
-GO
-
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-CREATE VIEW {databaseOwner}{objectQualifier}vw_Connect_ApiBrowser_Documentations
-AS
-SELECT
- d.*,
- ISNULL(c.FullQualifier, m.FullQualifier) FullQualifier,
- CAST(CASE WHEN ISNULL(c.DocumentationId, -1)=d.DocumentationId 
-        OR ISNULL(m.DocumentationId, -1)=d.DocumentationId
- THEN 1
- ELSE 0
- END AS BIT) IsCurrentVersion,
- uc.DisplayName CreatedByUserDisplayName,
- uc.Email CreatedByUserEmail,
- um.DisplayName LastModifiedByUserDisplayName,
- um.Email LastModifiedByUserEmail
-FROM {databaseOwner}{objectQualifier}Connect_ApiBrowser_Documentations d
- INNER JOIN {databaseOwner}{objectQualifier}Users uc ON uc.UserID=d.CreatedByUserID
- INNER JOIN {databaseOwner}{objectQualifier}Users um ON um.UserID=d.LastModifiedByUserID
- LEFT JOIN {databaseOwner}{objectQualifier}vw_Connect_ApiBrowser_ApiClasses c ON c.ClassId=d.ClassId
- LEFT JOIN {databaseOwner}{objectQualifier}vw_Connect_ApiBrowser_Members m ON m.MemberId=d.MemberId
-GO
-
 IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}vw_Connect_ApiBrowser_Members'))
 DROP VIEW {databaseOwner}{objectQualifier}vw_Connect_ApiBrowser_Members
 GO
@@ -356,6 +327,35 @@ SELECT
 FROM {databaseOwner}{objectQualifier}Connect_ApiBrowser_ApiNamespaces n
 GO
 
+IF  EXISTS (SELECT * FROM sys.views WHERE object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}vw_Connect_ApiBrowser_Documentations'))
+DROP VIEW {databaseOwner}{objectQualifier}vw_Connect_ApiBrowser_Documentations
+GO
+
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE VIEW {databaseOwner}{objectQualifier}vw_Connect_ApiBrowser_Documentations
+AS
+SELECT
+ d.*,
+ ISNULL(c.FullQualifier, m.FullQualifier) FullQualifier,
+ CAST(CASE WHEN ISNULL(c.DocumentationId, -1)=d.DocumentationId 
+        OR ISNULL(m.DocumentationId, -1)=d.DocumentationId
+ THEN 1
+ ELSE 0
+ END AS BIT) IsCurrentVersion,
+ uc.DisplayName CreatedByUserDisplayName,
+ uc.Email CreatedByUserEmail,
+ um.DisplayName LastModifiedByUserDisplayName,
+ um.Email LastModifiedByUserEmail
+FROM {databaseOwner}{objectQualifier}Connect_ApiBrowser_Documentations d
+ INNER JOIN {databaseOwner}{objectQualifier}Users uc ON uc.UserID=d.CreatedByUserID
+ INNER JOIN {databaseOwner}{objectQualifier}Users um ON um.UserID=d.LastModifiedByUserID
+ LEFT JOIN {databaseOwner}{objectQualifier}vw_Connect_ApiBrowser_ApiClasses c ON c.ClassId=d.ClassId
+ LEFT JOIN {databaseOwner}{objectQualifier}vw_Connect_ApiBrowser_Members m ON m.MemberId=d.MemberId
+GO
+
 /******* FUNCTIONS *******/
 /******* SPROCS *******/
 IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}Connect_ApiBrowser_ClassDisappeared') AND type in (N'P', N'PC'))

diff --git a/gulpfile.js b/gulpfile.js
@@ -69,6 +69,8 @@ gulp.task('packageInstall', ['build'], function() {
             merge(
                 gulp.src([
                     '**/*.html',
+                    '**/*.cshtml',
+                    '**/*.ascx',
                     '**/*.resx'
                 ], {
                     base: '.'
@@ -121,6 +123,8 @@ gulp.task('packageSource', ['build'], function() {
                 '**/*.json',
                 '**/*.cs',
                 '**/*.vb',
+                '**/*.cshtml',
+                '**/*.ascx',
                 '**/*.resx',
                 config.dnn.pathToSupplementaryFiles + '**/*.*'
             ], {

diff --git a/package.json b/package.json
@@ -19,12 +19,17 @@
             "folderName": "MVC/Connect/ApiBrowser",
             "azureCompatible": "true"
         },
+        "folder": "MVC/Connect/ApiBrowser",
         "tempPath": "./package",
         "packagesPath": "./_Packages",
         "pathToAssemblies": "./bin",
         "pathToScripts": "./_Installation/SQL",
         "pathToSupplementaryFiles": "./_Installation",
         "excludeFilter": [
+            "_BuildSupport",
+            "_Development",
+            "_Installation",
+            "_Packages",
             "node_modules",
             "bin",
             "obj"