Merge branch 'master' into devcertintegration

Author: akrantz

manifest.outlook.xml

@@ -46,7 +46,7 @@
     <Hosts>
       <Host xsi:type="MailHost">
         <DesktopFormFactor>
-          <FunctionFile resid="Contoso.Ribbon.Url" />
+          <FunctionFile resid="Contoso.Commands.Url" />
           <ExtensionPoint xsi:type="MessageReadCommandSurface">
             <OfficeTab id="TabDefault">
               <Group id="msgReadGroup">
@@ -79,7 +79,7 @@
         <bt:Image id="Contoso.tpicon_80x80" DefaultValue="https://localhost:3000/assets/icon-80.png"/>
       </bt:Images>
       <bt:Urls>
-        <bt:Url id="Contoso.Ribbon.Url" DefaultValue="https://localhost:3000/ribbon.html" />
+        <bt:Url id="Contoso.Commands.Url" DefaultValue="https://localhost:3000/commands.html" />
         <bt:Url id="Contoso.Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html" />
       </bt:Urls>
       <bt:ShortStrings>

manifest.xml

@@ -31,7 +31,7 @@
             <Description resid="Contoso.GetStarted.Description"/>
             <LearnMoreUrl resid="Contoso.GetStarted.LearnMoreUrl"/>
           </GetStarted>
-          <FunctionFile resid="Contoso.Ribbon.Url" />
+          <FunctionFile resid="Contoso.Commands.Url" />
           <ExtensionPoint xsi:type="PrimaryCommandSurface">
             <OfficeTab id="TabHome">
               <Group id="Contoso.Group1">
@@ -69,7 +69,7 @@
             <Description resid="Contoso.GetStarted.Description"/>
             <LearnMoreUrl resid="Contoso.GetStarted.LearnMoreUrl"/>
           </GetStarted>
-          <FunctionFile resid="Contoso.Ribbon.Url" />
+          <FunctionFile resid="Contoso.Commands.Url" />
           <ExtensionPoint xsi:type="PrimaryCommandSurface">
             <OfficeTab id="TabHome">
               <Group id="Contoso.Group1">
@@ -107,7 +107,7 @@
             <Description resid="Contoso.GetStarted.Description"/>
             <LearnMoreUrl resid="Contoso.GetStarted.LearnMoreUrl"/>
           </GetStarted>
-          <FunctionFile resid="Contoso.Ribbon.Url" />
+          <FunctionFile resid="Contoso.Commands.Url" />
           <ExtensionPoint xsi:type="PrimaryCommandSurface">
             <OfficeTab id="TabHome">
               <Group id="Contoso.Group1">
@@ -145,7 +145,7 @@
             <Description resid="Contoso.GetStarted.Description"/>
             <LearnMoreUrl resid="Contoso.GetStarted.LearnMoreUrl"/>
           </GetStarted>
-          <FunctionFile resid="Contoso.Ribbon.Url" />
+          <FunctionFile resid="Contoso.Commands.Url" />
           <ExtensionPoint xsi:type="PrimaryCommandSurface">
             <OfficeTab id="TabHome">
               <Group id="Contoso.Group1">
@@ -185,7 +185,7 @@
       </bt:Images>
       <bt:Urls>
         <bt:Url id="Contoso.GetStarted.LearnMoreUrl" DefaultValue="https://go.microsoft.com/fwlink/?LinkId=276812" />
-        <bt:Url id="Contoso.Ribbon.Url" DefaultValue="https://localhost:3000/ribbon.html" />
+        <bt:Url id="Contoso.Commands.Url" DefaultValue="https://localhost:3000/commands.html" />
         <bt:Url id="Contoso.Taskpane.Url" DefaultValue="https://localhost:3000/taskpane.html" />
       </bt:Urls>
       <bt:ShortStrings>

package-lock.json

@@ -13,7 +13,7 @@
     <!-- Office JavaScript API -->
     <script type="text/javascript" src="https://appsforoffice.microsoft.com/lib/1.1/hosted/office.js"></script>
 
-    <!-- For the Office UI Fabric, go to http://aka.ms/office-ui-fabric to learn more. -->
+    <!-- For more information on Office UI Fabric, visit https://developer.microsoft.com/fabric. -->
     <link rel="stylesheet" href="https://static2.sharepointonline.com/files/fabric/office-ui-fabric-core/9.6.1/css/fabric.min.css"/>
 
     <!-- Template styles -->

src/ribbon/ribbon.html renamed to src/commands/commands.html

@@ -13,7 +13,7 @@ module.exports = async (env, options) => {
     entry: {
       polyfill: 'babel-polyfill',
       taskpane: "./src/taskpane/taskpane.ts",
-      ribbon: "./src/ribbon/ribbon.ts"
+      commands: "./src/commands/commands.ts"
     },
     resolve: {
       extensions: [".ts", ".tsx", ".html", ".js"]
@@ -55,9 +55,9 @@ module.exports = async (env, options) => {
         }
       ]),
       new HtmlWebpackPlugin({
-        filename: "ribbon.html",
-        template: "./src/ribbon/ribbon.html",
-        chunks: ["polyfill", "ribbon"]
+        filename: "commands.html",
+        template: "./src/commands/commands.html",
+        chunks: ["polyfill", "commands"]
       }),
     ],
     devServer: {