From 2c4f4e28b67034e6e2c6fc0abf79d256e779eea7 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Wed, 20 Dec 2017 09:59:31 -0800
Subject: [PATCH] chore: fix build errors related to material-experimental
 dialog-container style file (#9072)

---
 .../dialog/{dialog-container.scss => dialog-container.css}     | 0
 tools/gulp/packages.ts                                         | 3 ++-
 tools/gulp/tasks/development.ts                                | 1 +
 tools/gulp/tasks/publish.ts                                    | 2 +-
 tools/gulp/tasks/unit-test.ts                                  | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)
 rename src/material-experimental/dialog/{dialog-container.scss => dialog-container.css} (100%)

diff --git a/src/material-experimental/dialog/dialog-container.scss b/src/material-experimental/dialog/dialog-container.css
similarity index 100%
rename from src/material-experimental/dialog/dialog-container.scss
rename to src/material-experimental/dialog/dialog-container.css
diff --git a/tools/gulp/packages.ts b/tools/gulp/packages.ts
index cc7260b9347..56e130d4a65 100644
--- a/tools/gulp/packages.ts
+++ b/tools/gulp/packages.ts
@@ -4,7 +4,8 @@ import {join} from 'path';
 export const cdkPackage = new BuildPackage('cdk');
 export const materialPackage = new BuildPackage('material', [cdkPackage]);
 export const cdkExperimentalPackage = new BuildPackage('cdk-experimental', [materialPackage]);
-export const materialExperimentalPackage = new BuildPackage('material-experimental', [cdkPackage]);
+export const materialExperimentalPackage = new BuildPackage('material-experimental',
+    [cdkExperimentalPackage]);
 export const momentAdapterPackage = new BuildPackage('material-moment-adapter', [materialPackage]);
 export const examplesPackage = new BuildPackage('material-examples', [momentAdapterPackage]);
 
diff --git a/tools/gulp/tasks/development.ts b/tools/gulp/tasks/development.ts
index c2045c4e4e5..a14109d32af 100644
--- a/tools/gulp/tasks/development.ts
+++ b/tools/gulp/tasks/development.ts
@@ -78,6 +78,7 @@ task(':build:devapp:material-with-styles', sequenceTask(
 task('build:devapp', sequenceTask(
   'cdk:build-no-bundles',
   'material:build-no-bundles',
+  'cdk-experimental:build-no-bundles',
   'material-experimental:build-no-bundles',
   'material-moment-adapter:build-no-bundles',
   [':build:devapp:assets', ':build:devapp:scss', ':build:devapp:ts']
diff --git a/tools/gulp/tasks/publish.ts b/tools/gulp/tasks/publish.ts
index a4905cc7f77..493d4483f65 100644
--- a/tools/gulp/tasks/publish.ts
+++ b/tools/gulp/tasks/publish.ts
@@ -10,8 +10,8 @@ import * as minimist from 'minimist';
 /** Packages that will be published to NPM by the release task. */
 export const releasePackages = [
   'cdk',
-  'cdk-experimental',
   'material',
+  'cdk-experimental',
   'material-experimental',
   'material-moment-adapter'
 ];
diff --git a/tools/gulp/tasks/unit-test.ts b/tools/gulp/tasks/unit-test.ts
index 198f88092db..074de0457c9 100644
--- a/tools/gulp/tasks/unit-test.ts
+++ b/tools/gulp/tasks/unit-test.ts
@@ -16,8 +16,8 @@ const defaultOptions = {
 task(':test:build', sequenceTask(
   'clean',
   'cdk:build-no-bundles',
-  'cdk-experimental:build-no-bundles',
   'material:build-no-bundles',
+  'cdk-experimental:build-no-bundles',
   'material-experimental:build-no-bundles',
   'material-moment-adapter:build-no-bundles'
 ));