From 29d083e57630720f6affbdaa144e08b8f1684d99 Mon Sep 17 00:00:00 2001
From: beth-panx <beth_panx@hotmail.com>
Date: Wed, 5 Oct 2016 16:17:07 -0700
Subject: [PATCH] Added IconUrl element and optional SupportUtl element to all
 generator manifest files. Updated test for appveyor to validate IconUrl in
 manifest files.

---
 generators/content/templates/common/manifest.xml   | 3 +++
 generators/content/templates/ng-adal/manifest.xml  | 3 +++
 generators/mail/templates/common/manifest.xml      | 3 +++
 generators/mail/templates/ng-adal/manifest.xml     | 3 +++
 generators/taskpane/templates/common/manifest.xml  | 3 +++
 generators/taskpane/templates/ng-adal/manifest.xml | 3 +++
 test/content/existingproj-html.js                  | 6 ++++++
 test/content/existingproj-manifestonly.js          | 6 ++++++
 test/content/existingproj-ng.js                    | 6 ++++++
 test/content/existingproj-ngadal.js                | 6 ++++++
 test/content/newproj-html.js                       | 6 ++++++
 test/content/newproj-manifestonly.js               | 6 ++++++
 test/content/newproj-ng.js                         | 6 ++++++
 test/content/newproj-ngadal.js                     | 6 ++++++
 test/mail/existingproj-html.js                     | 6 ++++++
 test/mail/existingproj-manifestonly.js             | 6 ++++++
 test/mail/existingproj-ng.js                       | 6 ++++++
 test/mail/existingproj-ngadal.js                   | 6 ++++++
 test/mail/newproj-html.js                          | 6 ++++++
 test/mail/newproj-manifestonly.js                  | 6 ++++++
 test/mail/newproj-ng.js                            | 6 ++++++
 test/mail/newproj-ngadal.js                        | 6 ++++++
 test/taskpane/existingproj-html.js                 | 6 ++++++
 test/taskpane/existingproj-manifestonly.js         | 6 ++++++
 test/taskpane/existingproj-ng.js                   | 6 ++++++
 test/taskpane/existingproj-ngadal.js               | 6 ++++++
 test/taskpane/newproj-html.js                      | 6 ++++++
 test/taskpane/newproj-manifestonly.js              | 6 ++++++
 test/taskpane/newproj-ng.js                        | 6 ++++++
 test/taskpane/newproj-ngadal.js                    | 6 ++++++
 30 files changed, 162 insertions(+)

diff --git a/generators/content/templates/common/manifest.xml b/generators/content/templates/common/manifest.xml
index 908bb0de..46eb1a46 100644
--- a/generators/content/templates/common/manifest.xml
+++ b/generators/content/templates/common/manifest.xml
@@ -6,6 +6,9 @@
   <DefaultLocale>en-US</DefaultLocale>
   <DisplayName DefaultValue="<%= projectDisplayName %>" />
   <Description DefaultValue="[Task pane Add-in description]"/>
+  <IconUrl DefaultValue="https://localhost:8443/images/icon-32.png"/>
+  <!--If you plan to submit this add-in to the Office Store, uncomment the SupportUrl element below-->
+  <!--<SupportUrl DefaultValue="[Insert the URL of a page that provides support information for the app]">-->
   <Hosts>
   </Hosts>
   <DefaultSettings>
diff --git a/generators/content/templates/ng-adal/manifest.xml b/generators/content/templates/ng-adal/manifest.xml
index bd1417e0..456a9e79 100644
--- a/generators/content/templates/ng-adal/manifest.xml
+++ b/generators/content/templates/ng-adal/manifest.xml
@@ -6,6 +6,9 @@
   <DefaultLocale>en-US</DefaultLocale>
   <DisplayName DefaultValue="<%= projectDisplayName %>" />
   <Description DefaultValue="[Task pane Add-in description]"/>
+  <IconUrl DefaultValue="https://localhost:8443/images/icon-32.png"/>
+  <!--If you plan to submit this add-in to the Office Store, uncomment the SupportUrl element below-->
+  <!--<SupportUrl DefaultValue="[Insert the URL of a page that provides support information for the app]">-->
   <AppDomains>
     <AppDomain>https://login.windows.net</AppDomain>
     <AppDomain>https://login.microsoftonline.net</AppDomain>
