Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manifest element update #184

Merged
merged 3 commits into from
Oct 6, 2016
Merged

Manifest element update #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd525a0
Merge branch 'master' into dev
beth-panx Oct 5, 2016
707f94d
Merge branch 'master' of https://github.com/OfficeDev/generator-office
beth-panx Oct 5, 2016
29d083e
Added IconUrl element and optional SupportUtl element to all generato…
beth-panx Oct 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions generators/content/templates/common/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions generators/content/templates/ng-adal/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions generators/mail/templates/common/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions generators/mail/templates/ng-adal/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions generators/taskpane/templates/common/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions generators/taskpane/templates/ng-adal/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions test/content/existingproj-html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 6 additions & 0 deletions test/content/existingproj-manifestonly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 6 additions & 0 deletions test/content/existingproj-ng.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 6 additions & 0 deletions test/content/existingproj-ngadal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions test/content/newproj-html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 6 additions & 0 deletions test/content/newproj-manifestonly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 6 additions & 0 deletions test/content/newproj-ng.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 6 additions & 0 deletions test/content/newproj-ngadal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions test/mail/existingproj-html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions test/mail/existingproj-manifestonly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions test/mail/existingproj-ng.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions test/mail/existingproj-ngadal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions test/mail/newproj-html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions test/mail/newproj-manifestonly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions test/mail/newproj-ng.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions test/mail/newproj-ngadal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions test/taskpane/existingproj-html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 6 additions & 0 deletions test/taskpane/existingproj-manifestonly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 6 additions & 0 deletions test/taskpane/existingproj-ng.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 6 additions & 0 deletions test/taskpane/existingproj-ngadal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions test/taskpane/newproj-html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 6 additions & 0 deletions test/taskpane/newproj-manifestonly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 6 additions & 0 deletions test/taskpane/newproj-ng.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 6 additions & 0 deletions test/taskpane/newproj-ngadal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down