diff --git a/generators/mail/templates/common/manifest.xml b/generators/mail/templates/common/manifest.xml
index c683bc62..3a419bc9 100644
--- a/generators/mail/templates/common/manifest.xml
+++ b/generators/mail/templates/common/manifest.xml
@@ -7,7 +7,10 @@
   <DefaultLocale>en-US</DefaultLocale>
   <DisplayName DefaultValue="<%= projectDisplayName %>" />
   <Description DefaultValue="[Outlook Add-in description]"/>
+  <IconUrl DefaultValue="https://localhost:8443/images/icon-32.png"/>
   <HighResolutionIconUrl DefaultValue="https://localhost:8443/images/hi-res-icon.png"/>
+  <!--If you plan to submit this add-in to the Office Store, uncomment the SupportUrl element below-->
+  <!--<SupportUrl DefaultValue="[Insert the URL of a page that provides support information for the app]">-->
   <Hosts>
     <Host Name="Mailbox" />
   </Hosts>
diff --git a/generators/mail/templates/ng-adal/manifest.xml b/generators/mail/templates/ng-adal/manifest.xml
index b672cbe8..4e8ed79b 100644
--- a/generators/mail/templates/ng-adal/manifest.xml
+++ b/generators/mail/templates/ng-adal/manifest.xml
@@ -7,6 +7,9 @@
   <DefaultLocale>en-US</DefaultLocale>
   <DisplayName DefaultValue="<%= projectDisplayName %>" />
   <Description DefaultValue="[Outlook Add-in description]"/>
+  <IconUrl DefaultValue="https://localhost:8443/images/icon-32.png"/>
+  <!--If you plan to submit this add-in to the Office Store, uncomment the SupportUrl element below-->
+  <!--<SupportUrl DefaultValue="[Insert the URL of a page that provides support information for the app]">-->
   <HighResolutionIconUrl DefaultValue="https://localhost:8443/images/hi-res-icon.png"/>
   <AppDomains>
     <AppDomain>https://login.windows.net</AppDomain>
diff --git a/generators/taskpane/templates/common/manifest.xml b/generators/taskpane/templates/common/manifest.xml
index c9d37d8f..ac32998d 100644
--- a/generators/taskpane/templates/common/manifest.xml
+++ b/generators/taskpane/templates/common/manifest.xml
@@ -6,6 +6,9 @@
   <DefaultLocale>en-US</DefaultLocale>
   <DisplayName DefaultValue="<%= projectDisplayName %>" />
   <Description DefaultValue="[Task pane Add-in description]"/>
+  <IconUrl DefaultValue="https://localhost:8443/images/icon-32.png"/>
+  <!--If you plan to submit this add-in to the Office Store, uncomment the SupportUrl element below-->
+  <!--<SupportUrl DefaultValue="[Insert the URL of a page that provides support information for the app]">-->
   <Hosts>
   </Hosts>
   <DefaultSettings>
diff --git a/generators/taskpane/templates/ng-adal/manifest.xml b/generators/taskpane/templates/ng-adal/manifest.xml
index 8723e772..4b6c7e1a 100644
--- a/generators/taskpane/templates/ng-adal/manifest.xml
+++ b/generators/taskpane/templates/ng-adal/manifest.xml
@@ -6,6 +6,9 @@
   <DefaultLocale>en-US</DefaultLocale>
   <DisplayName DefaultValue="<%= projectDisplayName %>" />
   <Description DefaultValue="[Task pane Add-in description]"/>
+  <IconUrl DefaultValue="https://localhost:8443/images/icon-32.png"/>
+  <!--If you plan to submit this add-in to the Office Store, uncomment the SupportUrl element below-->
+  <!--<SupportUrl DefaultValue="[Insert the URL of a page that provides support information for the app]">-->
   <AppDomains>
     <AppDomain>https://login.windows.net</AppDomain>
     <AppDomain>https://login.microsoftonline.net</AppDomain>
diff --git a/test/content/existingproj-html.js b/test/content/existingproj-html.js
index a1811249..0458da2f 100644
--- a/test/content/existingproj-html.js
+++ b/test/content/existingproj-html.js
@@ -227,6 +227,12 @@ describe('office:content', function () {
           done();
         });
 
+        it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
+          
         /**
          * Word present in host entry.
          */
diff --git a/test/content/existingproj-manifestonly.js b/test/content/existingproj-manifestonly.js
index f4aa8e78..9507f820 100644
--- a/test/content/existingproj-manifestonly.js
+++ b/test/content/existingproj-manifestonly.js
@@ -113,6 +113,12 @@ describe('office:content', function(){
           done();
         });
 
+        it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
+          
         /**
          * Word present in host entry.
          */
diff --git a/test/content/existingproj-ng.js b/test/content/existingproj-ng.js
index d63c3750..27edf87c 100644
--- a/test/content/existingproj-ng.js
+++ b/test/content/existingproj-ng.js
@@ -231,6 +231,12 @@ describe('office:content', function(){
           done();
         });
 
+        it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
+
         /**
          * Word present in host entry.
          */
diff --git a/test/content/existingproj-ngadal.js b/test/content/existingproj-ngadal.js
index a152a53b..46b57d26 100644
--- a/test/content/existingproj-ngadal.js
+++ b/test/content/existingproj-ngadal.js
@@ -235,6 +235,12 @@ describe('office:content', function(){
           expect(subject).to.equal('https://localhost:8443/index.html');
           done();
         });
+
+        it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
         
         it('includes AAD App Domains', function(done){
           var loginWindowsNetFound = false;
diff --git a/test/content/newproj-html.js b/test/content/newproj-html.js
index a4e32a9f..304308df 100644
--- a/test/content/newproj-html.js
+++ b/test/content/newproj-html.js
@@ -219,6 +219,12 @@ describe('office:content', function(){
           done();
         });
 
+        it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
+
         /**
          * Word present in host entry.
          */
diff --git a/test/content/newproj-manifestonly.js b/test/content/newproj-manifestonly.js
index dea23823..604ed49f 100644
--- a/test/content/newproj-manifestonly.js
+++ b/test/content/newproj-manifestonly.js
@@ -109,6 +109,12 @@ describe('office:content', function(){
           done();
         });
 
+        it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
+
         /**
          * Word present in host entry.
          */
diff --git a/test/content/newproj-ng.js b/test/content/newproj-ng.js
index 0fe5da96..c812ed54 100644
--- a/test/content/newproj-ng.js
+++ b/test/content/newproj-ng.js
@@ -221,6 +221,12 @@ describe('office:content', function(){
           done();
         });
 
+        it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
+
         /**
          * Word present in host entry.
          */
diff --git a/test/content/newproj-ngadal.js b/test/content/newproj-ngadal.js
index b21f3c0a..751ea800 100644
--- a/test/content/newproj-ngadal.js
+++ b/test/content/newproj-ngadal.js
@@ -225,6 +225,12 @@ describe('office:content', function(){
           expect(subject).to.equal('https://localhost:8443/index.html');
           done();
         });
+
+        it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
         
         it('includes AAD App Domains', function(done){
           var loginWindowsNetFound = false;
diff --git a/test/mail/existingproj-html.js b/test/mail/existingproj-html.js
index 70228418..541eaf51 100644
--- a/test/mail/existingproj-html.js
+++ b/test/mail/existingproj-html.js
@@ -237,6 +237,12 @@ describe('office:mail', function () {
             expect(manifest.OfficeApp.DisplayName[0].$.DefaultValue).to.equal(projectDisplayName);
             done();
           });
+
+          it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
           
           it('has valid hi-res icon URL', function (done) {
             expect(manifest.OfficeApp.HighResolutionIconUrl[0].$.DefaultValue)
diff --git a/test/mail/existingproj-manifestonly.js b/test/mail/existingproj-manifestonly.js
index f987ece6..43ca6042 100644
--- a/test/mail/existingproj-manifestonly.js
+++ b/test/mail/existingproj-manifestonly.js
@@ -121,6 +121,12 @@ describe('office:mail', function () {
             expect(manifest.OfficeApp.DisplayName[0].$.DefaultValue).to.equal(projectDisplayName);
             done();
           });
+
+          it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
           
           it('has valid hi-res icon URL', function (done) {
             expect(manifest.OfficeApp.HighResolutionIconUrl[0].$.DefaultValue)
diff --git a/test/mail/existingproj-ng.js b/test/mail/existingproj-ng.js
index b3b85b69..fa99aefb 100644
--- a/test/mail/existingproj-ng.js
+++ b/test/mail/existingproj-ng.js
@@ -254,6 +254,12 @@ describe('office:mail', function () {
             expect(manifest.OfficeApp.DisplayName[0].$.DefaultValue).to.equal(projectDisplayName);
             done();
           });
+
+          it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
           
           it('has valid hi-res icon URL', function (done) {
             expect(manifest.OfficeApp.HighResolutionIconUrl[0].$.DefaultValue)
diff --git a/test/mail/existingproj-ngadal.js b/test/mail/existingproj-ngadal.js
index 020dcef4..708fc141 100644
--- a/test/mail/existingproj-ngadal.js
+++ b/test/mail/existingproj-ngadal.js
@@ -261,6 +261,12 @@ describe('office:mail', function () {
             expect(manifest.OfficeApp.DisplayName[0].$.DefaultValue).to.equal(projectDisplayName);
             done();
           });
+
+          it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
           
           it('has valid hi-res icon URL', function (done) {
             expect(manifest.OfficeApp.HighResolutionIconUrl[0].$.DefaultValue)
diff --git a/test/mail/newproj-html.js b/test/mail/newproj-html.js
index 52526d5a..13e364cf 100644
--- a/test/mail/newproj-html.js
+++ b/test/mail/newproj-html.js
@@ -232,6 +232,12 @@ describe('office:mail', function () {
             expect(manifest.OfficeApp.DisplayName[0].$.DefaultValue).to.equal(projectDisplayName);
             done();
           });
+
+          it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
           
           it('has valid hi-res icon URL', function (done) {
             expect(manifest.OfficeApp.HighResolutionIconUrl[0].$.DefaultValue)
diff --git a/test/mail/newproj-manifestonly.js b/test/mail/newproj-manifestonly.js
index 3c7d3153..973de52d 100644
--- a/test/mail/newproj-manifestonly.js
+++ b/test/mail/newproj-manifestonly.js
@@ -121,6 +121,12 @@ describe('office:mail', function () {
             expect(manifest.OfficeApp.DisplayName[0].$.DefaultValue).to.equal(projectDisplayName);
             done();
           });
+
+          it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
           
           it('has valid hi-res icon URL', function (done) {
             expect(manifest.OfficeApp.HighResolutionIconUrl[0].$.DefaultValue)
diff --git a/test/mail/newproj-ng.js b/test/mail/newproj-ng.js
index 14939845..e712e099 100644
--- a/test/mail/newproj-ng.js
+++ b/test/mail/newproj-ng.js
@@ -248,6 +248,12 @@ describe('office:mail', function () {
             expect(manifest.OfficeApp.DisplayName[0].$.DefaultValue).to.equal(projectDisplayName);
             done();
           });
+
+          it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
           
           it('has valid hi-res icon URL', function (done) {
             expect(manifest.OfficeApp.HighResolutionIconUrl[0].$.DefaultValue)
diff --git a/test/mail/newproj-ngadal.js b/test/mail/newproj-ngadal.js
index efb19af4..42f587ea 100644
--- a/test/mail/newproj-ngadal.js
+++ b/test/mail/newproj-ngadal.js
@@ -255,6 +255,12 @@ describe('office:mail', function () {
             expect(manifest.OfficeApp.DisplayName[0].$.DefaultValue).to.equal(projectDisplayName);
             done();
           });
+
+          it('has valid icon URL', function (done) {
+            expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+              .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+            done();
+          });
           
           it('has valid hi-res icon URL', function (done) {
             expect(manifest.OfficeApp.HighResolutionIconUrl[0].$.DefaultValue)
diff --git a/test/taskpane/existingproj-html.js b/test/taskpane/existingproj-html.js
index dd09d0b7..f02b0e5f 100644
--- a/test/taskpane/existingproj-html.js
+++ b/test/taskpane/existingproj-html.js
@@ -183,6 +183,12 @@ describe('office:taskpane', function(){
           done();
         });
 
+        it('has valid icon URL', function (done) {
+          expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+            .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+          done();
+        });
+
         /**
          * Word present in host entry.
          */
diff --git a/test/taskpane/existingproj-manifestonly.js b/test/taskpane/existingproj-manifestonly.js
index 372193e4..7b14f22d 100644
--- a/test/taskpane/existingproj-manifestonly.js
+++ b/test/taskpane/existingproj-manifestonly.js
@@ -110,6 +110,12 @@ describe('office:taskpane', function(){
           done();
         });
 
+        it('has valid icon URL', function (done) {
+          expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+            .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+          done();
+        });
+
         /**
          * Word present in host entry.
          */
diff --git a/test/taskpane/existingproj-ng.js b/test/taskpane/existingproj-ng.js
index 2d1f4fdc..8eb5f535 100644
--- a/test/taskpane/existingproj-ng.js
+++ b/test/taskpane/existingproj-ng.js
@@ -187,6 +187,12 @@ describe('office:taskpane', function(){
           done();
         });
 
+        it('has valid icon URL', function (done) {
+          expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+            .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+          done();
+        });
+
         /**
          * Word present in host entry.
          */
diff --git a/test/taskpane/existingproj-ngadal.js b/test/taskpane/existingproj-ngadal.js
index 14648d38..fc649b00 100644
--- a/test/taskpane/existingproj-ngadal.js
+++ b/test/taskpane/existingproj-ngadal.js
@@ -191,6 +191,12 @@ describe('office:taskpane', function(){
           expect(subject).to.equal('https://localhost:8443/index.html');
           done();
         });
+
+        it('has valid icon URL', function (done) {
+          expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+            .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+          done();
+        });
         
         it('includes AAD App Domains', function(done){
           var loginWindowsNetFound = false;
diff --git a/test/taskpane/newproj-html.js b/test/taskpane/newproj-html.js
index f7bced91..d3022da0 100644
--- a/test/taskpane/newproj-html.js
+++ b/test/taskpane/newproj-html.js
@@ -220,6 +220,12 @@ describe('office:taskpane', function(){
           done();
         });
 
+        it('has valid icon URL', function (done) {
+          expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+            .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+          done();
+        });
+
         /**
          * Word present in host entry.
          */
diff --git a/test/taskpane/newproj-manifestonly.js b/test/taskpane/newproj-manifestonly.js
index 7ac0a485..d649e4df 100644
--- a/test/taskpane/newproj-manifestonly.js
+++ b/test/taskpane/newproj-manifestonly.js
@@ -109,6 +109,12 @@ describe('office:taskpane', function(){
           done();
         });
 
+        it('has valid icon URL', function (done) {
+          expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+            .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+          done();
+        });
+
         /**
         * Word present in host entry.
         */
diff --git a/test/taskpane/newproj-ng.js b/test/taskpane/newproj-ng.js
index 2ec089d4..5374eb39 100644
--- a/test/taskpane/newproj-ng.js
+++ b/test/taskpane/newproj-ng.js
@@ -222,6 +222,12 @@ describe('office:taskpane', function(){
           done();
         });
 
+        it('has valid icon URL', function (done) {
+          expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+            .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+          done();
+        });
+
         /**
       * Word present in host entry.
       */
diff --git a/test/taskpane/newproj-ngadal.js b/test/taskpane/newproj-ngadal.js
index 9b1d793d..75508461 100644
--- a/test/taskpane/newproj-ngadal.js
+++ b/test/taskpane/newproj-ngadal.js
@@ -226,6 +226,12 @@ describe('office:taskpane', function(){
           expect(subject).to.equal('https://localhost:8443/index.html');
           done();
         });
+
+        it('has valid icon URL', function (done) {
+          expect(manifest.OfficeApp.IconUrl[0].$.DefaultValue)
+            .to.match(/^https:\/\/.+\.(png|jpe?g|gif|bmp)$/i);
+          done();
+        });
         
         it('includes AAD App Domains', function(done){
           var loginWindowsNetFound = false;